39

app/Module/GameItems/AdminControllers/ChestContentController.php

@@ -16,7 +16,7 @@ use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
 use Spatie\RouteAttributes\Attributes\Resource;
 use App\Module\GameItems\AdminControllers\Helper\FilterHelper;
-use UCore\DcatAdmin\FormHelper;
+use App\Module\GameItems\AdminControllers\Helper\FormHelper;
 use App\Module\GameItems\AdminControllers\Helper\GridHelper;
 use App\Module\GameItems\AdminControllers\Helper\ShowHelper;
 
@@ -59,7 +59,7 @@ class ChestContentController extends AdminController
 
             // 筛选
             $grid->filter(function ($filter) {
-                $helper = new \App\Module\GameItems\AdminControllers\Helper\FilterHelper($filter, $this);
+                $helper = new FilterHelper($filter, $this);
                 $helper->equal('id', 'ID');
                 $helper->equalSelectModelChestItem('item_id');
 
@@ -103,7 +103,7 @@ class ChestContentController extends AdminController
     protected function form()
     {
         return Form::make(new ItemChestContentRepository(), function (Form $form) {
-            $helper = new \App\Module\GameItems\AdminControllers\Helper\FormHelper($form, $this);
+            $helper = new FormHelper($form, $this);
             $form->select('chest_id', '宝箱')
                 ->options((new ItemRepository())->where('type', ITEM_TYPE::CHEST)->pluck('name', 'id'))
                 ->required();

app/Module/GameItems/AdminControllers/CraftLogController.php

@@ -7,13 +7,13 @@ use App\Module\GameItems\Repositorys\ItemRecipeRepository;
 use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
-use UCore\DcatAdmin\AdminController;
+use App\Module\GameItems\AdminControllers\Helper\AdminController;
 use Dcat\Admin\Layout\Content;
 use Spatie\RouteAttributes\Attributes\Resource;
-use UCore\DcatAdmin\FilterHelper;
-use UCore\DcatAdmin\FormHelper;
-use UCore\DcatAdmin\GridHelper;
-use UCore\DcatAdmin\ShowHelper;
+use \App\Module\GameItems\AdminControllers\Helper\FormHelper;
+use \App\Module\GameItems\AdminControllers\Helper\FilterHelper;
+use \App\Module\GameItems\AdminControllers\Helper\ShowHelper;
+use \App\Module\GameItems\AdminControllers\Helper\GridHelper;
 
 /**
  * 物品合成记录管理控制器

app/Module/GameItems/AdminControllers/DismantleLogController.php

@@ -10,10 +10,10 @@ use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
 use Dcat\Admin\Layout\Content;
 use Spatie\RouteAttributes\Attributes\Resource;
-use UCore\DcatAdmin\FilterHelper;
-use UCore\DcatAdmin\FormHelper;
-use UCore\DcatAdmin\GridHelper;
-use UCore\DcatAdmin\ShowHelper;
+use App\Module\GameItems\AdminControllers\Helper\FilterHelper;
+use App\Module\GameItems\AdminControllers\Helper\FormHelper;
+use App\Module\GameItems\AdminControllers\Helper\GridHelper;
+use App\Module\GameItems\AdminControllers\Helper\ShowHelper;
 
 /**
  * 物品分解记录管理控制器

app/Module/GameItems/AdminControllers/DismantleRuleController.php

@@ -11,10 +11,10 @@ use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
 use Dcat\Admin\Layout\Content;
 use Spatie\RouteAttributes\Attributes\Resource;
-use UCore\DcatAdmin\FilterHelper;
+use App\Module\GameItems\AdminControllers\Helper\FilterHelper;
 use App\Module\GameItems\AdminControllers\Helper\FormHelper;
-use UCore\DcatAdmin\GridHelper;
-use UCore\DcatAdmin\ShowHelper;
+use App\Module\GameItems\AdminControllers\Helper\GridHelper;
+use App\Module\GameItems\AdminControllers\Helper\ShowHelper;
 
 /**
  * 物品分解规则管理控制器

app/Module/GameItems/AdminControllers/Helper/FormHelper.php

@@ -4,7 +4,5 @@ namespace App\Module\GameItems\AdminControllers\Helper;
 
 class FormHelper extends \UCore\DcatAdmin\FormHelper
 {
-
-    // FormHelperTrait
-    use FilterHelperTrait;
+    use FormHelperTrait;
 }

app/Module/GameItems/AdminControllers/InstanceController.php

@@ -10,10 +10,10 @@ use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
 use Dcat\Admin\Layout\Content;
 use Spatie\RouteAttributes\Attributes\Resource;
-use UCore\DcatAdmin\FilterHelper;
+use App\Module\GameItems\AdminControllers\Helper\FilterHelper;
 use App\Module\GameItems\AdminControllers\Helper\FormHelper;
-use UCore\DcatAdmin\GridHelper;
-use UCore\DcatAdmin\ShowHelper;
+use App\Module\GameItems\AdminControllers\Helper\GridHelper;
+use App\Module\GameItems\AdminControllers\Helper\ShowHelper;
 
 /**
  * 单独属性物品管理控制器

app/Module/GameItems/AdminControllers/PityTimeController.php

@@ -9,9 +9,9 @@ use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
 use Dcat\Admin\Layout\Content;
 use Spatie\RouteAttributes\Attributes\Resource;
-use UCore\DcatAdmin\FilterHelper;
-use UCore\DcatAdmin\GridHelper;
-use UCore\DcatAdmin\ShowHelper;
+use App\Module\GameItems\AdminControllers\Helper\FilterHelper;
+use App\Module\GameItems\AdminControllers\Helper\GridHelper;
+use App\Module\GameItems\AdminControllers\Helper\ShowHelper;
 
 /**
  * 用户宝箱保底计数管理控制器
@@ -68,7 +68,7 @@ class PityTimeController extends AdminController
 
             // 筛选
             $grid->filter(function ($filter) {
-                $helper = new \App\Module\GameItems\AdminControllers\Helper\FilterHelper($filter, $this);
+                $helper = new FilterHelper($filter, $this);
                 $helper->equal('id', 'ID');
                 $helper->equal('user_id', '用户ID');
 

app/Module/GameItems/AdminControllers/RecipeController.php

@@ -10,7 +10,7 @@ use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
 use Dcat\Admin\Layout\Content;
 use Spatie\RouteAttributes\Attributes\Resource;
-use UCore\DcatAdmin\FilterHelper;
+use App\Module\GameItems\AdminControllers\Helper\FilterHelper;
 use App\Module\GameItems\AdminControllers\Helper\FormHelper;
 use App\Module\GameItems\AdminControllers\Helper\GridHelper;
 use App\Module\GameItems\AdminControllers\Helper\ShowHelper;

app/Module/GameItems/AdminControllers/UserItemController.php

@@ -8,13 +8,13 @@ use App\Module\GameItems\Repositorys\ItemInstanceRepository;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
-use UCore\DcatAdmin\AdminController;
+use App\Module\GameItems\AdminControllers\Helper\AdminController;
 use Dcat\Admin\Layout\Content;
 use Spatie\RouteAttributes\Attributes\Resource;
-use UCore\DcatAdmin\FilterHelper;
-use App\Module\GameItems\AdminControllers\Helper\FormHelper;
-use UCore\DcatAdmin\GridHelper;
-use UCore\DcatAdmin\ShowHelper;
+use \App\Module\GameItems\AdminControllers\Helper\FilterHelper;
+use \App\Module\GameItems\AdminControllers\Helper\FormHelper;
+use \App\Module\GameItems\AdminControllers\Helper\GridHelper;
+use \App\Module\GameItems\AdminControllers\Helper\ShowHelper;
 
 /**
  * 用户物品管理控制器

app/Module/GameItems/AdminControllers/UserOutputCounterController.php

@@ -9,9 +9,9 @@ use Dcat\Admin\Show;
 use Dcat\Admin\Layout\Content;
 use Spatie\RouteAttributes\Attributes\Resource;
 use UCore\DcatAdmin\AdminController;
-use UCore\DcatAdmin\FilterHelper;
-use UCore\DcatAdmin\GridHelper;
-use UCore\DcatAdmin\ShowHelper;
+use App\Module\GameItems\AdminControllers\Helper\FilterHelper;
+use App\Module\GameItems\AdminControllers\Helper\GridHelper;
+use App\Module\GameItems\AdminControllers\Helper\ShowHelper;
 
 /**
  * 用户产出限制计数管理控制器
@@ -44,7 +44,7 @@ class UserOutputCounterController extends AdminController
     {
         return Grid::make(new ItemUserOutputCounterRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
-            
+
             // 禁用创建、编辑和删除按钮
             $grid->disableCreateButton();
             $grid->disableActions();
@@ -106,7 +106,7 @@ class UserOutputCounterController extends AdminController
     {
         return Show::make($id, new ItemUserOutputCounterRepository(), function (Show $show) {
             $helper = new ShowHelper($show, $this);
-            
+
             // 禁用编辑和删除按钮
             $show->panel()->tools(function ($tools) {
                 $tools->disableEdit();

app/Module/GameItems/AdminControllers/UserRecipeController.php

@@ -9,9 +9,9 @@ use Dcat\Admin\Show;
 use Dcat\Admin\Layout\Content;
 use Spatie\RouteAttributes\Attributes\Resource;
 use UCore\DcatAdmin\AdminController;
-use UCore\DcatAdmin\FilterHelper;
-use UCore\DcatAdmin\GridHelper;
-use UCore\DcatAdmin\ShowHelper;
+use App\Module\GameItems\AdminControllers\Helper\FilterHelper;
+use App\Module\GameItems\AdminControllers\Helper\GridHelper;
+use App\Module\GameItems\AdminControllers\Helper\ShowHelper;
 
 /**
  * 用户配方解锁状态管理控制器
@@ -44,7 +44,7 @@ class UserRecipeController extends AdminController
     {
         return Grid::make(new ItemUserRecipeRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
-            
+
             // 禁用创建、编辑和删除按钮
             $grid->disableCreateButton();
             $grid->disableActions();
@@ -113,7 +113,7 @@ class UserRecipeController extends AdminController
     {
         return Show::make($id, new ItemUserRecipeRepository(), function (Show $show) {
             $helper = new ShowHelper($show, $this);
-            
+
             // 禁用编辑和删除按钮
             $show->panel()->tools(function ($tools) {
                 $tools->disableEdit();

noai.md

@@ -48,5 +48,4 @@ Show::make 正确的使用方式`Show::make($id, new FundRepository(), function
 
 检查物品模块所有控制器
 
-修复物品模块后台控制器的 FormHelper，改用\App\Module\GameItems\AdminControllers\Helper\FormHelper
-修复物品模块后台控制器的 FilterHelper，改用\App\Module\GameItems\AdminControllers\Helper\FilterHelper;ShowHelper，改用\App\Module\GameItems\AdminControllers\Helper\ShowHelper; GridHelper，改用\App\Module\GameItems\AdminControllers\Helper\GridHelper
+修复物品模块后台控制器的 FormHelper，改用\App\Module\GameItems\AdminControllers\Helper\FormHelper; FilterHelper，改用\App\Module\GameItems\AdminControllers\Helper\FilterHelper;ShowHelper，改用\App\Module\GameItems\AdminControllers\Helper\ShowHelper; GridHelper，改用\App\Module\GameItems\AdminControllers\Helper\GridHelper