Merge branch 'master' of github.com:gcpaas/DataRoom

DataRoom/dataroom-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>1.0.1.2023080301.Alpha</version>
+        <version>1.0.1.2023080901.Alpha</version>
     </parent>
 
     <artifactId>dataroom-core</artifactId>

DataRoom/dataroom-server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>1.0.1.2023080301.Alpha</version>
+        <version>1.0.1.2023080901.Alpha</version>
     </parent>
 
     <artifactId>dataroom-server</artifactId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.gccloud</groupId>
             <artifactId>dataroom-core</artifactId>
-            <version>1.0.1.2023080301.Alpha</version>
+            <version>1.0.1.2023080901.Alpha</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>

DataRoom/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.gccloud</groupId>
     <artifactId>dataroom</artifactId>
-    <version>1.0.1.2023080301.Alpha</version>
+    <version>1.0.1.2023080901.Alpha</version>
 
     <packaging>pom</packaging>
     <description>基于G2Plot、Echarts的大屏设计服务端，具备设计、预览能力，支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入
@@ -60,7 +60,7 @@
         <clickhouse.version>0.3.2</clickhouse.version>
         <commons-io.version>2.2</commons-io.version>
         <okhttp3.version>4.9.1</okhttp3.version>
-        <dataset.core.version>1.0.1.2023080702.Alpha</dataset.core.version>
+        <dataset.core.version>1.0.1.2023080901.Alpha</dataset.core.version>
     </properties>
 
     <dependencyManagement>

data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue

@@ -837,7 +837,7 @@ export default {
         getDataset(this.datasetId).then(res => {
           const { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config } = res
           const { script, paramsList, fieldDesc, fieldList } = config
-          this.dataForm = { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config: { ...config } }
+          this.dataForm = { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config: { ...config }, labelIds: this.dataForm.labelIds }
           this.fieldDesc = fieldDesc
           this.outputFieldList = fieldList
           this.newParamsList = _.cloneDeep(paramsList)