diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue index 40be38ef3b..8faef103d4 100644 --- a/core/frontend/src/components/canvas/customComponent/UserView.vue +++ b/core/frontend/src/components/canvas/customComponent/UserView.vue @@ -433,7 +433,7 @@ export default { const trackMenuInfo = [] let linkageCount = 0 let jumpCount = 0 - if(this.drillFilters.length && !this.chart.type.includes('table')){ + if (this.drillFilters.length && !this.chart.type.includes('table')) { const checkItem = this.drillFields[this.drillFilters.length] const sourceInfo = this.chart.id + '#' + checkItem.id if (this.nowPanelTrackInfo[sourceInfo]) { @@ -442,7 +442,7 @@ export default { if (this.nowPanelJumpInfo[sourceInfo]) { jumpCount++ } - }else{ + } else { this.chart.data && this.chart.data.fields && this.chart.data.fields.forEach(item => { const sourceInfo = this.chart.id + '#' + item.id if (this.nowPanelTrackInfo[sourceInfo]) { @@ -634,7 +634,7 @@ export default { }, exportViewImg() { this.imageDownloading = true - this.$refs['userViewDialog'].exportViewImg(()=>{ + this.$refs['userViewDialog'].exportViewImg(() => { this.imageDownloading = false }) }, diff --git a/core/frontend/src/views/chart/group/Group.vue b/core/frontend/src/views/chart/group/Group.vue index 63a1fec87f..422b5c4f5c 100644 --- a/core/frontend/src/views/chart/group/Group.vue +++ b/core/frontend/src/views/chart/group/Group.vue @@ -13,7 +13,7 @@ @click="add('group')" /> - + - {{ searchMap[searchType] }} + {{ searchMap[searchType] }} {{ $t('commons.all') }} @@ -63,7 +63,7 @@ > - + - + - +
- +
- - + + {{ - $t('chart.preview') - }} + $t('chart.preview') + }} {{ - $t('dataset.confirm') - }} + $t('dataset.confirm') + }}
@@ -481,8 +481,8 @@ size="mini" @click="saveMoveDs(tDs)" >{{ - $t('dataset.confirm') - }} + $t('dataset.confirm') + }}
@@ -630,6 +630,10 @@ export default { }, panelInfo() { return this.$store.state.panel.panelInfo + }, + watchChartTypeChangeObj() { + const { type, render } = this.view + return { type, render } } }, watch: { @@ -649,8 +653,14 @@ export default { this.searchPids = [] this.$refs.chartTreeRef.filter(this.filterText) }, - chartType(val) { - this.view.isPlugin = val && this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(val) + // chartType(val) { + // this.view.isPlugin = val && this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(val) + // }, + watchChartTypeChangeObj(newVal, oldVal) { + if (newVal.type === oldVal.type && newVal.render === oldVal.render) { + return + } + this.view.isPlugin = this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(newVal.type, newVal.render) } }, diff --git a/core/frontend/src/views/chart/view/ChartEdit.vue b/core/frontend/src/views/chart/view/ChartEdit.vue index f5e8c44e44..3166057da2 100644 --- a/core/frontend/src/views/chart/view/ChartEdit.vue +++ b/core/frontend/src/views/chart/view/ChartEdit.vue @@ -1324,8 +1324,8 @@ ref="itemForm" label-width="80px" :model="itemForm" - @submit.native.prevent :rules="itemFormRules" + @submit.native.prevent > plugin.value === type) + return plugins.some(plugin => plugin.value === type && plugin.render === render) }, initTypes(plugins) { plugins.forEach(plugin => {