From fdfa15b1d1ebb866402cd80510685a41066bf746 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 1 Aug 2024 19:41:43 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E6=8B=86=E5=88=86]=20=E8=AF=91?=
 =?UTF-8?q?=E6=96=87=E8=A1=A8=E6=A0=BC=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentSplit/modules/SplitAddForm.vue          | 13 +++++++++----
 .../documentSplit/modules/SplitDetailAddTable.vue   |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
index 090193f..3b41931 100644
--- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
@@ -603,10 +603,15 @@ export default {
      * @param ueContent
      */
     editTableOk (ueContent) {
-      this.contentList[this.addIndex] = {
-        id: '',
-        type: 'TABLE',
-        [this.currentFieldObj.field]: ueContent[0]
+      // 如果内容和译文有一个有内容，就不进行覆盖
+      if (this.contentList[this.addIndex][this.operateField.content.field] || this.contentList[this.addIndex][this.operateField.translation.field]) {
+        this.contentList[this.addIndex][this.currentFieldObj.field] = ueContent[0]
+      } else {
+        this.contentList[this.addIndex] = {
+          id: '',
+          type: 'TABLE',
+          [this.currentFieldObj.field]: ueContent[0]
+        }
       }
       this.contentList = JSON.parse(JSON.stringify(this.contentList))
     },
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue b/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue
index 2bb1a0a..12e72c6 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue
@@ -132,7 +132,9 @@ export default {
     // 表格确认按钮
     handleOkTable () {
       let ueContent = []
-      ueContent = this.ueContent.match(/<table.{0,}?.+?>{0,}?<\/table>/g) || []
+      if (this.ueContent) {
+        ueContent = this.ueContent.match(/<table.{0,}?.+?>{0,}?<\/table>/g) || []
+      }
       if (ueContent && ueContent.length > 1) {
         this.$message.warning(this.$t('oneTableAdded'))
       } else if (!ueContent || ueContent.length < 1) {