v2_2

web/templates/manage/system/role/edit.tmpl

@@ -99,7 +99,7 @@
             <div class="layui-form-item layui-fixbar btn-fixbar-box">
                 <div class="layui-input-block">
                     {{ submitBtn .AuthorizeMenus "save"}}
-                    <button type="button" class="pear-btn pear-btn-sm" lay-on="close">
+                    <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" lay-on="close">
                         <i class="layui-icon layui-icon-close"></i>关闭
                     </button>
                 </div>
@@ -119,30 +119,13 @@
 
 {{define "js"}}
 <script>
-    layui.use(['form', 'jquery', 'iconPicker', 'dtree', 'util'], function () {
-        let form = layui.form;
+    layui.use(['jquery', 'form', 'xmSelect', 'util'], function () {
         let $ = layui.jquery;
-        let iconPicker = layui.iconPicker;
-        let dtree = layui.dtree;
+        let form = layui.form;
+        let xmSelect = layui.xmSelect;
         let util = layui.util;
 
-        var dTree = dtree.render({
-            elem: "#roleTree",
-            initLevel: "2", // 默认展开层级为1
-            line: true, // 有线树
-            ficon: ["1", "-1"], // 设定一级图标样式。0表示方形加减图标，8表示小圆点图标
-            icon: ["0", "2"], // 设定二级图标样式。0表示文件夹图标，5表示叶子图标
-            method: 'POST',
-            url: "/system/role/dtree",
-            select: true,
-            selectInitVal: $('#ParentID').val(),
-            headers: { 'X-CSRF-Token': $('#csrf_token').val() }
-        });
-
-        // 绑定节点事件
-        dtree.on("node(roleTree)", function (obj) {
-            $('#ParentID').val(obj.param.nodeId);
-        });
+        getRoleTree();
 
         // 表单提交
         form.on('submit(save)', function (data) {
@@ -174,6 +157,43 @@
                 window.parent.layer.close(parent.layer.getFrameIndex(window.name));
             }
         });
+
+        function getRoleTree() {
+            $.ajax({
+                url: "/system/role/tree?type=xmselect",
+                type: 'post',
+                dataType: 'json',
+                headers: { 'X-CSRF-Token': $('#csrf_token').val() },
+                success: function (res) {
+                    xmSelect.render({
+                        el: '#roleTree',
+                        // 工具栏
+                        toolbar: {
+                            show: true
+                        },
+                        radio: true,
+                        clickClose: true,
+                        tips: '请选择父级',
+                        filterable: true,
+                        data: res,
+                        name: 'ParentID',
+                        initValue: ['{{.Item.ParentID}}'],
+                        tree: {
+                            show: true,
+                            //非严格模式
+                            strict: false,
+                            //默认展开节点的数组, 为 true 时, 展开所有节点
+                            expandedKeys: [1],
+                        },
+                        on: function (data) { },
+                    });
+                },
+                error: function (err) {
+                    // 处理请求错误
+                    console.log('请求出错：', err);
+                }
+            });
+        }
     });
 </script>
 {{end}}

web/templates/manage/system/role/list.tmpl

@@ -291,14 +291,14 @@
 
         function getRoleTree() {
             $.ajax({
-                url: "/system/role/dtree",
+                url: "/system/role/tree",
                 type: 'post',
                 dataType: 'json',
                 headers: { 'X-CSRF-Token': $('#csrf_token').val() },
                 success: function (res) {
                     tree.render({
                         elem: '#roleTree',
-                        data: res.data,
+                        data: res,
                         onlyIconControl: true,  // 是否仅允许节点左侧图标控制展开收缩
                         showLine: true,
                         click: function (obj) {