diff --git a/frontend/src/components/widget/DeWidget/DeInputSearch.vue b/frontend/src/components/widget/DeWidget/DeInputSearch.vue index 36cb3083a9..18f23069b9 100644 --- a/frontend/src/components/widget/DeWidget/DeInputSearch.vue +++ b/frontend/src/components/widget/DeWidget/DeInputSearch.vue @@ -2,7 +2,7 @@ 0) { + this.value = this.options.value[0] + } }, methods: { search() { // this.options.value && this.setCondition() + this.options.value = [] + if (this.inDraw && this.value) { + this.options.value = [this.value] + } + this.setCondition() }, setCondition() { const param = { component: this.element, - value: !this.values ? [] : Array.isArray(this.values) ? this.values : [this.values], + value: !this.options.value ? [] : Array.isArray(this.options.value) ? this.options.value : [this.options.value], operator: this.operator } this.inDraw && this.$store.commit('addViewFilter', param) diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue index 17dc4cde31..c005736cbe 100644 --- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue +++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue @@ -66,6 +66,12 @@ export default { }, created() { this.options = this.element.options + if (this.inDraw && this.options.value && this.options.value.length > 0) { + this.form.min = this.options.value[0] + if (this.options.value.length > 1) { + this.form.max = this.options.value[1] + } + } }, methods: { searchWithKey(index) { @@ -134,6 +140,7 @@ export default { if (!valid) { return false } + this.setCondition() this.styleChange() }) @@ -145,6 +152,8 @@ export default { value: [this.form.min, this.form.max], operator: this.operator } + + this.inDraw && (this.options.value = param.value) if (this.form.min && this.form.max) { this.inDraw && this.$store.commit('addViewFilter', param) return diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue index 7c81e1e8a0..92a1374e18 100644 --- a/frontend/src/views/chart/components/ChartComponent.vue +++ b/frontend/src/views/chart/components/ChartComponent.vue @@ -214,11 +214,21 @@ export default { // 指定图表的配置项和数据 const chart = this.myChart chart.resize() + this.reDrawMap() + }, + reDrawMap() { + const chart = this.chart + if (chart.type === 'map') { + this.preDraw() + } }, trackClick(trackAction) { const param = this.pointParam if (!param || !param.data || !param.data.dimensionList) { - this.$warning(this.$t('panel.no_drill_field')) + // 地图提示没有关联字段 其他没有维度信息的 直接返回 + if (this.chart.type === 'map') { + this.$warning(this.$t('panel.no_drill_field')) + } return } const linkageParam = {