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 @@
+
+
-
-