Merge remote-tracking branch 'origin/main' into lichang

src/views/configManage/configParamTreeTable/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, ref, onMounted, watchEffect, toRaw, nextTick } from 'vue';
+import { reactive, ref, onMounted, toRaw, nextTick, watch } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
 import { Modal, message } from 'ant-design-vue/lib';
 import useI18n from '@/hooks/useI18n';
@@ -1009,17 +1009,24 @@ function fnModalCancel() {
   modalState.data = [];
 }
 
-watchEffect(() => {
-  // 监听表格字段列排序变化关闭展开
-  if (arrayState.columnsDnd) {
+// 监听表格字段列排序变化关闭展开
+watch(
+  () => arrayState.columnsDnd,
+  () => {
     arrayEditClose();
   }
+);
 
-  // SMF需要选择配置的UPF id
-  if (modalState.visible && neTypeSelect.value[0] === 'SMF') {
-    initUPFIds();
+// 监听新增编辑弹窗
+watch(
+  () => modalState.visible,
+  val => {
+    // SMF需要选择配置的UPF id
+    if (val && neTypeSelect.value[0] === 'SMF') {
+      initUPFIds();
+    }
   }
-});
+);
 
 onMounted(() => {
   // 获取网元网元列表