@@ -17,12 +18,12 @@
+
+
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 8e5d3cd9d4..1fbc589005 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -153,7 +153,7 @@ export default {
this.searchCount++
}, refreshTime)
eventBus.$on('openChartDetailsDialog', this.openChartDetailsDialog)
- this.$store.commit('setLinkageSettingStatus', false)
+ this.$store.commit('clearLinkageSettingInfo', false)
},
beforeDestroy() {
clearInterval(this.timer)
diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
index 39dbb39ba3..dbed702832 100644
--- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue
+++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
@@ -21,6 +21,7 @@
+
+
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index ddaf643d25..d296e47dff 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -746,6 +746,7 @@ export default {
view.yaxis = JSON.stringify([])
view.extStack = JSON.stringify([])
view.customFilter = JSON.stringify([])
+ view.drillFields = JSON.stringify([])
post('/chart/view/save', view).then(response => {
this.closeCreateChart()
this.$store.dispatch('chart/setTableId', null)
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index c82559cf15..f4ffa1f64d 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -233,6 +233,29 @@
/>
+
+
+ 钻取
+ /
+ {{ $t('chart.dimension') }}
+
+
+
+
+
+
+
+ {{ $t('chart.placeholder_field') }}
+
+
{{ $t('chart.drag_block_table_data_column') }}
@@ -532,6 +555,7 @@ import DimensionItem from '../components/drag-item/DimensionItem'
import QuotaItem from '../components/drag-item/QuotaItem'
import FilterItem from '../components/drag-item/FilterItem'
import ChartDragItem from '../components/drag-item/ChartDragItem'
+import DrillItem from '../components/drag-item/DrillItem'
import ResultFilterEditor from '../components/filter/ResultFilterEditor'
import ChartComponent from '../components/ChartComponent'
import bus from '@/utils/bus'
@@ -593,7 +617,8 @@ export default {
QuotaItem,
DimensionItem,
draggable,
- ChartDragItem
+ ChartDragItem,
+ DrillItem
},
props: {
param: {
@@ -613,6 +638,7 @@ export default {
xaxis: [],
yaxis: [],
extStack: [],
+ drillFields: [],
show: true,
type: 'bar',
title: '',
@@ -800,6 +826,7 @@ export default {
view.customStyle = JSON.stringify(view.customStyle)
view.customFilter = JSON.stringify(view.customFilter)
view.extStack = JSON.stringify(view.extStack)
+ view.drillFields = JSON.stringify(view.drillFields)
post('/chart/view/save', view).then(response => {
// this.get(response.data.id);
// this.getData(response.data.id)
@@ -900,6 +927,7 @@ export default {
this.view.xaxis = this.view.xaxis ? JSON.parse(this.view.xaxis) : []
this.view.yaxis = this.view.yaxis ? JSON.parse(this.view.yaxis) : []
this.view.extStack = this.view.extStack ? JSON.parse(this.view.extStack) : []
+ this.view.drillFields = this.view.drillFields ? JSON.parse(this.view.drillFields) : []
this.view.customAttr = this.view.customAttr ? JSON.parse(this.view.customAttr) : {}
this.view.customStyle = this.view.customStyle ? JSON.parse(this.view.customStyle) : {}
this.view.customFilter = this.view.customFilter ? JSON.parse(this.view.customFilter) : {}
@@ -932,6 +960,7 @@ export default {
this.view.xaxis = this.view.xaxis ? JSON.parse(this.view.xaxis) : []
this.view.yaxis = this.view.yaxis ? JSON.parse(this.view.yaxis) : []
this.view.extStack = this.view.extStack ? JSON.parse(this.view.extStack) : []
+ this.view.drillFields = this.view.drillFields ? JSON.parse(this.view.drillFields) : []
this.view.customAttr = this.view.customAttr ? JSON.parse(this.view.customAttr) : {}
this.view.customStyle = this.view.customStyle ? JSON.parse(this.view.customStyle) : {}
this.view.customFilter = this.view.customFilter ? JSON.parse(this.view.customFilter) : {}
@@ -1364,6 +1393,18 @@ export default {
stackItemRemove(item) {
this.view.extStack.splice(item.index, 1)
this.save(true)
+ },
+ dillItemChange(item) {
+ this.save(true)
+ },
+ drillItemRemove(item) {
+ this.view.drillFields.splice(item.index, 1)
+ this.save(true)
+ },
+ addDrill(e) {
+ this.dragCheckType(this.view.drillFields, 'd')
+ this.dragMoveDuplicate(this.view.drillFields, e)
+ this.save(true)
}
}
}
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 3fb4e2ee29..070886ad4d 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -323,7 +323,7 @@ export default {
listenGlobalKeyDown()
this.$store.commit('setCurComponent', { component: null, index: null })
- this.$store.commit('setLinkageSettingStatus', false)
+ this.$store.commit('clearLinkageSettingInfo', false)
},
mounted() {
// this.insertToBody()
diff --git a/pom.xml b/pom.xml
index a2ab99fe56..24a7db2ef7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
io.dataease
dataease-server
- 1.0.0
+ 1.2.0
pom