From 06139305eb69ef3658f7f57feefbdf3ebc8ae42d Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Fri, 24 Mar 2023 09:56:39 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=20bug#10779=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E5=99=A8=E6=96=B0=E5=A2=9E=E6=97=B6=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E4=B8=8D=E5=AE=8C=E6=95=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data-collect/collector.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/data-collect/collector.ts b/src/api/data-collect/collector.ts
index 75d9abc7..6c1ed981 100644
--- a/src/api/data-collect/collector.ts
+++ b/src/api/data-collect/collector.ts
@@ -4,7 +4,7 @@ export const queryCollector = (data: any) =>
     server.post(`/data-collect/collector/_query/no-paging?paging=false`, data);
 
 export const queryChannelNoPaging = () =>
-    server.post(`/data-collect/channel/_query/no-paging?paging=false`, {});
+    server.post(`/data-collect/channel/_query/no-paging`, { paging: false });
 
 export const save = (data: any) => server.post(`/data-collect/collector`, data);
 

From 3f075e6f2491e84e1b3acf07a70760e1ca4fd82a Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Fri, 24 Mar 2023 10:06:51 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E6=B5=81=E5=AA=92=E4=BD=93=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=20=E5=9F=9F=E5=90=8Dip=E6=A0=A1=E9=AA=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/link/Type/data.ts             | 12 ++++--------
 src/views/media/Stream/Detail/index.vue |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/views/link/Type/data.ts b/src/views/link/Type/data.ts
index 46420ab7..0b54fc9b 100644
--- a/src/views/link/Type/data.ts
+++ b/src/views/link/Type/data.ts
@@ -113,8 +113,8 @@ export const Validator = {
     regOnlyNumber: new RegExp(/^\d+$/),
 };
 
