From cfc2055af8a15a78d65daef7dd13bd48c8c56b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Sat, 17 Sep 2022 11:18:57 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=83=AD=E5=8A=9B?= =?UTF-8?q?=E5=9B=BE=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=98=A0=E5=B0=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/ChartItemSetting/GlobalSetting.vue | 294 +++++++----------- .../GlobalSettingPosition.vue | 29 ++ .../Pages/ChartItemSetting/index.ts | 5 +- .../chartConfiguration/echarts/axis.ts | 30 +- .../Charts/Bars/BarCommon/config.vue | 4 +- .../Charts/Bars/BarCrossrange/config.vue | 4 +- .../Charts/Lines/LineCommon/config.vue | 4 +- .../Lines/LineGradientSingle/config.vue | 4 +- .../Charts/Lines/LineGradients/config.vue | 4 +- .../Charts/Lines/LineLinearSingle/config.vue | 4 +- .../Charts/Maps/MapChina/config.vue | 118 ++++--- .../components/Charts/Mores/Funnel/config.vue | 2 +- .../components/Charts/Mores/Heatmap/config.ts | 47 ++- .../Charts/Mores/Heatmap/config.vue | 12 +- .../components/Charts/Mores/Heatmap/data.json | 201 +++++++++++- .../components/Charts/Mores/Heatmap/index.ts | 3 +- .../components/Charts/Mores/Radar/config.vue | 14 +- .../Charts/Pies/PieCircle/config.vue | 49 +-- .../Charts/Pies/PieCommon/config.vue | 2 +- src/settings/chartThemes/global.theme.json | 1 + 20 files changed, 492 insertions(+), 339 deletions(-) create mode 100644 src/components/Pages/ChartItemSetting/GlobalSettingPosition.vue diff --git a/src/components/Pages/ChartItemSetting/GlobalSetting.vue b/src/components/Pages/ChartItemSetting/GlobalSetting.vue index 0548cfc4..e428e8e2 100644 --- a/src/components/Pages/ChartItemSetting/GlobalSetting.vue +++ b/src/components/Pages/ChartItemSetting/GlobalSetting.vue @@ -1,163 +1,104 @@ diff --git a/src/components/Pages/ChartItemSetting/GlobalSettingPosition.vue b/src/components/Pages/ChartItemSetting/GlobalSettingPosition.vue new file mode 100644 index 00000000..cf97a8bd --- /dev/null +++ b/src/components/Pages/ChartItemSetting/GlobalSettingPosition.vue @@ -0,0 +1,29 @@ + + + diff --git a/src/components/Pages/ChartItemSetting/index.ts b/src/components/Pages/ChartItemSetting/index.ts index e8c7ad66..676766e4 100644 --- a/src/components/Pages/ChartItemSetting/index.ts +++ b/src/components/Pages/ChartItemSetting/index.ts @@ -5,6 +5,9 @@ import CollapseItem from './CollapseItem.vue' // 全局配置属性 import GlobalSetting from './GlobalSetting.vue' +// 全局配置属性-位置 +import GlobalSettingPosition from './GlobalSettingPosition.vue' + // 名称 import NameSetting from './NameSetting.vue' // 方向 @@ -14,4 +17,4 @@ import SizeSetting from './SizeSetting.vue' // 样式 import StylesSetting from './StylesSetting.vue' -export { CollapseItem, SettingItemBox, SettingItem, GlobalSetting, NameSetting, PositionSetting, SizeSetting, StylesSetting } +export { CollapseItem, SettingItemBox, SettingItem, GlobalSetting, GlobalSettingPosition, NameSetting, PositionSetting, SizeSetting, StylesSetting } diff --git a/src/packages/chartConfiguration/echarts/axis.ts b/src/packages/chartConfiguration/echarts/axis.ts index 8a358727..5c72418c 100644 --- a/src/packages/chartConfiguration/echarts/axis.ts +++ b/src/packages/chartConfiguration/echarts/axis.ts @@ -1,40 +1,56 @@ export const axisConfig = { + // X轴位置 xposition: [ { - label: 'top', + label: '顶部', value: 'top' }, { - label: 'bottom', + label: '底部', value: 'bottom' } ], + // Y轴位置 yposition: [ { - label: 'left', + label: '左侧', value: 'left' }, { - label: 'right', + label: '右侧', value: 'right' } ], + // 线条 splitLint: { lineStyle: { type: [ { - label: 'solid', + label: '实线', value: 'solid' }, { - label: 'dashed', + label: '虚线', value: 'dashed' }, { - label: 'dotted', + label: '点线', value: 'dotted' } ] } + }, + // 视觉映射 + visualMap: { + orient: [ + { + label: '竖直', + value: 'vertical' + }, + { + label: '水平', + value: 'horizontal' + } + ] } } diff --git a/src/packages/components/Charts/Bars/BarCommon/config.vue b/src/packages/components/Charts/Bars/BarCommon/config.vue index 04882454..078130c3 100644 --- a/src/packages/components/Charts/Bars/BarCommon/config.vue +++ b/src/packages/components/Charts/Bars/BarCommon/config.vue @@ -1,4 +1,6 @@