From 7c9c690c5d82fead86acc7ba215ca46fe0112ce4 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 8 Jul 2021 18:29:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=86=E5=9B=BE=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=A7=8D=E9=85=8D=E8=89=B2=E6=96=B9?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 9 ++++- frontend/src/lang/tw.js | 9 ++++- frontend/src/lang/zh.js | 9 ++++- .../components/shape-attr/ColorSelector.vue | 35 +++++++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 555a33eba1..b9c7b03dd4 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -795,7 +795,14 @@ export default { condition: 'Filter Value', filter_value_can_null: 'Filter value can not empty', filter_like: 'Contain', - filter_not_like: 'Not Contain' + filter_not_like: 'Not Contain', + color_light: 'Light', + color_classical: 'Classical', + color_fresh: 'Fresh', + color_energy: 'Energy', + color_red: 'Red', + color_fast: 'Fast', + color_spiritual: 'Spiritual' }, 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 081d10fbd6..24d4c9bb1f 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -795,7 +795,14 @@ export default { condition: '過濾值', filter_value_can_null: '過濾值不能為空', filter_like: '包含', - filter_not_like: '不包含' + filter_not_like: '不包含', + color_light: '明亮', + color_classical: '經典', + color_fresh: '清新', + color_energy: '活力', + color_red: '火紅', + color_fast: '輕快', + color_spiritual: '靈動' }, dataset: { sheet_warn: '有多個sheet頁面,默認抽取第一個', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index c53c83bd07..cf4fd3cf6c 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -795,7 +795,14 @@ export default { condition: '过滤值', filter_value_can_null: '过滤值不能为空', filter_like: '包含', - filter_not_like: '不包含' + filter_not_like: '不包含', + color_light: '明亮', + color_classical: '经典', + color_fresh: '清新', + color_energy: '活力', + color_red: '火红', + color_fast: '轻快', + color_spiritual: '灵动' }, dataset: { sheet_warn: '有多个 Sheet 页,默认抽取第一个', diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue index 161f15a6ee..1baffa05a0 100644 --- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue +++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue @@ -122,6 +122,41 @@ export default { name: this.$t('chart.color_technology'), value: 'technology', colors: ['#05f8d6', '#0082fc', '#fdd845', '#22ed7c', '#09b0d3', '#1d27c9', '#f9e264', '#f47a75', '#009db2'] + }, + { + name: this.$t('chart.color_light'), + value: 'light', + colors: ['#884898', '#808080', '#82ae46', '#00a3af', '#ef8b07', '#007bbb', '#9d775f', '#fae800', '#5f9b3c'] + }, + { + name: this.$t('chart.color_classical'), + value: 'classical', + colors: ['#007bbb', '#ffdb4f', '#dd4b4b', '#2ca9e1', '#ef8b07', '#4a488e', '#82ae46', '#dd4b4b', '#bb9581'] + }, + { + name: this.$t('chart.color_fresh'), + value: 'fresh', + colors: ['#5f9b3c', '#75c24b', '#83d65f', '#aacf53', '#c7dc68', '#d8e698', '#e0ebaf', '#bbc8e6', '#e5e5e5'] + }, + { + name: this.$t('chart.color_energy'), + value: 'energy', + colors: ['#ef8b07', '#2a83a2', '#f07474', '#c55784', '#274a78', '#7058a3', '#0095d9', '#75c24b', '#808080'] + }, + { + name: this.$t('chart.color_red'), + value: 'red', + colors: ['#ff0000', '#ef8b07', '#4c6cb3', '#f8e944', '#69821b', '#9c5ec3', '#00ccdf', '#f07474', '#bb9581'] + }, + { + name: this.$t('chart.color_fast'), + value: 'fast', + colors: ['#fae800', '#00c039', '#0482dc', '#bb9581', '#ff7701', '#9c5ec3', '#00ccdf', '#00c039', '#ff7701'] + }, + { + name: this.$t('chart.color_spiritual'), + value: 'spiritual', + colors: ['#00a3af', '#4da798', '#57baaa', '#62d0bd', '#6ee4d0', '#86e7d6', '#aeede1', '#bde1e6', '#e5e5e5'] } ], colorForm: JSON.parse(JSON.stringify(DEFAULT_COLOR_CASE))