diff --git a/src/Console/UpdateCommand.php b/src/Console/UpdateCommand.php index 7f9dd896..8c23e74a 100644 --- a/src/Console/UpdateCommand.php +++ b/src/Console/UpdateCommand.php @@ -5,6 +5,7 @@ use Illuminate\Support\Str; use Illuminate\Console\Command; use Illuminate\Support\Facades\Schema; +use Slowlyo\OwlAdmin\Support\Cores\Database; class UpdateCommand extends Command { @@ -259,4 +260,11 @@ public function version373() }); } } + + public function version400() + { + $this->output->title('Update to version v3.7.3'); + + Database::make()->fillCodeGeneratorFields(); + } } diff --git a/src/Controllers/DevTools/CodeGeneratorController.php b/src/Controllers/DevTools/CodeGeneratorController.php index 4f4fddc6..ee3e4982 100644 --- a/src/Controllers/DevTools/CodeGeneratorController.php +++ b/src/Controllers/DevTools/CodeGeneratorController.php @@ -6,6 +6,7 @@ use Illuminate\Support\Str; use Illuminate\Support\Arr; use Illuminate\Http\Request; +use Slowlyo\OwlAdmin\Support\Cores\Database; use Slowlyo\OwlAdmin\Services\AdminMenuService; use Slowlyo\OwlAdmin\Traits\IconifyPickerTrait; use Slowlyo\OwlAdmin\Controllers\AdminController; @@ -929,8 +930,7 @@ public function columnForm() ->required(), amis() ->TextControl('input_label', admin_trans('admin.code_generators.filter_input_label')) - ->visibleOn('${mode == "input"}') - ->required(), + ->visibleOn('${mode == "input"}'), $this->componentSelect('filter', admin_trans('admin.code_generators.filter_component')) ->visibleOn('${mode == "input"}') ->value([ diff --git a/src/Models/AdminSetting.php b/src/Models/AdminSetting.php index b9f56b19..a3ecf7ed 100644 --- a/src/Models/AdminSetting.php +++ b/src/Models/AdminSetting.php @@ -13,4 +13,9 @@ class AdminSetting extends BaseModel protected $casts = [ 'values' => 'json', ]; + + protected function asJson($value) + { + return json_encode($value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); + } } diff --git a/src/Support/CodeGenerator/FilterGenerator.php b/src/Support/CodeGenerator/FilterGenerator.php index 78f402ca..ddca4e0a 100644 --- a/src/Support/CodeGenerator/FilterGenerator.php +++ b/src/Support/CodeGenerator/FilterGenerator.php @@ -27,7 +27,18 @@ class FilterGenerator extends BaseGenerator public function renderComponent() { - $filters = collect(data_get($this->model->columns, '*.list_filter.*', [])) + $columns = $this->model->columns; + foreach ($columns as $key => $value) { + if (!data_get($value, 'list_filter')) continue; + + foreach ($value['list_filter'] as $index => $item) { + if (!data_get($item, 'input_label')) { + data_set($columns, "$key.list_filter.$index.input_label", $value['comment'] ?: $value['name']); + } + } + } + + $filters = collect(data_get($columns, '*.list_filter.*', [])) ->where('mode', 'input') ->values() ->toArray(); diff --git a/src/Support/Cores/Database.php b/src/Support/Cores/Database.php index c7928a90..f01ff2da 100644 --- a/src/Support/Cores/Database.php +++ b/src/Support/Cores/Database.php @@ -337,6 +337,9 @@ public function fillInitialData() // 默认中文 settings()->set('admin_locale', 'zh_CN'); + + // 填充代码生成器常用字段 + $this->fillCodeGeneratorFields(); } public static function getTables() @@ -351,4 +354,24 @@ public static function getTables() // laravel 11+ return array_column(Schema::getTables(), 'name'); } + + /** + * 填充代码生成器常用字段 + * + * @return void + */ + public function fillCodeGeneratorFields() + { + if ($this->moduleName) return; + + $data = [ + 'admin_common_field' => '{"标题/名称":{"name":"title","type":"string","default":null,"nullable":false,"comment":"标题","action_scope":["list","detail","create","edit"],"file_column":0,"list_component":{"list_component_property":[{"name":"searchable","value":"1"}],"list_component_type":"TableColumn","component_property_options":[{"label":"align","value":"align"},{"label":"breakpoint","value":"breakpoint"},{"label":"canAccessSuperData","value":"canAccessSuperData"},{"label":"className","value":"className"},{"label":"classNameExpr","value":"classNameExpr"},{"label":"copyable","value":"copyable"},{"label":"filterable","value":"filterable"},{"label":"fixed","value":"fixed"},{"label":"headerAlign","value":"headerAlign"},{"label":"innerStyle","value":"innerStyle"},{"label":"labelClassName","value":"labelClassName"},{"label":"lazyRenderAfter","value":"lazyRenderAfter"},{"label":"popOver","value":"popOver"},{"label":"quickEdit","value":"quickEdit"},{"label":"quickEditOnUpdate","value":"quickEditOnUpdate"},{"label":"remark","value":"remark"},{"label":"searchable","value":"searchable"},{"label":"sortable","value":"sortable"},{"label":"toggled","value":"toggled"},{"label":"type","value":"type"},{"label":"unique","value":"unique"},{"label":"vAlign","value":"vAlign"},{"label":"value","value":"value"},{"label":"width","value":"width"},{"label":"make","value":"make"},{"label":"permission","value":"permission"},{"label":"filteredResults","value":"filteredResults"},{"label":"macro","value":"macro"},{"label":"mixin","value":"mixin"},{"label":"hasMacro","value":"hasMacro"},{"label":"flushMacros","value":"flushMacros"},{"label":"__callStatic","value":"__callStatic"},{"label":"macroCall","value":"macroCall"}]},"form_component":{"form_component_type":"TextControl","component_property_options":[{"label":"addApi","value":"addApi"},{"label":"addControls","value":"addControls"},{"label":"addDialog","value":"addDialog"},{"label":"addOn","value":"addOn"},{"label":"autoComplete","value":"autoComplete"},{"label":"autoFill","value":"autoFill"},{"label":"borderMode","value":"borderMode"},{"label":"className","value":"className"},{"label":"clearValueOnEmpty","value":"clearValueOnEmpty"},{"label":"clearValueOnHidden","value":"clearValueOnHidden"},{"label":"clearable","value":"clearable"},{"label":"creatable","value":"creatable"},{"label":"createBtnLabel","value":"createBtnLabel"},{"label":"deferApi","value":"deferApi"},{"label":"deferField","value":"deferField"},{"label":"deleteApi","value":"deleteApi"},{"label":"deleteConfirmText","value":"deleteConfirmText"},{"label":"delimiter","value":"delimiter"},{"label":"desc","value":"desc"},{"label":"description","value":"description"},{"label":"descriptionClassName","value":"descriptionClassName"},{"label":"disabled","value":"disabled"},{"label":"disabledOn","value":"disabledOn"},{"label":"editApi","value":"editApi"},{"label":"editControls","value":"editControls"},{"label":"editDialog","value":"editDialog"},{"label":"editable","value":"editable"},{"label":"editorSetting","value":"editorSetting"},{"label":"extraName","value":"extraName"},{"label":"extractValue","value":"extractValue"},{"label":"hidden","value":"hidden"},{"label":"hiddenOn","value":"hiddenOn"},{"label":"hint","value":"hint"},{"label":"horizontal","value":"horizontal"},{"label":"id","value":"id"},{"label":"initAutoFill","value":"initAutoFill"},{"label":"initFetch","value":"initFetch"},{"label":"initFetchOn","value":"initFetchOn"},{"label":"inline","value":"inline"},{"label":"inputClassName","value":"inputClassName"},{"label":"inputControlClassName","value":"inputControlClassName"},{"label":"joinValues","value":"joinValues"},{"label":"labelAlign","value":"labelAlign"},{"label":"labelClassName","value":"labelClassName"},{"label":"labelRemark","value":"labelRemark"},{"label":"labelWidth","value":"labelWidth"},{"label":"maxLength","value":"maxLength"},{"label":"minLength","value":"minLength"},{"label":"mode","value":"mode"},{"label":"multiple","value":"multiple"},{"label":"nativeAutoComplete","value":"nativeAutoComplete"},{"label":"nativeInputClassName","value":"nativeInputClassName"},{"label":"onEvent","value":"onEvent"},{"label":"options","value":"options"},{"label":"placeholder","value":"placeholder"},{"label":"prefix","value":"prefix"},{"label":"readOnly","value":"readOnly"},{"label":"readOnlyOn","value":"readOnlyOn"},{"label":"remark","value":"remark"},{"label":"removable","value":"removable"},{"label":"required","value":"required"},{"label":"resetValue","value":"resetValue"},{"label":"row","value":"row"},{"label":"saveImmediately","value":"saveImmediately"},{"label":"selectFirst","value":"selectFirst"},{"label":"showCounter","value":"showCounter"},{"label":"size","value":"size"},{"label":"source","value":"source"},{"label":"static","value":"static"},{"label":"staticClassName","value":"staticClassName"},{"label":"staticInputClassName","value":"staticInputClassName"},{"label":"staticLabelClassName","value":"staticLabelClassName"},{"label":"staticOn","value":"staticOn"},{"label":"staticPlaceholder","value":"staticPlaceholder"},{"label":"staticSchema","value":"staticSchema"},{"label":"style","value":"style"},{"label":"submitOnChange","value":"submitOnChange"},{"label":"suffix","value":"suffix"},{"label":"testIdBuilder","value":"testIdBuilder"},{"label":"transform","value":"transform"},{"label":"trimContents","value":"trimContents"},{"label":"type","value":"type"},{"label":"useMobileUI","value":"useMobileUI"},{"label":"validateApi","value":"validateApi"},{"label":"validateOnChange","value":"validateOnChange"},{"label":"validationErrors","value":"validationErrors"},{"label":"validations","value":"validations"},{"label":"value","value":"value"},{"label":"valuesNoWrap","value":"valuesNoWrap"},{"label":"visible","value":"visible"},{"label":"visibleOn","value":"visibleOn"},{"label":"width","value":"width"},{"label":"make","value":"make"},{"label":"permission","value":"permission"},{"label":"filteredResults","value":"filteredResults"},{"label":"macro","value":"macro"},{"label":"mixin","value":"mixin"},{"label":"hasMacro","value":"hasMacro"},{"label":"flushMacros","value":"flushMacros"},{"label":"__callStatic","value":"__callStatic"},{"label":"macroCall","value":"macroCall"}],"form_component_property":[{"name":"required","value":"1"}]},"detail_component":[],"list_filter":[{"mode":"input","type":"contains","filter":{"filter_type":"TextControl","filter_property":[{"name":"size","value":"md"},{"name":"clearable","value":1}],"component_property_options":[{"label":"addApi","value":"addApi"},{"label":"addControls","value":"addControls"},{"label":"addDialog","value":"addDialog"},{"label":"addOn","value":"addOn"},{"label":"autoComplete","value":"autoComplete"},{"label":"autoFill","value":"autoFill"},{"label":"borderMode","value":"borderMode"},{"label":"className","value":"className"},{"label":"clearValueOnEmpty","value":"clearValueOnEmpty"},{"label":"clearValueOnHidden","value":"clearValueOnHidden"},{"label":"clearable","value":"clearable"},{"label":"creatable","value":"creatable"},{"label":"createBtnLabel","value":"createBtnLabel"},{"label":"deferApi","value":"deferApi"},{"label":"deferField","value":"deferField"},{"label":"deleteApi","value":"deleteApi"},{"label":"deleteConfirmText","value":"deleteConfirmText"},{"label":"delimiter","value":"delimiter"},{"label":"desc","value":"desc"},{"label":"description","value":"description"},{"label":"descriptionClassName","value":"descriptionClassName"},{"label":"disabled","value":"disabled"},{"label":"disabledOn","value":"disabledOn"},{"label":"editApi","value":"editApi"},{"label":"editControls","value":"editControls"},{"label":"editDialog","value":"editDialog"},{"label":"editable","value":"editable"},{"label":"editorSetting","value":"editorSetting"},{"label":"extraName","value":"extraName"},{"label":"extractValue","value":"extractValue"},{"label":"hidden","value":"hidden"},{"label":"hiddenOn","value":"hiddenOn"},{"label":"hint","value":"hint"},{"label":"horizontal","value":"horizontal"},{"label":"id","value":"id"},{"label":"initAutoFill","value":"initAutoFill"},{"label":"initFetch","value":"initFetch"},{"label":"initFetchOn","value":"initFetchOn"},{"label":"inline","value":"inline"},{"label":"inputClassName","value":"inputClassName"},{"label":"inputControlClassName","value":"inputControlClassName"},{"label":"joinValues","value":"joinValues"},{"label":"labelAlign","value":"labelAlign"},{"label":"labelClassName","value":"labelClassName"},{"label":"labelRemark","value":"labelRemark"},{"label":"labelWidth","value":"labelWidth"},{"label":"maxLength","value":"maxLength"},{"label":"minLength","value":"minLength"},{"label":"mode","value":"mode"},{"label":"multiple","value":"multiple"},{"label":"nativeAutoComplete","value":"nativeAutoComplete"},{"label":"nativeInputClassName","value":"nativeInputClassName"},{"label":"onEvent","value":"onEvent"},{"label":"options","value":"options"},{"label":"placeholder","value":"placeholder"},{"label":"prefix","value":"prefix"},{"label":"readOnly","value":"readOnly"},{"label":"readOnlyOn","value":"readOnlyOn"},{"label":"remark","value":"remark"},{"label":"removable","value":"removable"},{"label":"required","value":"required"},{"label":"resetValue","value":"resetValue"},{"label":"row","value":"row"},{"label":"saveImmediately","value":"saveImmediately"},{"label":"selectFirst","value":"selectFirst"},{"label":"showCounter","value":"showCounter"},{"label":"size","value":"size"},{"label":"source","value":"source"},{"label":"static","value":"static"},{"label":"staticClassName","value":"staticClassName"},{"label":"staticInputClassName","value":"staticInputClassName"},{"label":"staticLabelClassName","value":"staticLabelClassName"},{"label":"staticOn","value":"staticOn"},{"label":"staticPlaceholder","value":"staticPlaceholder"},{"label":"staticSchema","value":"staticSchema"},{"label":"style","value":"style"},{"label":"submitOnChange","value":"submitOnChange"},{"label":"suffix","value":"suffix"},{"label":"testIdBuilder","value":"testIdBuilder"},{"label":"transform","value":"transform"},{"label":"trimContents","value":"trimContents"},{"label":"type","value":"type"},{"label":"useMobileUI","value":"useMobileUI"},{"label":"validateApi","value":"validateApi"},{"label":"validateOnChange","value":"validateOnChange"},{"label":"validationErrors","value":"validationErrors"},{"label":"validations","value":"validations"},{"label":"value","value":"value"},{"label":"valuesNoWrap","value":"valuesNoWrap"},{"label":"visible","value":"visible"},{"label":"visibleOn","value":"visibleOn"},{"label":"width","value":"width"},{"label":"make","value":"make"},{"label":"permission","value":"permission"},{"label":"filteredResults","value":"filteredResults"},{"label":"macro","value":"macro"},{"label":"mixin","value":"mixin"},{"label":"hasMacro","value":"hasMacro"},{"label":"flushMacros","value":"flushMacros"},{"label":"__callStatic","value":"__callStatic"},{"label":"macroCall","value":"macroCall"}]},"input_name":"keywords"}]},"单图":{"name":"image","type":"string","default":null,"nullable":true,"comment":"单图","action_scope":["list","detail","create","edit"],"file_column":true,"list_component":{"list_component_type":"TableColumn","component_property_options":[{"label":"align","value":"align"},{"label":"breakpoint","value":"breakpoint"},{"label":"canAccessSuperData","value":"canAccessSuperData"},{"label":"className","value":"className"},{"label":"classNameExpr","value":"classNameExpr"},{"label":"copyable","value":"copyable"},{"label":"filterable","value":"filterable"},{"label":"fixed","value":"fixed"},{"label":"headerAlign","value":"headerAlign"},{"label":"innerStyle","value":"innerStyle"},{"label":"labelClassName","value":"labelClassName"},{"label":"lazyRenderAfter","value":"lazyRenderAfter"},{"label":"popOver","value":"popOver"},{"label":"quickEdit","value":"quickEdit"},{"label":"quickEditOnUpdate","value":"quickEditOnUpdate"},{"label":"remark","value":"remark"},{"label":"searchable","value":"searchable"},{"label":"sortable","value":"sortable"},{"label":"toggled","value":"toggled"},{"label":"type","value":"type"},{"label":"unique","value":"unique"},{"label":"vAlign","value":"vAlign"},{"label":"value","value":"value"},{"label":"width","value":"width"},{"label":"make","value":"make"},{"label":"permission","value":"permission"},{"label":"filteredResults","value":"filteredResults"},{"label":"macro","value":"macro"},{"label":"mixin","value":"mixin"},{"label":"hasMacro","value":"hasMacro"},{"label":"flushMacros","value":"flushMacros"},{"label":"__callStatic","value":"__callStatic"},{"label":"macroCall","value":"macroCall"}],"list_component_property":[{"name":"type","value":"image"},{"name":"enlargeAble","value":"1"}]},"form_component":{"form_component_type":"ImageControl","component_property_options":[{"label":"accept","value":"accept"},{"label":"allowInput","value":"allowInput"},{"label":"autoFill","value":"autoFill"},{"label":"autoUpload","value":"autoUpload"},{"label":"btnClassName","value":"btnClassName"},{"label":"btnUploadClassName","value":"btnUploadClassName"},{"label":"capture","value":"capture"},{"label":"className","value":"className"},{"label":"clearValueOnHidden","value":"clearValueOnHidden"},{"label":"compress","value":"compress"},{"label":"compressOptions","value":"compressOptions"},{"label":"crop","value":"crop"},{"label":"cropFormat","value":"cropFormat"},{"label":"cropQuality","value":"cropQuality"},{"label":"delimiter","value":"delimiter"},{"label":"desc","value":"desc"},{"label":"description","value":"description"},{"label":"descriptionClassName","value":"descriptionClassName"},{"label":"disabled","value":"disabled"},{"label":"disabledOn","value":"disabledOn"},{"label":"draggable","value":"draggable"},{"label":"draggableTip","value":"draggableTip"},{"label":"dropCrop","value":"dropCrop"},{"label":"editorSetting","value":"editorSetting"},{"label":"extraName","value":"extraName"},{"label":"extractValue","value":"extractValue"},{"label":"fixedSize","value":"fixedSize"},{"label":"fixedSizeClassName","value":"fixedSizeClassName"},{"label":"frameImage","value":"frameImage"},{"label":"hidden","value":"hidden"},{"label":"hiddenOn","value":"hiddenOn"},{"label":"hideUploadButton","value":"hideUploadButton"},{"label":"hint","value":"hint"},{"label":"horizontal","value":"horizontal"},{"label":"id","value":"id"},{"label":"imageClassName","value":"imageClassName"},{"label":"initAutoFill","value":"initAutoFill"},{"label":"initCrop","value":"initCrop"},{"label":"inline","value":"inline"},{"label":"inputClassName","value":"inputClassName"},{"label":"joinValues","value":"joinValues"},{"label":"labelAlign","value":"labelAlign"},{"label":"labelClassName","value":"labelClassName"},{"label":"labelRemark","value":"labelRemark"},{"label":"labelWidth","value":"labelWidth"},{"label":"limit","value":"limit"},{"label":"maxLength","value":"maxLength"},{"label":"maxSize","value":"maxSize"},{"label":"mode","value":"mode"},{"label":"multiple","value":"multiple"},{"label":"onEvent","value":"onEvent"},{"label":"placeholder","value":"placeholder"},{"label":"reCropable","value":"reCropable"},{"label":"readOnly","value":"readOnly"},{"label":"readOnlyOn","value":"readOnlyOn"},{"label":"receiver","value":"receiver"},{"label":"remark","value":"remark"},{"label":"required","value":"required"},{"label":"resetValue","value":"resetValue"},{"label":"row","value":"row"},{"label":"saveImmediately","value":"saveImmediately"},{"label":"showCompressOptions","value":"showCompressOptions"},{"label":"size","value":"size"},{"label":"src","value":"src"},{"label":"static","value":"static"},{"label":"staticClassName","value":"staticClassName"},{"label":"staticInputClassName","value":"staticInputClassName"},{"label":"staticLabelClassName","value":"staticLabelClassName"},{"label":"staticOn","value":"staticOn"},{"label":"staticPlaceholder","value":"staticPlaceholder"},{"label":"staticSchema","value":"staticSchema"},{"label":"style","value":"style"},{"label":"submitOnChange","value":"submitOnChange"},{"label":"testIdBuilder","value":"testIdBuilder"},{"label":"thumbMode","value":"thumbMode"},{"label":"thumbRatio","value":"thumbRatio"},{"label":"type","value":"type"},{"label":"uploadBtnText","value":"uploadBtnText"},{"label":"useMobileUI","value":"useMobileUI"},{"label":"validateApi","value":"validateApi"},{"label":"validateOnChange","value":"validateOnChange"},{"label":"validationErrors","value":"validationErrors"},{"label":"validations","value":"validations"},{"label":"value","value":"value"},{"label":"visible","value":"visible"},{"label":"visibleOn","value":"visibleOn"},{"label":"width","value":"width"},{"label":"make","value":"make"},{"label":"permission","value":"permission"},{"label":"filteredResults","value":"filteredResults"},{"label":"macro","value":"macro"},{"label":"mixin","value":"mixin"},{"label":"hasMacro","value":"hasMacro"},{"label":"flushMacros","value":"flushMacros"},{"label":"__callStatic","value":"__callStatic"},{"label":"macroCall","value":"macroCall"},{"label":"uploadImagePath","value":"uploadImagePath"},{"label":"uploadImage","value":"uploadImage"},{"label":"uploadFilePath","value":"uploadFilePath"},{"label":"uploadFile","value":"uploadFile"},{"label":"uploadRichPath","value":"uploadRichPath"},{"label":"uploadRich","value":"uploadRich"},{"label":"chunkUploadStart","value":"chunkUploadStart"},{"label":"chunkUpload","value":"chunkUpload"},{"label":"chunkUploadFinish","value":"chunkUploadFinish"}],"form_component_property":[{"name":"required","value":"1"}]},"detail_component":{"detail_component_type":"StaticExactControl","component_property_options":[{"label":"autoFill","value":"autoFill"},{"label":"borderMode","value":"borderMode"},{"label":"className","value":"className"},{"label":"clearValueOnHidden","value":"clearValueOnHidden"},{"label":"copyable","value":"copyable"},{"label":"desc","value":"desc"},{"label":"description","value":"description"},{"label":"descriptionClassName","value":"descriptionClassName"},{"label":"disabled","value":"disabled"},{"label":"disabledOn","value":"disabledOn"},{"label":"editorSetting","value":"editorSetting"},{"label":"extraName","value":"extraName"},{"label":"hidden","value":"hidden"},{"label":"hiddenOn","value":"hiddenOn"},{"label":"hint","value":"hint"},{"label":"horizontal","value":"horizontal"},{"label":"id","value":"id"},{"label":"initAutoFill","value":"initAutoFill"},{"label":"inline","value":"inline"},{"label":"inputClassName","value":"inputClassName"},{"label":"labelAlign","value":"labelAlign"},{"label":"labelClassName","value":"labelClassName"},{"label":"labelRemark","value":"labelRemark"},{"label":"labelWidth","value":"labelWidth"},{"label":"mode","value":"mode"},{"label":"onEvent","value":"onEvent"},{"label":"placeholder","value":"placeholder"},{"label":"popOver","value":"popOver"},{"label":"quickEdit","value":"quickEdit"},{"label":"readOnly","value":"readOnly"},{"label":"readOnlyOn","value":"readOnlyOn"},{"label":"remark","value":"remark"},{"label":"required","value":"required"},{"label":"row","value":"row"},{"label":"saveImmediately","value":"saveImmediately"},{"label":"size","value":"size"},{"label":"static","value":"static"},{"label":"staticClassName","value":"staticClassName"},{"label":"staticInputClassName","value":"staticInputClassName"},{"label":"staticLabelClassName","value":"staticLabelClassName"},{"label":"staticOn","value":"staticOn"},{"label":"staticPlaceholder","value":"staticPlaceholder"},{"label":"staticSchema","value":"staticSchema"},{"label":"style","value":"style"},{"label":"submitOnChange","value":"submitOnChange"},{"label":"testIdBuilder","value":"testIdBuilder"},{"label":"text","value":"text"},{"label":"tpl","value":"tpl"},{"label":"type","value":"type"},{"label":"useMobileUI","value":"useMobileUI"},{"label":"validateApi","value":"validateApi"},{"label":"validateOnChange","value":"validateOnChange"},{"label":"validationErrors","value":"validationErrors"},{"label":"validations","value":"validations"},{"label":"value","value":"value"},{"label":"visible","value":"visible"},{"label":"visibleOn","value":"visibleOn"},{"label":"width","value":"width"},{"label":"make","value":"make"},{"label":"permission","value":"permission"},{"label":"filteredResults","value":"filteredResults"},{"label":"macro","value":"macro"},{"label":"mixin","value":"mixin"},{"label":"hasMacro","value":"hasMacro"},{"label":"flushMacros","value":"flushMacros"},{"label":"__callStatic","value":"__callStatic"},{"label":"macroCall","value":"macroCall"}],"detail_component_property":[{"name":"type","value":"static-image"},{"name":"enlargeAble","value":"1"}]},"file_column_multi":0},"排序":{"type":"integer","comment":"排序","action_scope":["list","detail","create","edit"],"file_column":0,"list_component":[],"form_component":{"form_component_type":"NumberControl","component_property_options":[{"label":"autoFill","value":"autoFill"},{"label":"big","value":"big"},{"label":"borderMode","value":"borderMode"},{"label":"className","value":"className"},{"label":"clearValueOnHidden","value":"clearValueOnHidden"},{"label":"desc","value":"desc"},{"label":"description","value":"description"},{"label":"descriptionClassName","value":"descriptionClassName"},{"label":"disabled","value":"disabled"},{"label":"disabledOn","value":"disabledOn"},{"label":"displayMode","value":"displayMode"},{"label":"editorSetting","value":"editorSetting"},{"label":"extraName","value":"extraName"},{"label":"hidden","value":"hidden"},{"label":"hiddenOn","value":"hiddenOn"},{"label":"hint","value":"hint"},{"label":"horizontal","value":"horizontal"},{"label":"id","value":"id"},{"label":"initAutoFill","value":"initAutoFill"},{"label":"inline","value":"inline"},{"label":"inputClassName","value":"inputClassName"},{"label":"keyboard","value":"keyboard"},{"label":"kilobitSeparator","value":"kilobitSeparator"},{"label":"labelAlign","value":"labelAlign"},{"label":"labelClassName","value":"labelClassName"},{"label":"labelRemark","value":"labelRemark"},{"label":"labelWidth","value":"labelWidth"},{"label":"max","value":"max"},{"label":"min","value":"min"},{"label":"mode","value":"mode"},{"label":"onEvent","value":"onEvent"},{"label":"placeholder","value":"placeholder"},{"label":"precision","value":"precision"},{"label":"prefix","value":"prefix"},{"label":"readOnly","value":"readOnly"},{"label":"readOnlyOn","value":"readOnlyOn"},{"label":"remark","value":"remark"},{"label":"required","value":"required"},{"label":"row","value":"row"},{"label":"saveImmediately","value":"saveImmediately"},{"label":"showAsPercent","value":"showAsPercent"},{"label":"showSteps","value":"showSteps"},{"label":"size","value":"size"},{"label":"static","value":"static"},{"label":"staticClassName","value":"staticClassName"},{"label":"staticInputClassName","value":"staticInputClassName"},{"label":"staticLabelClassName","value":"staticLabelClassName"},{"label":"staticOn","value":"staticOn"},{"label":"staticPlaceholder","value":"staticPlaceholder"},{"label":"staticSchema","value":"staticSchema"},{"label":"step","value":"step"},{"label":"style","value":"style"},{"label":"submitOnChange","value":"submitOnChange"},{"label":"suffix","value":"suffix"},{"label":"testIdBuilder","value":"testIdBuilder"},{"label":"type","value":"type"},{"label":"unitOptions","value":"unitOptions"},{"label":"useMobileUI","value":"useMobileUI"},{"label":"validateApi","value":"validateApi"},{"label":"validateOnChange","value":"validateOnChange"},{"label":"validationErrors","value":"validationErrors"},{"label":"validations","value":"validations"},{"label":"value","value":"value"},{"label":"visible","value":"visible"},{"label":"visibleOn","value":"visibleOn"},{"label":"width","value":"width"},{"label":"make","value":"make"},{"label":"permission","value":"permission"},{"label":"filteredResults","value":"filteredResults"},{"label":"macro","value":"macro"},{"label":"mixin","value":"mixin"},{"label":"hasMacro","value":"hasMacro"},{"label":"flushMacros","value":"flushMacros"},{"label":"__callStatic","value":"__callStatic"},{"label":"macroCall","value":"macroCall"}],"form_component_property":[{"name":"required","value":"1"},{"name":"value","value":"0"},{"name":"min","value":"0"},{"name":"max","value":"999999"},{"name":"description","value":"越大越靠前"}]},"detail_component":[],"name":"custom_order","default":"0"},"是否启用":{"type":"tinyInteger","comment":"是否启用","action_scope":["list","detail","create","edit"],"file_column":0,"list_component":{"list_component_type":"TableColumn","list_component_property":[{"name":"quickEdit","value":"{\"type\":\"switch\",\"mode\":\"inline\",\"saveImmediately\":true}"}]},"form_component":{"form_component_type":"SwitchControl","form_component_property":[{"name":"value","value":"1"}]},"detail_component":{"detail_component_type":"StaticExactControl","detail_component_property":[{"name":"type","value":"static-status"}]},"name":"enabled","default":"1","list_filter":[{"mode":"input","type":"equal","filter":{"filter_type":"SelectControl","filter_property":[{"name":"size","value":"md"},{"name":"clearable","value":"1"},{"name":"options","value":"[{\"value\":1,\"label\":\"是\"},{\"value\":0,\"label\":\"否\"}]"}]},"input_name":"enabled"}]},"多图":{"name":"images","type":"text","default":null,"nullable":true,"comment":"多图","action_scope":["list","detail","create","edit"],"file_column":true,"list_component":{"list_component_type":"TableColumn","list_component_property":[{"name":"type","value":"images"},{"name":"enlargeAble","value":"1"}]},"form_component":{"form_component_type":"ImageControl","form_component_property":[{"name":"required","value":"1"},{"name":"multiple","value":"1"}]},"detail_component":{"detail_component_type":"StaticExactControl","detail_component_property":[{"name":"type","value":"static-images"},{"name":"enlargeAble","value":"1"}]},"file_column_multi":true}}', + 'detail_component_property' => '[{"key":"StaticExactControl","value":[{"name":"type","value":"static-image"},{"name":"enlargeAble","value":"1"}],"label":"单图"},{"key":"StaticExactControl","value":[{"name":"type","value":"static-images"},{"name":"enlargeAble","value":"1"}],"label":"多图"}]', + 'filter_property' => '[{"key":"TextControl","value":[{"name":"size","value":"md"},{"name":"clearable","value":1}],"label":"文本"},{"key":"SelectControl","value":[{"name":"size","value":"md"},{"name":"clearable","value":"1"},{"name":"options","value":"[{\"value\":1,\"label\":\"是\"},{\"value\":0,\"label\":\"否\"}]"}],"label":"是/否"}]', + 'form_component_property' => '[{"key":"TextControl","value":[{"name":"required","value":"1"}],"label":"文本(必填)"},{"key":"NumberControl","value":[{"name":"required","value":"1"},{"name":"value","value":"0"},{"name":"min","value":"0"},{"name":"max","value":"999999"},{"name":"description","value":"越大越靠前"}],"label":"排序字段"}]', + 'list_component_property' => '[{"key":"TableColumn","value":[{"name":"searchable","value":"1"}],"label":"文本(带搜索)"},{"key":"TableColumn","value":[{"name":"type","value":"image"},{"name":"enlargeAble","value":"1"}],"label":"单图"},{"key":"TableColumn","value":[{"name":"quickEdit","value":"{\"type\":\"switch\",\"mode\":\"inline\",\"saveImmediately\":true}"}],"label":"开关"}]', + ]; + + settings()->setMany(array_map(fn($i)=>json_decode($i, true), $data)); + } } diff --git a/src/Traits/ElementTrait.php b/src/Traits/ElementTrait.php index 22b1d005..436069ca 100644 --- a/src/Traits/ElementTrait.php +++ b/src/Traits/ElementTrait.php @@ -152,11 +152,23 @@ protected function rowShowButton(bool|string $dialog = false, string $dialogSize if ($dialog) { if ($dialog === 'drawer') { $action = amis()->DrawerAction()->drawer( - amis()->Drawer()->title($title)->body($this->detail('$id'))->size($dialogSize) + amis()->Drawer() + ->title($title) + ->body($this->detail('$id')) + ->size($dialogSize) + ->actions([]) + ->closeOnEsc() + ->closeOnOutside() ); } else { $action = amis()->DialogAction()->dialog( - amis()->Dialog()->title($title)->body($this->detail('$id'))->size($dialogSize) + amis()->Dialog() + ->title($title) + ->body($this->detail('$id')) + ->size($dialogSize) + ->actions([]) + ->closeOnEsc() + ->closeOnOutside() ); } }