feat: 框架安装时携带代码生成器常用字段

slowlyo · Sep 20, 2024 · 59a13dc · 59a13dc
1 parent 912bc95
commit 59a13dc
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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()
                 );
             }
         }