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

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

@@ -974,7 +974,7 @@ export default {
      */
     save (formName, noCheckToSave = false) {
       if (this.passTest === false) {
-        this.$message.error('请确保数据集SQL加工脚本不为空且测试通过')
+        this.$message.error('请确保数据集SQL加工脚本不为空且运行通过')
         return
       }
       if (!this.structurePreviewList.length) {
@@ -1190,7 +1190,7 @@ export default {
           this.$message.warning('参数名称不可以与字段名相同！')
           this.passTest = false
         } else {
-          if (val) this.$message.success('测试成功')
+          if (val) this.$message.success('运行成功')
           this.exception = ''
           this.msg = ''
           this.passTest = true

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

@@ -793,7 +793,7 @@ export default {
      */
     save (formName, noCheckToSave = false) {
       if (this.passTest === false) {
-        this.$message.error('请确保数据集SQL加工脚本不为空且测试通过')
+        this.$message.error('请确保数据集SQL加工脚本不为空且运行通过')
         return
       }
       if (!this.structurePreviewList.length) {
@@ -984,7 +984,7 @@ export default {
           this.$message.warning('参数名称不可以与字段名相同！')
           this.passTest = false
         } else {
-          if (val) this.$message.success('测试成功')
+          if (val) this.$message.success('运行成功')
           this.exception = ''
           this.msg = ''
           this.passTest = true

data-room-ui/packages/DataSourceManagement/src/setDatasource.vue

@@ -32,13 +32,13 @@
             popper-class="bs-el-select"
             clearable
             filterable
-            @change="sourceEdit"
+            @change="sourceTypeChange"
           >
             <el-option
               v-for="sourceType in sourceTypeList"
               :key="sourceType.id"
               :label="sourceType.name"
-              :value="sourceType.name"
+              :value="sourceType.code"
             />
           </el-select>
         </el-form-item>
@@ -358,20 +358,15 @@ export default {
       })
     },
     // 数据源类型选择
-    sourceEdit (name) {
+    sourceTypeChange (code) {
-      this.dataForm.coding = '自动'
+      if (!this.dataForm.id && code) {
-      if (!this.dataForm.id && name) {
+        let driverName = ''
-        let type = ''
+        driverName = code + 'Driver'
-        type = name
+        // 从驱动列表中获取驱动的对应的jdbcUrl
-        this.sourceTypeList.forEach(r => {
+        this.driverCLassList.forEach(driver => {
-          if (type === r.name) {
+          if (driverName === driver.code) {
-            const code = r.code + 'Driver'
+            this.dataForm.driverClassName = driver.name
-            this.driverCLassList.forEach(r => {
+            this.queryDriverTemp(driver.name)
-              if (code === r.code) {
-                this.dataForm.driverClassName = r.name
-                this.queryDriverTemp(r.name)
-              }
-            })
           }
         })
       }