From d0436c598b2dfda3cbf8e075f545dd0bf299c06e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 1 Dec 2021 11:56:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/datasource/form.vue | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue index 4476565b81..58b69008da 100644 --- a/frontend/src/views/system/datasource/form.vue +++ b/frontend/src/views/system/datasource/form.vue @@ -132,6 +132,7 @@ import LayoutContent from '@/components/business/LayoutContent' import {addDs, editDs, getSchema, validateDs, validateDsById} from '@/api/system/datasource' import {$confirm} from '@/utils/message' +import i18n from '@/lang/index' export default { name: 'DsForm', @@ -157,61 +158,61 @@ export default { } }, rule: { - 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'}], - desc: [{min: 0, max: 50, message: this.$t('datasource.input_limit_0_50'), trigger: 'blur'}], - type: [{required: true, message: this.$t('datasource.please_choose_type'), trigger: 'change'}], + name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'}, + {min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}], + desc: [{min: 0, max: 50, message: i18n.t('datasource.input_limit_0_50'), trigger: 'blur'}], + type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'change'}], 'configuration.dataBase': [{ required: true, - message: this.$t('datasource.please_input_data_base'), + message: i18n.t('datasource.please_input_data_base'), trigger: 'blur' }], 'configuration.connectionType': [{ required: true, - message: this.$t('datasource.please_select_oracle_type'), + message: i18n.t('datasource.please_select_oracle_type'), trigger: 'blur' }], 'configuration.username': [{ required: true, - message: this.$t('datasource.please_input_user_name'), + message: i18n.t('datasource.please_input_user_name'), trigger: 'blur' }], 'configuration.password': [{ required: true, - message: this.$t('datasource.please_input_password'), + message: i18n.t('datasource.please_input_password'), trigger: 'change' }], - 'configuration.host': [{required: true, message: this.$t('datasource.please_input_host'), trigger: 'change'}], - 'configuration.url': [{required: true, message: this.$t('datasource.please_input_url'), trigger: 'change'}], - 'configuration.port': [{required: true, message: this.$t('datasource.please_input_port'), trigger: 'change'}], + 'configuration.host': [{required: true, message: i18n.t('datasource.please_input_host'), trigger: 'change'}], + 'configuration.url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'change'}], + 'configuration.port': [{required: true, message: i18n.t('datasource.please_input_port'), trigger: 'change'}], 'configuration.initialPoolSize': [{ required: true, - message: this.$t('datasource.please_input_initial_pool_size'), + message: i18n.t('datasource.please_input_initial_pool_size'), trigger: 'change' }], 'configuration.minPoolSize': [{ required: true, - message: this.$t('datasource.please_input_min_pool_size'), + message: i18n.t('datasource.please_input_min_pool_size'), trigger: 'change' }], 'configuration.maxPoolSize': [{ required: true, - message: this.$t('datasource.please_input_max_pool_size'), + message: i18n.t('datasource.please_input_max_pool_size'), trigger: 'change' }], 'configuration.maxIdleTime': [{ required: true, - message: this.$t('datasource.please_input_max_idle_time'), + message: i18n.t('datasource.please_input_max_idle_time'), trigger: 'change' }], 'configuration.acquireIncrement': [{ required: true, - message: this.$t('datasource.please_input_acquire_increment'), + message: i18n.t('datasource.please_input_acquire_increment'), trigger: 'change' }], 'configuration.connectTimeout': [{ required: true, - message: this.$t('datasource.please_input_connect_timeout'), + message: i18n.t('datasource.please_input_connect_timeout'), trigger: 'change' }] }, @@ -296,15 +297,15 @@ export default { }, save() { if (!this.form.configuration.schema && (this.form.type === 'oracle' || this.form.type === 'sqlServer')) { - this.$message.error(this.$t('datasource.please_choose_schema')) + this.$message.error(i18n.t('datasource.please_choose_schema')) return } if (this.form.configuration.dataSourceType === 'jdbc' && this.form.configuration.port <= 0) { - this.$message.error(this.$t('datasource.port_no_less_then_0')) + this.$message.error(i18n.t('datasource.port_no_less_then_0')) return } if (this.form.configuration.initialPoolSize < 0 || this.form.configuration.minPoolSize < 0 || this.form.configuration.maxPoolSize < 0) { - this.$message.error(this.$t('datasource.no_less_then_0')) + this.$message.error(i18n.t('datasource.no_less_then_0')) return } this.$refs.dsForm.validate(valid => { @@ -313,16 +314,16 @@ export default { const form = JSON.parse(JSON.stringify(this.form)) form.configuration = JSON.stringify(form.configuration) if (this.formType !== 'add' && this.originConfiguration !== form.configuration) { - $confirm(this.$t('datasource.edit_datasource_msg'), () => { + $confirm(i18n.t('datasource.edit_datasource_msg'), () => { method(form).then(res => { - this.$success(this.$t('commons.save_success')) + this.$success(i18n.t('commons.save_success')) this.refreshType(form) this.backToList() }) }) } else { method(form).then(res => { - this.$success(this.$t('commons.save_success')) + this.$success(i18n.t('commons.save_success')) this.refreshType(form) this.backToList() }) @@ -339,7 +340,7 @@ export default { data.configuration = JSON.stringify(data.configuration) getSchema(data).then(res => { this.schemas = res.data - this.$success(this.$t('commons.success')) + this.$success(i18n.t('commons.success')) }) } else { return false @@ -348,11 +349,11 @@ export default { }, validaDatasource() { if (!this.form.configuration.schema && this.form.type === 'oracle') { - this.$message.error(this.$t('datasource.please_choose_schema')) + this.$message.error(i18n.t('datasource.please_choose_schema')) return } if (this.form.configuration.dataSourceType === 'jdbc' && this.form.configuration.port <= 0) { - this.$message.error(this.$t('datasource.port_no_less_then_0')) + this.$message.error(i18n.t('datasource.port_no_less_then_0')) return } this.$refs.dsForm.validate(valid => { @@ -362,9 +363,9 @@ export default { if (data.showModel === 'show' && !this.canEdit) { validateDsById(data.id).then(res => { if (res.success) { - this.$success(this.$t('datasource.validate_success')) + this.$success(i18n.t('datasource.validate_success')) } else { - this.$error(this.$t(res.message)) + this.$error(res.message) } this.refreshType(data) }).catch(res => { @@ -373,9 +374,9 @@ export default { } else { validateDs(data).then(res => { if (res.success) { - this.$success(this.$t('datasource.validate_success')) + this.$success(i18n.t('datasource.validate_success')) } else { - this.$error(this.$t(res.message)) + this.$error(res.message) } }).catch(res => { this.$error(res.message) From 3ce6aaebfb9481a048598bf456de183defb67ba0 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 1 Dec 2021 14:47:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E5=AF=BC=E5=87=BApdf=E4=BC=98=E5=8C=96=EF=BC=8C=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E5=AF=BC=E5=87=BA=E7=94=BB=E9=9D=A2=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/panel/view.js | 3 +++ .../src/components/canvas/components/Editor/Preview.vue | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/src/api/panel/view.js b/frontend/src/api/panel/view.js index 1c3f9c12c6..5cc64150b1 100644 --- a/frontend/src/api/panel/view.js +++ b/frontend/src/api/panel/view.js @@ -4,6 +4,7 @@ export function tree(data) { return request({ url: '/api/panelView/tree', method: 'post', + timeout: 30000, data }) } @@ -12,6 +13,7 @@ export function viewsWithIds(data) { return request({ url: '/api/panelView/viewsWithIds', method: 'post', + timeout: 30000, loading: true, data }) @@ -21,6 +23,7 @@ export function findOne(id) { return request({ url: '/api/panelView/findOne/' + id, method: 'get', + timeout: 30000, loading: true }) } diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 27cf09c80b..83496631e7 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -4,6 +4,7 @@
{ _this.$nextTick(() => { _this.restore() + }) + }) + // 监听div变动事件 + const tempCanvas = document.getElementById('canvasInfoTemp') + erd.listenTo(tempCanvas, element => { + _this.$nextTick(() => { // 将mainHeight 修改为px 临时解决html2canvas 截图不全的问题 - _this.mainHeight = mainDom.scrollHeight + 'px!important' + _this.mainHeight = tempCanvas.scrollHeight + 'px!important' }) }) eventBus.$on('openChartDetailsDialog', this.openChartDetailsDialog)