doway-coms 2.11.0 → 2.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.11.0",
+  "version": "2.11.2",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -1252,35 +1252,6 @@ export default {
     } catch (err) {
       console.debug(err)
     }
-    //拖动后输入框有错位问题，暂时不启用
-    // this.initColumnDrop()
-    for (let i = 0; i < this.columns.length; i++) {
-      this.internalColumns.push(this.initColumns(this.columns[i]))
-      if (
-        this.columns[i].visible !== false &&
-        this.columns[i].controlType !== 'operation'
-      ) {
-        this.internalColumns[i].slots.header = this.columns[i].field
-      }
-    }
-    //设置验证规则信息，如果没有验证规则的情况下一定要设置null值，设置{}的话会导致点击编辑行会有问题
-    this.editRules =XEUtils.isEmpty(this.validRules)?null:this.validRules
-    if(this.mergeFields.length>0){
-        this.gridOptions['spanMethod'] = this.rowspanMethod
-    }
-
-    // 初始化排序和筛选
-    if (this.sortRemote) {
-      let data = []
-      this.defaultSort.forEach((x) => {
-        data.push([x.field, x.order])
-      })
-      this.$emit('sortModify', data)
-
-      //设置筛选过滤条件
-      this.setFilterExpression(this.internalColumns)
-    }
-
     if (this.showSeq) {
       this.internalColumns.push(
         // {
@@ -1314,6 +1285,36 @@ export default {
         },
       })
     }
+    //拖动后输入框有错位问题，暂时不启用
+    // this.initColumnDrop()
+    for (let i = 0; i < this.columns.length; i++) {
+      this.internalColumns.push(this.initColumns(this.columns[i]))
+      if (
+        this.columns[i].visible !== false &&
+        this.columns[i].controlType !== 'operation'
+      ) {
+        this.internalColumns[i].slots.header = this.columns[i].field
+      }
+    }
+    //设置验证规则信息，如果没有验证规则的情况下一定要设置null值，设置{}的话会导致点击编辑行会有问题
+    this.editRules =XEUtils.isEmpty(this.validRules)?null:this.validRules
+    if(this.mergeFields.length>0){
+        this.gridOptions['spanMethod'] = this.rowspanMethod
+    }
+
+    // 初始化排序和筛选
+    if (this.sortRemote) {
+      let data = []
+      this.defaultSort.forEach((x) => {
+        data.push([x.field, x.order])
+      })
+      this.$emit('sortModify', data)
+
+      //设置筛选过滤条件
+      this.setFilterExpression(this.internalColumns)
+    }
+
+    
     this.gridEdit = this.edit
   },
   mounted() {