From a356c6c4843e6a8d5479f1b9f7d26cc478d521e1 Mon Sep 17 00:00:00 2001 From: ulleo Date: Wed, 15 Nov 2023 15:56:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=9B=BE=E4=B8=AD=E2=80=9C=E5=88=86=E7=BB=84/=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E2=80=9D=E4=BD=BF=E7=94=A8=E8=AE=A1=E7=AE=97=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=97=B6=EF=BC=8C=E8=A7=86=E5=9B=BE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #6218 --- .../java/io/dataease/service/chart/ChartViewService.java | 4 ++-- core/frontend/src/views/chart/chart/common/common_table.js | 2 -- extensions/dataease-extensions-view/view-racebar/build.sh | 6 +++--- .../dataease-extensions-view/view-racebar/plugin.json | 4 ++-- .../view/official/handler/RaceBarViewStatHandler.java | 1 - .../dataease/plugins/view/official/impl/RaceBarService.java | 2 +- .../io/dataease/plugins/view/entity/PluginViewField.java | 4 ++-- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 8547e357e1..bd75627656 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -451,7 +451,7 @@ public class ChartViewService { List xAxisExtList = gson.fromJson(view.getXAxisExt(), new TypeToken>() { }.getType()); xAxisExtList.forEach((x) -> { - x.setExtField(1); + x.setBusiType("race-bar"); }); xAxis.addAll(xAxisExtList); } else { @@ -1031,7 +1031,7 @@ public class ChartViewService { List xAxisExtList = gson.fromJson(view.getXAxisExt(), new TypeToken>() { }.getType()); xAxisExtList.forEach((x) -> { - x.setExtField(1); + x.setBusiType("race-bar"); }); xAxis.addAll(xAxisExtList); } diff --git a/core/frontend/src/views/chart/chart/common/common_table.js b/core/frontend/src/views/chart/chart/common/common_table.js index c9e8a79bd5..4c16f0dfd5 100644 --- a/core/frontend/src/views/chart/chart/common/common_table.js +++ b/core/frontend/src/views/chart/chart/common/common_table.js @@ -166,7 +166,6 @@ export function getCustomTheme(chart) { theme.colCell.measureText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor // 奇数行单元格背景色 - console.log(enableTableCrossBG, i_s_c, i_c) theme.dataCell.cell.crossBackgroundColor = enableTableCrossBG ? i_s_c : i_c theme.dataCell.cell.backgroundColor = i_c theme.dataCell.cell.horizontalBorderColor = b_c @@ -228,7 +227,6 @@ export function getCustomTheme(chart) { theme.dataCell.measureText.textAlign = i_a } } - console.log(theme) return theme } diff --git a/extensions/dataease-extensions-view/view-racebar/build.sh b/extensions/dataease-extensions-view/view-racebar/build.sh index d9fca1ae58..e732dc0c16 100644 --- a/extensions/dataease-extensions-view/view-racebar/build.sh +++ b/extensions/dataease-extensions-view/view-racebar/build.sh @@ -1,8 +1,8 @@ #!/bin/sh mvn clean package -cp view-racebar-backend/target/view-racebar-backend-1.18.10.jar . +cp view-racebar-backend/target/view-racebar-backend-1.18.12.jar . -zip -r racebar.zip ./view-racebar-backend-1.18.10.jar ./plugin.json +zip -r racebar.zip ./view-racebar-backend-1.18.12.jar ./plugin.json -rm -f ./view-racebar-backend-1.18.10.jar +rm -f ./view-racebar-backend-1.18.12.jar diff --git a/extensions/dataease-extensions-view/view-racebar/plugin.json b/extensions/dataease-extensions-view/view-racebar/plugin.json index 6eacf6d870..fe4b949ea3 100644 --- a/extensions/dataease-extensions-view/view-racebar/plugin.json +++ b/extensions/dataease-extensions-view/view-racebar/plugin.json @@ -5,9 +5,9 @@ "cost": 0, "category": "view", "descript": "ECharts 动态排序图插件", - "version": "1.18.10", + "version": "1.18.12", "creator": "DATAEASE", "moduleName": "view-racebar-backend", - "require": "1.18.10", + "require": "1.18.12", "dsType": "" } \ No newline at end of file diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/handler/RaceBarViewStatHandler.java b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/handler/RaceBarViewStatHandler.java index e5187964de..605c948270 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/handler/RaceBarViewStatHandler.java +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/handler/RaceBarViewStatHandler.java @@ -39,7 +39,6 @@ public class RaceBarViewStatHandler implements PluginViewStatHandler { PluginViewField pluginViewField = pluginViewParam.getPluginViewFields().get(i); if (StringUtils.equals(pluginViewField.getTypeField(), "xAxisExt")) { pluginViewField.setTypeField("xAxis"); - pluginViewField.setExtField(1); } String typeKey = pluginViewField.getTypeField(); PluginSingleField pluginSingleField = baseService.buildField(dsType, pluginViewField, tableObj, i); diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java index 82800c721c..cd529e0412 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java @@ -134,7 +134,7 @@ public class RaceBarService extends ViewPluginService { encode.put("x", i); type = p.getType(); } else if (StringUtils.equals(p.getTypeField(), "xAxis")) { - if (p.getExtField() == 1) { + if (StringUtils.equals(p.getBusiType(), "race-bar")) { map.put("extIndex", i); } else { encode.put("y", i); diff --git a/sdk/dataease-plugin-view/src/main/java/io/dataease/plugins/view/entity/PluginViewField.java b/sdk/dataease-plugin-view/src/main/java/io/dataease/plugins/view/entity/PluginViewField.java index 5d7c3f3289..16ac231166 100644 --- a/sdk/dataease-plugin-view/src/main/java/io/dataease/plugins/view/entity/PluginViewField.java +++ b/sdk/dataease-plugin-view/src/main/java/io/dataease/plugins/view/entity/PluginViewField.java @@ -5,11 +5,11 @@ import lombok.Data; import java.util.List; @Data -public class PluginViewField extends PluginChartViewFieldBase{ +public class PluginViewField extends PluginChartViewFieldBase { private String typeField; private List filter; - + private String busiType; }