From fb47f93cbdc5381316ee21c23bf38607c3b4e9a9 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Thu, 28 Dec 2023 13:38:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=9D=A1=E5=BD=A2?=
 =?UTF-8?q?=E5=9B=BE=E5=9B=BE=E4=BE=8B=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/G2Plots/条形图/分组条形图.js | 1 +
 data-room-ui/packages/G2Plots/条形图/基础条形图.js | 5 ++++-
 data-room-ui/packages/G2Plots/条形图/堆叠条形图.js | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/data-room-ui/packages/G2Plots/条形图/分组条形图.js b/data-room-ui/packages/G2Plots/条形图/分组条形图.js
index 3adba1e1..6a05176e 100644
--- a/data-room-ui/packages/G2Plots/条形图/分组条形图.js
+++ b/data-room-ui/packages/G2Plots/条形图/分组条形图.js
@@ -523,6 +523,7 @@ const data = [
 
 // 配置处理脚本
 const optionHandler = '\noption.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' +
+  'if (option.legendEnable) {\n  option.legend.itemName = option.legendItemName\n};' +
   '\nconst radiusNum = setting.find(settingItem=>settingItem.field === \'radiusNum\').value; option.barStyle.radius = [radiusNum,radiusNum,0,0];' +
   'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
 
diff --git a/data-room-ui/packages/G2Plots/条形图/基础条形图.js b/data-room-ui/packages/G2Plots/条形图/基础条形图.js
index b6f81fba..20f3c2e5 100644
--- a/data-room-ui/packages/G2Plots/条形图/基础条形图.js
+++ b/data-room-ui/packages/G2Plots/条形图/基础条形图.js
@@ -573,6 +573,9 @@ const data = [
 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;
+if (option.legendEnable) {
+  option.legend.itemName = option.legendItemName
+};
 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
@@ -603,7 +606,7 @@ const option = {
   legendLayout: 'vertical',
   legendPosition: 'top',
   legend: false,
-  legendItemName: {
+  itemName: {
     style: {
       fill: '#e9e9e9',
       fontSize: 12,
diff --git a/data-room-ui/packages/G2Plots/条形图/堆叠条形图.js b/data-room-ui/packages/G2Plots/条形图/堆叠条形图.js
index 78fab859..3e2710c1 100644
--- a/data-room-ui/packages/G2Plots/条形图/堆叠条形图.js
+++ b/data-room-ui/packages/G2Plots/条形图/堆叠条形图.js
@@ -526,6 +526,7 @@ const data = [
 
 // 配置处理脚本
 const optionHandler = '\noption.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' +
+  'if (option.legendEnable) {\n  option.legend.itemName = option.legendItemName\n};' +
   '\nconst radiusNum = setting.find(settingItem=>settingItem.field === \'radiusNum\').value; option.barStyle.radius = [radiusNum,radiusNum,0,0];' +
   'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
 
@@ -571,8 +572,8 @@ const option = {
       // 数据标签防遮挡
       { type: 'interval-hide-overlap' },
       // 数据标签文颜色自动调整
-      { type: 'adjust-color' },
-    ],
+      { type: 'adjust-color' }
+    ]
   },
   radiusNum: 0, // 设置条形图的圆角的中间值
   xAxis: {