-const validateAddress = (_rule: any, value: string): Promise<any> =>
-    new Promise(async (resolve, reject) => {
+const validateAddress = (_rule: any, value: string): Promise<any> => {
+    return new Promise(async (resolve, reject) => {
         if (
             Validator.regIpv4.test(value) ||
             Validator.regIPv6.test(value) ||
@@ -122,9 +122,10 @@ const validateAddress = (_rule: any, value: string): Promise<any> =>
         ) {
             return resolve('');
         } else {
-            return reject('请输入正确的IP地址或者域名');
+            return value ? reject('请输入正确的IP地址或者域名') : resolve('');
         }
     });
+};
 
 export const Rules = {
     name: [
@@ -176,11 +177,6 @@ export const Rules = {
             validator: validateAddress,
             message: '请输入正确的IP地址或者域名',
         },
-        // {
-        //     pattern:
-        //         Validator.regIpv4 || Validator.regIPv6 || Validator.regDomain,
-        //     message: '请输入正确格式的域名或ip',
-        // },
     ],
     publicPort: [
         {
diff --git a/src/views/media/Stream/Detail/index.vue b/src/views/media/Stream/Detail/index.vue
index ba13c1dd..e5620008 100644
--- a/src/views/media/Stream/Detail/index.vue
+++ b/src/views/media/Stream/Detail/index.vue
@@ -302,7 +302,7 @@ const validateAddress = (_rule: any, value: string): Promise<any> =>
         ) {
             return resolve('');
         } else {
-            return reject('请输入正确的IP地址或者域名');
+            return value ? reject('请输入正确的IP地址或者域名') : resolve('');
         }
     });
 

From 62bd45e6242713c2f84a278fdd637e1410be81eb Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Fri, 24 Mar 2023 15:34:04 +0800
Subject: [PATCH 3/7] fix: bug#10844

---
 src/views/system/Menu/Detail/ButtonMange.vue         | 3 ++-
 src/views/system/Menu/components/ButtonAddDialog.vue | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/system/Menu/Detail/ButtonMange.vue b/src/views/system/Menu/Detail/ButtonMange.vue
index 41e52f86..77d8f618 100644
--- a/src/views/system/Menu/Detail/ButtonMange.vue
+++ b/src/views/system/Menu/Detail/ButtonMange.vue
@@ -122,7 +122,8 @@ const table = reactive({
         routeParams.id &&
             getMenuInfo_api(routeParams.id).then((resp: any) => {
                 menuInfo.value = resp.result;
-                table.tableData = resp.result.buttons as tableDataItem[];
+                table.tableData =
+                    (resp.result?.buttons as tableDataItem[]) || [];
             });
     },
     clickDel: (row: tableDataItem) => {
diff --git a/src/views/system/Menu/components/ButtonAddDialog.vue b/src/views/system/Menu/components/ButtonAddDialog.vue
index 5bec96ea..ffc69edb 100644
--- a/src/views/system/Menu/components/ButtonAddDialog.vue
+++ b/src/views/system/Menu/components/ButtonAddDialog.vue
@@ -95,8 +95,8 @@ const confirm = () => {
     loading.value = true;
     formRef.value &&
         formRef.value.validate().then(() => {
-            const buttons = toRaw(props.menuInfo.buttons);
-            const button = buttons.find((item) => item.id === form.data.id);
+            const buttons = toRaw(props.menuInfo?.buttons);
+            const button = buttons?.find((item) => item.id === form.data.id);
             if (button) {
                 Object.entries(form.data).forEach(([key, value]) => {
                     button[key] = value;
@@ -112,7 +112,10 @@ const confirm = () => {
                     emits('confirm');
                     emits('update:visible', false);
                 })
-                .finally(() => (loading.value = false));
+                .finally(() => (loading.value = false))
+                .catch(() => {
+                    loading.value = false;
+                });
         });
 };
 const initForm = {

From 32e78e9fc0fadde6068dca88721e55568ddb3341 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Fri, 24 Mar 2023 15:36:25 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E5=99=A8=E6=96=AD=E5=BC=80=E6=96=87=E6=A1=88=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?PLC=E5=9C=B0=E5=9D=80=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Collector/Point/Save/SaveModBus.vue       | 37 +++++++++++++++----
 .../DataCollect/Collector/Tree/Save/index.vue |  4 +-
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 2e1e1120..07a0ce3c 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -57,8 +57,18 @@
                     v-model:value="formData.pointKey"
                     :min="0"
                     :max="255"
+                    :precision="0"
                 />
             </j-form-item>
+            <p
+                style="color: #616161"
+                v-if="formData.configuration.function && formData.pointKey"
+            >
+                PLC地址:{{
+                    InitAddress[formData.configuration.function] +
+                    formData.pointKey
+                }}
+            </p>
             <j-form-item
                 label="寄存器数量"
                 :name="['configuration', 'parameter', 'quantity']"
@@ -70,6 +80,7 @@
                     v-model:value="formData.configuration.parameter.quantity"
                     :min="1"
                     :max="255"
+                    :precision="0"
                     @blur="changeQuantity"
                 />
             </j-form-item>
@@ -258,6 +269,12 @@ const collectorId = props.data.collectorId;
 const provider = props.data.provider;
 const oldPointKey = props.data.pointKey;
 
+const InitAddress = {
+    Coils: 1,
+    HoldingRegisters: 40001,
+    InputRegisters: 30001,
+};
+
 const formData = ref({
     name: '',
     configuration: {
@@ -371,9 +388,20 @@ const getProviderList = async () => {
             value: item.id,
             label: item.name,
         }));
+
+    setProviderList(formData.value.configuration.function);
 };
 getProviderList();
 
+const setProviderList = (value: string | undefined) => {
+    providerList.value =
+        value === 'HoldingRegisters'
+            ? providerListAll.value
+            : providerListAll.value.filter(
+                  (item: any) => item.value !== 'bool',
+              );
+};
+
 watch(
     () => formData.value.configuration.parameter.quantity,
     (value) => {
@@ -384,14 +412,9 @@ watch(
 watch(
     () => formData.value.configuration.function,
     (value) => {
-        providerList.value =
-            value === 'HoldingRegisters'
-                ? providerListAll.value
-                : providerListAll.value.filter(
-                      (item: any) => item.value !== 'bool',
-                  );
+        setProviderList(value);
     },
-    { deep: true },
+    { immediate: true, deep: true },
 );
 watch(
     () => props.data,
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index b821a575..5142f14d 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -77,7 +77,7 @@
                     v-model:value="formData.circuitBreaker.type"
                     :options="[
                         { label: '降频', value: 'LowerFrequency' },
-                        { label: '熔断', value: 'Break' },
+                        { label: '断开', value: 'Break' },
                         { label: '忽略', value: 'Ignore' },
                     ]"
                     @change="changeCardSelectType"
@@ -203,7 +203,7 @@ const getTypeTooltip = (value: string) =>
     value === 'LowerFrequency'
         ? '连续20次异常，降低连接频率至原有频率的1/10（重试间隔不超过1分钟），故障处理后自动恢复至设定连接频率'
         : value === 'Break'
-        ? '连续10分钟异常，停止采集数据进入熔断状态，设备重新启用后恢复采集状态'
+        ? '连续10分钟异常，停止采集数据进入断开状态，设备重新启用后恢复采集状态'
         : '忽略异常，保持原采集频率超时时间为5s';
 
 const handleCancel = () => {

From 1c23a544fea7ccfa90ae3006628ae448211771d0 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Fri, 24 Mar 2023 18:04:13 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E8=8F=9C=E5=8D=95=E9=85=8D=E7=BD=AEtodo?=
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      | 462 +++++++------------
 2 files changed, 545 insertions(+), 305 deletions(-)
 create 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
new file mode 100644
index 00000000..b0444c57
--- /dev/null
+++ b/src/views/system/Menu/Setting/index copy.vue	
@@ -0,0 +1,388 @@
+<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 c1904ac7..96f5fa15 100644
--- a/src/views/system/Menu/Setting/index.vue
+++ b/src/views/system/Menu/Setting/index.vue
@@ -1,350 +1,202 @@
 <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">
+    <page-container>
+        <j-card>
+            <div class="top">
+                <AIcon style="padding: 12px" type="ExclamationCircleOutlined" />
+                <span>基于系统源代码中的菜单数据，配置系统菜单。</span>
+            </div>
+            <div class="content">
                 <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
+                    系统菜单
+                    <j-tooltip>
+                        <template #title
+                            >根据系统代码自动读取的菜单数据</template
                         >
-                    </div>
+                        <AIcon type="QuestionCircleOutlined" />
+                    </j-tooltip>
                 </div>
-                <div class="content">
+                <div class="tree">
                     <j-input
-                        v-model:value="transfer.data.leftSearchValue"
-                        style="margin-bottom: 8px"
-                        placeholder="请输入菜单名称"
-                    >
-                        <template #prefix>
-                            <AIcon
-                                type="SearchOutlined"
-                                style="color: #b3b3b3"
-                            />
-                        </template>
-                    </j-input>
+                        v-model="filterText"
+                        placeholder="请输入"
+                        @change="change"
+                        style="margin-bottom: 12px"
+                    />
                     <j-tree
-                        autoExpandParent
-                        :tree-data="transfer.data.leftTreeData"
+                        show-line
+                        defaultExpandAll
+                        multiple
                         draggable
+                        :tree-data="treeData"
+                        :height="500"
                     >
                         <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="请输入菜单名称"
-                    >
-                        <template #prefix>
-                            <AIcon
-                                type="SearchOutlined"
-                                style="color: #b3b3b3"
-                            />
-                        </template>
-                    </j-input>
-                    <j-tree
-                        draggable
-                        autoExpandParent
-                        :tree-data="transfer.data.rightTreeData"
-                        @drop="transfer.onRightDrop"
-                    >
-                        <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)"
-                                >
-                                    <j-tooltip>
-                                        <template #title>删除</template>
-                                        <j-button
-                                            style="padding: 0"
-                                            type="link"
+                            <div class="tree-content">
+                                <div class="tree-content-title">
+                                    <AIcon type="HolderOutlined" />
+                                    <div style="margin-left: 8px">
+                                        {{ row.name }}
+                                    </div>
+                                </div>
+                                <div class="tree-content-action">
+                                    <span @click="(e) => e.stopPropagation()">
+                                        <PermissionButton
+                                            type="text"
+                                            :tooltip="{
+                                                title: '删除',
+                                            }"
+                                            hasPermission="DataCollect/Collector:delete"
+                                            :popConfirm="{
+                                                title: `确定删除？`,
+                                                onConfirm: () =>
+                                                    handlDelete(row.id),
+                                            }"
                                         >
                                             <AIcon type="CloseOutlined" />
-                                        </j-button>
-                                    </j-tooltip>
-                                </j-popconfirm>
+                                        </PermissionButton>
+                                    </span>
+                                </div>
                             </div>
                         </template>
                     </j-tree>
                 </div>
+                <j-button type="primary">保存</j-button>
             </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>
+        </j-card>
+    </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 { filterMenu, getKeys, loop } from './utils';
-import BaseTreeData from './baseMenu';
+import BaseMenu 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[],
+const treeData = ref<any>();
+const filterText = ref('');
+treeData.value = [...BaseMenu];
+let systemMenu: any = reactive([]);
+const baseMenu = cloneDeep(BaseMenu);
 
-        // 右侧树
-        rightSearchValue: '',
-        rightTreeData: [] as any[],
-    }),
-    leftSourceData: [] as any[],
-    rightSourceData: [] as any[],
+const BaseMenuMap = new Map();
+BaseMenu.forEach((item) => {
+    BaseMenuMap.set(item.code, item);
+});
 
-    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,
+console.log(11, BaseMenuMap);
+
+const params = {
+    paging: false,
+    terms: [
+        {
             terms: [
                 {
-                    terms: [
-                        {
-                            column: 'owner',
-                            termType: 'eq',
-                            value: 'iot',
-                        },
-                        {
-                            column: 'owner',
-                            termType: 'isnull',
-                            value: '1',
-                            type: 'or',
-                        },
-                    ],
+                    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));
-    },
+        },
+    ],
 };
-transfer.init();
 
-const dialogShow = ref<boolean>(false);
+const change = (val: any) => {
+    treeData.value = treeFilter(baseMenu, val.target.value, 'name');
+};
+
+const handlDelete = (value) => {
+    console.log(22, value);
+};
+
+onMounted(() => {
+    getMenuTree_api(params).then((resp: any) => {
+        if (resp.status == 200) {
+            systemMenu = resp.result;
+            console.log(2, systemMenu);
+        }
+        // transfer.data.rightTreeData = resp.result;
+    });
+});
 </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;
+.top {
+    background: #f6f6f6;
+    height: 40px;
+    font-style: normal;
+    font-weight: 400;
+    font-size: 14px;
+    line-height: 20px;
+    color: rgba(0, 0, 0, 0.55);
+}
+.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);
     }
-
-    .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: 500px;
-                    overflow: auto;
-                    .ant-tree-list-holder-inner {
-                        > .ant-tree-treenode {
-                            width: 100%;
-                        }
-                        .ant-tree-node-content-wrapper {
-                            width: 100%;
-                        }
-                    }
-                }
-            }
-        }
-
-        .center {
-            flex-basis: 120px;
+    :deep(.ant-tree) {
+        .ant-tree-switcher {
             display: flex;
             align-items: center;
-            margin: 0 24px;
+            justify-content: center;
+        }
+        .ant-tree-switcher-noop {
+            visibility: hidden;
+        }
+        .ant-tree-treenode {
+            width: 100%;
+        }
+        .ant-tree-node-content-wrapper {
+            width: 100%;
+        }
+    }
+    .tree {
+        height: 580px;
+        margin: 16px 0;
+        padding: 12px;
+        background: #ffffff;
+        border: 1px solid #e0e0e0;
+        border-radius: 4px;
+        overflow: hidden;
+        width: 100%;
+
+        &-content {
+            display: flex;
+            justify-content: space-between;
+            width: 100%;
+            &-title {
+                flex: 1;
+                font-weight: 800;
+                font-size: 12px;
+                line-height: 17px;
+                display: flex;
+                align-items: center;
+
+                color: #333333;
+            }
+            &-action {
+                // width: 20px;
+            }
         }
     }
 }

