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

feat: antv组合图插件去除维度自定义排序

Browse Source
This commit is contained in:
ulleo 2023-10-31 16:45:12 +08:00
parent 301317c4af
commit a49c351216
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2098,6 +2098,13 @@ export default {
if (newVal.type === oldVal.type && newVal.render === oldVal.render && newVal.isPlugin === oldVal.isPlugin) {
return
}
if (newVal.render === 'antv' && newVal.type === 'chart-mix') {
// 针对antv组合图，清理自定义排序
this.view.xaxis.forEach(x => {
x.customSort = []
x.sort = 'none'
})
}
this.setChartDefaultOptions()
this.calcData(true, 'chart', true, newVal.type !== oldVal.type, newVal.render !== oldVal.render)
}

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

@ -1,8 +1,8 @@
#!/bin/sh
mvn clean package
cp view-chartmix-backend/target/view-chartmix-backend-1.18.11.jar .
cp view-chartmix-backend/target/view-chartmix-backend-1.18.12.jar .
zip -r chartmix.zip ./view-chartmix-backend-1.18.11.jar ./plugin.json
zip -r chartmix.zip ./view-chartmix-backend-1.18.12.jar ./plugin.json
rm -f ./view-chartmix-backend-1.18.11.jar
rm -f ./view-chartmix-backend-1.18.12.jar

4
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue
View File

@ -89,10 +89,10 @@
<el-dropdown-item :command="beforeSort('none')">{{ $t('chart.none') }}</el-dropdown-item>
<el-dropdown-item :command="beforeSort('asc')">{{ $t('chart.asc') }}</el-dropdown-item>
<el-dropdown-item :command="beforeSort('desc')">{{ $t('chart.desc') }}</el-dropdown-item>
<el-dropdown-item
<!-- <el-dropdown-item
v-show="!item.chartId && (item.deType === 0 || item.deType === 5)"
:command="beforeSort('custom_sort')"
>{{ $t('chart.custom_sort') }}...</el-dropdown-item>
>{{ $t('chart.custom_sort') }}...</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</el-dropdown-item>