merge

app/Admin/Components.php

@@ -15,8 +15,7 @@ class Components extends BaseRenderer {
                 ->name($name)->label($label)
                 ->showIcon(false)
                 ->labelField($labelField)
-                ->valueField($valueField)
-                ->value(0)->source($apiUrl);
+                ->valueField($valueField)->source($apiUrl);
     }
 
     /**

app/Admin/Controllers/RegionCategoryController.php

@@ -10,6 +10,7 @@ use Slowlyo\OwlAdmin\Controllers\AdminController;
 use Slowlyo\OwlAdmin\Renderers\Button;
 use App\Services\Admin\RegionCategoryService;
 use App\Admin\Components;
+use Illuminate\Http\Request;
 
 class RegionCategoryController extends AdminController
 {
@@ -19,6 +20,7 @@ class RegionCategoryController extends AdminController
 
     public function list(): Page
     {
+        // dd(Components::make()->parentControl('region-categories/tree-list'));
         $crud = $this->baseCRUD()
             //关闭查询
             ->filterTogglable(false)
@@ -34,7 +36,7 @@ class RegionCategoryController extends AdminController
             ->filter(
 				$this->baseFilter()->body([
 					amisMake()->TextControl()->make('name')->label('分类名称')->name('name'),
-                    amisMake()->SelectControl()->make('parent_id')->label('父级')->name('parent_id'),
+                    Components::make()->parentControl(admin_url('api/region-categories/tree-list'))->size('sm'),
 				
 					Button::make()->label(__('admin.reset'))->actionType('clear-and-submit'),
 					amis('submit')->label(__('admin.search'))->level('primary'),
@@ -65,7 +67,7 @@ class RegionCategoryController extends AdminController
             amisMake()->TextControl()->name('name')->label('名称')->required(true),
 			amisMake()->ImageControl()->name('icon')->label('封面图')->autoUpload(true),
 			amisMake()->TextControl()->name('description')->label('描述'),
-            Components::make()->parentControl(),
+            Components::make()->parentControl(admin_url('api/region-categories/tree-list')),
 			Components::make()->sortControl(),
 			amisMake()->SwitchControl()->name('is_enable')->label('状态'),
         ]);
@@ -81,4 +83,8 @@ class RegionCategoryController extends AdminController
 			TextControl::make()->static(true)->name('updated_at')->label('更新时间')
         ]);
     }
+
+    public function getTreeList(Request $request){
+		return $this->service->getTree();
+	}
 }

app/Admin/Controllers/RegionController.php

@@ -8,6 +8,7 @@ use Slowlyo\OwlAdmin\Renderers\TableColumn;
 use Slowlyo\OwlAdmin\Renderers\TextControl;
 use Slowlyo\OwlAdmin\Controllers\AdminController;
 use App\Services\Admin\RegionService;
+use Slowlyo\OwlAdmin\Renderers\Button;
 use App\Admin\Components;
 
 class RegionController extends AdminController
@@ -24,6 +25,15 @@ class RegionController extends AdminController
                 $this->createButton(true, 'lg'),
                 ...$this->baseHeaderToolBar(),
             ])
+            ->filter(
+				$this->baseFilter()->body([
+					amisMake()->TextControl()->make('name')->label('名称')->name('name'),
+                    Components::make()->parentControl(admin_url('api/region-categories/tree-list'), 'category_id', '分类')->size('sm'),
+				
+					Button::make()->label(__('admin.reset'))->actionType('clear-and-submit'),
+					amis('submit')->label(__('admin.search'))->level('primary'),
+				])->actions([])
+			)
             ->columns([
                 TableColumn::make()->name('id')->label('ID')->sortable(true),
 				TableColumn::make()->name('name')->label('名称'),
@@ -43,7 +53,7 @@ class RegionController extends AdminController
     {
         return $this->baseForm()->body([
             TextControl::make()->name('name')->label('名称')->required(true),
-            Components::make()->parentControl('', 'category_id', '分类'),
+            Components::make()->parentControl(admin_url('api/region-categories/tree-list'), 'category_id', '分类'),
             Components::make()->fuEditorControl('description', '介绍'),
             Components::make()->decimalControl('area', '面积m²'),
             Components::make()->sortControl(),

app/Admin/routes.php

@@ -14,6 +14,7 @@ Route::group([
     ], function (Router $router) {
         $router->get('keywords/tree-list', '\App\Admin\Controllers\KeywordController@getTreeList')->name('api.keywords.tree-list');
         $router->get('article-categories/tree-list', [\App\Admin\Controllers\ArticleCategoryController::class, 'getTreeList'])->name('api.article-categories.tree-list');
+        $router->get('region-categories/tree-list', '\App\Admin\Controllers\RegionCategoryController@getTreeList')->name('api.region-categories.tree-list');
     });
 
     $router->get('dashboard', '\App\Admin\Controllers\HomeController@index');

app/Filters/Admin/RegionFilter.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Filters\Admin;
+
+use EloquentFilter\ModelFilter;
+
+class RegionFilter extends ModelFilter
+{
+    /**
+     * 名称
+     */
+    public function name($name){
+        return $this->where('name', 'like', '%'.$name.'%');
+    }
+
+    /**
+     * 父级分类
+     */
+    public function category($categoryId){
+        return $this->where('category_id', $categoryId);
+    }
+
+    /**
+     * 是否开启
+     */
+    public function isEnable($isEnable){
+        return $this->where('is_enbale', $isEnable);
+    }
+    
+}

