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

Merge pull request #9420 from MaekBlack/dev

Browse Source 
feat: 插件支持维度自定义排序
This commit is contained in:
Junjun 2024-04-29 09:48:04 +08:00 committed by GitHub
commit 75eeab4229
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1089,7 +1089,7 @@ public class ChartViewService {
} }
datasourceRequest.setQuery(sql); datasourceRequest.setQuery(sql);
data = datasourceProvider.getData(datasourceRequest); data = datasourceProvider.getData(datasourceRequest);
data = resultCustomSort(xAxis, data);
Map<String, Object> mapChart = pluginViewResult(pluginViewParam, view, data, isDrill); Map<String, Object> mapChart = pluginViewResult(pluginViewParam, view, data, isDrill);
logger.info("plugin_sql:" + sql); logger.info("plugin_sql:" + sql);
Map<String, Object> mapTableNormal = ChartDataBuild.transTableNormal(fieldMap, view, data, desensitizationList); Map<String, Object> mapTableNormal = ChartDataBuild.transTableNormal(fieldMap, view, data, desensitizationList);

5
core/frontend/src/views/chart/view/ChartEdit.vue
View File

@ -2438,6 +2438,7 @@ export default {
bus.$on('plugin-chart-click', this.chartClick) bus.$on('plugin-chart-click', this.chartClick)
bus.$on('set-dynamic-area-code', this.setDynamicAreaCode) bus.$on('set-dynamic-area-code', this.setDynamicAreaCode)
bus.$on('set-table-column-width', this.onTableFieldWidthChange) bus.$on('set-table-column-width', this.onTableFieldWidthChange)
bus.$on('show-custom-sort', this.customSort)
}, },
initTableData(id, optType) { initTableData(id, optType) {
if (id != null) { if (id != null) {
@ -2931,6 +2932,10 @@ export default {
this.moveId = e.draggedContext.element.id this.moveId = e.draggedContext.element.id
return true return true
}, },
customSort(args) {
const { item, axis } = JSON.parse(JSON.stringify(args))
this.onCustomSort(item, axis);
},
onCustomSort(item, axis) { onCustomSort(item, axis) {
this.customSortFieldType = axis this.customSortFieldType = axis
this.customSortField = this.view[axis][item.index] this.customSortField = this.view[axis][item.index]