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

frontend/src/components/widget/DeWidget/DeSelectGrid.vue

@@ -23,7 +23,9 @@
 
       <div v-else class="radio-group-container">
         <el-radio-group v-model="value" @change="changeRadioBox">
-          <el-radio v-for="(item, index) in datas" :key="index" :label="item.id">{{ item.id }}</el-radio>
+          <el-radio v-for="(item, index) in datas" :key="index" :label="item.id" @click.native.prevent="testChange(item)">
+            <span>{{ item.id }}</span>
+          </el-radio>
         </el-radio-group>
       </div>
 
@@ -209,6 +211,10 @@ export default {
       this.checkAll = checkedCount === this.datas.length
       this.isIndeterminate = checkedCount > 0 && checkedCount < this.datas.length
       this.changeValue(values)
+    },
+    testChange(item) {
+      this.value = this.value === item.id ? null : item.id
+      this.changeRadioBox(this.value)
     }
 
   }

frontend/src/views/panel/edit/ComponentWait.vue

@@ -4,13 +4,18 @@
       {{ $t('panel.component_hidden') }}
     </el-row>
     <el-row class="component-wait-main">
-      <component-wait-item
+      <el-col
+        :span="8"
         v-for="(config, index) in pcComponentData"
         v-if="!config.mobileSelected"
         :id="'wait' + config.id"
         :key="index"
-        :config="config"
+      >
-      />
+        <component-wait-item
+          :config="config"
+        />
+      </el-col>
+
     </el-row>
 
   </el-row>
@@ -81,7 +86,7 @@ export default {
   .component-wait-main {
     width: 100%;
     height: calc(100% - 30px);
-    text-align: left;
+    float: left;
     overflow-y: auto;
   }
   .component-custom {

frontend/src/views/panel/edit/ComponentWaitItem.vue

@@ -69,9 +69,7 @@ export default {
     },
     componentItemStyle() {
       return {
-        padding: '5px',
+        padding: '5px'
-        float: 'left',
-        width: '33%'
       }
     },
     ...mapState([