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

fix: antv组合图插件 数值格式没有清除上一个指标的设置

Browse Source
This commit is contained in:
ulleo 2023-11-16 14:25:21 +08:00
parent a248312061
commit 48199eb271
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
extensions/dataease-extensions-view/view-chartmix/plugin.json
View File

@ -5,7 +5,7 @@
"cost": 0, "cost": 0,
"category": "view", "category": "view",
"descript": "AntV G2Plot 组合图插件", "descript": "AntV G2Plot 组合图插件",
"version": "1.18.11", "version": "1.18.13",
"creator": "DATAEASE", "creator": "DATAEASE",
"moduleName": "view-chartmix-backend", "moduleName": "view-chartmix-backend",
"require": "1.18.11", "require": "1.18.11",

7
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue
View File

@ -152,9 +152,10 @@
</template> </template>
<script> <script>
import {compareItem} from '@/utils/compare' import {compareItem} from '../../utils/compare'
import {getItemType, getOriginFieldName, resetValueFormatter, quotaViews} from './utils' import {getItemType, getOriginFieldName, resetValueFormatter, quotaViews} from './utils'
import FieldErrorTips from './FieldErrorTips' import FieldErrorTips from './FieldErrorTips'
import {formatterItem} from "../../utils/map";
export default { export default {
name: 'QuotaExtItem', name: 'QuotaExtItem',
@ -188,6 +189,7 @@ export default {
data() { data() {
return { return {
compareItem: compareItem, compareItem: compareItem,
formatterItem: formatterItem,
disableEditCompare: false, disableEditCompare: false,
tagType: 'success', tagType: 'success',
quotaViews: quotaViews quotaViews: quotaViews
@ -216,6 +218,9 @@ export default {
if (!this.item.compareCalc) { if (!this.item.compareCalc) {
this.item.compareCalc = JSON.parse(JSON.stringify(this.compareItem)) this.item.compareCalc = JSON.parse(JSON.stringify(this.compareItem))
} }
if (!this.item.formatterCfg) {
this.item.formatterCfg = JSON.parse(JSON.stringify(this.formatterItem))
}
}, },
isEnableCompare() { isEnableCompare() {
let xAxis = null let xAxis = null

7
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue
View File

@ -152,9 +152,10 @@
</template> </template>
<script> <script>
import {compareItem} from '@/utils/compare' import {compareItem} from '../../utils/compare'
import {getItemType, getOriginFieldName, resetValueFormatter, quotaViews} from './utils' import {getItemType, getOriginFieldName, resetValueFormatter, quotaViews} from './utils'
import FieldErrorTips from './FieldErrorTips' import FieldErrorTips from './FieldErrorTips'
import {formatterItem} from "../../utils/map";
export default { export default {
name: 'QuotaItem', name: 'QuotaItem',
@ -188,6 +189,7 @@ export default {
data() { data() {
return { return {
compareItem: compareItem, compareItem: compareItem,
formatterItem: formatterItem,
disableEditCompare: false, disableEditCompare: false,
tagType: 'success', tagType: 'success',
quotaViews: quotaViews quotaViews: quotaViews
@ -213,6 +215,9 @@ export default {
if (!this.item.compareCalc) { if (!this.item.compareCalc) {
this.item.compareCalc = JSON.parse(JSON.stringify(this.compareItem)) this.item.compareCalc = JSON.parse(JSON.stringify(this.compareItem))
} }
if (!this.item.formatterCfg) {
this.item.formatterCfg = JSON.parse(JSON.stringify(this.formatterItem))
}
}, },
isEnableCompare() { isEnableCompare() {
let xAxis = null let xAxis = null