From c29875ffa95f98bbc5393a9ffc6e43b51b8aa315 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 24 May 2022 23:05:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=BF=E6=8D=A2excel=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                     |  3 ++-
 frontend/src/lang/tw.js                     |  3 ++-
 frontend/src/lang/zh.js                     |  3 ++-
 frontend/src/views/dataset/add/AddExcel.vue | 13 +++++++++++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 60fc62b068..fc1b64fc28 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1248,7 +1248,8 @@ export default {
       pending: 'Pause',
       exec: 'Execute Once',
       confirm_exec: 'Manual trigger execution？',
-      change_success: 'State switch successful'
+      change_success: 'State switch successful',
+      excel_replace_msg: 'Calculation fields, custom datasets, associated datasets, dashboards, etc. may be affected. Confirm the replacement？'
     },
     field_group_type: 'Type',
     location: 'Location',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 1d912df2fe..854bcd3075 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1248,7 +1248,8 @@ export default {
       pending: '暫停',
       exec: '執行一次',
       confirm_exec: '手動觸發執行？',
-      change_success: '狀態切換成功'
+      change_success: '狀態切換成功',
+      excel_replace_msg: '可能會影響計算欄位、自定義數据集、關聯數据集、儀錶板等，確認替換？'
     },
     field_group_type: '分類',
     location: '地理位置',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 344decdc99..5c35eca3e0 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1249,7 +1249,8 @@ export default {
       pending: '暂停',
       exec: '执行一次',
       confirm_exec: '手动触发执行？',
-      change_success: '状态切换成功'
+      change_success: '状态切换成功',
+      excel_replace_msg: '可能会影响计算字段、自定义数据集、关联数据集、仪表板等，确认替换？'
     },
     field_group_type: '分类',
     location: '地理位置',
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index c31da404c9..fe347628f4 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -153,7 +153,7 @@
 import { post } from '@/api/dataset/dataset'
 import { getToken } from '@/utils/auth'
 import i18n from '@/lang'
-import {$alert} from "@/utils/message";
+import {$alert, $confirm} from "@/utils/message";
 import store from "@/store";
 
 const token = getToken()
@@ -366,8 +366,17 @@ export default {
           editType: this.param.editType ? this.param.editType : 0
         }
       }
+      if (this.param.editType === 0 && this.param.tableId) {
+        $confirm(i18n.t('dataset.repeat_datasource_msg'), () => {
+          this.saveExcelData(sheetFileMd5, table)
+        })
+      }else {
+        this.saveExcelData(sheetFileMd5, table)
+      }
+    },
+    saveExcelData(sheetFileMd5, table) {
       if (new Set(sheetFileMd5).size !== sheetFileMd5.length && !this.param.tableId) {
-        this.$confirm(this.$t('dataset.merge_msg'), this.$t('dataset.merge_title'), {
+        this.$confirm(this.$t('dataset.excel_replace_msg'), this.$t('dataset.merge_title'), {
           distinguishCancelAndClose: true,
           confirmButtonText: this.$t('dataset.merge'),
           cancelButtonText: this.$t('dataset.no_merge'),