From 7dedd8f50843e113dc48a44045b3e58a1dcc4d0f Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Mon, 31 Jul 2023 16:54:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=BE=93=E5=85=A5=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=92=E6=A7=BD=EF=BC=8C=E4=BE=9B=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataSetManagement/src/OriginalEditForm.vue | 18 ++++++++++--------
 .../packages/DataSetManagement/src/index.vue   |  6 +++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index 915af7aa..91f70b95 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -461,6 +461,8 @@
               prop="sourceTable"
               label="字段来源"
             />
+            <!-- 添加一个插槽，供其他人可扩展表格列，并把表格列的数据返回出去 -->
+            <slot name="output-field-table-column" />
           </el-table>
         </div>
         <span
@@ -655,11 +657,11 @@ export default {
     getData () {
       const executeParams = {
         dataSourceId: this.dataForm.sourceId,
-        script:JSON.stringify({
-           fieldInfo: this.dataForm.fieldInfo,// 未选中字段就传空数组
+        script: JSON.stringify({
+          fieldInfo: this.dataForm.fieldInfo, // 未选中字段就传空数组
           tableName: this.dataForm.tableName,
           repeatStatus: this.dataForm.repeatStatus
-        }) ,
+        }),
         // 原始表数据集没有数据集参数
         params: [],
         dataSetType: 'original',
@@ -668,7 +670,7 @@ export default {
       }
       this.tableLoading = true
       datasetExecuteTest(executeParams).then((data) => {
-         if (this.dataForm.fieldList == null) {
+        if (this.dataForm.fieldList == null) {
           this.dataForm.fieldList = _.cloneDeep(res.structure)
         }
         this.dataPreviewList = data.data.list
@@ -735,12 +737,12 @@ export default {
         this.saveText = '正在保存...'
         const saveOriginal = this.dataForm.id ? datasetUpdate : datasetAdd
         saveOriginal(datasetParams).then(res => {
+          this.goBack()
           this.$message.success('保存成功')
           this.$parent.init(false)
           this.$parent.setType = null
           this.saveLoading = false
           this.saveText = ''
-          this.goBack()
         }).catch(() => {
           this.$message.error('保存失败')
           this.saveLoading = false
@@ -863,11 +865,11 @@ export default {
       if (!this.dataForm.sourceId || !this.dataForm.tableName) return
       const executeParams = {
         dataSourceId: this.dataForm.sourceId,
-         script:JSON.stringify({
-           fieldInfo: this.dataForm.fieldInfo,// 未选中字段就传空数组
+        script: JSON.stringify({
+          fieldInfo: this.dataForm.fieldInfo, // 未选中字段就传空数组
           tableName: this.dataForm.tableName,
           repeatStatus: this.dataForm.repeatStatus
-        }) ,
+        }),
         // 原始表数据集没有数据集参数
         params: [],
         dataSetType: 'original',
diff --git a/data-room-ui/packages/DataSetManagement/src/index.vue b/data-room-ui/packages/DataSetManagement/src/index.vue
index 2e53cb4c..b4c28496 100644
--- a/data-room-ui/packages/DataSetManagement/src/index.vue
+++ b/data-room-ui/packages/DataSetManagement/src/index.vue
@@ -108,7 +108,7 @@
           </el-form-item>
           <el-form-item class="filter-item">
             <el-button
-              v-if="ToAdd"
+              v-if="toAdd"
               class="bs-el-button-default"
               @click="addDataset"
             >
@@ -310,7 +310,7 @@ export default {
       type: Boolean,
       default: false
     },
-    ToAdd: {
+    toAdd: {
       type: Boolean,
       default: true
     },
@@ -365,7 +365,7 @@ export default {
   },
   computed: {
     allType () {
-      return this.datasetTypeList.map(item => item.datasetType).filter(item => item != '')
+      return this.datasetTypeList.map(item => item.datasetType).filter(item => item !== '')
     }
   },
   watch: {