From 79262fb928acc6d63e77b393de289dccf328b1fe Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Tue, 7 Nov 2023 11:54:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=9B=B7=E8=BE=BE?= =?UTF-8?q?=E5=9B=BE=E5=92=8C=E6=9D=A1=E5=BD=A2=E5=9B=BE=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=8E=89=E7=8F=8F=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/componentLogo/基础玉珏图.png | Bin 0 -> 13837 bytes data-room-ui/packages/G2Plots/plotListSort.js | 3 + .../G2Plots/条形图/基础条形图.js | 93 +++++++- .../G2Plots/玉珏图/基础玉珏图.js | 224 ++++++++++++++++++ .../G2Plots/雷达图/基础雷达图.js | 122 ++++++++-- 5 files changed, 417 insertions(+), 25 deletions(-) create mode 100644 data-room-ui/packages/G2Plots/images/componentLogo/基础玉珏图.png create mode 100644 data-room-ui/packages/G2Plots/玉珏图/基础玉珏图.js diff --git a/data-room-ui/packages/G2Plots/images/componentLogo/基础玉珏图.png b/data-room-ui/packages/G2Plots/images/componentLogo/基础玉珏图.png new file mode 100644 index 0000000000000000000000000000000000000000..d771816fd12d361109853054e852526b3fa3f8dc GIT binary patch literal 13837 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 literal 0 HcmV?d00001 diff --git a/data-room-ui/packages/G2Plots/plotListSort.js b/data-room-ui/packages/G2Plots/plotListSort.js index f4ffb465..ecb7214b 100644 --- a/data-room-ui/packages/G2Plots/plotListSort.js +++ b/data-room-ui/packages/G2Plots/plotListSort.js @@ -26,6 +26,9 @@ export default [ '基础饼图', '基础环图', '玫瑰图', + + '基础玉珏图', + '水波图', '矩形水波图', '钻石水波图', diff --git a/data-room-ui/packages/G2Plots/条形图/基础条形图.js b/data-room-ui/packages/G2Plots/条形图/基础条形图.js index e47d9e22..f38b0ea1 100644 --- a/data-room-ui/packages/G2Plots/条形图/基础条形图.js +++ b/data-room-ui/packages/G2Plots/条形图/基础条形图.js @@ -119,6 +119,39 @@ const setting = [ tabName: 'custom', groupName: 'graph' }, + { + label: '数据标签位置', + type: 'select', // 设置组件类型 + field: 'label_position', // 字段 + optionField: 'label.position', // 对应options中的字段 + // 是否多选 + multiple: false, + value: 'middle', + tabName: 'custom', + options: [ + { + label: '顶部', + value: 'top' + }, + { + label: '居中', + value: 'middle' + }, + { + label: '底部', + value: 'bottom' + }, + { + label: '左侧', + value: 'left' + }, + { + label: '右侧', + value: 'right' + } + ], + groupName: 'graph' + }, { label: '条形颜色', // 设置组件类型 @@ -131,6 +164,41 @@ const setting = [ tabName: 'custom', groupName: 'graph' }, + { + label: '条形背景颜色', + type: 'colorPicker', + field: 'barBackground_style_fill', + optionField: 'barBackground.style.fill', + // 是否多选 + multiple: false, + value: 'rgba(0,0,0,0)', + tabName: 'custom', + groupName: 'graph' + }, + { + label: '条形最小宽度', + // 设置组件类型 + type: 'inputNumber', + // 字段 + field: 'minBarWidth', + // 对应options中的字段 + optionField: 'minBarWidth', + value: 0, + tabName: 'custom', + groupName: 'graph' + }, + { + label: '条形最大宽度', + // 设置组件类型 + type: 'inputNumber', + // 字段 + field: 'maxBarWidth', + // 对应options中的字段 + optionField: 'maxBarWidth', + value: 100, + tabName: 'custom', + groupName: 'graph' + }, // 网格线 grid { label: '虚线', @@ -492,15 +560,19 @@ const data = [ ] // 配置处理脚本 -const optionHandler = 'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]' + - '\noption.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' + - '\nconst radiusNum = setting.find(settingItem=>settingItem.field === \'radiusNum\').value; option.barStyle.radius = [radiusNum,radiusNum,0,0]' +const optionHandler = ` +option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value] +option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === 'legendPosition').value} : false; +const radiusNum = setting.find(settingItem=>settingItem.field === 'radiusNum').value; +option.barStyle.radius = [radiusNum,radiusNum,0,0] +const yFieldValue = setting.find(settingItem=>settingItem.field === 'yField').value +if (yFieldValue) { + option.seriesField = yFieldValue +} +` // 数据处理脚本 -const dataHandler = 'const yFieldValue = setting.find(settingItem=>settingItem.field === \'yField\').value\n' + - 'if (yFieldValue) {\n' + - ' option.seriesField = yFieldValue\n' + - '}' +const dataHandler = `` // 图表配置 new Line('domName', option) const option = { @@ -510,6 +582,8 @@ const option = { data, xField: 'value', yField: 'year', + minBarWidth: 0, + maxBarWidth: 100, // shape: 'default', // 条形图形状 seriesField: 'year', color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'], @@ -527,6 +601,11 @@ const option = { barStyle: { radius: [10, 10, 0, 0]// 设置条形图的圆角 }, + barBackground: { + style: { + fill: 'rgba(0,0,0,0)', + }, + }, label: { position: 'middle', layout:{}, diff --git a/data-room-ui/packages/G2Plots/玉珏图/基础玉珏图.js b/data-room-ui/packages/G2Plots/玉珏图/基础玉珏图.js new file mode 100644 index 00000000..3a209bc7 --- /dev/null +++ b/data-room-ui/packages/G2Plots/玉珏图/基础玉珏图.js @@ -0,0 +1,224 @@ + +const version = '20231107' +// 分类 +const category = 'RadialBar' +// 标题 +const title = '基础玉珏图' +// 类别 +const chartType = 'RadialBar' +// 用于标识,唯一,title的中文转拼音 +const name = 'JiChuYuJueTu' + +// 右侧配置项 +const setting = [ + { + // 在右侧设置中显示的名称 + label: "维度", + // 设置组件类型, select/input/inputNumber/colorPicker/ColorMultipleSelect/radio/switch + type: "select", + // 字段, 用于设置option中的字段, 若option中的字段是对象,使用_连接,比如:point_style_stroke, 若option中的字段是单个单词,直接使用 + field: "xField", + // 对应options中的字段,若指向option中的对象,使用.连接,比如:point.style.stroke + optionField: "xField", // 对应options中的字段 + // 是否多选,仅对select有效 + multiple: false, + // 绑定的值 + value: '', + // tab页。 data: 数据, custom: 自定义,自定义的配置将会显示在其他的tab + tabName:'data', + // 当type为select 且tabName为custom时,options为下拉框的选项;若tab为data, options数据来源为数据集中的数据 + options: [ + { + label: '年份', + value: 'year' + } + ] + }, + { + label: "指标", + // 设置组件类型 + type: "select", + // 字段 + field: "yField", + // 对应options中的字段 + optionField: "yField", + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + // tab页。 data: 数据, custom: 自定义,自定义的配置将会显示在其他的tab + tabName:'data' + }, + // 图表配置 + { + label: '颜色配置', + // 设置组件类型(这里的colorSelect为封装过的组件) + type: 'colorSelect', + // 字段 + field: 'color', + // 对应options中的字段 + optionField: 'color', + // 是否多选 + multiple: false, + value: ["#5B8FF9", "#5AD8A6", "#5D7092", "#F6BD16", "#E8684A", "#6DC8EC", "#9270CA", "#FF9D4D", "#269A99", "#FF99C3"], + tabName: 'custom', + groupName: 'graph' + }, + { + label: '玉珏类型', + type: 'select', + field: 'barStyle_lineCap', + optionField: 'barStyle.lineCap', + value: 'round', + options: [ { label: '圆角', value: 'round' }, { label: '直角', value: 'square' } ], + tabName: 'custom', + groupName: 'graph' + }, + { + label: '最大旋转角度', + type: 'inputNumber', + field: 'maxAngle', + optionField: 'maxAngle', + value: 270, + min: 45, + max: 360, + step: 15, + tabName: 'custom', + groupName: 'graph' + }, + { + label: '最小宽度', + type: 'inputNumber', + field: 'minBarWidth', + optionField: 'minBarWidth', + value: 10, + min: 0, + step: 1, + tabName: 'custom', + groupName: 'graph' + }, + { + label: '最大宽度', + type: 'inputNumber', + field: 'maxBarWidth', + optionField: 'maxBarWidth', + value: 100, + min: 0, + step: 1, + tabName: 'custom', + groupName: 'graph' + }, + { + label: '背景色', + type: 'colorPicker', + field: 'backgroundStyle_fill', + optionField: 'barBackground.style.fill', + value: 'rgba(0,0,0,0)', + tabName: 'custom', + groupName: 'graph' + }, + // x轴配置 + { + label: '标签颜色', + type: 'colorPicker', + field: 'xAxis_labelStyle_fill', + optionField: 'xAxis.label.style.fill', + value: '#595959', + tabName: 'custom', + groupName: 'xAxis' + }, + { + label: '标签字体大小', + type: 'inputNumber', + field: 'xAxis_labelStyle_fontSize', + optionField: 'xAxis.label.style.fontSize', + value: 12, + tabName: 'custom', + groupName: 'xAxis' + }, + { + label: '标签字体粗细', + type: 'inputNumber', + field: 'xAxis_labelStyle_fontWeight', + optionField: 'xAxis.label.style.fontWeight', + value: 600, + min: 100, + step: 100, + max: 900, + tabName: 'custom', + groupName: 'xAxis' + + } +] + +// 模拟数据 +const data = [ + { name: 'X6', star: 297 }, + { name: 'G', star: 506 }, + { name: 'AVA', star: 805 }, + { name: 'G2Plot', star: 1478 }, + { name: 'L7', star: 2029 }, + { name: 'G6', star: 7100 }, + { name: 'F2', star: 7346 }, + { name: 'G2', star: 10178 }, +] + +const optionHandler = ` +const xFieldValue = setting.find(settingItem=>settingItem.field === 'xField').value +if (xFieldValue) { + option.seriesField = xFieldValue +} +` + +// 数据处理脚本 可以处理data数据和option配置,若要处理,直接赋值即可,比如 data = data[0]; option.style.stroke = 'red' +const dataHandler = `` + +// 图表配置 new Line('domName', option), 此处的option就是https://g2plot.antv.antgroup.com/examples 中的对应配置,复制后粘贴即可 +const option = { + // 数据将要放入到哪个字段中 + dataKey: 'data', + data, + xField: 'name', + yField: 'star', + startAngle: - Math.PI / 2, // 起始角度 + maxAngle: 270, //最大旋转角度, + radius: 0.8, + color: [], + colorField: 'name', + innerRadius: 0.2, + barStyle: { + lineCap: 'round', // 可选项:round 和 square + }, + minBarWidth: 10, + maxBarWidth: 100, + barBackground: { + style: { + fill: 'rgba(0,0,0,0)' + } + }, + xAxis: { + label: { + style: { + fill: '#ffffff', + fontSize: 12, + fontWeight: 600, + } + } + } + // tooltip: { + // formatter: (datum) => { + // return { name: 'star数', value: datum.star }; + // }, + // }, +} + +export default { + category, + version, + title, + chartType, + name, + option, + setting, + dataHandler +} diff --git a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js index 24028705..d21344be 100644 --- a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js +++ b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js @@ -41,15 +41,6 @@ const setting = [ }, /** 样式配置 **/ // 图表 graph - { - label: '底色', - type: 'colorPicker', // 设置组件类型 - field: 'yAxis_grid_alternateColor', // 字段 - optionField: 'yAxis.grid.alternateColor', // 对应options中的字段 - value: 'rgba(0, 0, 0, 0.04)', - tabName: 'custom', - groupName: 'graph' - }, { label: '面积填充', type: 'switch', // 设置组件类型 @@ -159,8 +150,70 @@ const setting = [ value: 2, tabName: 'custom', groupName: 'graph' - } - // 边距 padding + }, + { + label: '数据标签', + type: 'switch', // 设置组件类型 + field: 'label_style_opacity', // 字段 + optionField: 'label.style.opacity', // 对应options中的字段 + value: 0, + active: 1, + inactive: 0, + tabName: 'custom', + groupName: 'graph' + }, + { + label: '数据标签颜色', + type: 'colorPicker', // 设置组件类型 + field: 'label_style_fill', // 字段 + optionField: 'label.style.fill', // 对应options中的字段 + value: '#ffffff', + tabName: 'custom', + groupName: 'graph' + }, + { + label: '数据标签大小', + // 设置组件类型 + type: 'inputNumber', + // 字段 + field: 'label_style_fontSize', + // 对应options中的字段 + optionField: 'label.style.fontSize', + value: 12, + tabName: 'custom', + groupName: 'graph' + }, + + // x轴 xAxis + { + label: '显示外层圆圈', + type: 'switch', + field: 'xAxis_lineEnabled', + optionField: 'xAxis.lineEnabled', + value: false, + active: true, + inactive: false, + tabName: 'custom', + groupName: 'grid' + }, + { + label: '奇数圈底色', + type: 'colorPicker', // 设置组件类型 + field: 'yAxis_grid_alternateColor1', // 字段 + optionField: 'yAxis.grid.alternateColor1', // 对应options中的字段 + value: 'rgba(0, 0, 0, 0.04)', + tabName: 'custom', + groupName: 'grid' + }, + { + label: '偶数圈底色', + type: 'colorPicker', // 设置组件类型 + field: 'yAxis_grid_alternateColor2', // 字段 + optionField: 'yAxis.grid.alternateColor2', // 对应options中的字段 + value: 'rgba(0, 0, 0, 0.04)', + tabName: 'custom', + groupName: 'grid' + }, ] // 模拟数据 @@ -174,6 +227,17 @@ const data = [ { name: 'G2Plot', star: 1626 } ] +// 配置处理脚本 +const optionHandler = ` +if (option.xAxis.lineEnabled) { + option.xAxis.line = {} +} else { + option.xAxis.line = null +} +option.yAxis.grid.alternateColor = [option.yAxis.grid.alternateColor1, option.yAxis.grid.alternateColor2] +` + + // 数据处理脚本 const dataHandler = '' @@ -192,17 +256,28 @@ const option = { } }, meta: { - star: { - alias: 'star 数量', + value: { + alias: '数据', min: 0, nice: true, formatter: (v) => Number(v).toFixed(2) } }, xAxis: { - tickLine: null + lineEnabled: false, + line: {}, + tickLine: null, + grid: { + line: { + style: { + lineDash: null, + }, + }, + }, }, yAxis: { + // line: null, + tickLine: null, label: false, grid: { line: { @@ -211,8 +286,10 @@ const option = { lineDash: null, }, }, - alternateColor: 'rgba(0, 0, 0, 0.04)' - } + alternateColor1: 'rgba(0, 0, 0, 0.04)', + alternateColor2: 'rgba(0, 0, 0, 0.04)', + alternateColor: ['rgba(0, 0, 0, 0.04)','rgba(0, 0, 0, 0.04)'], + }, }, // 开启辅助点 point: { @@ -222,7 +299,15 @@ const option = { shape: '', size: 2 }, - area: 1 + area: 1, + label: { + autoRotate: false, + style: { + fill: '#ffffff', + opacity: 1, + fontSize: 12 + } + } } export default { @@ -233,5 +318,6 @@ export default { name, option, setting, - dataHandler + dataHandler, + optionHandler }