app/Models/Region.php

@@ -4,8 +4,15 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use EloquentFilter\Filterable;
 
 class Region extends Model
 {
     use HasFactory;
+    use Filterable;
+
+    protected function serializeDate(\DateTimeInterface $date){
+        return $date->format('Y-m-d H:i:s');
+    }
+
 }

app/Services/Admin/BaseService.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Services\Admin;
+
+use Slowlyo\OwlAdmin\Services\AdminService;
+
+/**
+ * @method Region getModel()
+ * @method Region|\Illuminate\Database\Query\Builder query()
+ */
+class BaseService extends AdminService
+{
+
+    public function getTree()
+    {
+        $list = $this->query()->orderByDesc('sort')->get()->toArray();
+        return array2tree($list);
+    }
+
+    public function getModelFilter()
+    {
+        return $this->modelFilterName;
+    }
+
+    public function listQuery()
+    {
+        $model = $this->getModel();
+        $filter = $this->getModelFilter();
+
+        return $this->query()
+                ->filter(request()->input(), $filter)
+                ->orderByDesc($model->getUpdatedAtColumn() ?? $model->getKeyName());
+    }
+}

app/Services/Admin/KeywordService.php

@@ -10,16 +10,10 @@ use Slowlyo\OwlAdmin\Services\AdminService;
  * @method Keyword getModel()
  * @method Keyword|\Illuminate\Database\Query\Builder query()
  */
-class KeywordService extends AdminService
+class KeywordService extends BaseService
 {
     protected string $modelName = Keyword::class;
 
-    public function getTree()
-    {
-        $list = $this->query()->orderByDesc('sort')->get()->toArray();
-        return array2tree($list);
-    }
-
     public function parentIsChild($id, $parent_id): bool
     {
         $parent = $this->query()->find($parent_id);

app/Services/Admin/RegionCategoryService.php

@@ -4,23 +4,15 @@ namespace App\Services\Admin;
 
 use App\Models\RegionCategory;
 use App\Filters\Admin\RegionCategoryFilter;
-use Slowlyo\OwlAdmin\Services\AdminService;
 
 /**
  * @method RegionCategory getModel()
  * @method RegionCategory|\Illuminate\Database\Query\Builder query()
  */
-class RegionCategoryService extends AdminService
+class RegionCategoryService extends BaseService
 {
     protected string $modelName = RegionCategory::class;
 
-    public function listQuery()
-    {
-        $model = $this->getModel();
-
-        return $this->query()
-                ->with('parent')
-                ->filter(request()->input(), RegionCategoryFilter::class)
-                ->orderByDesc($model->getUpdatedAtColumn() ?? $model->getKeyName());
-    }
+    protected string $modelFilterName = RegionCategoryFilter::class;
+    
 }

app/Services/Admin/RegionService.php

@@ -3,13 +3,16 @@
 namespace App\Services\Admin;
 
 use App\Models\Region;
+use App\Filters\Admin\RegionFilter;
 use Slowlyo\OwlAdmin\Services\AdminService;
 
 /**
  * @method Region getModel()
  * @method Region|\Illuminate\Database\Query\Builder query()
  */
-class RegionService extends AdminService
+class RegionService extends BaseService
 {
     protected string $modelName = Region::class;
+
+    protected string $modelFilterName = RegionFilter::class;
 }