From 6e60a265d5271fab11dce8a50a8766fa8d745aad Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 9 Jun 2021 10:54:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(frontend):=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=EF=BC=9B=E8=A7=86=E5=9B=BE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=92=8C=E6=A0=87=E9=A2=98=E7=BB=9F=E4=B8=80=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 3 ++- frontend/src/lang/zh.js | 3 ++- .../chart/components/component-style/TitleSelector.vue | 5 +++++ frontend/src/views/chart/group/Group.vue | 7 ++++--- frontend/src/views/chart/view/ChartEdit.vue | 6 +++--- frontend/src/views/dataset/add/AddCustom.vue | 2 +- frontend/src/views/dataset/add/AddExcel.vue | 2 +- frontend/src/views/dataset/add/AddSQL.vue | 2 +- 9 files changed, 21 insertions(+), 12 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index a03480aa93..d977c47a3c 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -838,7 +838,8 @@ export default { excel_add: 'Add', dataset_group: 'Dataset Group', m1: 'Move ', - m2: ' To' + m2: ' To', + char_can_not_more_50: 'Dataset name can not more 50' }, datasource: { datasource: 'Data Source', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 13a797cf85..dac653393d 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -838,7 +838,8 @@ export default { excel_add: '追加', dataset_group: '數據集分組', m1: '將 ', - m2: ' 移動到' + m2: ' 移動到', + char_can_not_more_50: '數據集名稱不能超過50個字符' }, datasource: { datasource: '數據源', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 05d51ae056..7aa86ef99b 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -838,7 +838,8 @@ export default { excel_add: '追加', dataset_group: '数据集分组', m1: '将 ', - m2: ' 移动到' + m2: ' 移动到', + char_can_not_more_50: '数据集名称不能超过50个字符' }, datasource: { datasource: '数据源', diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue index 67938b87ea..4da0873d01 100644 --- a/frontend/src/views/chart/components/component-style/TitleSelector.vue +++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue @@ -115,6 +115,11 @@ export default { this.fontSize = arr }, changeTitleStyle() { + if (this.titleForm.title.length < 1) { + this.$error(this.$t('chart.title_cannot_empty')) + this.titleForm.title = this.chart.title + return + } if (!this.titleForm.show) { this.isSetting = false } diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index e9979fa14a..6a6f96d4e5 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -168,9 +168,9 @@ /> - - {{ $t('chart.rename') }} - + + + {{ $t('chart.delete') }} @@ -536,6 +536,7 @@ export default { this.chartData.forEach(function(ele) { if (ele.id === that.$store.state.chart.chartSceneData.id) { ele.type = that.$store.state.chart.chartSceneData.type + ele.name = that.$store.state.chart.chartSceneData.name } }) } diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 29eadf3e26..dc04eaf7fa 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -486,9 +486,9 @@ export default { const view = JSON.parse(JSON.stringify(this.view)) view.id = this.view.id view.sceneId = this.view.sceneId - view.name = this.view.name ? this.view.name : this.table.name + view.name = this.view.title ? this.view.title : this.table.name if (view.title.length > 50) { - this.$warning(this.$t('chart.title_limit')) + this.$error(this.$t('chart.title_limit')) return } view.tableId = this.view.tableId @@ -623,7 +623,7 @@ export default { } // 从仪表板入口关闭 bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' }) - this.$emit('switchComponent', { name: '' }) + // this.$emit('switchComponent', { name: '' }) }, getData(id) { if (id) { diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue index 1d80d54548..c30c3ed23b 100644 --- a/frontend/src/views/dataset/add/AddCustom.vue +++ b/frontend/src/views/dataset/add/AddCustom.vue @@ -192,7 +192,7 @@ export default { if (this.name.length > 50) { this.$message({ showClose: true, - message: this.$t('commons.char_can_not_more_50'), + message: this.$t('dataset.char_can_not_more_50'), type: 'error' }) return diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index e5de317cb3..b475fc17fe 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -171,7 +171,7 @@ export default { if (this.name.length > 50) { this.$message({ showClose: true, - message: this.$t('commons.char_can_not_more_50'), + message: this.$t('dataset.char_can_not_more_50'), type: 'error' }) return diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index 225c7797ce..187d72445a 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -248,7 +248,7 @@ export default { if (this.name.length > 50) { this.$message({ showClose: true, - message: this.$t('commons.char_can_not_more_50'), + message: this.$t('dataset.char_can_not_more_50'), type: 'error' }) return