From effcab3ec46a3548e5e8050b39f96fd72eb78b18 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 17 Aug 2021 15:26:05 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E4=B8=8B=E9=92=BB=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E7=BA=A7=E6=8F=90=E7=A4=BA=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/custom-component/UserView.vue | 6 ++++++ frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 3 ++- frontend/src/lang/zh.js | 3 ++- frontend/src/views/chart/view/ChartEdit.vue | 6 ++++++ 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index 153100e9c1..5c6210b454 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -309,6 +309,12 @@ export default { this.chart.type === 'map' && this.sendToChildren(param) this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList }) this.getData(this.element.propValue.viewId) + } else if (this.chart.drillFields.length > 0) { + this.$message({ + type: 'error', + message: this.$t('chart.last_layer'), + showClose: true + }) } }, diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index dd94163107..2332d6a427 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -842,7 +842,8 @@ export default { width: 'Width', height: 'Height', system_case: 'System', - custom_case: 'Custom' + custom_case: 'Custom', + last_layer: 'This Is The Last Layer' }, dataset: { sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 5a34132bcf..4a0b9a256b 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -842,7 +842,8 @@ export default { width: '寬度', height: '高度', system_case: '系統方案', - custom_case: '自定義' + custom_case: '自定義', + last_layer: '当前已经是最后一级' }, dataset: { sheet_warn: '有多個sheet頁面,默認抽取第一個', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 57126190ef..66691bb5fd 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -842,7 +842,8 @@ export default { width: '宽度', height: '高度', system_case: '系统方案', - custom_case: '自定义' + custom_case: '自定义', + last_layer: '当前已经是最后一级' }, dataset: { sheet_warn: '有多个 Sheet 页,默认抽取第一个', diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 387e47457d..92b5f6fbac 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1416,6 +1416,12 @@ export default { this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList }) this.getData(this.param.id) } + } else if (this.view.drillFields.length > 0) { + this.$message({ + type: 'error', + message: this.$t('chart.last_layer'), + showClose: true + }) } },