Merge branch 'dev' of github.com:dataease/dataease into dev

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) {

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

frontend/src/views/chart/view/ChartEdit.vue

@@ -375,7 +375,7 @@
                           $t('chart.drag_block_word_cloud_label')
                         }}</span>
                         <span v-else-if="view.type && view.type === 'label'">{{ $t('chart.drag_block_label') }}</span>
-                        /
+                        <span v-show="view.type !== 'richTextView'"> / </span>
                         <span v-if="view.type && view.type !== 'table-info'">{{ $t('chart.dimension') }}</span>
                         <span
                           v-else-if="view.type && view.type === 'table-info'"
@@ -502,7 +502,7 @@
                         <span v-else-if="view.type && view.type === 'word-cloud'">{{
                           $t('chart.drag_block_word_cloud_size')
                         }}</span>
-                        /
+                        <span v-show="view.type !== 'richTextView'"> / </span>
                         <span>{{ $t('chart.quota') }}</span>
                       </span>
                       <draggable