过滤

app/Admin/Controllers/BaseProductCategoryController.php

@@ -37,15 +37,19 @@ class BaseProductCategoryController extends AdminController
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
+            //过滤器
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->like('name');
-                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'));
+                $filter->panel();
+                $filter->expand();
+                $filter->like('name')->width(2);
+                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'))->width(2);
             });
+            //工具栏
             $grid->disableViewButton();
             $grid->showQuickEditButton();
             $grid->enableDialogCreate();
             $grid->disableEditButton();
-            $grid->quickSearch('name');
+            //$grid->quickSearch('name');
         });
 
     }

app/Admin/Controllers/BaseProductController.php

@@ -50,10 +50,12 @@ class BaseProductController extends AdminController
             $grid->column('updated_at')->sortable();
             // 筛选
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('sku');
-                $filter->like('title');
-                $filter->equal('category_id','Category')->select(BaseProductCategory::selectOptions());
-                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'));
+                $filter->panel();
+                $filter->expand();
+                $filter->equal('sku')->width(2);
+                $filter->like('title')->width(2);
+                $filter->equal('category_id','Category')->select(BaseProductCategory::selectOptions())->width(2);
+                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'))->width(2);
             });
             //排序
             $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc');

app/Admin/Controllers/BaseProductParameterController.php

@@ -35,15 +35,19 @@ class BaseProductParameterController extends AdminController
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
+            // 允许筛选
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('name');
-                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'));
+                $filter->panel();
+                $filter->expand();
+                $filter->equal('name')->width(2);
+                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'))->width(2);
             });
+            //按钮
             $grid->disableViewButton();
             $grid->showQuickEditButton();
             $grid->enableDialogCreate();
             $grid->disableEditButton();
-            $grid->quickSearch('name');
+            //$grid->quickSearch('name');
             //排序
             $grid->model()->orderBy("order",'asc')->orderBy('id', 'asc');
         });

app/Admin/Controllers/BaseVideoCategoryController.php

@@ -41,10 +41,13 @@ class BaseVideoCategoryController extends AdminController
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
-            $grid->quickSearch('name');
+            //$grid->quickSearch('name');
+            // 允许筛选
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('name');
-                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'));
+                $filter->panel();
+                $filter->expand();
+                $filter->equal('name')->width(2);
+                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'))->width(2);
             });
             //按钮
             $grid->disableViewButton();

app/Admin/Controllers/BaseVideoController.php

@@ -49,10 +49,12 @@ class BaseVideoController extends AdminController
             $grid->column('updated_at')->sortable();
             // 筛选
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('sku');
-                $filter->like('title');
-                $filter->equal('category_id','Category')->select(BaseVideoCategory::selectOptions());
-                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'));
+                $filter->panel();
+                $filter->expand();
+                $filter->equal('sku')->width(2);
+                $filter->like('title')->width(2);
+                $filter->equal('category_id','Category')->select(BaseVideoCategory::selectOptions())->width(2);
+                $filter->equal('enabled', 'Enabled')->select(config('dictionary.enabled'))->width(2);
             });
             //排序
             $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc');

app/Admin/Controllers/DistAdminDistributorController.php

@@ -44,10 +44,12 @@ class DistAdminDistributorController extends AdminController
             $grid->column('updated_at')->sortable();
             // 过滤
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('company_name');
-                $filter->equal('site_name');
-                $filter->equal('level_domain');
-                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'));
+                $filter->panel();
+                $filter->expand();
+                $filter->equal('company_name', 'company name')->width(2);
+                $filter->equal('site_name')->width(2);
+                $filter->equal('level_domain')->width(2);
+                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'))->width(2);
             });
             // 排序
             $grid->model()->orderBy("id",'desc');

app/Admin/Controllers/DistAdminUserController.php

@@ -44,11 +44,14 @@ class DistAdminUserController extends AdminController
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
+            //设置过滤器
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('username');
-                $filter->equal('name','name');
-                $filter->like('distributor.company_name', 'Company Name');
-                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'));
+                $filter->panel();
+                $filter->expand();
+                $filter->equal('username')->width(2);
+                $filter->equal('name','name')->width(2);
+                $filter->like('distributor.company_name', 'Company Name')->width(2);
+                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'))->width(2);
             });
             //排序
             $grid->model()->orderBy("id",'desc');

app/Admin/Controllers/DistAppearanceController.php

@@ -44,9 +44,12 @@ class DistAppearanceController extends AdminController
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
+            // 过滤器
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('title');
-                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'));
+                $filter->panel();
+                $filter->expand();
+                $filter->equal('title')->width(2);
+                $filter->equal('enabled', 'enabled')->select(config('dictionary.enabled'))->width(2);
             });
         });
     }

