写法更改上传

src/views/ruleConfig/Algorithm/modules/formModule.vue

@@ -133,6 +133,9 @@ watch(
     if (props.itemData) {
       const data = JSON.parse(JSON.stringify(props.itemData));
       form.value = { ...form.value, ...data };
+      if (props.type === 'edit') {
+        rulenameList.value = rulenameList.value.filter(item => item !== data.rulename)
+      }
     }
   },
   { deep: true, immediate: true }
@@ -142,6 +145,10 @@ watch(
   () => props.nameList,
   (newVal) => {
     rulenameList.value = props.nameList;
+    const data = JSON.parse(JSON.stringify(props.itemData));
+    if (props.type === 'edit' && data) {
+      rulenameList.value = rulenameList.value.filter(item => item !== data.rulename)
+    }
   },
   { deep: true, immediate: true }
 );

src/views/ruleConfig/CalculationMethod/modules/formModule.vue

 <script setup lang="ts" name="Form">
-import { onMounted, reactive, ref, toRefs, watch } from "vue";
+import { onMounted, reactive, ref, toRefs, watch, computed } from "vue";
 import { Switch } from "view-ui-plus";
 import type { FormInstance } from "element-plus";
 import { ElMessage } from "element-plus";
@@ -47,10 +47,10 @@ const data = reactive({
 });
 
 const { form, rules } = toRefs(data);
-const encryptionList = ref<any[]>([]); // 加密规则选项列表
 const secretkeyList = ref<any[]>([]); // 密钥选项列表
 const readOnly = ref(true);
 const formRef = ref<FormInstance>();
+const encryptionList = computed(() => props.encryptionDict); // 加密规则选项列表
 
 // 重置
 const reset = () => { 
@@ -145,13 +145,6 @@ watch(
   { deep: true, immediate: true }
 );
 
-watch(
-  () => props.encryptionDict,
-  (newVal) => {
-    encryptionList.value = props.encryptionDict;
-  },
-  { deep: true, immediate: true }
-);
 </script>
 
 <template>

src/views/ruleConfig/Dictionary/modules/AddValue.vue

 <script setup lang="ts" name="AddValue">
-import { onMounted, reactive, ref, toRefs, watch } from "vue";
+import { onMounted, reactive, ref, toRefs, watch, computed } from "vue";
 import type { FormInstance } from "element-plus";
 import { ElMessage } from "element-plus";
 
@@ -36,7 +36,7 @@ const data = reactive({
 
 const { form, rules } = toRefs(data);
 const formRef = ref<FormInstance>();
-const classDictList = ref<any[]>([]);
+const classDictList = computed(() => props.classDict);
 
 // 重置
 const reset = () => {
@@ -81,20 +81,12 @@ watch(
   () => props.itemData,
   (newVal) => {
     if (props.itemData) {
-      const data = JSON.parse(JSON.stringify(props.itemData))
-      form.value = {...form.value, ...data}
+      const data = JSON.parse(JSON.stringify(props.itemData));
+      form.value = { ...form.value, ...data };
     }
   },
   { deep: true, immediate: true }
 );
-
-watch(
-  () => props.classDict,
-  (newVal) => {
-    classDictList.value = props.classDict;
-  },
-  { deep: true, immediate: true }
-);
 </script>
 
 <template>

src/views/ruleConfig/Discover/modules/AddDomain.vue

@@ -30,25 +30,6 @@ const { form, rules } = toRefs(data);
 const readOnly = ref(true);
 const formRef = ref<FormInstance>();
 
-watch(
-  () => props.type,
-  (newVal) => {
-    readOnly.value = props.type === 'edit' ? true : false;
-  },
-  { deep: true, immediate: true }
-);
-
-watch(
-  () => props.itemData,
-  (newVal) => {
-    if (props.type === 'edit' && props.itemData) {
-      const data = JSON.parse(JSON.stringify(props.itemData));
-      form.value = { ...form.value, ...data };
-    }
-  },
-  { deep: true, immediate: true }
-);
-
 // 取消
 const cancel = () => { 
   if (props.type === 'edit') { 
@@ -109,6 +90,24 @@ const addDataAreaFun = () => {
   })
 }
 
+watch(
+  () => props.type,
+  (newVal) => {
+    readOnly.value = props.type === 'edit' ? true : false;
+  },
+  { deep: true, immediate: true }
+);
+
+watch(
+  () => props.itemData,
+  (newVal) => {
+    if (props.type === 'edit' && props.itemData) {
+      const data = JSON.parse(JSON.stringify(props.itemData));
+      form.value = { ...form.value, ...data };
+    }
+  },
+  { deep: true, immediate: true }
+);
 
 </script>
 

src/views/ruleConfig/Encryption/modules/AddEncryption.vue

@@ -99,6 +99,9 @@ watch(
     if (props.type === 'edit' && props.itemData) {
       const data = JSON.parse(JSON.stringify(props.itemData));
       form.value = { ...form.value, ...data };
+      if (props.type === 'edit') {
+        typeNameList.value = typeNameList.value.filter(item => item !== data.encryption_name)
+      }
     }
   },
   { deep: true, immediate: true }
@@ -108,8 +111,9 @@ watch(
   () => props.typeNameDict,
   (newVal) => {
     typeNameList.value = props.typeNameDict
-    if (props.type === 'edit' && props.itemData) {
-      typeNameList.value = typeNameList.value.filter(item => item !== props.itemData.encryption_name)
+    const data = JSON.parse(JSON.stringify(props.itemData));
+    if (props.type === 'edit' && data) {
+      typeNameList.value = typeNameList.value.filter(item => item !== data.encryption_name)
     }
   },
   { deep: true, immediate: true }

src/views/ruleConfig/Encryption/modules/AddKey.vue

@@ -137,6 +137,9 @@ watch(
     if (props.itemData) {
       const data = JSON.parse(JSON.stringify(props.itemData));
       form.value = { ...form.value, ...data };
+      if (props.type === 'edit' && data) {
+        keyNameList.value = keyNameList.value.filter(item => item !== data.secret_key_name)
+      }
     }
   },
   { deep: true, immediate: true }
@@ -146,8 +149,9 @@ watch(
   () => props.keyNameDict,
   (newVal) => {
     keyNameList.value = props.keyNameDict
-    if (props.type === 'edit' && props.itemData) {
-      keyNameList.value = keyNameList.value.filter(item => item !== props.itemData.secret_key_name)
+    const data = JSON.parse(JSON.stringify(props.itemData));
+    if (props.type === 'edit' && data) {
+      keyNameList.value = keyNameList.value.filter(item => item !== data.secret_key_name)
     }
   },
   { deep: true, immediate: true }