From 10d5caf52c8b5d6fcfb87c5fbe9c1d2d98c361c4 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Wed, 15 Nov 2023 10:59:31 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=9F=BA=E7=A1=80=E7=BA=BF?= =?UTF-8?q?=E5=9B=BE=E3=80=81=E6=9F=B1=E5=9B=BE=E4=BC=98=E5=8C=96=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../G2Plots/折线图/基础折线图.js | 22 ++--- .../G2Plots/折线图/基础折线点图.js | 19 ++-- .../G2Plots/折线图/基础曲线图.js | 22 ++--- .../折线图/迷你基础折线图.js | 2 +- .../G2Plots/折线图/迷你面积图.js | 2 +- .../G2Plots/条形图/基础条形图.js | 14 +-- .../G2Plots/柱状图/基础柱状图.js | 42 ++------ .../G2Plots/面积图/基础面积图.js | 22 ++--- .../G2Plots/面积图/渐变色面积图.js | 98 ++----------------- 9 files changed, 66 insertions(+), 177 deletions(-) diff --git a/data-room-ui/packages/G2Plots/折线图/基础折线图.js b/data-room-ui/packages/G2Plots/折线图/基础折线图.js index c2cc58cc..6cf63c3d 100644 --- a/data-room-ui/packages/G2Plots/折线图/基础折线图.js +++ b/data-room-ui/packages/G2Plots/折线图/基础折线图.js @@ -477,16 +477,14 @@ const setting = [ // 模拟数据 const data = [ - { Date: '2010-01', scales: 1998 }, - { Date: '2010-02', scales: 1850 }, - { Date: '2010-03', scales: 1720 }, - { Date: '2010-04', scales: 1818 }, - { Date: '2010-05', scales: 1920 }, - { Date: '2010-06', scales: 1802 }, - { Date: '2010-07', scales: 1945 }, - { Date: '2010-08', scales: 1856 }, - { Date: '2010-09', scales: 2107 }, - { Date: '2010-10', scales: 2140 } + { date: '2016年', value: 100 }, + { date: '2017年', value: 200 }, + { date: '2018年', value: 300 }, + { date: '2019年', value: 200 }, + { date: '2020年', value: 100 }, + { date: '2021年', value: 200 }, + { date: '2022年', value: 300 }, + { date: '2023年', value: 400 } ] // 配置处理脚本 @@ -503,8 +501,8 @@ const option = { appendPadding: [0, 0, 0, 0], data, color: '', - xField: 'Date', - yField: 'scales', + xField: 'date', + yField: 'value', smooth: false, lineStyle: { lineWidth: 2, diff --git a/data-room-ui/packages/G2Plots/折线图/基础折线点图.js b/data-room-ui/packages/G2Plots/折线图/基础折线点图.js index e665f5b1..dd9ccf2c 100644 --- a/data-room-ui/packages/G2Plots/折线图/基础折线点图.js +++ b/data-room-ui/packages/G2Plots/折线图/基础折线点图.js @@ -468,15 +468,14 @@ const setting = [ // 模拟数据 const data = [ - { year: '1991', value: 3 }, - { year: '1992', value: 4 }, - { year: '1993', value: 3.5 }, - { year: '1994', value: 5 }, - { year: '1995', value: 4.9 }, - { year: '1996', value: 6 }, - { year: '1997', value: 7 }, - { year: '1998', value: 9 }, - { year: '1999', value: 13 } + { date: '2016年', value: 100 }, + { date: '2017年', value: 200 }, + { date: '2018年', value: 300 }, + { date: '2019年', value: 200 }, + { date: '2020年', value: 100 }, + { date: '2021年', value: 200 }, + { date: '2022年', value: 300 }, + { date: '2023年', value: 400 } ] // 配置处理脚本 const optionHandler = 'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]' @@ -491,7 +490,7 @@ const option = { // 图表内边距 appendPadding: [0, 0, 0, 0], data, - xField: 'year', + xField: 'date', yField: 'value', label: { style: { diff --git a/data-room-ui/packages/G2Plots/折线图/基础曲线图.js b/data-room-ui/packages/G2Plots/折线图/基础曲线图.js index 258d988f..7d7f35f4 100644 --- a/data-room-ui/packages/G2Plots/折线图/基础曲线图.js +++ b/data-room-ui/packages/G2Plots/折线图/基础曲线图.js @@ -368,16 +368,14 @@ const setting = [ // 模拟数据 const data = [ - { Date: '2010-01', scales: 1998 }, - { Date: '2010-02', scales: 1850 }, - { Date: '2010-03', scales: 1720 }, - { Date: '2010-04', scales: 1818 }, - { Date: '2010-05', scales: 1920 }, - { Date: '2010-06', scales: 1802 }, - { Date: '2010-07', scales: 1945 }, - { Date: '2010-08', scales: 1856 }, - { Date: '2010-09', scales: 2107 }, - { Date: '2010-10', scales: 2140 } + { date: '2016年', value: 100 }, + { date: '2017年', value: 200 }, + { date: '2018年', value: 300 }, + { date: '2019年', value: 200 }, + { date: '2020年', value: 100 }, + { date: '2021年', value: 200 }, + { date: '2022年', value: 300 }, + { date: '2023年', value: 400 } ] // 配置处理脚本 @@ -394,8 +392,8 @@ const option = { appendPadding: [0, 0, 0, 0], data, color: '', - xField: 'Date', - yField: 'scales', + xField: 'date', + yField: 'value', smooth: true, lineStyle: { lineWidth: 2, diff --git a/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js b/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js index 7273296b..085ba4b0 100644 --- a/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js +++ b/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js @@ -95,7 +95,7 @@ const option = { appendPadding: [0, 0, 0, 0], xField:'', yField:'', - data: [16, 95, 35, 27, 50, 36, 78, 99, 60, 62, 37], + data: [100, 200, 300, 200, 100, 200, 300, 400], height: 60, autoFit: true, smooth: true, diff --git a/data-room-ui/packages/G2Plots/折线图/迷你面积图.js b/data-room-ui/packages/G2Plots/折线图/迷你面积图.js index 84164c8c..cbf19908 100644 --- a/data-room-ui/packages/G2Plots/折线图/迷你面积图.js +++ b/data-room-ui/packages/G2Plots/折线图/迷你面积图.js @@ -114,7 +114,7 @@ const dataHandler = '// 取出所有指标的值 \ndata = data.map(item => item[ // 图表配置 new Line('domName', option) const option = { - data: [16, 95, 35, 27, 50, 36, 78, 99, 60, 62, 37], + data: [100, 200, 300, 200, 100, 200, 300, 400], // 图表内边距 appendPadding: [0, 0, 0, 0], xField: '', diff --git a/data-room-ui/packages/G2Plots/条形图/基础条形图.js b/data-room-ui/packages/G2Plots/条形图/基础条形图.js index 482ced70..07598b5e 100644 --- a/data-room-ui/packages/G2Plots/条形图/基础条形图.js +++ b/data-room-ui/packages/G2Plots/条形图/基础条形图.js @@ -562,11 +562,11 @@ const setting = [ // 模拟数据 const data = [ - { year: '1951 年', value: 38 }, - { year: '1952 年', value: 52 }, - { year: '1956 年', value: 61 }, - { year: '1957 年', value: 145 }, - { year: '1958 年', value: 48 } + { date: '2019年', value: 38 }, + { date: '2020年', value: 52 }, + { date: '2021年', value: 61 }, + { date: '2022年', value: 145 }, + { date: '2023年', value: 48 } ] // 配置处理脚本 @@ -593,11 +593,11 @@ const option = { renderer: 'canvas', data, xField: 'value', - yField: 'year', + yField: 'date', minBarWidth: 0, maxBarWidth: 100, // shape: 'default', // 条形图形状 - seriesField: 'year', + seriesField: 'date', color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'], legendEnable: true, legendLayout: 'vertical', diff --git a/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js b/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js index 544a11a6..2ea31ce2 100644 --- a/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js +++ b/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js @@ -437,38 +437,12 @@ const setting = [ // 模拟数据 const data = [ - { - type: '家具家电', - sales: 38 - }, - { - type: '粮油副食', - sales: 52 - }, - { - type: '生鲜水果', - sales: 61 - }, - { - type: '美容洗护', - sales: 145 - }, - { - type: '母婴用品', - sales: 48 - }, - { - type: '进口食品', - sales: 38 - }, - { - type: '食品饮料', - sales: 38 - }, - { - type: '家庭清洁', - sales: 38 - } + { date: '2018年', value: 300 }, + { date: '2019年', value: 200 }, + { date: '2020年', value: 100 }, + { date: '2021年', value: 200 }, + { date: '2022年', value: 300 }, + { date: '2023年', value: 400 } ] // 配置处理脚本 const optionHandler = 'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]' @@ -483,8 +457,8 @@ const option = { // 图表内边距 appendPadding: [0, 0, 0, 0], data, - xField: 'type', - yField: 'sales', + xField: 'date', + yField: 'value', color: '', columnStyle: { // 设置柱子渐变色 fill: 'l(90) 0:#5AA6AB 1:#217AB1' diff --git a/data-room-ui/packages/G2Plots/面积图/基础面积图.js b/data-room-ui/packages/G2Plots/面积图/基础面积图.js index cab93389..f0ac7e43 100644 --- a/data-room-ui/packages/G2Plots/面积图/基础面积图.js +++ b/data-room-ui/packages/G2Plots/面积图/基础面积图.js @@ -490,16 +490,14 @@ const setting = [ // 模拟数据 const data = [ - { Date: '2010-01', scales: 1998 }, - { Date: '2010-02', scales: 1850 }, - { Date: '2010-03', scales: 1720 }, - { Date: '2010-04', scales: 1818 }, - { Date: '2010-05', scales: 1920 }, - { Date: '2010-06', scales: 1802 }, - { Date: '2010-07', scales: 1945 }, - { Date: '2010-08', scales: 1856 }, - { Date: '2010-09', scales: 2107 }, - { Date: '2010-10', scales: 2140 } + { date: '2016年', value: 100 }, + { date: '2017年', value: 200 }, + { date: '2018年', value: 300 }, + { date: '2019年', value: 200 }, + { date: '2020年', value: 100 }, + { date: '2021年', value: 200 }, + { date: '2022年', value: 300 }, + { date: '2023年', value: 400 } ] // 配置处理脚本 @@ -524,8 +522,8 @@ const option = { // 图表内边距 appendPadding: [0, 0, 0, 0], data, - xField: 'Date', - yField: 'scales', + xField: 'date', + yField: 'value', smooth: false, startOnZero: true, isStack: false, diff --git a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js index 633042d5..96e8a7c8 100644 --- a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js +++ b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js @@ -489,92 +489,14 @@ const setting = [ // 模拟数据 const data = [ - { Date: '2010-01', scales: 1998 }, - { Date: '2010-02', scales: 1850 }, - { Date: '2010-03', scales: 1720 }, - { Date: '2010-04', scales: 1818 }, - { Date: '2010-05', scales: 1920 }, - { Date: '2010-06', scales: 1802 }, - { Date: '2010-07', scales: 1945 }, - { Date: '2010-08', scales: 1856 }, - { Date: '2010-09', scales: 2107 }, - { Date: '2010-10', scales: 2140 }, - { Date: '2010-11', scales: 2311 }, - { Date: '2010-12', scales: 1972 }, - { Date: '2011-01', scales: 1760 }, - { Date: '2011-02', scales: 1824 }, - { Date: '2011-03', scales: 1801 }, - { Date: '2011-04', scales: 2001 }, - { Date: '2011-05', scales: 1640 }, - { Date: '2011-06', scales: 1502 }, - { Date: '2011-07', scales: 1621 }, - { Date: '2011-08', scales: 1480 }, - { Date: '2011-09', scales: 1549 }, - { Date: '2011-10', scales: 1390 }, - { Date: '2011-11', scales: 1325 }, - { Date: '2011-12', scales: 1250 }, - { Date: '2012-01', scales: 1394 }, - { Date: '2012-02', scales: 1406 }, - { Date: '2012-03', scales: 1578 }, - { Date: '2012-04', scales: 1465 }, - { Date: '2012-05', scales: 1689 }, - { Date: '2012-06', scales: 1755 }, - { Date: '2012-07', scales: 1495 }, - { Date: '2012-08', scales: 1508 }, - { Date: '2012-09', scales: 1433 }, - { Date: '2012-10', scales: 1344 }, - { Date: '2012-11', scales: 1201 }, - { Date: '2012-12', scales: 1065 }, - { Date: '2013-01', scales: 1255 }, - { Date: '2013-02', scales: 1429 }, - { Date: '2013-03', scales: 1398 }, - { Date: '2013-04', scales: 1678 }, - { Date: '2013-05', scales: 1524 }, - { Date: '2013-06', scales: 1688 }, - { Date: '2013-07', scales: 1500 }, - { Date: '2013-08', scales: 1670 }, - { Date: '2013-09', scales: 1734 }, - { Date: '2013-10', scales: 1699 }, - { Date: '2013-11', scales: 1508 }, - { Date: '2013-12', scales: 1680 }, - { Date: '2014-01', scales: 1750 }, - { Date: '2014-02', scales: 1602 }, - { Date: '2014-03', scales: 1834 }, - { Date: '2014-04', scales: 1722 }, - { Date: '2014-05', scales: 1430 }, - { Date: '2014-06', scales: 1280 }, - { Date: '2014-07', scales: 1367 }, - { Date: '2014-08', scales: 1155 }, - { Date: '2014-09', scales: 1289 }, - { Date: '2014-10', scales: 1104 }, - { Date: '2014-11', scales: 1246 }, - { Date: '2014-12', scales: 1098 }, - { Date: '2015-01', scales: 1189 }, - { Date: '2015-02', scales: 1276 }, - { Date: '2015-03', scales: 1033 }, - { Date: '2015-04', scales: 956 }, - { Date: '2015-05', scales: 845 }, - { Date: '2015-06', scales: 1089 }, - { Date: '2015-07', scales: 944 }, - { Date: '2015-08', scales: 1043 }, - { Date: '2015-09', scales: 893 }, - { Date: '2015-10', scales: 840 }, - { Date: '2015-11', scales: 934 }, - { Date: '2015-12', scales: 810 }, - { Date: '2016-01', scales: 782 }, - { Date: '2016-02', scales: 1089 }, - { Date: '2016-03', scales: 745 }, - { Date: '2016-04', scales: 680 }, - { Date: '2016-05', scales: 802 }, - { Date: '2016-06', scales: 697 }, - { Date: '2016-07', scales: 583 }, - { Date: '2016-08', scales: 456 }, - { Date: '2016-09', scales: 524 }, - { Date: '2016-10', scales: 398 }, - { Date: '2016-11', scales: 278 }, - { Date: '2016-12', scales: 195 }, - { Date: '2017-01', scales: 145 }, - { Date: '2017-02', scales: 207 } + { date: '2016年', value: 100 }, + { date: '2017年', value: 200 }, + { date: '2018年', value: 300 }, + { date: '2019年', value: 200 }, + { date: '2020年', value: 100 }, + { date: '2021年', value: 200 }, + { date: '2022年', value: 300 }, + { date: '2023年', value: 400 } ] const optionHandler = 'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]' // 数据处理脚本 @@ -587,8 +509,8 @@ const option = { // 图表内边距 appendPadding: [0, 0, 0, 0], data, - xField: 'Date', - yField: 'scales', + xField: 'date', + yField: 'value', smooth: false, startOnZero: true, isStack: false,