imatrix-ui 2.9.49-dw → 2.9.51-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.49-dw",
+  "version": "2.9.51-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/packages/super-grid/src/search-form-ordinarySearch.vue

@@ -47,7 +47,7 @@
     padding-right: 24px;
   }
   .grid-search-form >>> .el-col{
-    padding-left: 24px;
+    padding-left: 10px;
     padding-bottom: 16px;
   }
 </style>

package/packages/super-grid/src/search-form.vue

@@ -178,8 +178,9 @@ export default {
         }
       }
     })
-    const spanNum = this.getSpanNum()
-    const fieldNum = this.getFieldNumPerRow()
+    const spanNum = this.getSpanNum(searchColumns)
+    const fieldNum = this.getFieldNumPerRow(searchColumns)
+    console.log('searchForm-----fieldNum---', fieldNum, 'spanNum---', spanNum)
     const rowNum = Math.ceil(searchColumns.length / fieldNum)
     const advancedQuery = this.query.advancedQuery
     const normalQuery = this.query.normalQuery
@@ -237,17 +238,23 @@ export default {
   methods: {
     ...searchMethods,
     // 每行放的字段个数
-    getFieldNumPerRow() {
-      const gridParams = store.get(this.code)
-      return gridParams.options.search && gridParams.options.search.fieldNum ? gridParams.options.search.fieldNum : 3
+    getFieldNumPerRow(searchColumns) {
+      let myFieldNum
+      if (searchColumns && searchColumns.length === 1) {
+        myFieldNum = 2
+      } else {
+        const gridParams = store.get(this.code)
+        myFieldNum = gridParams.options.search && gridParams.options.search.fieldNum ? gridParams.options.search.fieldNum : 3
+      }
+      return myFieldNum
     },
     // 根据每行显示的字段个数，确定栅栏个数,默认是4个字段。最多就只能放6个字段
-    getSpanNum() {
-      const fieldNum = this.getFieldNumPerRow()
+    getSpanNum(searchColumns) {
+      const fieldNum = this.getFieldNumPerRow(searchColumns)
       if (fieldNum === 1) {
         return 22
       } else if (fieldNum === 2) {
-        return 10
+        return 12
       } else if (fieldNum === 3) {
         return 8
       } else if (fieldNum === 4) {