提交 7c391ed8 authored 作者: taojinlong's avatar taojinlong

refactor: 代码格式化

上级 386d15b7
...@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service; ...@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.xml.crypto.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-collapse > <el-collapse>
<el-collapse-item :title="$t('datasource.priority')" name="1"> <el-collapse-item :title="$t('datasource.priority')" name="1">
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.initial_pool_size')" prop="configuration.initialPoolSize"> <el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.initial_pool_size')" prop="configuration.initialPoolSize">
...@@ -114,7 +114,8 @@ export default { ...@@ -114,7 +114,8 @@ export default {
}, },
data() { data() {
return { return {
form: { configuration: { form: {
configuration: {
initialPoolSize: 5, initialPoolSize: 5,
minPoolSize: 5, minPoolSize: 5,
maxPoolSize: 50, maxPoolSize: 50,
...@@ -122,7 +123,8 @@ export default { ...@@ -122,7 +123,8 @@ export default {
acquireIncrement: 5, acquireIncrement: 5,
idleConnectionTestPeriod: 5, idleConnectionTestPeriod: 5,
connectTimeout: 5 connectTimeout: 5
}}, }
},
rule: { rule: {
name: [{ required: true, message: this.$t('datasource.input_name'), trigger: 'blur' }, name: [{ required: true, message: this.$t('datasource.input_name'), trigger: 'blur' },
{ min: 2, max: 25, message: this.$t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }], { min: 2, max: 25, message: this.$t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
...@@ -191,29 +193,28 @@ export default { ...@@ -191,29 +193,28 @@ export default {
this.form = Object.assign({}, row) this.form = Object.assign({}, row)
this.originConfiguration = this.form.configuration this.originConfiguration = this.form.configuration
this.form.configuration = JSON.parse(this.form.configuration) this.form.configuration = JSON.parse(this.form.configuration)
if(!this.form.configuration.initialPoolSize){ if (!this.form.configuration.initialPoolSize) {
this.form.configuration.initialPoolSize = 5 this.form.configuration.initialPoolSize = 5
} }
if(!this.form.configuration.minPoolSize){ if (!this.form.configuration.minPoolSize) {
this.form.configuration.minPoolSize = 5 this.form.configuration.minPoolSize = 5
} }
if(!this.form.configuration.maxPoolSize){ if (!this.form.configuration.maxPoolSize) {
this.form.configuration.maxPoolSize = 50 this.form.configuration.maxPoolSize = 50
} }
if(!this.form.configuration.maxIdleTime){ if (!this.form.configuration.maxIdleTime) {
this.form.configuration.maxIdleTime = 30 this.form.configuration.maxIdleTime = 30
} }
if(!this.form.configuration.acquireIncrement){ if (!this.form.configuration.acquireIncrement) {
this.form.configuration.acquireIncrement = 5 this.form.configuration.acquireIncrement = 5
} }
if(!this.form.configuration.idleConnectionTestPeriod){ if (!this.form.configuration.idleConnectionTestPeriod) {
this.form.configuration.idleConnectionTestPeriod = 5 this.form.configuration.idleConnectionTestPeriod = 5
} }
if(!this.form.configuration.connectTimeout){ if (!this.form.configuration.connectTimeout) {
this.form.configuration.connectTimeout = 5 this.form.configuration.connectTimeout = 5
} }
}, },
reset() { reset() {
this.$refs.dsForm.resetFields() this.$refs.dsForm.resetFields()
}, },
...@@ -222,8 +223,8 @@ export default { ...@@ -222,8 +223,8 @@ export default {
this.$message.error(this.$t('datasource.please_choose_schema')) this.$message.error(this.$t('datasource.please_choose_schema'))
return return
} }
if(this.form.configuration.initialPoolSize < 0 || this.form.configuration.minPoolSize < 0 || this.form.configuration.maxPoolSize < 0 || this.form.configuration.maxIdleTime < 0 if (this.form.configuration.initialPoolSize < 0 || this.form.configuration.minPoolSize < 0 || this.form.configuration.maxPoolSize < 0 || this.form.configuration.maxIdleTime < 0
|| this.form.configuration.acquireIncrement < 0 || this.form.configuration.idleConnectionTestPeriod < 0 || this.form.configuration.connectTimeout < 0){ || this.form.configuration.acquireIncrement < 0 || this.form.configuration.idleConnectionTestPeriod < 0 || this.form.configuration.connectTimeout < 0) {
this.$message.error(this.$t('datasource.no_less_then_0')) this.$message.error(this.$t('datasource.no_less_then_0'))
return return
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论