{:build_heading()}
diff --git a/extend/fast/Tree.php b/extend/fast/Tree.php
index 0e63a77d..656c87c3 100644
--- a/extend/fast/Tree.php
+++ b/extend/fast/Tree.php
@@ -55,15 +55,15 @@ class Tree
/**
* 初始化方法
* @param array $arr 2维数组，例如：
- * array(
- * 1 => array('id'=>'1','pid'=>0,'name'=>'一级栏目一'),
- * 2 => array('id'=>'2','pid'=>0,'name'=>'一级栏目二'),
- * 3 => array('id'=>'3','pid'=>1,'name'=>'二级栏目一'),
- * 4 => array('id'=>'4','pid'=>1,'name'=>'二级栏目二'),
- * 5 => array('id'=>'5','pid'=>2,'name'=>'二级栏目三'),
- * 6 => array('id'=>'6','pid'=>3,'name'=>'三级栏目一'),
- * 7 => array('id'=>'7','pid'=>3,'name'=>'三级栏目二')
- * )
+ * array(
+ * 1 => array('id'=>'1','pid'=>0,'name'=>'一级栏目一'),
+ * 2 => array('id'=>'2','pid'=>0,'name'=>'一级栏目二'),
+ * 3 => array('id'=>'3','pid'=>1,'name'=>'二级栏目一'),
+ * 4 => array('id'=>'4','pid'=>1,'name'=>'二级栏目二'),
+ * 5 => array('id'=>'5','pid'=>2,'name'=>'二级栏目三'),
+ * 6 => array('id'=>'6','pid'=>3,'name'=>'三级栏目一'),
+ * 7 => array('id'=>'7','pid'=>3,'name'=>'三级栏目二')
+ * )
* @param string $pidname 父字段名称
* @param string $nbsp 空格占位符
* @return Tree
@@ -435,4 +435,55 @@ class Tree
}
return $arr;
}
+
+ public function getTreeArrayList($pid = 0)
+ {
+ $map = [];
+ $data = [];
+
+ $items = $this->arr;
+
+ foreach ($items as &$item) {
+ $item['children'] = []; // 初始化子节点
+ $map[$item['id']] = &$item;
+ }
+ unset($item);
+
+ foreach ($items as &$item) {
+ if ($item[$this->pidname] == $pid) {
+ $data[] = &$item;
+ } else {
+ if (isset($map[$item[$this->pidname]])) {
+ $map[$item[$this->pidname]]['children'][] = &$item;
+ }
+ }
+ }
+ unset($item);
+
+ return $this->getFlattenTree($data);
+ }
+
+ /**
+ * 将多维树形结构数据扁平化处理
+ *
+ * 该函数递归遍历树形结构，将嵌套的节点展开为一维数组，
+ * 并为每个节点添加层级标识
+ *
+ * @param array $data 树形结构数据，每个节点可能包含children子节点
+ * @param int $level 当前节点的层级深度，默认为0（根节点）
+ * @param array &$result 引用传递的结果数组，用于存储扁平化后的所有节点
+ *
+ * @return array 扁平化后的节点数组，每个节点包含原始数据和level层级信息
+ */
+ public function getFlattenTree($data, $level = 0, &$result = [])
+ {
+ foreach ($data as $node) {
+ $node['level'] = $level;
+ $result[] = $node;
+ if (!empty($node['children'])) {
+ $this->getFlattenTree($node['children'], $level + 1, $result);
+ }
+ }
+ return $result;
+ }
}
diff --git a/public/assets/js/backend/auth/rule.js b/public/assets/js/backend/auth/rule.js
index 6020ab72..7713b0c4 100755
--- a/public/assets/js/backend/auth/rule.js
+++ b/public/assets/js/backend/auth/rule.js
@@ -14,6 +14,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
}
});
+ var isExpanded = false;
+
var table = $("#table");
// 初始化表格
@@ -29,7 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
{field: 'icon', title: __('Icon'), formatter: Controller.api.formatter.icon},
{field: 'name', title: __('Name'), align: 'left', formatter: Controller.api.formatter.name},
{field: 'weigh', title: __('Weigh')},
- {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
+ {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, operate: false},
{
field: 'ismenu',
title: __('Ismenu'),
@@ -50,8 +52,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
search: false,
commonSearch: false,
rowAttributes: function (row, index) {
- var expanded = $(".btn-toggle-all i").hasClass("fa-minus");
- return row.pid == 0 || expanded ? {} : {style: "display:none"};
+ return row.pid == 0 || isExpanded ? {} : {style: "display:none"};
+ }
+ });
+
+ table.on('post-body.bs.table', function (e, data) {
+ if (data.length > 2000) {
+ $(".btn-dragsort").addClass("disabled");
}
});
@@ -142,6 +149,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
$(".btn-node-sub:not([data-pid=0])").closest("tr").toggle(show);
$(".btn-node-sub").data("shown", show);
$(".btn-node-sub > i").toggleClass("fa-caret-down", show).toggleClass("fa-caret-right", !show);
+ isExpanded = show;
});
},
add: function () {
@@ -153,13 +161,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
api: {
formatter: {
title: function (value, row, index) {
- value = value.toString().replace(/(&|&)nbsp;/g, ' ');
var caret = row.haschild == 1 || row.ismenu == 1 ? '
' : '';
- value = value.indexOf(" ") > -1 ? value.replace(/(.*) /, "$1" + caret) : caret + value;
value = !row.ismenu || row.status == 'hidden' ? "
" + value + "" : value;
return '';
+ + (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;
From 92e722c674fdf96e1c90bee479212ddee0689f5b Mon Sep 17 00:00:00 2001
From: Karson
Date: Thu, 11 Sep 2025 14:24:50 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E7=BB=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/controller/auth/Group.php | 5 +-
application/admin/view/auth/group/add.html | 10 +--
application/admin/view/auth/group/edit.html | 10 +--
public/assets/js/backend/auth/group.js | 71 ++++++++++++---------
4 files changed, 58 insertions(+), 38 deletions(-)
diff --git a/application/admin/controller/auth/Group.php b/application/admin/controller/auth/Group.php
index be4c2c62..aec0cd5c 100644
--- a/application/admin/controller/auth/Group.php
+++ b/application/admin/controller/auth/Group.php
@@ -258,7 +258,10 @@ class Group extends Backend
}
if (($pid || $parentGroupModel) && (!$id || $currentGroupModel)) {
$id = $id ? $id : null;
- $ruleList = collection(model('AuthRule')->order('weigh', 'desc')->order('id', 'asc')->select())->toArray();
+ $ruleList = Db::name("auth_rule")
+ ->field('id,pid,name,title,icon,ismenu,status,weigh')
+ ->order('weigh DESC,id ASC')
+ ->select();
//读取父类角色所有节点列表
$parentRuleList = [];
if (in_array('*', explode(',', $parentGroupModel->rules))) {
diff --git a/application/admin/view/auth/group/add.html b/application/admin/view/auth/group/add.html
index 3c281ee0..7e0a4644 100644
--- a/application/admin/view/auth/group/add.html
+++ b/application/admin/view/auth/group/add.html
@@ -1,6 +1,6 @@