From 2e66372c4b85c119a2171c415094f61ec1002237 Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Fri, 22 Sep 2023 10:39:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=BE=E8=A1=A8=E7=BB=84=E4=BB=B6y?= =?UTF-8?q?=E8=BD=B4=E6=A0=87=E9=A2=98=E5=8F=AF=E6=97=8B=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/G2Plots/折线图/基础折线图.js | 13 ++++++++++++- .../G2Plots/折线图/基础折线点图.js | 13 ++++++++++++- .../packages/G2Plots/折线图/基础曲线图.js | 13 ++++++++++++- .../G2Plots/折线图/多折线动画图.js | 13 ++++++++++++- .../packages/G2Plots/折线图/多折线图.js | 13 ++++++++++++- .../G2Plots/折线图/多阶梯折线图.js | 13 ++++++++++++- .../G2Plots/折线图/折线趋势填充图.js | 13 ++++++++++++- .../G2Plots/折线图/迷你基础折线图.js | 2 +- .../packages/G2Plots/折线图/迷你面积图.js | 2 +- .../packages/G2Plots/条形图/分组条形图.js | 13 ++++++++++++- .../packages/G2Plots/条形图/基础条形图.js | 13 ++++++++++++- .../packages/G2Plots/柱状图/分组柱状图.js | 13 ++++++++++++- .../packages/G2Plots/柱状图/圆角柱状图.js | 13 ++++++++++++- .../packages/G2Plots/柱状图/基础柱状图.js | 13 ++++++++++++- .../packages/G2Plots/柱状图/堆叠柱状图.js | 13 ++++++++++++- .../packages/G2Plots/漏斗图/分面漏斗图.js | 2 +- .../packages/G2Plots/漏斗图/对比漏斗图.js | 2 +- .../G2Plots/矩形树图/基础矩形树图.js | 2 +- .../packages/G2Plots/词云图/词云图.js | 2 +- .../packages/G2Plots/进度图/仪表盘.js | 2 +- .../packages/G2Plots/进度图/圆角进度条.js | 2 +- .../packages/G2Plots/进度图/水波图.js | 2 +- .../packages/G2Plots/进度图/矩形水波图.js | 2 +- .../packages/G2Plots/进度图/进度仪表盘.js | 2 +- .../G2Plots/进度图/进度指标环图.js | 2 +- .../packages/G2Plots/进度图/进度条.js | 2 +- .../packages/G2Plots/进度图/进度环图.js | 2 +- .../packages/G2Plots/进度图/钻石水波图.js | 2 +- .../packages/G2Plots/雷达图/分组雷达图.js | 2 +- .../packages/G2Plots/雷达图/基础雷达图.js | 2 +- .../packages/G2Plots/面积图/基础面积图.js | 13 ++++++++++++- .../packages/G2Plots/面积图/堆叠面积图.js | 13 ++++++++++++- .../G2Plots/面积图/渐变色面积图.js | 13 ++++++++++++- .../packages/G2Plots/饼图/基础环图.js | 2 +- .../packages/G2Plots/饼图/基础饼图.js | 2 +- data-room-ui/packages/G2Plots/饼图/玫瑰图.js | 2 +- data-room-ui/packages/js/store/actions.js | 8 ++++++-- 37 files changed, 218 insertions(+), 38 deletions(-) diff --git a/data-room-ui/packages/G2Plots/折线图/基础折线图.js b/data-room-ui/packages/G2Plots/折线图/基础折线图.js index e450542d..a60b500c 100644 --- a/data-room-ui/packages/G2Plots/折线图/基础折线图.js +++ b/data-room-ui/packages/G2Plots/折线图/基础折线图.js @@ -4,7 +4,7 @@ * @Author: xing.heng */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Line' // 标题 @@ -359,6 +359,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/折线图/基础折线点图.js b/data-room-ui/packages/G2Plots/折线图/基础折线点图.js index d2b17bc0..a4a60e5f 100644 --- a/data-room-ui/packages/G2Plots/折线图/基础折线点图.js +++ b/data-room-ui/packages/G2Plots/折线图/基础折线点图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Line' // 标题 @@ -350,6 +350,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/折线图/基础曲线图.js b/data-room-ui/packages/G2Plots/折线图/基础曲线图.js index f01c974b..9a25dc2b 100644 --- a/data-room-ui/packages/G2Plots/折线图/基础曲线图.js +++ b/data-room-ui/packages/G2Plots/折线图/基础曲线图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Line' // 标题 @@ -250,6 +250,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/折线图/多折线动画图.js b/data-room-ui/packages/G2Plots/折线图/多折线动画图.js index 8fb43272..3bc04611 100644 --- a/data-room-ui/packages/G2Plots/折线图/多折线动画图.js +++ b/data-room-ui/packages/G2Plots/折线图/多折线动画图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Line' // 标题 @@ -365,6 +365,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/折线图/多折线图.js b/data-room-ui/packages/G2Plots/折线图/多折线图.js index 89ffb7d6..98d3b939 100644 --- a/data-room-ui/packages/G2Plots/折线图/多折线图.js +++ b/data-room-ui/packages/G2Plots/折线图/多折线图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Line' // 标题 @@ -327,6 +327,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js b/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js index ef8a954f..2daa19f2 100644 --- a/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js +++ b/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Line' // 标题 @@ -323,6 +323,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js b/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js index 2657ac03..9da38a36 100644 --- a/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js +++ b/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Line' // 标题 @@ -379,6 +379,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js b/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js index 001a75e5..0aa9451d 100644 --- a/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js +++ b/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'TinyLine' // 标题 diff --git a/data-room-ui/packages/G2Plots/折线图/迷你面积图.js b/data-room-ui/packages/G2Plots/折线图/迷你面积图.js index 7e490a24..13997ec9 100644 --- a/data-room-ui/packages/G2Plots/折线图/迷你面积图.js +++ b/data-room-ui/packages/G2Plots/折线图/迷你面积图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'TinyArea' // 标题 diff --git a/data-room-ui/packages/G2Plots/条形图/分组条形图.js b/data-room-ui/packages/G2Plots/条形图/分组条形图.js index 87e5463f..0bb73110 100644 --- a/data-room-ui/packages/G2Plots/条形图/分组条形图.js +++ b/data-room-ui/packages/G2Plots/条形图/分组条形图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Bar' // 标题 @@ -341,6 +341,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/条形图/基础条形图.js b/data-room-ui/packages/G2Plots/条形图/基础条形图.js index 06bc827e..9bc8e766 100644 --- a/data-room-ui/packages/G2Plots/条形图/基础条形图.js +++ b/data-room-ui/packages/G2Plots/条形图/基础条形图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Bar' // 标题 @@ -329,6 +329,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js b/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js index 4f276e65..96d3d47b 100644 --- a/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js +++ b/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Column' // 标题 @@ -365,6 +365,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js b/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js index 123584c5..a9a37029 100644 --- a/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js +++ b/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Column' // 标题 @@ -365,6 +365,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js b/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js index 04e7c86b..c94676a9 100644 --- a/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js +++ b/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Column' // 标题 @@ -286,6 +286,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js b/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js index 29b0c0dc..fd0e0010 100644 --- a/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js +++ b/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Column' // 标题 @@ -365,6 +365,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js index 1c7ede39..4a14a7f7 100644 --- a/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js +++ b/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Funnel' // 标题 diff --git a/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js index 46f59cda..d371996d 100644 --- a/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js +++ b/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Funnel' // 标题 diff --git a/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js b/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js index af644a6f..046c1abb 100644 --- a/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js +++ b/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Treemap' // 标题 diff --git a/data-room-ui/packages/G2Plots/词云图/词云图.js b/data-room-ui/packages/G2Plots/词云图/词云图.js index 6c1ae495..411e36f2 100644 --- a/data-room-ui/packages/G2Plots/词云图/词云图.js +++ b/data-room-ui/packages/G2Plots/词云图/词云图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'WordCloud' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/仪表盘.js b/data-room-ui/packages/G2Plots/进度图/仪表盘.js index bc017831..a634ae4c 100644 --- a/data-room-ui/packages/G2Plots/进度图/仪表盘.js +++ b/data-room-ui/packages/G2Plots/进度图/仪表盘.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Gauge' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/圆角进度条.js b/data-room-ui/packages/G2Plots/进度图/圆角进度条.js index d3e7e15c..9b3d8cf7 100644 --- a/data-room-ui/packages/G2Plots/进度图/圆角进度条.js +++ b/data-room-ui/packages/G2Plots/进度图/圆角进度条.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Progress' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/水波图.js b/data-room-ui/packages/G2Plots/进度图/水波图.js index b8813240..9b106ff6 100644 --- a/data-room-ui/packages/G2Plots/进度图/水波图.js +++ b/data-room-ui/packages/G2Plots/进度图/水波图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Liquid' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/矩形水波图.js b/data-room-ui/packages/G2Plots/进度图/矩形水波图.js index 5513bb40..e474bcda 100644 --- a/data-room-ui/packages/G2Plots/进度图/矩形水波图.js +++ b/data-room-ui/packages/G2Plots/进度图/矩形水波图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023090801' +const version = '2023092201' // 分类 const category = 'Liquid' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js b/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js index 1a1696b4..2aadc2c4 100644 --- a/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js +++ b/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Gauge' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/进度指标环图.js b/data-room-ui/packages/G2Plots/进度图/进度指标环图.js index 84f8ba80..d01e7dbb 100644 --- a/data-room-ui/packages/G2Plots/进度图/进度指标环图.js +++ b/data-room-ui/packages/G2Plots/进度图/进度指标环图.js @@ -1,5 +1,5 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'RingProgress' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/进度条.js b/data-room-ui/packages/G2Plots/进度图/进度条.js index 923e320e..487609a7 100644 --- a/data-room-ui/packages/G2Plots/进度图/进度条.js +++ b/data-room-ui/packages/G2Plots/进度图/进度条.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Progress' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/进度环图.js b/data-room-ui/packages/G2Plots/进度图/进度环图.js index 9418144c..f2b0d411 100644 --- a/data-room-ui/packages/G2Plots/进度图/进度环图.js +++ b/data-room-ui/packages/G2Plots/进度图/进度环图.js @@ -1,5 +1,5 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'RingProgress' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js index fe58f6b1..5d1bff31 100644 --- a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js +++ b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Liquid' // 标题 diff --git a/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js b/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js index 251ebae5..e20b65cb 100644 --- a/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js +++ b/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Radar' // 标题 diff --git a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js index a9718ddc..973608c7 100644 --- a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js +++ b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Radar' // 标题 diff --git a/data-room-ui/packages/G2Plots/面积图/基础面积图.js b/data-room-ui/packages/G2Plots/面积图/基础面积图.js index 5e1c8d93..b1084d47 100644 --- a/data-room-ui/packages/G2Plots/面积图/基础面积图.js +++ b/data-room-ui/packages/G2Plots/面积图/基础面积图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Area' // 标题 @@ -372,6 +372,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js b/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js index 0172f8a3..51eedb87 100644 --- a/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js +++ b/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Area' // 标题 @@ -330,6 +330,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js index 8d09b10c..52840d54 100644 --- a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js +++ b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js @@ -5,7 +5,7 @@ */ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Area' // 标题 @@ -276,6 +276,17 @@ const setting = [ tabName: 'custom', groupName: 'yAxis' }, + { + label: '标题过长时旋转', + type: 'switch', + field: 'yAxis_title_autoRotate', + optionField: 'yAxis.title.autoRotate', + value: true, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'yAxis' + }, { label: '标题位置', type: 'select', diff --git a/data-room-ui/packages/G2Plots/饼图/基础环图.js b/data-room-ui/packages/G2Plots/饼图/基础环图.js index 103faf18..151859cc 100644 --- a/data-room-ui/packages/G2Plots/饼图/基础环图.js +++ b/data-room-ui/packages/G2Plots/饼图/基础环图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Pie' // 标题 diff --git a/data-room-ui/packages/G2Plots/饼图/基础饼图.js b/data-room-ui/packages/G2Plots/饼图/基础饼图.js index a13b2b3d..a5a9624f 100644 --- a/data-room-ui/packages/G2Plots/饼图/基础饼图.js +++ b/data-room-ui/packages/G2Plots/饼图/基础饼图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Pie' // 标题 diff --git a/data-room-ui/packages/G2Plots/饼图/玫瑰图.js b/data-room-ui/packages/G2Plots/饼图/玫瑰图.js index b77d8ac9..1ca8f3db 100644 --- a/data-room-ui/packages/G2Plots/饼图/玫瑰图.js +++ b/data-room-ui/packages/G2Plots/饼图/玫瑰图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023071001' +const version = '2023092201' // 分类 const category = 'Rose' // 标题 diff --git a/data-room-ui/packages/js/store/actions.js b/data-room-ui/packages/js/store/actions.js index 3fdf1c19..71c61b3d 100644 --- a/data-room-ui/packages/js/store/actions.js +++ b/data-room-ui/packages/js/store/actions.js @@ -14,8 +14,11 @@ export default { initLayout ({ commit, dispatch }, code) { return new Promise(resolve => { getScreenInfo(code).then(data => { + // 配置兼容 + const pageInfo = handleResData(data) // 兼容边框配置 - data.chartList.forEach((item) => { + pageInfo.chartList.forEach((item) => { + console.log(item) if (!item.border) { item.border={type:'',titleHeight:60,fontSize:30,isTitle:true,padding:[0,0,0,0]} } @@ -34,6 +37,7 @@ export default { const settings=JSON.parse(JSON.stringify(value.setting)) item.setting=settings.map((x)=>{ const index=item.setting.findIndex(y=>y.field==x.field) + console.log(item.setting[index].field) x.field = item.setting[index].field x.value=item.setting[index].value return x @@ -42,7 +46,7 @@ export default { } } }) - const pageInfo = handleResData(data) + // 改变页面数据 commit('changePageInfo', pageInfo) commit('changeZIndex', pageInfo.chartList)