From 07282640568a77f55c8392bc428c897e4e92e9d5 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 30 Dec 2022 16:01:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0Excel=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=87=E9=A2=98=E4=B8=8A=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=8B=89=E6=A1=86=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E5=8A=9F=E8=83=BD=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/add/AddExcel.vue              | 8 +++++---
 frontend/src/views/system/datasource/DsConfiguration.vue | 3 ++-
 frontend/src/views/system/datasource/DsFormContent.vue   | 3 +++
 frontend/src/views/system/datasource/DsTable.vue         | 2 +-
 frontend/src/views/system/datasource/DsTree.vue          | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index fd96a93531..98ea728587 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -145,19 +145,21 @@
           >
             <ux-table-column
               v-for="field in sheetObj.fields"
-              :key="field.fieldName + field.fieldType"
+              :key="field.fieldName"
               min-width="200px"
               :field="field.fieldName"
               :title="field.remarks"
+              :fieldType="field.fieldType"
               :resizable="true"
             >
-              <template slot="header">
+              <template #header>
                 <el-dropdown
                   placement="bottom-start"
                   trigger="click"
+                  :key="field.fieldName + field.fieldType"
                   @command="(type) => handleCommand(type, field)"
                 >
-                  <span class="type-switch">
+                  <span  class="type-switch">
                     <svg-icon
                       v-if="field.fieldType === 'TEXT'"
                       icon-class="field_text"
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index e3c1cf35aa..1b70e2a517 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -93,6 +93,7 @@
                       slot="reference"
                       icon-class="de-delete"
                       class="de-delete-icon"
+                      :class="[disabled ? 'not-allow' : '']"
                     />
                   </el-popover>
                 </span>
@@ -1584,7 +1585,7 @@ export default {
     margin-right: 20px;
     color: var(--deTextSecondary, #646a73);
   }
-  .de-delete-icon {
+  .de-delete-icon:not(.not-allow) {
     cursor: pointer;
     &:hover {
       color: var(--deDanger, #f54a45);
diff --git a/frontend/src/views/system/datasource/DsFormContent.vue b/frontend/src/views/system/datasource/DsFormContent.vue
index 07f570e71c..a19fda77b5 100644
--- a/frontend/src/views/system/datasource/DsFormContent.vue
+++ b/frontend/src/views/system/datasource/DsFormContent.vue
@@ -657,6 +657,9 @@ export default {
     this.$emit('setParams', { ...this.params })
     this.$nextTick(() => {
       this.disabled = appMarketCheck ? !this.appMarketEdit : (Boolean(id) && showModel === 'show' && !this.canEdit)
+      if (this.configFromTabs.editor === 'editor') {
+        this.$emit('editeTodisable', true)
+      }
     })
   },
   methods: {
diff --git a/frontend/src/views/system/datasource/DsTable.vue b/frontend/src/views/system/datasource/DsTable.vue
index f686b1bd49..e7fab390ad 100644
--- a/frontend/src/views/system/datasource/DsTable.vue
+++ b/frontend/src/views/system/datasource/DsTable.vue
@@ -64,7 +64,7 @@
         </div>
         <div style="height: calc(100% - 36px)">
           <ds-form-content
-            @editeTodisable="editDatasource(false)"
+            @editeTodisable="editDatasource"
             ref="DsFormContent"
             :config-from-tabs="configFromTabs"
           />
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index 7d5de21f87..056ee5eef9 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -705,7 +705,7 @@ export default {
     },
     _handleEditer(row) {
       if (this.showView === 'Datasource') {
-        const param = { ...row, ...{ showModel: 'show' }}
+        const param = { ...row, ...{ showModel: 'show', editor: 'editor' }}
         this.switchMain('dsTable', param, this.tData, this.dsTypes)
         this.currentNodeId && sessionStorage.setItem('datasource-current-node', this.currentNodeId)
         return