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 " /> 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: () => {