From 8d941fd8752a006acb394b19dc37fa204f249fc5 Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Thu, 2 Nov 2023 10:09:32 +0800
Subject: [PATCH] fix: bug#19588
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 菜单bug

* fix: bug#19588
---
 .../device/components/Metadata/Cat/index.vue  |  4 ++--
 .../Menu/components/ButtonAddDialog.vue       |  2 +-
 .../system/Menu/components/PermissChoose.vue  | 24 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/device/components/Metadata/Cat/index.vue b/src/views/device/components/Metadata/Cat/index.vue
index 623ec1ec..8c963baf 100644
--- a/src/views/device/components/Metadata/Cat/index.vue
+++ b/src/views/device/components/Metadata/Cat/index.vue
@@ -158,14 +158,14 @@ watch(
       if (props.type === 'device') {
         detail(id as string).then((resp) => {
           loading.value = false
-          instanceStore.setCurrent(resp.result)
+          // instanceStore.setCurrent(resp.result)
           value.value = resp.result.metadata
           hideVirtualRule(resp.result.metadata)
         });
       } else {
         productDetail(id as string).then((resp) => {
           loading.value = false
-          productStore.setCurrent(resp.result)
+          // productStore.setCurrent(resp.result)
           value.value = resp.result.metadata
           hideVirtualRule(resp.result.metadata)
         });
diff --git a/src/views/system/Menu/components/ButtonAddDialog.vue b/src/views/system/Menu/components/ButtonAddDialog.vue
index c769e091..bf927177 100644
--- a/src/views/system/Menu/components/ButtonAddDialog.vue
+++ b/src/views/system/Menu/components/ButtonAddDialog.vue
@@ -59,7 +59,7 @@
                     max-height="350px"
                     v-model:value="form.data.permissions"
                     :disabled="props.mode === '查看'"
-                    :key="form.data.id || ''"
+                    :btnId="form.data.id "
                 />
             </j-form-item>
             <j-form-item label="说明" name="describe">
diff --git a/src/views/system/Menu/components/PermissChoose.vue b/src/views/system/Menu/components/PermissChoose.vue
index 83cf39cc..f62e7e3c 100644
--- a/src/views/system/Menu/components/PermissChoose.vue
+++ b/src/views/system/Menu/components/PermissChoose.vue
@@ -50,7 +50,7 @@ import { Form } from 'jetlinks-ui-components';
 Form.useInjectFormItemContext();
 
 const props = defineProps<{
-    key: string;
+    btnId: string;
     value: any[];
     firstWidth: number;
     maxHeight: string;
@@ -77,17 +77,17 @@ const permission = reactive({
 
     init: () => {
         permission.getList();
-        watch(
-            () => props.key,
-            () => {
-                nextTick(() => {
-                    permission.list = permission.makeList(
-                        props.value,
-                        permission.sourceList,
-                    );
-                });
-            },
-        );
+        // watch(
+        //     () => props.btnId,
+        //     () => {
+        //         nextTick(() => {
+        //             permission.list = permission.makeList(
+        //                 props.value,
+        //                 permission.sourceList,
+        //             );
+        //         });
+        //     },
+        // );
     },
     // 获取权限列表
     getList: () => {