app/Admin/Controllers/DistInquiryController.php

@@ -53,10 +53,12 @@ class DistInquiryController extends AdminController
             $grid->column('updated_at')->sortable();
             //筛选
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('order_noumber');
-                $filter->equal('company_name');
-                $filter->equal('customer_name');
-                $filter->like('distributor.name','Distributor Company Name');
+                $filter->panel();
+                $filter->expand();
+                $filter->equal('order_noumber')->width(2);
+                $filter->equal('company_name')->width(2);
+                $filter->equal('customer_name')->width(2);
+                $filter->like('distributor.name','Distributor Company Name')->width(2);
             });
             //排序
             $grid->model()->orderBy("id",'desc');

app/Admin/Forms/AceRight.php

@@ -27,11 +27,35 @@ class AceRight extends Form
     {
         $variableRow = DistAppearanceVariable::getVariableRow($this->distId,$this->appearanceId,$this->templateId);
         if ($variableRow) {
-
-        } else {
-           $this->disableSubmitButton();
+            $i = 0;
+            foreach ($variableRow as $key => $value) {
+                $this->hidden('field['.$i.'][id]',$value->id);
+                if ($value->variable_type == '1') {
+                    //文本类型
+                    $this->text('field['.$i.']['.$value->variable_name.']',$value->variable_name)
+                        ->default($value->variable_value)
+                        ->width(12,12)
+                        ->setLabelClass('d-flex');
+                } elseif ($value->variable_type == '2') {
+                    //长文本类型
+                    $this->textarea('field['.$i.']['.$value->variable_name.']',$value->variable_name)
+                        ->default($value->variable_value)
+                        ->width(12,12)
+                        ->setLabelClass('d-flex');
+                } elseif ($value->variable_type == '3') {
+                    //json类型
+                    $this->textarea('field['.$i.']['.$value->variable_name.']',$value->variable_name)
+                        ->default($value->variable_value)
+                        ->width(12,12)
+                        ->setLabelClass('d-flex');
+                }
+                $i++;
+            }
         }
+        $this->disableSubmitButton();
         $this->disableResetButton();
+
+        $this->html('<button type="button" class="btn btn-primary">add</button> <button type="button" class="btn btn-success">save</button>');
     }
 
     // 处理表单提交请求

app/Admin/Repositories/DistAppearanceVariable.php

@@ -18,7 +18,7 @@ class DistAppearanceVariable extends EloquentRepository
     public static function getVariableRow($distId,$appearanceId,$templateId)
     {
         $model = new Model();
-        $variable = $model->where('dist_id',$distId)->where('appearance_id',$appearanceId)->where('template_id',$templateId)->first();
+        $variable = $model->where('dist_id',$distId)->where('appearance_id',$appearanceId)->whereIn('template_ids',[0,$templateId])->get();
         if($variable){
             return $variable;
         }else{

config/admin.php

@@ -349,7 +349,7 @@ return [
         'dark_mode_switch' => false,
 
         // bg-primary, bg-info, bg-warning, bg-success, bg-danger, bg-dark
-        'navbar_color' => '',
+        'navbar_color' => 'bg-primary',
 
         'full_screen' => true, // 是否展示全屏按钮
 

resources/views/admin/pages-custom/ace.blade.php

@@ -6,11 +6,18 @@
         background-color: #fff; /* 左侧面板的背景色 */
         height: 100vh; /* 高度占满 */
     }
+    .right-panel {
+        background-color: #fff; /* 左侧面板的背景色 */
+        height: 100vh; /* 高度占满 */
+        max-height: 100vh; /* 设置最大高度 */
+        overflow-y: auto; /* 启用垂直滚动条 */
+        border-radius: 4px; /* 圆角 */
+    }
     .main-panel {
         background-color: #e9ecef; /* 右侧面板的背景色 */
         height: 97vh; /* 高度占满 */
     }
-    .right-panel-header {
+    .main-panel-header {
         background-color: #fff;
     }
     .card-body {
@@ -43,13 +50,13 @@
             <!-- 代码树 end-->
         </div>
         <div class="col-8 main-panel"> <!-- 右侧80% -->
-            <div class="right-panel-header">
+            <div class="main-panel-header">
                 <button type="button" class="btn btn-primary btn-sm" id="save-btn">保存</button>
             </div>
-            <div class="right-panel-content" id="editor" style="width: 100%; height: 100%;"></div>
+            <div class="main-panel-content" id="editor" style="width: 100%; height: 100%;"></div>
             <input type="hidden" name="template_id"  id="template_id" />
         </div>
-        <div class="col-2 right-panel">
+        <div class="col-2 right-panel" id="variables-list">
         </div>
     </div>
 </div>