From 5ac6df4ffb2ce0f365554d6e9d0e226da70208ec Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Mon, 27 Mar 2023 14:20:04 +0800
Subject: [PATCH 1/2] fix: bug#11022

---
 src/views/device/DashBoard/index.vue      |   4 +-
 src/views/init-home/Basic/index.vue       | 107 ++++++++++++----------
 src/views/rule-engine/DashBoard/index.vue |   8 +-
 3 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index 662badb9..d406b886 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -445,7 +445,7 @@ const setDevMesChartOption = (
                 type: 'line',
                 smooth: true,
                 symbolSize: 0, // 拐点大小
-                color: '#96ECE3',
+                color: '#ADC6FF',
                 areaStyle: {
                     color: {
                         type: 'linear',
@@ -456,7 +456,7 @@ const setDevMesChartOption = (
                         colorStops: [
                             {
                                 offset: 0,
-                                color: '#96ECE3', // 100% 处的颜色
+                                color: '#ADC6FF', // 100% 处的颜色
                             },
                             {
                                 offset: 1,
diff --git a/src/views/init-home/Basic/index.vue b/src/views/init-home/Basic/index.vue
index 3f511712..9db759b8 100644
--- a/src/views/init-home/Basic/index.vue
+++ b/src/views/init-home/Basic/index.vue
@@ -10,7 +10,6 @@
                 >
                     <j-input
                         v-model:value="form.title"
-                        :maxlength="64"
                         placeholder="请输入系统名称"
                     />
                 </j-form-item>
@@ -255,7 +254,7 @@
 <script setup lang="ts">
 import { modalState, formState, logoState } from '../data/interface';
 import { getImage } from '@/utils/comm.ts';
-import { Form,  message } from 'jetlinks-ui-components';
+import { Form, message } from 'jetlinks-ui-components';
 import { FILE_UPLOAD } from '@/api/comm';
 import {
     getSystemPermission,
@@ -276,7 +275,7 @@ import {
 } from '@/api/initHome';
 import { LocalStore } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';
-import { SystemConst } from '@/utils/consts'
+import { SystemConst } from '@/utils/consts';
 const formRef = ref();
 const menuRef = ref();
 const formBasicRef = ref();
@@ -297,9 +296,16 @@ const form = ref<formState>({
     basePath: `${window.location.origin}/api`,
     logo: getImage('/logo.png'),
     ico: getImage('/favicon.ico'),
-    background:getImage('/login.png')
+    background: getImage('/login.png'),
 });
 const rulesFrom = ref({
+    title: [
+        {
+            max: 64,
+            message: '最多可输入64位',
+            trigger: 'change',
+        },
+    ],
     headerTheme: [
         {
             required: true,
@@ -322,49 +328,52 @@ const { resetFields, validate, validateInfos } = useForm(
 /**
  * 提交数据
  */
-const saveBasicInfo = () =>{
-    return new Promise( async (resolve) => {
-    validate()
-        .then(async () => {
-            const item = [
-                {
-                    scope: 'front',
-                    properties: {
-                        ...form.value,
-                        apikey: '',
-                        'base-path': '',
+const saveBasicInfo = () => {
+    return new Promise(async (resolve) => {
+        validate()
+            .then(async () => {
+                const item = [
+                    {
+                        scope: 'front',
+                        properties: {
+                            ...form.value,
+                            apikey: '',
+                            'base-path': '',
+                        },
                     },
-                },
-                {
-                    scope: 'amap',
-                    properties: {
-                        apiKey: form.value.apikey,
+                    {
+                        scope: 'amap',
+                        properties: {
+                            apiKey: form.value.apikey,
+                        },
                     },
-                },
-                {
-                    scope: 'paths',
-                    properties: {
-                        'base-path': form.value.basePath,
+                    {
+                        scope: 'paths',
+                        properties: {
+                            'base-path': form.value.basePath,
+                        },
                     },
-                },
-            ];
-            const res = await save(item);
-            if (res.status === 200) {
-                resolve(true);
-                localStorage.setItem(SystemConst.AMAP_KEY,form.value.apikey);
-                const ico: any = document.querySelector('link[rel="icon"]');
-                if (ico !== null) {
-                    ico.href = form.value.ico;
+                ];
+                const res = await save(item);
+                if (res.status === 200) {
+                    resolve(true);
+                    localStorage.setItem(
+                        SystemConst.AMAP_KEY,
+                        form.value.apikey,
+                    );
+                    const ico: any = document.querySelector('link[rel="icon"]');
+                    if (ico !== null) {
+                        ico.href = form.value.ico;
+                    }
+                } else {
+                    resolve(false);
                 }
-            }else {
+            })
+            .catch(() => {
                 resolve(false);
-            }
-        })
-        .catch(() => {
-            resolve(false);
-        });
-})
-}
+            });
+    });
+};
 /**
  * logo格式校验
  */
@@ -397,22 +406,22 @@ const handleChangeLogo = (info: any) => {
 /**
  * 浏览器页签上传之前
  */
-const beforeIconUpload = (file:any) => {
+const beforeIconUpload = (file: any) => {
     const isType = iconTypes.value.includes(file.type);
-    if(!isType){
+    if (!isType) {
         message.error('请上传ico格式的图片');
         return false;
     }
     const isSize = file.size / 1024 / 1024 < 1;
-    if(!isSize){
+    if (!isSize) {
         message.error('支持1M以内的图片');
     }
     return isType && isSize;
-}
+};
 /**
  * 浏览器页签发生改变
  */
- const changeIconUpload = (info: any) => {
+const changeIconUpload = (info: any) => {
     if (info.file.status === 'uploading') {
         iconLoading.value = true;
     }
@@ -421,11 +430,11 @@ const beforeIconUpload = (file:any) => {
         iconLoading.value = false;
         form.value.ico = info.file.response?.result;
     }
-}
+};
 /**
  * 背景图片上传之前
  */
- const beforeBackUpload = (file: any) => {
+const beforeBackUpload = (file: any) => {
     const isType = imageTypes.value.includes(file.type);
     if (!isType) {
         message.error(`请上传.jpg.png.jfif.pjp.pjpeg.jpeg格式的图片`);
diff --git a/src/views/rule-engine/DashBoard/index.vue b/src/views/rule-engine/DashBoard/index.vue
index 5ebea84f..039d03f6 100644
--- a/src/views/rule-engine/DashBoard/index.vue
+++ b/src/views/rule-engine/DashBoard/index.vue
@@ -264,7 +264,7 @@ const getDashBoard = () => {
                         name: '告警数',
                         data: fifteenData.map((item) => item.value),
                         type: 'line',
-                        color: '#2F54EB',
+                        color: '#FF595E',
                         smooth: true,
                         symbolSize: 0,
                         areaStyle: {
@@ -277,7 +277,7 @@ const getDashBoard = () => {
                                 colorStops: [
                                     {
                                         offset: 0,
-                                        color: '#2F54EB', // 100% 处的颜色
+                                        color: '#FF595E', // 100% 处的颜色
                                     },
                                     {
                                         offset: 1,
@@ -458,7 +458,7 @@ const selectChange = () => {
                         data: sData.reverse(),
                         type: 'line',
                         smooth: true,
-                        color: '#685DEB',
+                        color: '#ADC6FF',
                         areaStyle: {
                             color: {
                                 type: 'linear',
@@ -469,7 +469,7 @@ const selectChange = () => {
                                 colorStops: [
                                     {
                                         offset: 0,
-                                        color: '#685DEB', // 100% 处的颜色
+                                        color: '#ADC6FF', // 100% 处的颜色
                                     },
                                     {
                                         offset: 1,

From 049bf99395596e90a5c3de7c223efe924d391c84 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Mon, 27 Mar 2023 15:25:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=AE=8C=E6=88=90=E8=8F=9C=E5=8D=95=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Menu/Setting/index copy.vue | 388 -------------------
 src/views/system/Menu/Setting/index.vue      | 157 ++++----
 src/views/system/Menu/Setting/utils.ts       |  51 ++-
 3 files changed, 129 insertions(+), 467 deletions(-)
 delete mode 100644 src/views/system/Menu/Setting/index copy.vue

diff --git a/src/views/system/Menu/Setting/index copy.vue b/src/views/system/Menu/Setting/index copy.vue
deleted file mode 100644
index b0444c57..00000000
--- a/src/views/system/Menu/Setting/index copy.vue	
+++ /dev/null
@@ -1,388 +0,0 @@
-<template>
-    <div class="setting-container">
-        <h5 class="top">
-            <AIcon type="ExclamationCircleOutlined" />
-            <span style="padding-left: 12px"
-                >基于系统源代码中的菜单数据，配置系统菜单。</span
-            >
-        </h5>
-
-        <div class="transfer">
-            <!-- 左侧树 -->
-            <div class="basic-tree left">
-                <div class="title">
-                    <div class="title-label">
-                        <span>源菜单</span>
-                        <j-tooltip>
-                            <template #title
-                                >根据系统代码自动读取的菜单数据</template
-                            >
-                            <AIcon type="QuestionCircleOutlined" />
-                        </j-tooltip>
-                    </div>
-                    <div class="title-func">
-                        <j-button
-                            type="primary"
-                            @click="dialogShow = true"
-                            ghost
-                            >一键拷贝</j-button
-                        >
-                    </div>
-                </div>
-                <div class="content">
-                    <j-input
-                        v-model:value="transfer.data.leftSearchValue"
-                        style="margin-bottom: 8px"
-                        placeholder="请输入菜单名称"
-                        @change="transfer.changeTreeLeft"
-                    >
-                        <template #prefix>
-                            <AIcon
-                                type="SearchOutlined"
-                                style="color: #b3b3b3"
-                            />
-                        </template>
-                    </j-input>
-                    <j-tree
-                        v-if="transfer.data.leftTreeData.length !== 0"
-                        :tree-data="transfer.data.leftTreeData"
-                        draggable
-                        defaultExpandAll
-                        :height="550"
-                    >
-                        <template #title="row">
-                            <div>{{ row.name }}</div>
-                        </template>
-                    </j-tree>
-                </div>
-            </div>
-
-            <div class="center">
-                <j-button>请拖动至右侧</j-button>
-            </div>
-            <!-- 右侧树 -->
-            <div class="basic-tree right">
-                <div class="title">
-                    <div class="title-label">
-                        <span>系统菜单</span>
-                        <j-tooltip>
-                            <template #title
-                                >菜单管理页面配置的菜单数据</template
-                            >
-                            <AIcon type="QuestionCircleOutlined" />
-                        </j-tooltip>
-                    </div>
-                </div>
-                <div class="content">
-                    <j-input
-                        v-model:value="transfer.data.rightSearchValue"
-                        style="margin-bottom: 8px"
-                        placeholder="请输入菜单名称"
-                        @change="transfer.changeTreeRight"
-                    >
-                        <template #prefix>
-                            <AIcon
-                                type="SearchOutlined"
-                                style="color: #b3b3b3"
-                            />
-                        </template>
-                    </j-input>
-
-                    <j-tree
-                        v-if="transfer.data.rightTreeData.length !== 0"
-                        draggable
-                        defaultExpandAll
-                        :tree-data="transfer.data.rightTreeData"
-                        @drop="transfer.onRightDrop"
-                        :height="550"
-                    >
-                        <template #title="row">
-                            <div
-                                style="
-                                    display: flex;
-                                    justify-content: space-between;
-                                "
-                            >
-                                <span>{{ row.name }}</span>
-                                <j-popconfirm
-                                    title="确认删除？"
-                                    ok-text="确定"
-                                    cancel-text="取消"
-                                    @confirm="transfer.removeItem(row)"
-                                    placement="topRight"
-                                >
-                                    <j-tooltip>
-                                        <template #title>删除</template>
-                                        <j-button
-                                            style="
-                                                padding: 0;
-                                                margin-right: 12px;
-                                            "
-                                            type="link"
-                                        >
-                                            <AIcon type="CloseOutlined" />
-                                        </j-button>
-                                    </j-tooltip>
-                                </j-popconfirm>
-                            </div>
-                        </template>
-                    </j-tree>
-                </div>
-            </div>
-        </div>
-
-        <j-button type="primary" style="margin-top: 24px">保存</j-button>
-
-        <div class="dialogs">
-            <j-modal
-                v-model:visible="dialogShow"
-                title="一键拷贝"
-                @ok="transfer.copy"
-                cancelText="取消"
-                okText="确认"
-            >
-                <p>源数据将会覆盖当前的系统菜单数据，确定要一键拷贝吗？</p>
-            </j-modal>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts" name="MenuSetting">
-import { getMenuTree_api } from '@/api/system/menu';
-import { getSystemPermission as getSystemPermission_api } from '@/api/initHome';
-import { filterMenu, getKeys, loop } from './utils';
-import BaseTreeData from './baseMenu';
-import type {
-    AntTreeNodeDropEvent,
-    TreeDataItem,
-    TreeProps,
-} from 'ant-design-vue/es/tree';
-import { treeFilter } from '@/utils/tree';
-import { cloneDeep } from 'lodash';
-
-const transfer = {
-    data: reactive({
-        // 左侧树
-        leftSearchValue: '',
-        leftTreeData: [] as any[],
-
-        // 右侧树
-        rightSearchValue: '',
-        rightTreeData: [] as any[],
-    }),
-    leftSourceData: [] as any[],
-    rightSourceData: [] as any[],
-
-    init: () => {
-        // 源菜单
-        const sourceMenu = getSystemPermission_api().then((resp: any) => {
-            const newTree = filterMenu(
-                resp.result.map((item: any) => JSON.parse(item).id),
-                BaseTreeData,
-            );
-            transfer.leftSourceData = [...newTree];
-            transfer.data.leftTreeData = newTree;
-        });
-        const params = {
-            paging: false,
-            terms: [
-                {
-                    terms: [
-                        {
-                            column: 'owner',
-                            termType: 'eq',
-                            value: 'iot',
-                        },
-                        {
-                            column: 'owner',
-                            termType: 'isnull',
-                            value: '1',
-                            type: 'or',
-                        },
-                    ],
-                },
-            ],
-        };
-        // 系统菜单
-        const systemMenu = getMenuTree_api(params).then((resp: any) => {
-            transfer.data.rightTreeData = resp.result;
-            transfer.rightSourceData = [...resp.result];
-        });
-        // 当两个菜单的源数据都获取到之后，对左侧菜单进行更新，更新每项是否需要禁用
-        Promise.all([sourceMenu, systemMenu]).then(() => transfer.updateTree());
-    },
-    copy: () => {
-        transfer.data.rightTreeData = [...toRaw(transfer.data.leftTreeData)];
-        dialogShow.value = false;
-    },
-    removeItem: (row: any) => {
-        loop(
-            transfer.data.rightTreeData,
-            row.id,
-            (item: TreeDataItem, index: number, arr: TreeProps['treeData']) => {
-                arr?.splice(index, 1);
-            },
-        );
-        transfer.updateTree();
-    },
-    onRightDrop: (info: AntTreeNodeDropEvent) => {
-        const dropKey = info.node.id;
-        const dragKey = info.dragNode.id;
-        const dropPos = (info.node.pos && info.node.pos.split('-')) || [];
-        const dropPosition =
-            info.dropPosition - Number(dropPos[dropPos.length - 1]);
-        const data = [...transfer.data.rightTreeData];
-        let dragObj: TreeDataItem = { key: '' };
-        loop(
-            data,
-            dragKey,
-            (item: TreeDataItem, index: number, arr: TreeProps['treeData']) => {
-                arr?.splice(index, 1);
-                dragObj = item;
-            },
-        );
-
-        if (!info.dropToGap) {
-            // Drop on the content
-            loop(data, dropKey, (item: TreeDataItem) => {
-                item.children = item.children || [];
-                /// where to insert 示例添加到头部，可以是随意位置
-                item.children.unshift(dragObj);
-            });
-        } else if (
-            (info.node.children || []).length > 0 && // Has children
-            info.node.expanded && // Is expanded
-            dropPosition === 1 // On the bottom gap
-        ) {
-            loop(data, dropKey, (item: TreeDataItem) => {
-                item.children = item.children || [];
-                // where to insert 示例添加到头部，可以是随意位置
-                item.children.unshift(dragObj);
-            });
-        } else {
-            let ar: TreeProps['treeData'] = [];
-            let i = 0;
-            loop(
-                data,
-                dropKey,
-                (
-                    _item: TreeDataItem,
-                    index: number,
-                    arr: TreeProps['treeData'],
-                ) => {
-                    ar = arr;
-                    i = index;
-                },
-            );
-            if (dropPosition === -1) {
-                ar.splice(i, 0, dragObj);
-            } else {
-                ar.splice(i + 1, 0, dragObj);
-            }
-        }
-        transfer.data.rightTreeData = data;
-    },
-    updateTree: () => {
-        console.log(getKeys(transfer.data.rightTreeData));
-    },
-    changeTreeLeft: (val: any) => {
-        const value = val.target.value;
-        if (value) {
-            transfer.data.leftTreeData = treeFilter(
-                transfer.leftSourceData,
-                value,
-                'name',
-            );
-        } else {
-            transfer.data.leftTreeData = cloneDeep(transfer.rightSourceData);
-        }
-    },
-    changeTreeRight: (val: any) => {
-        const value = val.target.value;
-        if (value) {
-            transfer.data.rightTreeData = treeFilter(
-                transfer.rightSourceData,
-                value,
-                'name',
-            );
-        } else {
-            transfer.data.rightTreeData = cloneDeep(transfer.rightSourceData);
-        }
-    },
-};
-transfer.init();
-
-const dialogShow = ref<boolean>(false);
-</script>
-
-<style lang="less" scoped>
-.setting-container {
-    padding: 24px;
-    margin: 24px;
-    background-color: #fff;
-
-    .top {
-        font-size: inherit;
-        margin-bottom: 24px;
-        padding: 10px 24px;
-        color: rgba(0, 0, 0, 0.55);
-        background-color: #f6f6f6;
-    }
-
-    .transfer {
-        display: flex;
-        justify-content: space-between;
-
-        .basic-tree {
-            flex: 1;
-
-            .title {
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                margin-bottom: 16px;
-                padding: 14px 16px;
-                font-weight: 400;
-                font-size: 16px;
-                background-color: #f3f4f4;
-
-                .title-label {
-                    span {
-                        padding-right: 12px;
-                    }
-                }
-            }
-
-            .content {
-                padding: 12px;
-                border: 1px solid #e0e0e0;
-                border-radius: 4px;
-
-                .ant-input-affix-wrapper {
-                    width: 75%;
-                }
-
-                :deep(.ant-tree) {
-                    height: 550px;
-                    overflow: auto;
-                    .ant-tree-list-holder-inner {
-                        > .ant-tree-treenode {
-                            width: 100%;
-                        }
-                        .ant-tree-node-content-wrapper {
-                            width: 100%;
-                        }
-                    }
-                }
-            }
-        }
-
-        .center {
-            flex-basis: 120px;
-            display: flex;
-            align-items: center;
-            margin: 0 24px;
-        }
-    }
-}
-</style>
diff --git a/src/views/system/Menu/Setting/index.vue b/src/views/system/Menu/Setting/index.vue
index 9634b5b5..bf7bcea4 100644
--- a/src/views/system/Menu/Setting/index.vue
+++ b/src/views/system/Menu/Setting/index.vue
@@ -3,84 +3,84 @@
         <j-card>
             <div class="top">
                 <AIcon style="padding: 12px" type="ExclamationCircleOutlined" />
-                <span>基于系统源代码中的菜单数据，配置系统菜单。</span>
+                <span
+                    >单击可切换菜单未选中/选中状态；操作父级菜单时，对应子菜单状态将默认与其同步，可以单独操作调整；支持拖拽菜单调整展示顺序。
+                </span>
             </div>
             <div class="content">
-                <div class="title">
-                    系统菜单
-                    <j-tooltip>
-                        <template #title
-                            >根据系统代码自动读取的菜单数据</template
+                <j-card title="菜单配置" style="width: 80%">
+                    <div class="tree">
+                        <j-tree
+                            v-if="treeData.length !== 0"
+                            show-line
+                            defaultExpandAll
+                            multiple
+                            draggable
+                            :tree-data="treeData"
+                            :height="520"
+                            @select="onSelect"
+                            :selectedKeys="selectedKeys"
+                            @drop="onDrop"
                         >
-                        <AIcon type="QuestionCircleOutlined" />
-                    </j-tooltip>
-                </div>
-                <div class="tree">
-                    <j-input
-                        v-model="filterText"
-                        placeholder="请输入"
-                        @change="change"
-                        style="margin-bottom: 12px"
-                    />
-                    <j-tree
-                        v-if="treeData.length !== 0"
-                        show-line
-                        defaultExpandAll
-                        multiple
-                        draggable
-                        :tree-data="treeData"
-                        :height="500"
-                        @select="onSelect"
-                        :selectedKeys="selectedKeys"
-                        @drop="onDrop"
-                    >
-                        <template #title="row">
-                            <div class="tree-content">
-                                <div class="tree-content-title">
-                                    <AIcon type="HolderOutlined" />
-                                    <div style="margin-left: 8px">
-                                        {{ row.name }}
+                            <template #title="row">
+                                <div class="tree-content">
+                                    <div class="tree-content-title">
+                                        <AIcon type="HolderOutlined" />
+                                        <div style="margin-left: 8px">
+                                            {{ row.name }}
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </template>
-                    </j-tree>
-                </div>
-                <j-button type="primary">保存</j-button>
+                            </template>
+                        </j-tree>
+                    </div>
+                </j-card>
             </div>
+            <j-button
+                type="primary"
+                @click="() => (visible = true)"
+                style="margin-left: 10%"
+                >保存</j-button
+            >
         </j-card>
+        <j-modal
+            :visible="visible"
+            @ok="handleOk"
+            @cancel="handleCancel"
+            modalType="message"
+            :confirmLoading="loading"
+        >
+            保存后当前系统菜单数据将被覆盖，确认操作？
+        </j-modal>
     </page-container>
 </template>
 
 <script setup lang="ts" name="MenuSetting">
 import { getMenuTree_api } from '@/api/system/menu';
-import { getSystemPermission as getSystemPermission_api } from '@/api/initHome';
+import {
+    getSystemPermission as getSystemPermission_api,
+    updateMenus,
+} from '@/api/initHome';
 import {
     filterMenu,
     mergeMapToArr,
     developArrToMap,
     drop,
     select,
+    getMaxDepth,
 } from './utils';
 import BaseMenu from './baseMenu';
 import type { AntTreeNodeDropEvent } from 'ant-design-vue/es/tree';
-import { treeFilter } from '@/utils/tree';
 import { cloneDeep } from 'lodash';
+import { onlyMessage } from '@/utils/comm';
 
 const selectedKeys: any = ref([]);
 const treeData = ref<any>([]);
-const filterText = ref('');
 const systemMenu: any = ref([]);
 const baseMenu: any = ref([]);
 const AllMenu = ref([]);
-
-const onSelect = (selecteds: Array<string>, e: any) => {
-    selectedKeys.value = select(selecteds, e);
-};
-
-const onDrop = (info: AntTreeNodeDropEvent) => {
-    treeData.value = drop(info, treeData.value);
-};
+const visible = ref(false);
+const loading = ref(false);
 
 const params = {
     paging: false,
@@ -103,8 +103,33 @@ const params = {
     ],
 };
 
-const change = (val: any) => {
-    treeData.value = treeFilter(AllMenu.value, val.target.value, 'name');
+const handleOk = async () => {
+    loading.value = true;
+    const res = await updateMenus(treeData.value);
+    if (res.status === 200) {
+        onlyMessage('操作成功', 'success');
+    }
+    loading.value = false;
+    visible.value = false;
+};
+const handleCancel = () => {
+    visible.value = false;
+};
+
+const onSelect = (selecteds: Array<string>, e: any) => {
+    selectedKeys.value = select(selecteds, e);
+};
+
+const onDrop = (info: AntTreeNodeDropEvent) => {
+    const TreeData = cloneDeep(treeData.value);
+    const newTreeData = drop(info, treeData.value);
+    const maxDepth = getMaxDepth(newTreeData);
+    if (maxDepth > 3) {
+        onlyMessage('仅支持3级菜单', 'error');
+        treeData.value = TreeData;
+    } else {
+        treeData.value = newTreeData;
+    }
 };
 
 onMounted(() => {
@@ -116,6 +141,7 @@ onMounted(() => {
         getMenuTree_api(params).then((resp: any) => {
             if (resp.status == 200) {
                 systemMenu.value = resp.result;
+                //初始化菜单
                 const baseMenuData = developArrToMap(baseMenu.value);
                 const systemMenuData = developArrToMap(systemMenu.value, true);
                 selectedKeys.value = systemMenuData.checkedKeys;
@@ -136,19 +162,14 @@ onMounted(() => {
     font-size: 14px;
     line-height: 20px;
     color: rgba(0, 0, 0, 0.55);
+    margin-bottom: 12px;
 }
 .content {
-    width: 50%;
-    margin-top: 24px;
-    .title {
-        font-style: normal;
-        font-weight: 800;
-        font-size: 16px;
-        height: 48px;
-        padding: 12px;
-        background: #f3f4f4;
-        color: rgba(0, 0, 0, 0.8);
-    }
+    width: 100%;
+    margin: 12px 0;
+    display: flex;
+    justify-content: center;
+    // flex-direction: row;
     :deep(.ant-tree) {
         .ant-tree-switcher {
             display: flex;
@@ -165,12 +186,16 @@ onMounted(() => {
             width: 100%;
         }
     }
+    :deep(.ant-card-body) {
+        padding: 0;
+    }
+
     .tree {
-        height: 580px;
+        // flex: 1;
+        height: 540px;
         margin: 16px 0;
         padding: 12px;
         background: #ffffff;
-        border: 1px solid #e0e0e0;
         border-radius: 4px;
         overflow: hidden;
         width: 100%;
@@ -178,6 +203,8 @@ onMounted(() => {
         &-content {
             display: flex;
             justify-content: space-between;
+            margin: 5px 0;
+
             &-title {
                 flex: 1;
                 font-weight: 800;
diff --git a/src/views/system/Menu/Setting/utils.ts b/src/views/system/Menu/Setting/utils.ts
index 95d45d80..14090d68 100644
--- a/src/views/system/Menu/Setting/utils.ts
+++ b/src/views/system/Menu/Setting/utils.ts
@@ -61,20 +61,20 @@ export const developArrToMap = (Menu: any, checked = false) => {
     const rootSet = new Set();
     const arrMap = new Map();
     const checkedKeys: any = [];
-    const getMap = (arr: any, parentCode = 'root', preKey = '0') => {
-        arr.forEach((item: any, index: number) => {
-            const key = preKey + `-${index}`; //初始化key
+    const getMap = (arr: any, parentCode = 'root') => {
+        arr.forEach((item: any) => {
             item.title = item.code;
-            item.key = key;
-            if (checked) {
-                checkedKeys.push(key);
+            item.key = item.code;
+            if (checked || item?.checked) {
+                item.checked = item?.checked || checked;
+                checkedKeys.push(item.code);
             }
             arrMap.set(item.code, item);
             if (parentCode === 'root') {
                 rootSet.add(item.code); //处理根菜单
             }
             if (item?.children) {
-                getMap(item?.children, item.code, key);
+                getMap(item?.children, item.code);
             }
         });
     };
@@ -91,17 +91,16 @@ export const developArrToMap = (Menu: any, checked = false) => {
 export const select = (selecteds: Array<string>, e: any) => {
     const { node } = e;
     const childKeys: Array<string> = [];
-    const getChildKeys = (data: any, preKey = '0') => {
-        data.forEach((item: any, index: number) => {
-            const checkedKey = preKey + `-${index}`;
-            childKeys.push(checkedKey);
+    const getChildKeys = (data: any) => {
+        data.forEach((item: any) => {
+            childKeys.push(item.code);
             if (item?.children) {
-                getChildKeys(item?.children, checkedKey);
+                getChildKeys(item?.children);
             }
         });
     };
     if (node?.children) {
-        getChildKeys(node.children, node.key);
+        getChildKeys(node.children);
     }
 
     const Keys = new Set(selecteds);
@@ -185,4 +184,28 @@ export const drop = (info: AntTreeNodeDropEvent, treeData: any) => {
         }
     }
     return data;
-};
\ No newline at end of file
+};
+
+// 查找最深层级
+export const getMaxDepth = (data: any) => {
+    let maxDepth = 0;
+    data.forEach((node: any) => {
+        const depth = getNodeDepth(node);
+        if (depth > maxDepth) {
+            maxDepth = depth;
+        }
+    });
+    return maxDepth;
+};
+export const getNodeDepth = (node: any) => {
+    let depth = 1;
+    if (node.children) {
+        node.children.forEach((child: any) => {
+            const childDepth = getNodeDepth(child) + 1;
+            if (childDepth > depth) {
+                depth = childDepth;
+            }
+        });
+    }
+    return depth;
+};