dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 动态排序图中“分组/维度”使用计算字段时，视图显示异常

Browse Source 
#6218
This commit is contained in:
ulleo 2023-11-15 15:56:48 +08:00
parent 6f5d6579c1
commit a356c6c484
7 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -451,7 +451,7 @@ public class ChartViewService {
List<ChartViewFieldDTO> xAxisExtList = gson.fromJson(view.getXAxisExt(), new TypeToken<List<ChartViewFieldDTO>>() { List<ChartViewFieldDTO> xAxisExtList = gson.fromJson(view.getXAxisExt(), new TypeToken<List<ChartViewFieldDTO>>() {
}.getType()); }.getType());
xAxisExtList.forEach((x) -> { xAxisExtList.forEach((x) -> {
x.setExtField(1); x.setBusiType("race-bar");
}); });
xAxis.addAll(xAxisExtList); xAxis.addAll(xAxisExtList);
} else { } else {
@ -1031,7 +1031,7 @@ public class ChartViewService {
List<ChartViewFieldDTO> xAxisExtList = gson.fromJson(view.getXAxisExt(), new TypeToken<List<ChartViewFieldDTO>>() { List<ChartViewFieldDTO> xAxisExtList = gson.fromJson(view.getXAxisExt(), new TypeToken<List<ChartViewFieldDTO>>() {
}.getType()); }.getType());
xAxisExtList.forEach((x) -> { xAxisExtList.forEach((x) -> {
x.setExtField(1); x.setBusiType("race-bar");
}); });
xAxis.addAll(xAxisExtList); xAxis.addAll(xAxisExtList);
} }

2
core/frontend/src/views/chart/chart/common/common_table.js
View File

@ -166,7 +166,6 @@ export function getCustomTheme(chart) {
theme.colCell.measureText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor 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.crossBackgroundColor = enableTableCrossBG ? i_s_c : i_c
theme.dataCell.cell.backgroundColor = i_c theme.dataCell.cell.backgroundColor = i_c
theme.dataCell.cell.horizontalBorderColor = b_c theme.dataCell.cell.horizontalBorderColor = b_c
@ -228,7 +227,6 @@ export function getCustomTheme(chart) {
theme.dataCell.measureText.textAlign = i_a theme.dataCell.measureText.textAlign = i_a
} }
} }
console.log(theme)
return theme return theme
} }

6
extensions/dataease-extensions-view/view-racebar/build.sh
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
mvn clean package 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

4
extensions/dataease-extensions-view/view-racebar/plugin.json
View File

@ -5,9 +5,9 @@
"cost": 0, "cost": 0,
"category": "view", "category": "view",
"descript": "ECharts 动态排序图插件", "descript": "ECharts 动态排序图插件",
"version": "1.18.10", "version": "1.18.12",
"creator": "DATAEASE", "creator": "DATAEASE",
"moduleName": "view-racebar-backend", "moduleName": "view-racebar-backend",
"require": "1.18.10", "require": "1.18.12",
"dsType": "" "dsType": ""
} }

1
extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/handler/RaceBarViewStatHandler.java
View File

@ -39,7 +39,6 @@ public class RaceBarViewStatHandler implements PluginViewStatHandler {
PluginViewField pluginViewField = pluginViewParam.getPluginViewFields().get(i); PluginViewField pluginViewField = pluginViewParam.getPluginViewFields().get(i);
if (StringUtils.equals(pluginViewField.getTypeField(), "xAxisExt")) { if (StringUtils.equals(pluginViewField.getTypeField(), "xAxisExt")) {
pluginViewField.setTypeField("xAxis"); pluginViewField.setTypeField("xAxis");
pluginViewField.setExtField(1);
} }
String typeKey = pluginViewField.getTypeField(); String typeKey = pluginViewField.getTypeField();
PluginSingleField pluginSingleField = baseService.buildField(dsType, pluginViewField, tableObj, i); PluginSingleField pluginSingleField = baseService.buildField(dsType, pluginViewField, tableObj, i);

2
extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java
View File

@ -134,7 +134,7 @@ public class RaceBarService extends ViewPluginService {
encode.put("x", i); encode.put("x", i);
type = p.getType(); type = p.getType();
} else if (StringUtils.equals(p.getTypeField(), "xAxis")) { } else if (StringUtils.equals(p.getTypeField(), "xAxis")) {
if (p.getExtField() == 1) { if (StringUtils.equals(p.getBusiType(), "race-bar")) {
map.put("extIndex", i); map.put("extIndex", i);
} else { } else {
encode.put("y", i); encode.put("y", i);

4
sdk/dataease-plugin-view/src/main/java/io/dataease/plugins/view/entity/PluginViewField.java
View File

@ -5,11 +5,11 @@ import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data
public class PluginViewField extends PluginChartViewFieldBase{ public class PluginViewField extends PluginChartViewFieldBase {
private String typeField; private String typeField;
private List<PluginChartCustomFilterItem> filter; private List<PluginChartCustomFilterItem> filter;
private String busiType;
} }