区域标记修改bug解决

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

@@ -500,17 +500,35 @@ const setAreaMark = async (type: 'data' | 'head' = 'data') => {
     await settingForm.value?.validate()
 
     if (currentAreaMark.beginRow !== '' && currentAreaMark.beginRow !== undefined) {
-      await ElMessageBox.confirm('检测到未保存的标记，是否在覆盖当前标记区域？', '提示消息', {
-        confirmButtonText: '覆盖',
-        cancelButtonText: '取消'
-      })
-      resetCurrentArea(() => {
-        // 设置当前选区
-        luckysheet.setRangeShow({
-          row: [formState.beginRow, formState.endRow],
-          column: [formState.beginColum, formState.endColum]
+      try {
+        await ElMessageBox.confirm('检测到未保存的标记，是否保存？', '提示消息', {
+          confirmButtonText: '保存',
+          cancelButtonText: '取消'
         })
-      })
+        return saveAreaMark()
+      } catch {
+        if (currentAreaMark.excelAreaId) {
+          currentAreaMark.excelAreaId = ''
+          resetCurrentAreaState()
+        } else {
+          currentAreaMark.excelAreaId = ''
+          resetCurrentArea(() => {
+            // 设置当前选区
+            luckysheet.setRangeShow({
+              row: [formState.beginRow, formState.endRow],
+              column: [formState.beginColum, formState.endColum]
+            })
+          })
+        }
+      }
+
+      // resetCurrentArea(() => {
+      //   // 设置当前选区
+      //   luckysheet.setRangeShow({
+      //     row: [formState.beginRow, formState.endRow],
+      //     column: [formState.beginColum, formState.endColum]
+      //   })
+      // })
     }
     // console.log(formState)
     // debugger