From 7d57394fec37775e2357510c137c648b67766ceb Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 2 Nov 2021 16:01:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E8=BD=B4=E7=BA=BF=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=88=BB=E5=BA=A6=E6=95=B0=E9=99=90=E5=88=B6?= =?UTF-8?q?=E4=B8=8D=E8=B6=85=E8=BF=87100?= 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 +- .../chart/components/component-style/XAxisSelectorAntV.vue | 2 +- .../chart/components/component-style/YAxisExtSelectorAntV.vue | 2 +- .../chart/components/component-style/YAxisSelectorAntV.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d41d8550ef..61c5c068b3 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -954,7 +954,7 @@ export default { table_page_size_unit: 'Item/Page', result_count: 'Result', result_mode_all: 'ALL', - splitCount_less_100: 'Split Count must less 100' + splitCount_less_100: 'Split Count Range 0-100' }, 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 7d2dc6e127..cab7541558 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -955,7 +955,7 @@ export default { table_page_size_unit: '條/頁', result_count: '結果展示', result_mode_all: '全部', - splitCount_less_100: '刻度數不能超過100' + splitCount_less_100: '刻度數範圍0-100' }, dataset: { sheet_warn: '有多個 Sheet 頁，默認抽取第一個', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 7eb2130404..2c58090311 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -958,7 +958,7 @@ export default { table_page_size_unit: '条/页', result_count: '结果展示', result_mode_all: '全部', - splitCount_less_100: '刻度数不能超过100' + splitCount_less_100: '刻度数范围0-100' }, dataset: { sheet_warn: '有多个 Sheet 页，默认抽取第一个', diff --git a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue index 9ca3aa0b28..10d81c10c4 100644 --- a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue +++ b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue @@ -160,7 +160,7 @@ export default { if (!this.axisForm.show) { this.isSetting = false } - if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) { + if (this.axisForm.axisValue.splitCount && (parseInt(this.axisForm.axisValue.splitCount) > 100 || parseInt(this.axisForm.axisValue.splitCount) < 0)) { this.$message({ message: this.$t('chart.splitCount_less_100'), type: 'error' diff --git a/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue b/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue index f10d9cbc9c..9fc47388aa 100644 --- a/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue +++ b/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue @@ -163,7 +163,7 @@ export default { if (!this.axisForm.show) { this.isSetting = false } - if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) { + if (this.axisForm.axisValue.splitCount && (parseInt(this.axisForm.axisValue.splitCount) > 100 || parseInt(this.axisForm.axisValue.splitCount) < 0)) { this.$message({ message: this.$t('chart.splitCount_less_100'), type: 'error' diff --git a/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue b/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue index 1125ddaff5..f13242255c 100644 --- a/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue +++ b/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue @@ -171,7 +171,7 @@ export default { if (!this.axisForm.show) { this.isSetting = false } - if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) { + if (this.axisForm.axisValue.splitCount && (parseInt(this.axisForm.axisValue.splitCount) > 100 || parseInt(this.axisForm.axisValue.splitCount) < 0)) { this.$message({ message: this.$t('chart.splitCount_less_100'), type: 'error' From 7d818d33d048db3153e763df79e7dd2525ff6bd9 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 2 Nov 2021 16:23:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=BB=91=E8=89=B2=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E9=80=89=E8=89=B2=E6=9D=BF=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/styles/index.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index b58c0c5049..b957141d59 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -676,3 +676,11 @@ div:focus { } +.el-color-svpanel__black { + background: linear-gradient(to top, #000, rgba(0,0,0,0)) !important; +} + +.el-color-svpanel__white { + background: linear-gradient(to right, #fff, rgba(255,255,255,0)) !important; +} +