优化关联

src/views/comment-excel/components/ExcelOperate/ExcelOperate.vue

@@ -571,8 +571,10 @@ const confirmConnect = () => {
   addConnect(list)
 }
 const addConnect = async (list: any) => {
+  const connectFiled = []
+  const beConnectFiled = []
   list.forEach((item: any) => {
-    currentConnectInfo.connectFiled.push({
+    connectFiled.push({
       title: item.title,
       sheet: item.sheet,
       row: item.row,
@@ -584,7 +586,7 @@ const addConnect = async (list: any) => {
       script: item.script
     })
 
-    currentConnectInfo.beConnectFiled.push({
+    beConnectFiled.push({
       title: item.betitle,
       sheet: item.besheet,
       row: item.berow,
@@ -596,6 +598,8 @@ const addConnect = async (list: any) => {
       script: item.bescript
     })
   })
+  currentConnectInfo.beConnectFiled = beConnectFiled
+  currentConnectInfo.connectFiled = connectFiled
   currentConnectInfo.fileId = getFileInfo.value.orderFileId
 
   const { data } = await addExcelAreaConnect(currentConnectInfo)
@@ -606,8 +610,10 @@ const addConnect = async (list: any) => {
   }
   ElMessage.success('添加成功！')
   connectVisible.value = false
+  // 添加成功，重新获取数据
+  queryConnectList()
   // 添加成功 手动更新页面数据
-  connectList.value.push(data.result)
+  // connectList.value.push(data.result)
 }
 const chooseConnect = (row: any) => {
   currentConnectInfo.excelAreaId = row.excelAreaId
@@ -628,60 +634,61 @@ const beConnectSelectOptions = computed(
 )
 watch(connectVisible, (val) => {
   if (val) {
-    // 编辑重新复制
-    if (currentConnectInfo.excelAreaConnectId) {
-      // 按照顺序来赋值connectFiled -> beConnectFiled
-      const connectFiled = cachConnectEditInfo.value?.connectFiled || []
-      const beConnectFiled = cachConnectEditInfo.value?.beConnectFiled
-      connectConfigData.value = connectFiled.map((item, i) => {
-        const beConnectFiledItem = beConnectFiled[i]
-        console.log(beConnectFiledItem, '----')
-        return {
-          title: item.title,
-          sheet: item.sheet,
-          row: item.row,
-          colum: item.colum,
-          numFlag: item.numFlag,
-          numTitle: item.numTitle,
-          only: item.only,
-          script: item.script,
-          scriptName: item.scriptName,
-          bescriptName: beConnectFiledItem.scriptName,
-          bescript: beConnectFiledItem.script,
-          betitle: beConnectFiledItem.title,
-          berow: beConnectFiledItem.row,
-          becolum: beConnectFiledItem.colum,
-          besheet: beConnectFiledItem.sheet,
-          benumFlag: beConnectFiledItem.numFlag,
-          benumTitle: beConnectFiledItem.numTitle,
-          beonly: beConnectFiledItem.only
-        }
-      })
-    } else {
-      const titles = areaList.value.find(
-        (v: any) => v.excelAreaId == currentConnectInfo.excelAreaId
-      )?.excelAreaTitle
-
-      connectConfigData.value = titles.map((item: any) => {
-        return {
-          title: item.title,
-          sheet: item.sheet,
-          row: item.row,
-          colum: item.colum,
-          numFlag: item.numFlag,
-          numTitle: item.numTitle,
-          only: item.only,
-
-          betitle: '',
-          berow: '',
-          becolum: '',
-          besheet: '',
-          benumFlag: '',
-          benumTitle: '',
-          beonly: ''
+    const titles = areaList.value.find((v: any) => v.excelAreaId == currentConnectInfo.excelAreaId)
+      ?.excelAreaTitle
+
+    connectConfigData.value = titles.map((item: any) => {
+      // 全部列，并且匹配已经绑定的列
+      if (currentConnectInfo.excelAreaConnectId) {
+        // 按照顺序来赋值connectFiled -> beConnectFiled
+        const connectFiled = cachConnectEditInfo.value?.connectFiled || []
+        const beConnectFiled = cachConnectEditInfo.value?.beConnectFiled
+
+        const index = connectFiled.findIndex(
+          (v) => v.row == item.row && v.colum == item.colum && v.title == item.title
+        )
+        if (index > -1) {
+          const beConnectFiledItem = beConnectFiled[index]
+          return {
+            title: item.title,
+            sheet: item.sheet,
+            row: item.row,
+            colum: item.colum,
+            numFlag: item.numFlag,
+            numTitle: item.numTitle,
+            only: item.only,
+            script: item.script,
+            scriptName: item.scriptName,
+            bescriptName: beConnectFiledItem.scriptName,
+            bescript: beConnectFiledItem.script,
+            betitle: beConnectFiledItem.title,
+            berow: beConnectFiledItem.row,
+            becolum: beConnectFiledItem.colum,
+            besheet: beConnectFiledItem.sheet,
+            benumFlag: beConnectFiledItem.numFlag,
+            benumTitle: beConnectFiledItem.numTitle,
+            beonly: beConnectFiledItem.only
+          }
         }
-      })
-    }
+      }
+      return {
+        title: item.title,
+        sheet: item.sheet,
+        row: item.row,
+        colum: item.colum,
+        numFlag: item.numFlag,
+        numTitle: item.numTitle,
+        only: item.only,
+
+        betitle: '',
+        berow: '',
+        becolum: '',
+        besheet: '',
+        benumFlag: '',
+        benumTitle: '',
+        beonly: ''
+      }
+    })
   }
 })