From b6c11dd2cd24fd76d17ee2d62cb0dbc21c6b4a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=98=E4=BF=97=E4=BA=8C=E5=B8=88=E5=85=84?= <505097558@qq.com> Date: Mon, 2 Mar 2026 14:58:10 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0[=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=A7=84=E5=88=99]=EF=BC=8C=E4=BD=BF=E7=94=A8=E4=BA=86getTreeA?= =?UTF-8?q?rrayList=EF=BC=8C=E4=BD=86=E6=9C=AA=E8=BF=94=E5=9B=9Ehaschild?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=B2=A1=E6=9C=89=E7=AE=AD=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 还俗二师兄 <505097558@qq.com> --- extend/fast/Tree.php | 1 + 1 file changed, 1 insertion(+) diff --git a/extend/fast/Tree.php b/extend/fast/Tree.php index 656c87c30..98ad0f888 100644 --- a/extend/fast/Tree.php +++ b/extend/fast/Tree.php @@ -479,6 +479,7 @@ class Tree { foreach ($data as $node) { $node['level'] = $level; + $node['haschild'] = !empty($node['children']) ? 1 : 0; $result[] = $node; if (!empty($node['children'])) { $this->getFlattenTree($node['children'], $level + 1, $result); -- Gitee From 18c1fd0bc40ced17baaa4ce83127165980968bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=98=E4=BF=97=E4=BA=8C=E5=B8=88=E5=85=84?= <505097558@qq.com> Date: Mon, 2 Mar 2026 15:08:40 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=86=E4=BC=9A=E5=91=98=E8=A7=84?= =?UTF-8?q?=E5=88=99=E7=9A=84=E5=86=99=E6=B3=95=E4=B8=8E=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 还俗二师兄 <505097558@qq.com> --- application/admin/controller/user/Rule.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/admin/controller/user/Rule.php b/application/admin/controller/user/Rule.php index 9302dfec2..f3b755eb8 100644 --- a/application/admin/controller/user/Rule.php +++ b/application/admin/controller/user/Rule.php @@ -32,8 +32,7 @@ class Rule extends Backend $v['remark'] = __($v['remark']); } unset($v); - Tree::instance()->init($ruleList)->icon = ['    ', '    ', '    ']; - $this->rulelist = Tree::instance()->getTreeList(Tree::instance()->getTreeArray(0), 'title'); + $this->rulelist = Tree::instance()->init($ruleList)->getTreeArrayList(0); $ruledata = [0 => __('None')]; foreach ($this->rulelist as $k => &$v) { if (!$v['ismenu']) { -- Gitee From 73f33940628a3a65159633734b7b213b5ea7e5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=98=E4=BF=97=E4=BA=8C=E5=B8=88=E5=85=84?= <505097558@qq.com> Date: Mon, 2 Mar 2026 15:09:16 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=86=E4=BC=9A=E5=91=98=E8=A7=84?= =?UTF-8?q?=E5=88=99=E7=9A=84=E5=86=99=E6=B3=95=E4=B8=8E=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 还俗二师兄 <505097558@qq.com> --- public/assets/js/backend/user/rule.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/assets/js/backend/user/rule.js b/public/assets/js/backend/user/rule.js index 7f2aa693a..a39af3134 100644 --- a/public/assets/js/backend/user/rule.js +++ b/public/assets/js/backend/user/rule.js @@ -105,13 +105,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin api: { formatter: { title: function (value, row, index) { - value = value.toString().replace(/(&|&)nbsp;/g, ' '); var caret = row.haschild == 1 ? '' : ''; - value = value.indexOf(" ") > -1 ? value.replace(/(.*) /, "$1" + caret) : caret + value; value = !row.ismenu || row.status == 'hidden' ? "" + value + "" : value; return '' + value + ''; + + (row.haschild == 1 || row.ismenu == 1 ? 'text-primary' : 'disabled') + ' btn-node-sub">' + (' '.repeat(row.level)) + (' '.repeat(parseInt(row.level) * 4)) + caret + ' ' + value + ''; }, name: function (value, row, index) { return !row.ismenu || row.status == 'hidden' ? "" + value + "" : value; -- Gitee From 8ce35cf2d7fe5f6b1f8e762aafdd44d597164179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=98=E4=BF=97=E4=BA=8C=E5=B8=88=E5=85=84?= <505097558@qq.com> Date: Sun, 22 Mar 2026 12:44:08 +0000 Subject: [PATCH 4/5] =?UTF-8?q?update=20public/assets/js/require-table.js.?= =?UTF-8?q?=20delete=20data.title;=20=E4=BC=9A=E7=9B=B4=E6=8E=A5=E5=88=A0?= =?UTF-8?q?=E9=99=A4=20jQuery=20=E5=86=85=E9=83=A8=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=20title=20=E6=95=B0=E6=8D=AE=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E4=B8=BA=20$(that).data()=20=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=9A=84=E6=98=AF=E5=8E=9F=E5=AF=B9=E8=B1=A1=E5=BC=95?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E3=80=82=E8=BF=99=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=B8=8A=E7=9A=84=20data('title')=20=E8=A2=AB=E6=B0=B8?= =?UTF-8?q?=E4=B9=85=E7=A7=BB=E9=99=A4=EF=BC=8C=E5=8F=AF=E8=83=BD=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E5=90=8E=E7=BB=AD=E5=AF=B9=E8=AF=A5=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E8=AE=BF=E9=97=AE=EF=BC=88=E4=BE=8B?= =?UTF-8?q?=E5=A6=82=E5=86=8D=E6=AC=A1=E8=A7=A6=E5=8F=91=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C$(that).data('title')=20?= =?UTF-8?q?=E5=B0=86=E5=8F=98=E4=B8=BA=20undefined=EF=BC=89=EF=BC=8C?= =?UTF-8?q?=E6=AD=A4=E5=A4=84=E5=B0=86=20data=20=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=89=AF=E6=9C=AC=EF=BC=8C=E6=B5=85=E6=8B=B7=E8=B4=9D=E4=B8=80?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 还俗二师兄 <505097558@qq.com> --- public/assets/js/require-table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index cb52c49ad..287b50775 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -450,7 +450,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table return; } var title = $(that).data('title') || $(that).attr("title") || __('Edit'); - var data = $(that).data() || {}; + var data = $.extend({}, $(that).data()); delete data.title; //循环弹出多个编辑框 $.each(Table.api.selecteddata(table), function (index, row) { -- Gitee From 20dd8c6ac9a743e51640196c9a6df4497cf6e472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=98=E4=BF=97=E4=BA=8C=E5=B8=88=E5=85=84?= <505097558@qq.com> Date: Sat, 25 Apr 2026 19:45:12 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8DsearchList=E4=BD=BF?= =?UTF-8?q?=E7=94=A8$.getJSON=E7=AD=89=E5=BC=82=E6=AD=A5=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8DsearchLis?= =?UTF-8?q?t=E4=BD=BF=E7=94=A8$.getJSON=E7=AD=89=E5=BC=82=E6=AD=A5?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8=20?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E7=9A=84combineSearchList=20=E4=B8=AD=20$.wh?= =?UTF-8?q?en(list)=20=E5=BC=82=E6=AD=A5=E6=89=A7=E8=A1=8C=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8B=BC=E8=A3=85option=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E4=BA=86jq?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E7=BB=84=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 还俗二师兄 <505097558@qq.com> --- .../assets/js/bootstrap-table-commonsearch.js | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js index 428f707fe..42f20c070 100644 --- a/public/assets/js/bootstrap-table-commonsearch.js +++ b/public/assets/js/bootstrap-table-commonsearch.js @@ -134,7 +134,7 @@ var createOptionList = function (searchList, vObjCol, that) { var optionList = []; optionList.push(sprintf('', that.options.formatCommonChoose())); - searchList = $.fn.bootstrapTable.utils.combineSearchList(searchList); + searchList = $.fn.bootstrapTable.utils.combineSearchList(searchList, vObjCol, that); $.each(searchList, function (key, value) { optionList.push(sprintf("", key == vObjCol.defaultValue ? 'selected' : '')); }); @@ -286,7 +286,7 @@ _initSearch = BootstrapTable.prototype.initSearch; // 定义通用searchList处理方法 - $.fn.bootstrapTable.utils.combineSearchList = function (list) { + $.fn.bootstrapTable.utils.combineSearchList = function (list, vObjCol, that) { var searchList = {}; if (typeof list !== 'undefined') { @@ -302,7 +302,19 @@ } else { list = ret; } + let optionList = []; + $.each(list, function (key, val) { + if (typeof val !== 'undefined' && val.constructor === Object) { + key = val.id; + val = val[vObjCol.nameKey || 'name']; + } else { + key = isArray ? val : key; + } + optionList.push(sprintf("", key == vObjCol.defaultValue && vObjCol.defaultValue !='' ? 'selected' : '')); + }); + $("form.form-commonsearch select[name='" + vObjCol.field + "']", that.$container).append(optionList.join('')).trigger("change"); }); + list = ''; } // 兼容旧版本searchList返回字符串直接渲染自定义搜索栏 if (typeof list === 'string') { @@ -438,3 +450,16 @@ }) : this.data; }; }(jQuery); +/** + * FastAdmin通用搜索 + * + * @author: pppscn <35696959@qq.com> + * @update 2017-05-07 + * + * @author: Karson + * @update 2018-04-05 + */ +… return true; + }) : this.data; + }; +}(jQuery); -- Gitee