From 1b0ae546c3ba1cd848389c08855e34fe522ca0f2 Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Thu, 7 Sep 2023 09:33:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0title=EF=BC=8Ctext=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E5=87=BD=E6=95=B0=E8=B0=83=E7=94=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/AdminController.php    |  2 +-
 public/static/admin/js/system/admin.js       |  1 +
 public/static/plugs/easy-admin/easy-admin.js | 13 +++++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php
index 8bf8c6a..d61ab96 100644
--- a/app/common/controller/AdminController.php
+++ b/app/common/controller/AdminController.php
@@ -212,7 +212,7 @@ class AdminController extends BaseController
      */
     protected function buildTableParames($excludeFields = [])
     {
-        $get = $this->request->get('', null, null);
+        $get = $this->request->get('', null, []);
         $page = isset($get['page']) && !empty($get['page']) ? $get['page'] : 1;
         $limit = isset($get['limit']) && !empty($get['limit']) ? $get['limit'] : 15;
         $group = isset($get['group']) && !empty($get['group']) ? $get['group'] : null;
diff --git a/public/static/admin/js/system/admin.js b/public/static/admin/js/system/admin.js
index 26ab947..6070808 100644
--- a/public/static/admin/js/system/admin.js
+++ b/public/static/admin/js/system/admin.js
@@ -47,6 +47,7 @@ define(["jquery", "easy-admin"], function ($, ea) {
                             'edit',
                             [{
                                 text: '设置密码',
+                                titleField: 'username',
                                 url: init.password_url,
                                 method: 'open',
                                 auth: 'password',
diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index 645838f..ba9d587 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -778,15 +778,24 @@ define(["jquery", "ckeditor", 'miniTheme', 'tableData', 'citypicker', 'tagInput'
                 operat.title = operat.title || operat.text;
                 operat.text = operat.text || operat.title;
 
-
                 var titleEndfix = '';
 
                 if (typeof operat.titleField == 'function') {
-                    titleEndfix = operat.titleField(data)
+                    console.log(operat.titleField(data, operat));
+                    titleEndfix = operat.titleField(data, operat)
+
                 } else if (data[operat.titleField]) {
                     titleEndfix = '-' + data[operat.titleField];
                 }
 
+                if (typeof operat.text == 'function') {
+                    operat.text = operat.text(data, operat)
+                }
+
+                if (typeof operat.title == 'function') {
+                    operat.title = operat.title(data, operat)
+                }
+
                 var formatOperat = operat;
                 formatOperat.icon = formatOperat.icon !== '' ? '<i class="' + formatOperat.icon + '"></i> ' : '';
                 formatOperat.class = formatOperat.class !== '' ? 'class="' + formatOperat.class + '" ' : '';