admin

UCore/DcatAdmin/GridHelper.php

@@ -257,7 +257,7 @@ class GridHelper
 
     public function columnAtd($field, $label = '')
     {
-        $this->grid->column($field, $label)->display(function (/* \Carbon\Carbon*/ $p2) {
+        return  $this->grid->column($field, $label)->display(function (/* \Carbon\Carbon*/ $p2) {
             if (!$p2) {
                 return null;
             }

app/Module/UrsPromotion/AdminControllers/UrsUserMappingController.php

@@ -10,6 +10,7 @@ use App\Module\UrsPromotion\Repositorys\UrsUserMappingRepository;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Form;
+use UCore\DcatAdmin\GridHelper;
 
 /**
  * URS用户映射关系管理控制器
@@ -41,6 +42,7 @@ class UrsUserMappingController extends AdminController
     {
         return Grid::make(new UrsUserMappingRepository(), function (Grid $grid) {
             $grid->column('id', 'ID')->sortable();
+            $helper = new GridHelper($grid, $this);
             $grid->column('urs_user_id', 'URS用户ID')->sortable()->display(function ($value) {
                 // 添加到推荐关系的链接
                 $referralUrl = admin_url('urs-promotion/user-referrals?urs_user_id=' . $value);
@@ -71,7 +73,7 @@ class UrsUserMappingController extends AdminController
 
                 return $displayText;
             });
-            $grid->column('mapping_time', '绑定时间')->sortable();
+            $helper->columnAtd('mapping_time','绑定时间')->sortable();
             $grid->column('status', '状态')->using([
                 UrsUserMapping::STATUS_INVALID => '无效',
                 UrsUserMapping::STATUS_VALID => '有效',
@@ -89,11 +91,11 @@ class UrsUserMappingController extends AdminController
                 return $value > 0 ? $value : '<span class="text-muted">0</span>';
             });
 
-            $grid->column('last_activity_check', '最后检查时间')->display(function ($value) {
-                return $value ? $value : '<span class="text-muted">从未检查</span>';
-            });
 
-            $grid->column('created_at', '创建时间')->sortable();
+            $helper->columnAtd('last_activity_check','最后检查时间')->sortable();
+
+
+            $helper->columnAtd('created_at','创建时间')->sortable();
 
             // 禁用创建按钮（映射关系通过系统自动创建）
             $grid->disableCreateButton();

app/Module/UrsPromotion/AdminControllers/UrsUserTalentController.php

@@ -17,6 +17,7 @@ use App\Module\UrsPromotion\Enums\UrsTalentLevel;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Form;
+use UCore\DcatAdmin\GridHelper;
 
 /**
  * URS用户达人等级管理控制器
@@ -47,6 +48,7 @@ class UrsUserTalentController extends AdminController
     protected function grid(): Grid
     {
         return Grid::make(new UrsUserTalentRepository(['userMapping']), function (Grid $grid) {
+            $helper = new GridHelper($grid, $this);
             $grid->column('id', 'ID')->sortable();
             $grid->column('user_id', '用户ID')->sortable()->display(function ($value) {
                 // 添加到用户绑定和推荐关系的链接
@@ -82,8 +84,8 @@ class UrsUserTalentController extends AdminController
             $grid->column('third_count', '三推人数')->sortable();
             $grid->column('promotion_count', '团队总人数')->sortable();
             $grid->column('last_level_update_time', '最后升级时间')->sortable();
-            $grid->column('created_at', '创建时间')->sortable();
-
+//            $grid->column('created_at', '创建时间')->sortable();
+            $helper->columnCreatedAt();
             // 添加批量更新达人等级功能
             $grid->tools(function (Grid\Tools $tools) {
                 $tools->append(new \App\Module\UrsPromotion\AdminControllers\Actions\BatchUpdateTalentAction());