From 64b0b91fe382b27a59f0d21af119ce43376abee6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 31 Oct 2022 16:53:34 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
=?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=BB=E9=A2=98=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E9=85=8D=E8=89=B2=E3=80=81=E6=96=87=E6=A1=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/src/main/resources/db/migration/V42__1.16.sql | 4 ++++
frontend/src/lang/en.js | 1 +
frontend/src/lang/tw.js | 1 +
frontend/src/lang/zh.js | 1 +
frontend/src/views/chart/chart/chart.js | 4 ++--
.../panel/SubjectSetting/PanelStyle/ComponentStyle.vue | 6 +++---
6 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/backend/src/main/resources/db/migration/V42__1.16.sql b/backend/src/main/resources/db/migration/V42__1.16.sql
index 715e8f55b4..06804d06f3 100644
--- a/backend/src/main/resources/db/migration/V42__1.16.sql
+++ b/backend/src/main/resources/db/migration/V42__1.16.sql
@@ -281,3 +281,7 @@ RETURN 'success';
END
;;
delimiter ;
+
+UPDATE `panel_subject`
+SET `details` = '{\"width\":1600,\"height\":900,\"scale\":100,\"scaleWidth\":100,\"scaleHeight\":100,\"selfAdaption\":true,\"auxiliaryMatrix\":true,\"openCommonStyle\":true,\"panel\":{\"themeColor\":\"dark\",\"color\":\"#030B2E\",\"imageUrl\":{},\"backgroundType\":\"color\",\"gap\":\"yes\",\"resultMode\":\"all\",\"resultCount\":1000},\"aidedDesign\":{\"showGrid\":false,\"matrixBase\":4},\"refreshViewLoading\":true,\"refreshUnit\":\"minute\",\"refreshTime\":5,\"themeId\":\"f9f46a50-58f5-11ed-889b-91ab7371e877\",\"chartInfo\":{\"chartTitle\":{\"show\":true,\"fontSize\":\"18\",\"color\":\"#FFFFFF\",\"hPosition\":\"left\",\"vPosition\":\"top\",\"isItalic\":false,\"isBolder\":true,\"remarkShow\":false,\"remark\":\"\",\"remarkBackgroundColor\":\"#5A5C62\",\"fontFamily\":\"Microsoft YaHei\",\"letterSpace\":\"0\",\"fontShadow\":false},\"chartColor\":{\"value\":\"default\",\"colors\":[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\"],\"alpha\":100,\"tableHeaderBgColor\":\"#5470C6\",\"tableItemBgColor\":\"#131E42\",\"tableFontColor\":\"#ffffff\",\"tableStripe\":true,\"dimensionColor\":\"#ffffff\",\"quotaColor\":\"#5470C6\",\"tableBorderColor\":\"#CCCCCC\",\"seriesColors\":[],\"areaBorderColor\":\"#EBEEF5\",\"tableHeaderFontColor\":\"#ffffff\",\"modifyName\":\"colors\"},\"chartCommonStyle\":{\"backgroundColorSelect\":true,\"color\":\"#131E42\",\"alpha\":100,\"borderRadius\":5,\"innerPadding\":0},\"filterStyle\":{\"horizontal\":\"left\",\"vertical\":\"top\",\"color\":\"#FFFFFF\",\"brColor\":\"#4E4B4B\",\"wordColor\":\"#FFFFFF\",\"innerBgColor\":\"#131E42\"},\"tabStyle\":{\"headFontColor\":\"#FFFFFF\",\"headFontActiveColor\":\"#FFFFFF\",\"headBorderColor\":\"#FFFFFF\",\"headBorderActiveColor\":\"#FFFFFF\",\"headPosition\":\"left\"}}}'
+WHERE `id` = 'system_2';
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 29d3cb0bc2..996fec93ea 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -913,6 +913,7 @@ export default {
password_input_error: 'Original password input error'
},
chart: {
+ chart_background: 'Component background',
solid_color: 'Solid color',
split_gradient: 'Split gradient',
continuous_gradient: 'Continuous gradient',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 2d7e10c045..dd773ea421 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -913,6 +913,7 @@ export default {
password_input_error: '原始密碼輸入錯誤'
},
chart: {
+ chart_background: '組件背景',
solid_color: '純色',
split_gradient: '分離漸變',
continuous_gradient: '連續漸變',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index c0f7053b22..40b0369420 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -912,6 +912,7 @@ export default {
password_input_error: '原始密码输入错误'
},
chart: {
+ chart_background: '组件背景',
solid_color: '纯色',
split_gradient: '分离渐变',
continuous_gradient: '连续渐变',
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index e7056cccce..256ba7924e 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -1,8 +1,8 @@
export const DEFAULT_TAB_COLOR_CASE_DARK = {
headFontColor: '#FFFFFF',
headFontActiveColor: '#FFFFFF',
- headBorderColor: '#FFFFFF',
- headBorderActiveColor: '#FFFFFF',
+ headBorderColor: '#131E42',
+ headBorderActiveColor: '#131E42',
headPosition: 'left'
}
diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentStyle.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentStyle.vue
index 6e7de0d7be..f69f7d9746 100644
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentStyle.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentStyle.vue
@@ -7,7 +7,7 @@
style="margin-right: 10px;float: right"
@change="themeChange('backgroundColorSelect')"
>
- {{ $t('panel.color') }}
+ {{ $t('chart.chart_background') }}
@@ -100,10 +100,10 @@ export default {
font-size: 12px;
}
.custom-item{
- width: 70px;
+ width: 90px;
}
.custom-item-value{
- width: calc(100% - 70px);;
+ width: calc(100% - 90px);;
}