From 81578945ccf9bf2ad188ab3672d59a9569387d58 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 22 Jun 2022 16:24:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/DeWidget/DeSelectGrid.vue          | 42 +++++++++++--------
 frontend/src/store/modules/user.js            |  1 -
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index 20c7e5885a..b94c9af63b 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -3,10 +3,10 @@
   <div v-if="element.options!== null && element.options.attrs!==null && show" class="de-select-grid-class">
     <div class="de-select-grid-search">
       <el-input
+        ref="de-select-grid"
         v-model="keyWord"
         :placeholder="$t('deinputsearch.placeholder')"
         :size="size"
-        ref="de-select-grid"
         prefix-icon="el-icon-search"
         clearable
       />
@@ -78,7 +78,7 @@ export default {
       show: true,
       datas: [],
       isIndeterminate: false,
-      checkAll: false,
+      checkAll: false
     }
   },
   computed: {
@@ -100,8 +100,8 @@ export default {
       return this.$store.state.panel.panelInfo
     },
     cssArr() {
-        const { brColor, wordColor, innerBgColor } = this.element.style;
-        return { brColor, wordColor, innerBgColor }
+      const { brColor, wordColor, innerBgColor } = this.element.style
+      return { brColor, wordColor, innerBgColor }
     }
   },
   watch: {
@@ -137,6 +137,10 @@ export default {
       method(param).then(res => {
         this.datas = this.optionDatas(res.data)
         this.changeInputStyle()
+        if (this.element.options.attrs.multiple) {
+          this.checkAll = this.value.length === this.datas.length
+          this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
+        }
       }) || (this.element.options.value = '')
     },
     'element.options.attrs.multiple': function(value, old) {
@@ -155,7 +159,7 @@ export default {
           this.checkAll = this.value.length === this.datas.length
           this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
         }
-        this.changeInputStyle();
+        this.changeInputStyle()
       })
     },
     'element.options.attrs.sort': function(value, old) {
@@ -176,11 +180,15 @@ export default {
       method(param).then(res => {
         this.datas = this.optionDatas(res.data)
         this.changeInputStyle()
+        if (this.element.options.attrs.multiple) {
+          this.checkAll = this.value.length === this.datas.length
+          this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
+        }
       }) || (this.element.options.value = '')
     },
     cssArr: {
-        handler: 'changeInputStyle',
-        deep: true
+      handler: 'changeInputStyle',
+      deep: true
     },
     keyWord: 'changeInputStyle'
   },
@@ -206,21 +214,21 @@ export default {
 
   methods: {
     changeInputStyle() {
-      if (!this.$parent.handlerInputStyle) return;
+      if (!this.$parent.handlerInputStyle) return
       this.$nextTick(() => {
-          this.handlerInputStyle(this.element.style)
+        this.handlerInputStyle(this.element.style)
       })
     },
     handlerInputStyle(newValue) {
-      let nodeCache = '';
+      let nodeCache = ''
       if (!this.$refs['de-select-grid']) return
-        styleAttrs.forEach(ele => {
-            if (!nodeCache) {
-                nodeCache = this.$refs['de-select-grid'].$el.querySelector('.el-input__inner')
-            }
-            nodeCache.style[attrsMap[ele]] = newValue[ele];
-            this.textSelectGridWidget(this.$el, ele, newValue[ele])
-        })
+      styleAttrs.forEach(ele => {
+        if (!nodeCache) {
+          nodeCache = this.$refs['de-select-grid'].$el.querySelector('.el-input__inner')
+        }
+        nodeCache.style[attrsMap[ele]] = newValue[ele]
+        this.textSelectGridWidget(this.$el, ele, newValue[ele])
+      })
     },
     textSelectGridWidget: textSelectGridWidget,
     initLoad() {
diff --git a/frontend/src/store/modules/user.js b/frontend/src/store/modules/user.js
index 4ba90dae2f..a14a2db029 100644
--- a/frontend/src/store/modules/user.js
+++ b/frontend/src/store/modules/user.js
@@ -140,7 +140,6 @@ const actions = {
     const method = param && param.casEnable ? deLogout : logout
     return new Promise((resolve, reject) => {
       method(state.token).then(res => {
-        debugger
         removeToken() // must remove  token  first
         resetRouter()
         commit('RESET_STATE')