From 32b5c935c3f7790d89a4ca28a0b32d14a84dcdb8 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 31 Aug 2022 14:24:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style(=E8=A7=86=E5=9B=BE):=20=E5=AF=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=A7=86=E5=9B=BE=E7=BC=96=E8=BE=91=E5=8C=BA?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BB=B4=E5=BA=A6=E6=8C=87=E6=A0=87=E5=89=8D?= =?UTF-8?q?=E6=96=9C=E6=9D=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/ChartEdit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 8b62a745ee..f4450cf46a 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -375,7 +375,7 @@ $t('chart.drag_block_word_cloud_label') }} {{ $t('chart.drag_block_label') }} - / + / {{ $t('chart.dimension') }} {{ $t('chart.drag_block_word_cloud_size') }} - / + / {{ $t('chart.quota') }} Date: Wed, 31 Aug 2022 14:47:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8):=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=8A=B6=E6=80=81=E4=B8=8B=E5=88=87=E6=8D=A2=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=B8=83=E5=B1=80=E5=86=8D=E5=88=87=E5=9B=9E=E6=9D=A5?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/store/index.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index f83f7a7acc..91207ad0ea 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -244,6 +244,21 @@ const data = { }) }, + clearAllViewFilter(state) { + state.componentData.forEach(item => { + if (item.type === 'view' && item.filters && item.filters.length) { + item.filters = [] + } + if (item.type === 'de-tabs' && item.options.tabList && item.options.tabList.length) { + item.options.tabList.forEach(tab => { + if (tab.content && tab.content.type === 'view' && tab.content.filters && tab.content.filters.length) { + tab.content.filters = [] + } + }) + } + }) + }, + addViewFilter(state, data) { const condition = formatCondition(data) const vValid = valueValid(condition) @@ -505,6 +520,7 @@ const data = { }, // 启用移动端布局 openMobileLayout(state) { + this.commit('clearAllViewFilter') state.componentDataCache = null state.componentDataCache = JSON.stringify(state.componentData) state.pcComponentData = state.componentData From 13987e32a64a501c52141ed2e864072639233a7b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 31 Aug 2022 15:19:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=99=A8):=20?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE=E8=A7=A6=E5=8F=91=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=87=8D=E7=BD=AE=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=85=A8=E9=80=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/DeWidget/DeSelectGrid.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue index a6c976adf3..7c8d782d95 100644 --- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue +++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue @@ -214,6 +214,8 @@ export default { methods: { clearHandler() { this.value = this.element.options.attrs.multiple ? [] : null + this.checkAll = false + this.isIndeterminate = false }, resetDefaultValue(id) { if (this.inDraw && this.manualModify && this.element.id === id) {