Merge branch 'dev-mapconfig'

src/views/components/resiSearch.vue

@@ -173,6 +173,7 @@
                   size="small"
                   clearable
                   class="resi-cell-select"
+                  :multiple="n.multiSelect == 1 ? true : false"
                 >
                   <el-option
                     v-for="item in n.options"
@@ -446,7 +447,7 @@ export default {
             // columnValue: []
             columnValue: this.form[item.columnName] && 
               (itemTypes.includes(item.queryType) ||
-              itemTypes.includes(item.itemType)
+              itemTypes.includes(item.itemType) || item.multiSelect == 1
                 ? this.form[item.columnName]
                 : [this.form[item.columnName].toString()])
           }
@@ -672,7 +673,7 @@ export default {
   }
 }
 .resi-row-box {
-  height: 104px;
+  height: 214px;
   overflow: hidden;
   transition: height 0.5s;
 }