From 896a89b8134d1edf8672580cf0fd0033a1c2206a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 26 Sep 2022 10:41:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0):=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=99=90=E5=88=B6=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E5=85=81?= =?UTF-8?q?=E8=AE=B81-100=E6=AD=A3=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 2 ++ frontend/src/lang/tw.js | 2 ++ frontend/src/lang/zh.js | 2 ++ .../views/system/SysParam/BasicSetting.vue | 20 ++++++++++++++++--- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 0ab2dadd39..f4b82c0f04 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -815,6 +815,8 @@ export default { empty_msg: 'If empty then default value is 30 days', front_error: 'Valid ranger [0 - 300]', // 修改了提示信息 msg_error: 'Valid ranger [1 - 365]', + limit_times_error: 'Valid ranger [1 - 100]', + relieve_times_error: 'Valid ranger [1 - 100]', SMTP_port: 'SMTP Port', SMTP_account: 'SMTP Account', SMTP_password: 'SMTP Password', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 9eaefd1367..31e848ab5f 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -815,6 +815,8 @@ export default { empty_msg: '為空則默認取值30天', front_error: '請填寫0-300正整數', // 修改了提示信息 msg_error: '請填寫1-365正整數', + limit_times_error: '請填寫1-100正整數', + relieve_times_error: '請填寫1-100正整數', SMTP_port: 'SMTP端口', SMTP_account: 'SMTP賬戶', SMTP_password: 'SMTP密碼', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 0cf66591bf..09ed5853c8 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -814,6 +814,8 @@ export default { empty_msg: '为空则默认取30天', front_error: '请填写0-300正整数', // 修改了提示信息 msg_error: '请填写1-365正整数', + limit_times_error: '请填写1-100正整数', + relieve_times_error: '请填写1-100正整数', SMTP_port: 'SMTP端口', SMTP_account: 'SMTP账户', SMTP_password: 'SMTP密码', diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue index c350f0f83f..82897bb59d 100644 --- a/frontend/src/views/system/SysParam/BasicSetting.vue +++ b/frontend/src/views/system/SysParam/BasicSetting.vue @@ -49,8 +49,8 @@ - - + + @@ -139,7 +139,7 @@ export default { rules: { frontTimeOut: [ { - pattern: '^([0-9]|\\b[1-9]\\d\\b|\\b[1-2]\\d\\d\\b|\\b300\\b)$', // 修改了正则表达式，让其正确匹配0-300的数值 + pattern: '^([0-9]|\\b[1-9]\\d\\b|\\b[1-2]\\d\\d\\b|\\b300\\b)$', message: this.$t('system_parameter_setting.front_error'), trigger: 'blur' } @@ -150,6 +150,20 @@ export default { message: this.$t('system_parameter_setting.msg_error'), trigger: 'blur' } + ], + limitTimes: [ + { + pattern: '^([1-9]|[1-9]\\d|100)$', + message: this.$t('system_parameter_setting.limit_times_error'), + trigger: 'blur' + } + ], + relieveTimes: [ + { + pattern: '^([1-9]|[1-9]\\d|100)$', + message: this.$t('system_parameter_setting.relieve_times_error'), + trigger: 'blur' + } ] }, originLoginType: null From b2f752fde0a651783508896f2b5e5e7a12dda3d0 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 26 Sep 2022 16:12:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=8C=E6=96=87=E6=9C=AC=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5=E4=B8=8B=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=A6=81=E5=88=A0=E4=B8=A4=E6=AC=A1=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/custom-component/DeRichTextView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/DeRichTextView.vue b/frontend/src/components/canvas/custom-component/DeRichTextView.vue index 006caeee76..cdf84b1ad9 100644 --- a/frontend/src/components/canvas/custom-component/DeRichTextView.vue +++ b/frontend/src/components/canvas/custom-component/DeRichTextView.vue @@ -110,13 +110,13 @@ export default { // 监听内容变化 active(val) { if (!val) { + const ed = tinymce.editors[this.tinymceId] if (this.canEdit) { - this.element.propValue.textValue = this.myValue + this.element.propValue.textValue = ed.getContent() } this.canEdit = false this.reShow() this.myValue = this.assignment(this.element.propValue.textValue) - const ed = tinymce.editors[this.tinymceId] ed.setContent(this.myValue) } }, From 3dae4b9868b712146ca23d25efa49a821fb2fa08 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 26 Sep 2022 16:14:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E7=BB=84=E4=BB=B6=E6=8B=96=E6=8B=BD=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E5=BC=82=E5=B8=B8=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/DeDrag/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index 515f573c62..ebe445291d 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -731,14 +731,14 @@ export default { }, // private 监控dragging resizing dragging(val) { - if (this.enabled) { + if (this.enabled && this.curComponent) { this.curComponent.optStatus.dragging = val this.$store.commit('setScrollAutoMove', 0) } }, // private 监控dragging resizing resizing(val) { - if (this.enabled) { + if (this.enabled && this.curComponent) { this.curComponent.optStatus.resizing = val this.$store.commit('setScrollAutoMove', 0) } From 25a113b69ba5d2fc3307ec2eeec05732cf979b4c Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Mon, 26 Sep 2022 16:36:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0sql=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=95=B0=E6=8D=AE=E5=8F=82=E8=80=83=E4=B8=AD?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8=E5=92=8C=E5=AD=97=E6=AE=B5=E4=B8=BA?= =?UTF-8?q?0=20=E6=95=B0=E6=8D=AE=E9=9B=86=E8=BF=9B=E5=85=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E5=90=8E=E5=9B=9E=E9=80=80=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/add/AddSQL.vue | 19 +++++++++---------- frontend/src/views/dataset/group/Group.vue | 18 +++++++++++++++--- frontend/src/views/dataset/index.vue | 2 +- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index 7837dc9077..e1269f9168 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -122,7 +122,7 @@ {{ $t('deDataset.to_start_using') }} -
+
{ this.calHeight() } this.calHeight() - this.initDataSource() + await this.initDataSource() this.$refs.myCm.codemirror.on('keypress', () => { this.$refs.myCm.codemirror.showHint() }) - this.initTableInfo() }, created() { @@ -562,8 +557,11 @@ export default { } } } + this.tableLoading = true post('/datasource/getTables/' + this.dataSource, {}).then((response) => { this.tableData = response.data + }).finally(() => { + this.tableLoading = false }) }, calHeight: _.debounce(function() { @@ -572,7 +570,7 @@ export default { this.height = currentHeight - sqlHeight - 56 - 54 - 36 - 64 }, 200), initDataSource() { - listDatasource().then((response) => { + return listDatasource().then((response) => { this.options = response.data.filter((item) => item.type !== 'api') }) }, @@ -582,6 +580,7 @@ export default { getTable(this.param.tableId).then((response) => { const table = response.data this.dataSource = table.dataSourceId + this.changeDatasource() this.mode = table.mode + '' if (JSON.parse(table.info).isBase64Encryption) { diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 9261a9e947..73e0212b3f 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -419,7 +419,11 @@ export default { type: Object, required: false, default: null - } + }, + currentNodeId: { + type: String, + default: '' + }, }, data() { return { @@ -542,11 +546,16 @@ export default { queryAuthModel({ modelType: 'dataset' }, true) .then((res) => { localStorage.setItem('dataset-tree', JSON.stringify(res.data)) - this.tData = res.data + this.tData = res.data || [] this.$nextTick(() => { this.$refs.datasetTreeRef?.filter(this.filterText) if (id && name.includes(this.filterText)) { this.dfsTableData(this.tData, id) + } else { + const currentNodeId = sessionStorage.getItem('dataset-current-node') + if (currentNodeId) { + this.dfsTableData(this.tData, currentNodeId) + } } }) }) @@ -555,6 +564,9 @@ export default { }) this.refresh() }, + beforeDestroy() { + sessionStorage.setItem('dataset-current-node', this.currentNodeId) + }, methods: { dfsTableData(arr, id) { arr.some((ele) => { @@ -776,7 +788,7 @@ export default { .then((res) => { localStorage.setItem('dataset-tree', JSON.stringify(res.data)) if (!userCache) { - this.tData = res.data + this.tData = res.data || [] } this.$nextTick(() => { this.$refs.datasetTreeRef?.filter(this.filterText) diff --git a/frontend/src/views/dataset/index.vue b/frontend/src/views/dataset/index.vue index 2aa38bba0c..6eb63a6f56 100644 --- a/frontend/src/views/dataset/index.vue +++ b/frontend/src/views/dataset/index.vue @@ -3,7 +3,7 @@ v-loading="$store.getters.loadingMap[$store.getters.currentPath]" > - + Date: Mon, 26 Sep 2022 17:01:48 +0800 Subject: [PATCH 5/5] Update en.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(国际化): range拼写错误 --- frontend/src/lang/en.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index f4b82c0f04..1c6879cab7 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -813,10 +813,10 @@ export default { login_type: 'Default login type', empty_front: 'If empty then default value is 10s', empty_msg: 'If empty then default value is 30 days', - front_error: 'Valid ranger [0 - 300]', // 修改了提示信息 - msg_error: 'Valid ranger [1 - 365]', - limit_times_error: 'Valid ranger [1 - 100]', - relieve_times_error: 'Valid ranger [1 - 100]', + front_error: 'Valid range [0 - 300]', // 修改了提示信息 + msg_error: 'Valid range [1 - 365]', + limit_times_error: 'Valid range [1 - 100]', + relieve_times_error: 'Valid range [1 - 100]', SMTP_port: 'SMTP Port', SMTP_account: 'SMTP Account', SMTP_password: 'SMTP Password', @@ -2351,7 +2351,7 @@ export default { label: 'Search Button', text: 'Text', auto_trigger: 'Auto Trigger', - range: 'Ranger', + range: 'Range', relative: 'Relation', auto_trigger_tip: 'Automatically trigger once when entering the preview page', range_tip: 'Default association all filter components'