From 1c7fde3f5ab18d6099f6f41802c1fe759c523a01 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 11 Jun 2021 09:51:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E3=80=90ID1004278=E3=80=91=E3=80=90?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=91=E6=97=B6=E9=97=B4=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6-=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F=E6=B2=A1=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/DeWidget/DeDate.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue index bdc86c10cc..0c46b2c6da 100644 --- a/frontend/src/components/widget/DeWidget/DeDate.vue +++ b/frontend/src/components/widget/DeWidget/DeDate.vue @@ -35,6 +35,9 @@ export default { }, created() { this.options = this.element.options + if ((this.options.attrs.type === 'date' || this.options.attrs.type === 'daterange') && Array.isArray(this.options.value) && this.options.value.length === 0) { + this.options.value = null + } }, methods: { search() { From eaee41334d1b93fc8274a6c07c09bef1bd73eca9 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 11 Jun 2021 09:58:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E6=9D=83=E9=99=90=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= 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 +- frontend/src/views/system/authority/authConfig.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d78249c451..8d8a71c80e 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1029,7 +1029,7 @@ export default { roleHead: 'All Role', userHead: 'All User', linkAuthHead: 'All Datasource', - datasetAuthHead: 'All Data', + datasetAuthHead: 'All Dataset', chartAuthHead: 'All Chart', panelAuthHead: 'All Chart', view: 'View', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 9882cf983b..0295f1db6d 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1029,7 +1029,7 @@ export default { roleHead: '所有角色', userHead: '所有用戶', linkAuthHead: '所有數據源', - datasetAuthHead: '所有數據', + datasetAuthHead: '所有數據集', chartAuthHead: '所有視圖', panelAuthHead: '所有儀表板', view: '查看', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index fd6a4295ed..b503bc73a1 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1029,7 +1029,7 @@ export default { roleHead: '所有角色', userHead: '所有用户', linkAuthHead: '所有数据源', - datasetAuthHead: '所有数据', + datasetAuthHead: '所有数据集', chartAuthHead: '所有视图', panelAuthHead: '所有仪表板', menuAuthHead: '所有菜单和操作', diff --git a/frontend/src/views/system/authority/authConfig.vue b/frontend/src/views/system/authority/authConfig.vue index ed33c52dbe..4aae4cd2f4 100644 --- a/frontend/src/views/system/authority/authConfig.vue +++ b/frontend/src/views/system/authority/authConfig.vue @@ -100,7 +100,7 @@ export default { }, { tabName: this.$t('auth.chartAuth'), - head: this.$t('auth.linkAuthHead'), + head: this.$t('auth.chartAuthHead'), direction: 'source', authType: 'chart', authTargets: 'dept,role,user' From 97457de0b5bfd10fde0bba079c09905990a44b03 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 11 Jun 2021 10:53:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E6=9D=83=E9=99=90=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/authority/components/LazyTree.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/views/system/authority/components/LazyTree.vue b/frontend/src/views/system/authority/components/LazyTree.vue index c341d1cb1c..078782e2b0 100644 --- a/frontend/src/views/system/authority/components/LazyTree.vue +++ b/frontend/src/views/system/authority/components/LazyTree.vue @@ -266,6 +266,9 @@ export default { // 重新加载权限 this.loadAuth() this.loading = false + }).catch((e) => { + // this.$warning(e) + this.loading = false }) }, // 高亮显示搜索内容 From d946e7525faeea1eddb57587731bcaa802ce8da3 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 11 Jun 2021 10:59:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(frontend):=E8=A7=86=E5=9B=BE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E3=80=81=E6=A0=87=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/chart/components/component-style/TitleSelector.vue | 4 ++++ frontend/src/views/chart/group/Group.vue | 2 ++ 2 files changed, 6 insertions(+) diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue index 4da0873d01..33b03421ee 100644 --- a/frontend/src/views/chart/components/component-style/TitleSelector.vue +++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue @@ -19,6 +19,7 @@ :placeholder="$t('chart.title')" clearable @blur="changeTitleStyle" + @input="inputOnInput($event)" /> @@ -124,6 +125,9 @@ export default { this.isSetting = false } this.$emit('onTextChange', this.titleForm) + }, + inputOnInput: function(e) { + this.$forceUpdate() } } } diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index b58e414370..9a2f75a99e 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -202,6 +202,7 @@ :show-close="false" width="70%" class="dialog-css" + :destroy-on-close="true" > @@ -544,6 +545,7 @@ export default { selectTable() { this.selectTableFlag = true + this.chartName = this.$t('chart.chartName') }, closeCreateChart() { From f185cbcb3377409c763b7e26615a70f8bae63e37 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 11 Jun 2021 11:35:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E6=BB=9A=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/panel/SubjectSetting/PreSubject/Slider.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue index d6e965c674..fb852f5afb 100644 --- a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue +++ b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue @@ -3,7 +3,7 @@   -
    +
      • @@ -49,7 +49,7 @@   -
        +
          • @@ -141,6 +141,7 @@ export default { const request = { details: JSON.stringify(this.canvasStyleData) } + this.slidersLoading = true saveSubject(request).then(response => { this.$message({ message: '保存成功', @@ -148,6 +149,8 @@ export default { showClose: true }) this.querySubjectWithGroup() + }).catch(() => { + this.slidersLoading = false }) }, querySubjectWithGroup() { @@ -155,6 +158,8 @@ export default { querySubjectWithGroup({}).then(response => { this.sliders = response.data this.slidersLoading = false + }).catch(() => { + this.slidersLoading = false }) }, move(offset, direction, speed) {