From 31c916f2cdbe1a51196b47d5fd66988b7732c44e Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Wed, 19 Jul 2023 15:10:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DJS=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataSetManagement/src/CustomEditForm.vue  |  2 +-
 .../DataSetManagement/src/JsEditForm.vue      | 28 +++++++++++++++----
 .../DataSetManagement/src/JsonEditForm.vue    |  7 ++---
 .../src/OriginalEditForm.vue                  |  7 ++---
 .../DataSetManagement/src/ScriptEditForm.vue  |  2 +-
 .../src/StoredProcedureEditForm.vue           |  2 +-
 .../packages/DataSetManagement/src/index.vue  | 10 +++----
 7 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index d7d444d7..c89baf7f 100644
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@@ -156,7 +156,7 @@
                   label="标签"
                   prop="labelIds"
                 >
-                  <label-select
+                  <LabelSelect
                     :dataset-id="datasetId"
                     :id-list="dataForm.labelIds"
                     @commit="(ids) =>{dataForm.labelIds = ids}"
diff --git a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
index 0d40ee99..55096d57 100644
--- a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
@@ -124,6 +124,18 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="标签"
+                  prop="labelIds"
+                >
+                  <LabelSelect
+                    :dataset-id="datasetId"
+                    :id-list="dataForm.labelIds"
+                    @commit="(ids) =>{dataForm.labelIds = ids}"
+                  />
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
           <div
@@ -352,6 +364,7 @@
 </template>
 
 <script>
+import LabelSelect from 'data-room-ui/DataSetLabelManagement/src/LabelSelect.vue'
 import ParamsSettingDialog from './JsComponents/ParamsSettingDialog.vue'
 import OutputFieldDialog from './JsComponents/OutputFieldDialog.vue'
 import FieldFillDialog from './JsComponents/FieldFillDialog.vue'
@@ -366,7 +379,8 @@ export default {
     codemirror,
     FieldFillDialog,
     ParamsSettingDialog,
-    OutputFieldDialog
+    OutputFieldDialog,
+    LabelSelect
   },
   props: {
     config: {
@@ -410,6 +424,7 @@ export default {
         name: '',
         typeId: '',
         remark: '',
+        labelIds: [],
         config: {
           script: '',
           paramsList: []
@@ -474,9 +489,9 @@ export default {
       }
       if (this.datasetId) {
         getDataset(this.datasetId).then(res => {
-          const { id, name, typeId, remark, config } = res
+          const { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config } = res
           const { script, paramsList, fieldDesc, fieldList } = config
-          this.dataForm = { id, name, typeId, remark, config: { script, paramsList } }
+          this.dataForm = { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config: { script, paramsList } }
           this.fieldDesc = fieldDesc
           this.outputFieldList = fieldList
           this.scriptExecute(true)
@@ -507,17 +522,18 @@ export default {
         if (valid) {
           this.saveloading = true
           this.saveText = '正在保存...'
-          const { datasetId, dataForm, config, appCode, fieldDesc, outputFieldList } = this
+          const { datasetId, dataForm, appCode, fieldDesc, outputFieldList } = this
           const form = {
             id: datasetId,
             name: dataForm.name,
             typeId: dataForm.typeId,
             remark: dataForm.remark,
-            datasetType: config.datasetType,
+            datasetType: 'js',
             moduleCode: appCode,
             editable: appCode ? 1 : 0,
+            labelIds: dataForm.labelIds,
             config: {
-              className: config.className,
+              className: 'com.gccloud.dataset.entity.config.JsDataSetConfig',
               script: dataForm.config.script,
               fieldDesc,
               paramsList: dataForm.config.paramsList,
diff --git a/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue
index 3cdd1c0d..e34e55c3 100644
--- a/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue
@@ -130,12 +130,11 @@
                   label="标签"
                   prop="labelIds"
                 >
-                  <label-select
+                  <LabelSelect
                     :dataset-id="datasetId"
                     :id-list="dataForm.labelIds"
                     @commit="(ids) =>{dataForm.labelIds = ids}"
-                  >
-                  </label-select>
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -383,7 +382,7 @@ export default {
           { validator: validateName, trigger: 'blur' }
         ]
       },
-      passTest: false, // 通过测试
+      passTest: false // 通过测试
     }
   },
   mounted () {
diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index 3c9bded9..de06dea4 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -256,12 +256,11 @@
                   label="标签"
                   prop="labelIds"
                 >
-                  <label-select
+                  <LabelSelect
                     :dataset-id="datasetId"
                     :id-list="dataForm.labelIds"
                     @commit="(ids) =>{dataForm.labelIds = ids}"
-                  >
-                  </label-select>
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -552,7 +551,7 @@ export default {
       fieldList: [],
       isSelectAll: false,
       activeName: 'data',
-      currentCount: 0,
+      currentCount: 0
     }
   },
   watch: {
diff --git a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
index d3deb667..23bac560 100644
--- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
@@ -130,7 +130,7 @@
                   label="标签"
                   prop="labelIds"
                 >
-                  <label-select
+                  <LabelSelect
                     :dataset-id="datasetId"
                     :id-list="dataForm.labelIds"
                     @commit="(ids) =>{dataForm.labelIds = ids}"
diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
index beb58b47..4913bfee 100644
--- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
@@ -156,7 +156,7 @@
                   label="标签"
                   prop="labelIds"
                 >
-                  <label-select
+                  <LabelSelect
                     :dataset-id="datasetId"
                     :id-list="dataForm.labelIds"
                     @commit="(ids) => { dataForm.labelIds = ids }"
diff --git a/data-room-ui/packages/DataSetManagement/src/index.vue b/data-room-ui/packages/DataSetManagement/src/index.vue
index c9b524d0..ad856ead 100644
--- a/data-room-ui/packages/DataSetManagement/src/index.vue
+++ b/data-room-ui/packages/DataSetManagement/src/index.vue
@@ -170,7 +170,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <span>{{getLabels(scope.row.labelIds).join(',')}}</span>
+                <span>{{ getLabels(scope.row.labelIds).join(',') }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -368,10 +368,10 @@ export default {
     }
   },
   methods: {
-    getLabels(list){
-      const arr=[]
-      list?.forEach((item)=>{
-        arr.push(this.labelList.filter(x=>x.id==item)[0]?.labelName)
+    getLabels (list) {
+      const arr = []
+      list?.forEach((item) => {
+        arr.push(this.labelList.filter(x => x.id === item)[0]?.labelName)
       })
       return arr
     },