From bba4650fc80e4775ce6dcd26697e7a605118b77c Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Fri, 24 Mar 2023 18:06:43 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=A2=9E=E5=8A=A0=E9=98=B2=E6=8A=96=E8=8A=82?=
 =?UTF-8?q?=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/components/Metadata/Base/Edit/BaseForm.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
index de2cf923..cf298395 100644
--- a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
@@ -70,6 +70,7 @@ import { EventLevel, ExpandsTypeList } from '@/views/device/data';
 import { useMetadataStore } from '@/store/metadata';
 import { validateJson } from './validator';
 import { Rule } from 'ant-design-vue/es/form';
+import { debounce } from 'lodash';
 
 const props = defineProps({
   type: {
@@ -98,7 +99,7 @@ if (props.modelType === 'events' || props.modelType === 'tags') {
 const productStore = useProductStore()
 
 const config = ref<Record<any, any>[]>([])
-const asyncOtherConfig = async () => {
+const asyncOtherConfig = debounce(async () => {
   if (props.type !== 'product') return
   const { valueType, id } = props.value
   const { type } = valueType || {}
@@ -115,7 +116,7 @@ const asyncOtherConfig = async () => {
   if (resp.status === 200) {
     config.value = resp.result
   }
-}
+}, 500)
 
 onMounted(() => {
   if (props.modelType === 'properties') {

From 5fbbaa5f8333168f19c35b86ff036a3939ed4d63 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Fri, 24 Mar 2023 18:20:21 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scene/Save/action/Notify/variableItem/BuildIn.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/BuildIn.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/BuildIn.vue
index 0b85cc88..87b81d56 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/BuildIn.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/BuildIn.vue
@@ -15,10 +15,12 @@
                 :treeData="builtInList"
                 placeholder="请选择参数"
                 style="width: calc(100% - 120px)"
+                :fieldNames="{ label: 'name', value: 'id' }"
+                @change="(val) => itemOnChange(undefined, val)"
             >
-                <template #title="{ name, description }">
+                <template #title="{ fullName, description }">
                     <j-space>
-                        {{ name }}
+                        {{ fullName }}
                         <span style="color: grey; margin-left: 5px">{{ description }}</span>
                     </j-space>
                 </template>
@@ -95,14 +97,15 @@ const sourceChange = (val: any) => {
     emit('update:value', {
         ...props.value,
         source: val,
-        value: undefined,
+        value: undefined
     });
 };
 
-const itemOnChange = (val: any) => {
+const itemOnChange = (val: any, _upperKey?: string) => {
     emit('update:value', {
         ...props.value,
         value: val,
+        upperKey: _upperKey
     });
 };