diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index f1c27b2c..f5ddb0e5 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/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 diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue index 49a4d017..3aaffdf4 100644 --- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue +++ b/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 diff --git a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue index deae9f22..e9e736d3 100644 --- a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue +++ b/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) { - this.dataForm.coding = '自动' - if (!this.dataForm.id && name) { - let type = '' - type = name - this.sourceTypeList.forEach(r => { - if (type === r.name) { - const code = r.code + 'Driver' - this.driverCLassList.forEach(r => { - if (code === r.code) { - this.dataForm.driverClassName = r.name - this.queryDriverTemp(r.name) - } - }) + sourceTypeChange (code) { + if (!this.dataForm.id && code) { + let driverName = '' + driverName = code + 'Driver' + // 从驱动列表中获取驱动的对应的jdbcUrl + this.driverCLassList.forEach(driver => { + if (driverName === driver.code) { + this.dataForm.driverClassName = driver.name + this.queryDriverTemp(driver.name) } }) }