diff --git a/core/frontend/src/views/chart/components/ChartComponent.vue b/core/frontend/src/views/chart/components/ChartComponent.vue index 0d30eaee87..7a76eaa67d 100644 --- a/core/frontend/src/views/chart/components/ChartComponent.vue +++ b/core/frontend/src/views/chart/components/ChartComponent.vue @@ -292,6 +292,7 @@ export default { this.myChart = this.$echarts.init(document.getElementById(this.chartId)) } this.drawEcharts() + this.myChart.off('click') this.myChart.on('click', function(param) { that.pointParam = param if (that.linkageActiveParam) { diff --git a/core/frontend/src/views/chart/components/filter/ResultFilterEditor.vue b/core/frontend/src/views/chart/components/filter/ResultFilterEditor.vue index a90c5658ee..21d446f52c 100644 --- a/core/frontend/src/views/chart/components/filter/ResultFilterEditor.vue +++ b/core/frontend/src/views/chart/components/filter/ResultFilterEditor.vue @@ -275,6 +275,11 @@ export default { this.logic = this.item.logic this.filterType = this.item.filterType this.enumCheckField = this.item.enumCheckField + + // init enum option + if (this.item.filterType === 'enum' && this.needRequestEnum) { + this.initEnumOptions() + } }, initEnumOptions() { // 查找枚举值 diff --git a/extensions/dataease-extensions-view/view-chartmix/build.sh b/extensions/dataease-extensions-view/view-chartmix/build.sh index f66a518028..f554eff761 100644 --- a/extensions/dataease-extensions-view/view-chartmix/build.sh +++ b/extensions/dataease-extensions-view/view-chartmix/build.sh @@ -1,8 +1,8 @@ #!/bin/sh mvn clean package -cp view-chartmix-backend/target/view-chartmix-backend-1.18.9.jar . +cp view-chartmix-backend/target/view-chartmix-backend-1.18.10.jar . -zip -r chartmix.zip ./view-chartmix-backend-1.18.9.jar ./plugin.json +zip -r chartmix.zip ./view-chartmix-backend-1.18.10.jar ./plugin.json -rm -f ./view-chartmix-backend-1.18.9.jar +rm -f ./view-chartmix-backend-1.18.10.jar diff --git a/extensions/dataease-extensions-view/view-chartmix/plugin.json b/extensions/dataease-extensions-view/view-chartmix/plugin.json index 80a3f79aee..b0c4008aa2 100644 --- a/extensions/dataease-extensions-view/view-chartmix/plugin.json +++ b/extensions/dataease-extensions-view/view-chartmix/plugin.json @@ -5,9 +5,9 @@ "cost": 0, "category": "view", "descript": "AntV G2Plot 组合图插件", - "version": "1.18.9", + "version": "1.18.10", "creator": "DATAEASE", "moduleName": "view-chartmix-backend", - "require": "1.18.9", + "require": "1.18.10", "dsType": "" } diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/DefaultViewStatHandler.java b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java similarity index 96% rename from extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/DefaultViewStatHandler.java rename to extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java index 0f37d52e44..b23b5062fa 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/DefaultViewStatHandler.java +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java @@ -1,5 +1,6 @@ package io.dataease.plugins.view.official.handler; +import com.google.gson.Gson; import io.dataease.plugins.common.constants.datasource.SQLConstants; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.util.ConstantsUtil; @@ -19,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -public class DefaultViewStatHandler implements PluginViewStatHandler { +public class ChartMixViewStatHandler implements PluginViewStatHandler { @Override public String build(PluginViewParam pluginViewParam, ViewPluginService viewPluginService) { @@ -43,6 +44,8 @@ public class DefaultViewStatHandler implements PluginViewStatHandler { List xFields = fieldSQLMap.getOrDefault("xAxis", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getField())).map(PluginSingleField::getField).collect(Collectors.toList()); List xOrders = fieldSQLMap.getOrDefault("xAxis", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getSort())).map(PluginSingleField::getSort).collect(Collectors.toList()); + + System.out.println("11111111 orders:"+new Gson().toJson(xOrders)); // List xWheres = fieldSQLMap.get("xAxis").stream().map(singleField -> singleField.getWhere()).collect(Collectors.toList()); List yFields = fieldSQLMap.getOrDefault("yAxis", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getField())).map(PluginSingleField::getField).collect(Collectors.toList()); @@ -75,6 +78,9 @@ public class DefaultViewStatHandler implements PluginViewStatHandler { List orders = new ArrayList<>(); orders.addAll(xOrders); orders.addAll(yOrders); + + System.out.println("11111111 orders: " + new Gson().toJson(orders)); + List aggWheres = new ArrayList<>(); aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList())); diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/impl/ChartMixService.java b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/impl/ChartMixService.java index df669c06be..a3d91c6fb0 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/impl/ChartMixService.java +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/impl/ChartMixService.java @@ -3,7 +3,7 @@ package io.dataease.plugins.view.official.impl; import com.google.gson.Gson; import io.dataease.plugins.common.dto.StaticResource; import io.dataease.plugins.view.entity.*; -import io.dataease.plugins.view.official.handler.DefaultViewStatHandler; +import io.dataease.plugins.view.official.handler.ChartMixViewStatHandler; import io.dataease.plugins.view.service.ViewPluginService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -110,11 +110,10 @@ public class ChartMixService extends ViewPluginService { if (CollectionUtils.isNotEmpty(yAxisExt)) { yAxis.addAll(yAxisExt); }*/ - System.out.println(new Gson().toJson(yAxis)); if (CollectionUtils.isEmpty(xAxis) || CollectionUtils.isEmpty(yAxis)) { return null; } - String sql = new DefaultViewStatHandler().build(param, this); + String sql = new ChartMixViewStatHandler().build(param, this); System.out.println(sql); return sql; diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/LabelSelector.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/LabelSelector.vue index 16b95033cc..d937f484f2 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/LabelSelector.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/LabelSelector.vue @@ -16,6 +16,34 @@ + + + + + + - + + {{ $t('chart.value_formatter') }}... + --> - - + + - + - - - - + + + + - {{ item.name }} - - + {{ item.name }} + + - + {{ $t('chart.filter') }}... - + {{ $t('chart.delete') }} @@ -28,11 +69,12 @@ diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue index 678959c715..aa2edfdbdc 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue @@ -8,19 +8,19 @@ - @@ -84,7 +84,7 @@ @add="addCustomFilter" @update="calcData(true)"> @@ -98,7 +98,7 @@ diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue index 3dd5952d69..0afbe621e3 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue @@ -1,24 +1,65 @@ diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/utils/map.js b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/utils/map.js index caa4c17e11..1d49e69424 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/utils/map.js +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/utils/map.js @@ -87,6 +87,7 @@ export const DEFAULT_SLIDER = { export const DEFAULT_Graphic = { show: true, fontSize: '60', + marginModel: 'absolute', color: '#000000', alpha: 25, bottom: 90, @@ -842,7 +843,7 @@ const hexToRgba = (hex, opacity) => { } export const getMarginUnit = marginForm => { - if (!marginForm.marginModel || marginForm.marginModel === 'auto') return null + if (!marginForm || !marginForm.marginModel || marginForm.marginModel === 'auto') return null if (marginForm.marginModel === 'absolute') return 'px' if (marginForm.marginModel === 'relative') return '%' return null diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue index 499f1c3b58..fcc287506f 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue @@ -9,18 +9,18 @@ @add="addXaxis" @update="calcData(true)"> @@ -97,7 +97,7 @@ @add="addCustomFilter" @update="calcData(true)"> @@ -111,10 +111,10 @@