From c33d78cf4d89aa5fa4e494e80c2877a08a960754 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 30 Nov 2022 11:47:22 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=E8=A7=86=E5=9B=BE=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=90=8E=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E5=88=B0=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/editor/EditBar.vue | 4 +- .../canvas/components/editor/SettingMenu.vue | 5 +- .../src/components/deCustomCm/DeTextarea.vue | 16 ++++-- frontend/src/components/deDrag/index.vue | 4 +- frontend/src/utils/request.js | 5 +- .../chart/components/ChartTitleUpdate.vue | 2 +- frontend/src/views/chart/view/ChartEdit.vue | 3 +- .../src/views/dataset/data/UpdateInfo.vue | 2 +- .../panel/appTemplateMarket/log/index.vue | 16 +++--- frontend/src/views/panel/edit/index.vue | 8 +-- .../src/views/system/datasource/DsForm.vue | 1 + .../src/views/system/task/DatasetTaskList.vue | 56 +++++++++---------- 12 files changed, 65 insertions(+), 57 deletions(-) diff --git a/frontend/src/components/canvas/components/editor/EditBar.vue b/frontend/src/components/canvas/components/editor/EditBar.vue index bab1c21ef1..588422692a 100644 --- a/frontend/src/components/canvas/components/editor/EditBar.vue +++ b/frontend/src/components/canvas/components/editor/EditBar.vue @@ -137,7 +137,7 @@ :target="curComponent.hyperlinks.openMode " :href="curComponent.hyperlinks.content " > - + @@ -363,7 +363,7 @@ export default { ]) }, mounted() { - if (navigator.platform.indexOf('Mac') == -1) { + if (navigator.platform.indexOf('Mac') === -1) { this.systemOS = 'Other' } this.initCurFields() diff --git a/frontend/src/components/canvas/components/editor/SettingMenu.vue b/frontend/src/components/canvas/components/editor/SettingMenu.vue index 8eebf374c9..c7b85a1cfe 100644 --- a/frontend/src/components/canvas/components/editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/editor/SettingMenu.vue @@ -17,8 +17,7 @@ v-if="curComponent.type != 'custom-button'" icon="el-icon-document-copy" @click.native="copy" - >{{ $t('panel.copy') }}(+ D Control + D) + >{{ $t('panel.copy') }}(+ D Control + D) @@ -16,14 +16,14 @@ export default { directives: { count: { update: function(el, binding) { - const lg = binding.value?.length || 0 + const lg = binding.value.value?.length || 0 const count = el.querySelector('.el-input__count') if (!count) return if (!lg) { if (count?.classList?.contains('no-zore')) { count.classList.remove('no-zore') } - count.innerHTML = '0/200' + count.innerHTML = `0/${binding.value.maxlength || 200}` return } if (el.querySelector('.no-zore')) { @@ -34,7 +34,7 @@ export default { const num = document.createElement('span') const total = document.createElement('span') num.style.color = '#1F2329' - total.innerHTML = '/200' + total.innerHTML = `/${binding.value.maxlength || 200}` num.innerHTML = lg if (!newCount) return newCount.classList.add('el-input__count', 'no-zore') @@ -46,7 +46,11 @@ export default { }, props: { disabled: Boolean, - value: String + value: String, + maxlength: { + type: Number, + default: 200 + } }, methods: { handleChange(val) { diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue index 1fc60a50ab..6c18e6f26f 100644 --- a/frontend/src/components/deDrag/index.vue +++ b/frontend/src/components/deDrag/index.vue @@ -65,7 +65,7 @@ @mousedown.stop.prevent="handleDown(handlei, $event)" @touchstart.stop.prevent="handleTouchDown(handlei, $event)" > - +
- +
diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js index c9baf7f7df..78536360fc 100644 --- a/frontend/src/utils/request.js +++ b/frontend/src/utils/request.js @@ -108,13 +108,16 @@ service.interceptors.response.use(response => { const headers = error.response && error.response.headers || error.response || config.headers config.loading && tryHideLoading(store.getters.currentPath) - let msg + let msg = '' if (error.response) { checkAuth(error.response) msg = error.response.data.message || error.response.data } else { msg = error.message } + if (msg.length > 600) { + msg = msg.slice(0, 600) + } !config.hideMsg && (!headers['authentication-status']) && $error(msg) return Promise.reject(config.url === '/dataset/table/sqlPreview' ? msg : error) }) diff --git a/frontend/src/views/chart/components/ChartTitleUpdate.vue b/frontend/src/views/chart/components/ChartTitleUpdate.vue index 684ca0c194..a37a471c3e 100644 --- a/frontend/src/views/chart/components/ChartTitleUpdate.vue +++ b/frontend/src/views/chart/components/ChartTitleUpdate.vue @@ -380,8 +380,8 @@ export default { if (!viewSave) return viewEditSave(this.panelInfo.id, viewSave).then(() => { this.chart.title = this.chartTitleUpdate - bus.$emit('aside-set-title', this.chart.title) }) + bus.$emit('title-name', this.chart.title, chartView.id) bus.$emit('view-in-cache', { type: 'styleChange', viewId: chartView.id, diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index a0f02eac61..920404837e 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1934,7 +1934,8 @@ export default { }, methods: { - setTitle(title) { + setTitle(title, id) { + if (this.view.id !== id) return this.view.customStyle.text = { ...this.view.customStyle.text, title } this.view.title = title this.view.name = title diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index fc9075b9d7..89f14bba8a 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -861,7 +861,7 @@ export default { }, disableExec(task) { return ( - task.status === 'Pending' || task.status ==='Exec' || !hasDataPermission('manage', task.privileges) + task.status === 'Pending' || task.status === 'Exec' || !hasDataPermission('manage', task.privileges) ) }, disableDelete(task) { diff --git a/frontend/src/views/panel/appTemplateMarket/log/index.vue b/frontend/src/views/panel/appTemplateMarket/log/index.vue index 307ca921e1..bff056a815 100644 --- a/frontend/src/views/panel/appTemplateMarket/log/index.vue +++ b/frontend/src/views/panel/appTemplateMarket/log/index.vue @@ -1,8 +1,8 @@ From 1f7d8cfa91d95be34c303f67daeb54f5d648a54a Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 30 Nov 2022 17:35:10 +0800 Subject: [PATCH 12/13] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E8=A7=86=E5=9B=BE=E6=A0=87=E9=A2=98=E7=9A=84=E5=86=85?= =?UTF-8?q?=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/ChartComponentG2.vue | 2 +- frontend/src/views/chart/components/ChartComponentS2.vue | 2 +- frontend/src/views/chart/components/normal/LabelNormal.vue | 2 +- frontend/src/views/chart/components/normal/LabelNormalText.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue index 95feea34ab..5c1a727b62 100644 --- a/frontend/src/views/chart/components/ChartComponentG2.vue +++ b/frontend/src/views/chart/components/ChartComponentG2.vue @@ -18,7 +18,7 @@ :style="title_class" style="cursor: default;display: block;" > -
+
-
+
Date: Wed, 30 Nov 2022 18:38:40 +0800 Subject: [PATCH 13/13] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/data/FieldEdit.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue index 07d9f4bd90..1454f5eb2d 100644 --- a/frontend/src/views/dataset/data/FieldEdit.vue +++ b/frontend/src/views/dataset/data/FieldEdit.vue @@ -859,6 +859,9 @@ export default { if (item.dateFormatType !== 'custom') { item.dateFormat = item.dateFormatType } + }else { + item.dateFormatType = '' + item.dateFormat = '' } if (item.dateFormatType === 'custom' && !item.dateFormat) { return