一些优化，新增行政区划

src/DcatVueServiceProvider.php

@@ -5,8 +5,10 @@ namespace Weiwait\DcatVue;
 use Dcat\Admin\Extend\ServiceProvider;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Event;
 use Weiwait\DcatVue\Field\DateRange;
+use Weiwait\DcatVue\Field\Distpicker;
 use Weiwait\DcatVue\Field\File;
 use Weiwait\DcatVue\Field\Image;
 use Weiwait\DcatVue\Field\KeyValue;
@@ -20,7 +22,7 @@ use Weiwait\DcatVue\Models\FilesystemConfig;
 class DcatVueServiceProvider extends ServiceProvider
 {
 	protected $js = [
-        'js/index.js',
+        'js/helper.js',
     ];
 	protected $css = [
 		'css/index.css',
@@ -35,6 +37,8 @@ class DcatVueServiceProvider extends ServiceProvider
 	{
 		parent::init();
 
+        $this->loadMigrationsFrom(__DIR__ . '/../migrations');
+
         $this->hackConfigs();
 
 //		Form::extend('vue', Vue::class);
@@ -45,9 +49,10 @@ class DcatVueServiceProvider extends ServiceProvider
         Form::extend('vTags', Tag::class);
         Form::extend('vList', ListField::class);
         Form::extend('vKeyValue', KeyValue::class);
-//        Form::extend('dateRange', DateRange::class);
+        Form::extend('vDistpicker', Distpicker::class);
+        Form::extend('vDateRange', DateRange::class);
 
-        Admin::asset()->css(Admin::asset()->getAlias('@weiwait.dcat-vue')['css']);
+        Admin::requireAssets('@weiwait.dcat-vue');
 	}
 
 	public function settingForm()

src/Field/DateRange.php

@@ -4,6 +4,7 @@ namespace Weiwait\DcatVue\Field;
 
 use Dcat\Admin\Form\Field;
 use Dcat\Admin\Support\Helper;
+use Illuminate\Support\Str;
 
 class DateRange extends Field\DateRange
 {
@@ -49,6 +50,7 @@ class DateRange extends Field\DateRange
     {
         $this->addVariables([
             'component' => 'DateRange',
+            'mountId' => 'id' . md5(Str::uuid()),
        ]);
     }
 

src/Field/Distpicker.php

@@ -0,0 +1,167 @@
+<?php
+
+namespace Weiwait\DcatVue\Field;
+
+use Dcat\Admin\Form\Field;
+use Exception;
+use Illuminate\Support\Str;
+
+class Distpicker extends Field
+{
+    protected $view = 'weiwait.dcat-vue::common';
+    // 地图高度
+    protected string $height = '380px';
+    // 模板id
+    protected string $areaId = '';
+    // 关闭地图
+    protected bool $disableMap = false;
+    // 地址详细字段
+    protected string $detailField = '';
+    // 经度字段
+    protected string $lngField = '';
+    // 纬度字段
+    protected string $latField = '';
+    // 省字段
+    protected string $provinceField = '';
+    // 市字段
+    protected string $cityField = '';
+    // 区字段
+    protected string $districtField = '';
+    // 地图缩放字段
+    protected string $zoomField = '';
+    // 地图缩放
+    protected float $zoom = 13.14;
+    // 禁止选择
+    protected array $disables = [];
+
+    /**
+     * @throws Exception
+     */
+    public function __construct($label)
+    {
+        $this->areaId = md5(Str::uuid());
+        parent::__construct([], [$label]);
+    }
+
+    public function dist(string $province = null, string $city = null, string $district = null): self
+    {
+        if ($province) {
+            $this->column[$province] = $province;
+            $this->provinceField = $province;
+        }
+
+        if ($city) {
+            $this->column[$city] = $city;
+            $this->cityField = $city;
+        }
+
+        if ($district) {
+            $this->column[$district] = $district;
+            $this->districtField = $district;
+        }
+
+        return $this;
+    }
+
+    public function coordinate(string $lat, string $lng): self
+    {
+        $this->column[$lat] = $lat;
+        $this->column[$lng] = $lng;
+
+        $this->latField = $lat;
+        $this->lngField = $lng;
+
+        return $this;
+    }
+
+    public function detail(string $detail): self
+    {
+        $this->column[$detail] = $detail;
+
+        $this->detailField = $detail;
+
+        return $this;
+    }
+
+    public function mapHeight(int $height, string $unit = 'px'): self
+    {
+        $this->height = $height . $unit;
+
+        return $this;
+    }
+
+    public function disableMap(bool $disable = true): self
+    {
+        $this->disableMap = $disable;
+
+        return $this;
+    }
+
+    public function mapZoom(float $zoom = 13.14, string $column = ''): self
+    {
+        $this->zoom = $zoom;
+
+        if ($column) {
+            $this->column[$column] = $column;
+
+            $this->zoomField = $column;
+        }
+
+        return $this;
+    }
+
+    public function disableRegions(array $regions): self
+    {
+        $this->disables = $regions;
+
+        return $this;
+    }
+
+    protected function withProvides()
+    {
+        $this->addVariables([
+            'component' => 'DistPicker',
+            'mountId' => 'id' . md5(Str::uuid()),
+            'height' => $this->height,
+            'areaId' => $this->areaId,
+            'provinceField' => $this->provinceField,
+            'cityField' => $this->cityField,
+            'districtField' => $this->districtField,
+            'detailField' => $this->detailField,
+            'lngField' => $this->lngField,
+            'latField' => $this->latField,
+            'disableMap' => $this->disableMap,
+            'zoom' => $this->zoom,
+            'zoomField' => $this->zoomField,
+            'disables' => $this->disables,
+            'urls' => [
+                'address2ll' => route('dcat.admin.weiwait.distpicker.address2ll'),
+                'll2address' => route('dcat.admin.weiwait.distpicker.ll2address'),
+                'regions' => route('dcat.admin.weiwait.distpicker.regions'),
+            ]
+        ]);
+    }
+
+    public function render()
+    {
+        if (! $this->shouldRender()) {
+            return '';
+        }
+
+        $this->setDefaultClass();
+
+        $this->callComposing();
+
+        $this->withScript();
+
+        /****************************** custom ************************************/
+
+        $this->withProvides();
+
+        $this->addVariables([
+            'provides' => $this->variables(),
+        ]);
+
+        return view($this->view(), $this->variables());
+    }
+}

src/Field/Editor.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Weiwait\DcatVue\Field;
+
+use Dcat\Admin\Form\Field;
+use Dcat\Admin\Support\Helper;
+use Illuminate\Support\Str;
+use Weiwait\DcatVue\Field\Traits\UploadTrait;
+
+class Editor extends Field\Editor
+{
+    use UploadTrait;
+
+    protected $view = 'weiwait.dcat-vue::common';
+
+    public function render()
+    {
+        /****************************** parent ************************************/
+
+        $this->addVariables([
+            'options' => $this->formatOptions(),
+        ]);
+
+        /****************************** field ************************************/
+
+        if (!$this->shouldRender()) {
+            return '';
+        }
+
+        $this->setDefaultClass();
+
+        $this->callComposing();
+
+        $this->withScript();
+
+        /****************************** custom ************************************/
+
+        $this->withProvides();
+
+        $this->withUpload();
+
+        $this->addVariables([
+            'provides' => $this->variables(),
+        ]);
+
+        return view($this->view(), $this->variables());
+    }
+
+    protected function formatAttributes()
+    {
+        return $this->attributes;
+    }
+
+    protected function withProvides()
+    {
+        $this->addVariables([
+            'component' => 'Editor',
+            'mountId' => 'id' . md5(Str::uuid()),
+       ]);
+    }
+}

src/Field/File.php

@@ -3,6 +3,7 @@
 namespace Weiwait\DcatVue\Field;
 
 use Dcat\Admin\Form\Field;
+use Illuminate\Support\Str;
 use Weiwait\DcatVue\Models\WeiwaitUpload;
 
 class File extends Field\File
@@ -49,6 +50,7 @@ class File extends Field\File
 
         $this->addVariables([
             'component' => 'File',
+            'mountId' => 'id' . md5(Str::uuid()),
             'multiple' => false,
             'disk' => $this->disk ?? $disk,
             'dir' => $this->getDirectory(),

src/Field/Image.php

@@ -4,6 +4,7 @@ namespace Weiwait\DcatVue\Field;
 
 use Dcat\Admin\Form\Field;
 use Dcat\Admin\Support\Helper;
+use Illuminate\Support\Str;
 use Weiwait\DcatVue\Models\WeiwaitUpload;
 
 class Image extends Field\Image
@@ -54,6 +55,7 @@ class Image extends Field\Image
 
         $this->addVariables([
             'component' => 'Image',
+            'mountId' => 'id' . md5(Str::uuid()),
             'multiple' => false,
             'disk' => $this->disk ?? $disk,
             'dir' => $this->getDirectory(),

src/Field/KeyValue.php

@@ -6,6 +6,7 @@ use Dcat\Admin\Form\Field;
 use Dcat\Admin\Support\Helper;
 use Illuminate\Support\Arr;
 use Illuminate\Support\MessageBag;
+use Illuminate\Support\Str;
 use function Swoole\Coroutine\map;
 
 class KeyValue extends Field\KeyValue
@@ -143,6 +144,7 @@ class KeyValue extends Field\KeyValue
     {
         $this->addVariables([
             'component' => 'KeyValue',
+            'mountId' => 'id' . md5(Str::uuid()),
         ]);
     }
 

src/Field/ListField.php

@@ -4,6 +4,7 @@ namespace Weiwait\DcatVue\Field;
 
 use Dcat\Admin\Form\Field;
 use Dcat\Admin\Support\Helper;
+use Illuminate\Support\Str;
 
 class ListField extends Field\ListField
 {
@@ -54,6 +55,7 @@ class ListField extends Field\ListField
     {
         $this->addVariables([
             'component' => 'List',
+            'mountId' => 'id' . md5(Str::uuid()),
        ]);
     }
 

src/Field/MultipleFile.php

@@ -3,6 +3,7 @@
 namespace Weiwait\DcatVue\Field;
 
 use Dcat\Admin\Form\Field;
+use Illuminate\Support\Str;
 use Weiwait\DcatVue\Models\WeiwaitUpload;
 
 class MultipleFile extends Field\MultipleFile
@@ -49,6 +50,7 @@ class MultipleFile extends Field\MultipleFile
 
         $this->addVariables([
             'component' => 'File',
+            'mountId' => 'id' . md5(Str::uuid()),
             'multiple' => true,
             'disk' => $this->disk ?? $disk,
             'dir' => $this->getDirectory(),

src/Field/MultipleImage.php

@@ -4,6 +4,7 @@ namespace Weiwait\DcatVue\Field;
 
 use Dcat\Admin\Form\Field;
 use Dcat\Admin\Support\Helper;
+use Illuminate\Support\Str;
 use Weiwait\DcatVue\Models\WeiwaitUpload;
 
 class MultipleImage extends Field\MultipleImage
@@ -54,6 +55,7 @@ class MultipleImage extends Field\MultipleImage
 
         $this->addVariables([
             'component' => 'Image',
+            'mountId' => 'id' . md5(Str::uuid()),
             'multiple' => true,
             'disk' => $this->disk ?? $disk,
             'dir' => $this->getDirectory(),

src/Field/Tag.php

@@ -4,6 +4,7 @@ namespace Weiwait\DcatVue\Field;
 
 use Dcat\Admin\Form\Field;
 use Dcat\Admin\Support\Helper;
+use Illuminate\Support\Str;
 
 class Tag extends Field\Tags
 {
@@ -63,6 +64,7 @@ class Tag extends Field\Tags
     {
         $this->addVariables([
             'component' => 'Tag',
+            'mountId' => 'id' . md5(Str::uuid()),
        ]);
     }
 

src/Field/Traits/UploadTrait.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Weiwait\DcatVue\Field\Traits;
+
+trait UploadTrait
+{
+    use \Dcat\Admin\Form\Field\UploadField;
+
+    public function withUpload()
+    {
+        $this->addVariables([
+            'uploader' => [
+                'disk' => $this->disk,
+                'dir' => $this->getDirectory(),
+                'uploaded_url' => route('dcat.admin.weiwait.file.uploaded'),
+                'obs_config_url' => route('dcat.admin.weiwait.file.obs-config'),
+            ]
+        ]);
+    }
+
+    /**
+     * @return mixed
+     */
+    public function defaultDirectory()
+    {
+        return config('admin.upload.directory.file');
+    }
+}

src/Http/Controllers/DcatVueController.php

@@ -6,9 +6,11 @@ use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Admin;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
 use Qiniu\Config;
 use Weiwait\DcatVue\Forms\FilesystemConfig;
+use Weiwait\DcatVue\Models\ChinaArea;
 use Weiwait\DcatVue\Models\WeiwaitUpload;
 
 class DcatVueController extends Controller
@@ -43,10 +45,14 @@ class DcatVueController extends Controller
                 );
 
             case 'qiniu':
-                $url = (new Config())->getUpHost(
+                $config = new Config();
+                $config->useHTTPS = 'https' == $request->getScheme();
+
+                $url = $config->getUpHost(
                     config('filesystems.disks.qiniu.access_key'),
                     config('filesystems.disks.qiniu.bucket')
                 );
+
                 return [
                     'token' => Storage::disk('qiniu')->getAdapter()->getUploadToken($request['filename'], 3600),
                     'host' => $url,
@@ -86,4 +92,27 @@ class DcatVueController extends Controller
         return $content
             ->body(new FilesystemConfig());
     }
+
+    public function regions(Request $request)
+    {
+        $items = ChinaArea::query()->where('pcode', $request->get('pcode', 0))
+            ->get(['code as value', 'name as label', 'pcode']);
+
+        return response()->json(['items' => $items]);
+    }
+
+    public function address2ll(Request $request)
+    {
+        $sign =  'rYRi7PfL5beOtUfcABaF4MIFHaHGDPE';
+
+        $uri = "/ws/geocoder/v1/?address={$request['address']}&key=ZZQBZ-WE6E2-FCMUZ-CBUZ7-ZW5I3-I7BIX";
+        $uri .= '&sig=' . md5($uri . $sign);
+
+        return Http::get('https://apis.map.qq.com' . $uri)->body();
+    }
+
+    public function ll2address(Request $request)
+    {
+        return Http::get("https://apis.map.qq.com/ws/geocoder/v1/?location={$request['lat']},{$request['lng']}&key=ZZQBZ-WE6E2-FCMUZ-CBUZ7-ZW5I3-I7BIX&get_poi=1")->body();
+    }
 }

src/Http/routes.php

@@ -14,3 +14,12 @@ Route::post('weiwait/file/uploaded', [Controllers\DcatVueController::class, 'upl
 // 本地上传
 Route::post('weiwait/file/upload', [Controllers\DcatVueController::class, 'upload'])
     ->name('weiwait.file.upload');
+// 区划
+Route::get('weiwait/distpicker/regions', [Controllers\DcatVueController::class, 'regions'])
+    ->name('weiwait.distpicker.regions');
+// 地址解析
+Route::get('weiwait/distpicker/address2ll', [Controllers\DcatVueController::class, 'address2ll'])
+    ->name('weiwait.distpicker.address2ll');
+// 坐标位置信息
+Route::get('weiwait/distpicker/ll2address', [Controllers\DcatVueController::class, 'll2address'])
+    ->name('weiwait.distpicker.ll2address');

src/Models/ChinaArea.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Weiwait\DcatVue\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\Model;
+
+class ChinaArea extends Model
+{
+    use HasDateTimeFormatter;
+
+    public static function provinces()
+    {
+        return self::query()->where('level', 1)->get(['code as value', 'name as label', 'pcode']);
+    }
+
+    public static function cities()
+    {
+        return self::query()->where('level', 2)->get(['code as value', 'name as label', 'pcode']);
+    }
+
+    public static function districts()
+    {
+        return self::query()->where('level', 3)->get(['code as value', 'name as label', 'pcode']);
+    }
+}