diff --git a/src/components/Pages/ChartItemSetting/GlobalSetting.vue b/src/components/Pages/ChartItemSetting/GlobalSetting.vue index 8946fb6c..0548cfc4 100644 --- a/src/components/Pages/ChartItemSetting/GlobalSetting.vue +++ b/src/components/Pages/ChartItemSetting/GlobalSetting.vue @@ -47,13 +47,30 @@ size="small" > - + + + + + + + + + + @@ -70,6 +87,13 @@ v-model:value="xAxis.axisLabel.color" > + + + @@ -93,6 +117,11 @@ > + + + + + @@ -155,13 +184,30 @@ size="small" > - + + + + + + + + + + @@ -178,6 +224,13 @@ v-model:value="yAxis.axisLabel.color" > + + + @@ -206,6 +259,11 @@ > + + + + + diff --git a/src/packages/public/chart.ts b/src/packages/public/chart.ts index 84f3f061..d36a850e 100644 --- a/src/packages/public/chart.ts +++ b/src/packages/public/chart.ts @@ -10,12 +10,8 @@ import { globalThemeJson } from '@/settings/chartThemes/index' * @param excludes 排除元素 * @returns object */ -export const mergeTheme = ( - option: T, - themeSetting: U, - includes: string[] -) => { - return option = merge({}, pick(themeSetting, includes), option) +export const mergeTheme = (option: T, themeSetting: U, includes: string[]) => { + return (option = merge({}, pick(themeSetting, includes), option)) } /** diff --git a/src/settings/chartThemes/global.theme.json b/src/settings/chartThemes/global.theme.json index 410700c7..d7b2a61f 100644 --- a/src/settings/chartThemes/global.theme.json +++ b/src/settings/chartThemes/global.theme.json @@ -12,11 +12,16 @@ }, "xAxis": { "show": true, + "name": "", + "nameGap": 15, "nameTextStyle": { - "color": "#B9B8CE" + "color": "#B9B8CE", + "fontSize": 12 }, + "inverse": false, "axisLabel": { "show": true, + "fontSize": 12, "color": "#B9B8CE" }, "position": "bottom", @@ -42,11 +47,16 @@ }, "yAxis": { "show": true, + "name": "", + "nameGap": 15, "nameTextStyle": { - "color": "#B9B8CE" + "color": "#B9B8CE", + "fontSize": 12 }, + "inverse": false, "axisLabel": { "show": true, + "fontSize": 12, "color": "#B9B8CE" }, "position": "left",