doway-coms 2.11.29 → 2.11.31

package/package.json

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

package/packages/BaseGrid/src/SeqSetting.vue

@@ -147,6 +147,7 @@ export default {
         }
         const column = {
           currentKey: item.currentKey,
+          type:item.type,
           field: item.field,
           title: item.title,
           visible: item.visible,
@@ -154,6 +155,7 @@ export default {
           width: item.width,
           filters: item.filters,
           order: item.order,
+          fixed:item.fixed
         }
         this.columns.push(column);
       })
@@ -214,11 +216,14 @@ export default {
         let tempObject = vm.columns.find(x => x.currentKey == item)
         let tempData = {
           field: tempObject.field,
-          sort: index + 1,
+          sort: index + 1 + 100,//davis20250407 序号从100开始，防止和系统字段序号冲突
           hidden: !tempObject.visible,
           width: tempObject.width,
           extraInfo:{}
         }
+        if(tempObject.fixed){//设置固定列20250407 davis添加
+          tempData.extraInfo.fixed = tempObject.fixed
+        }
         if (tempObject.filters && tempObject.filters[0].data && tempObject.filters[0].data.bindingValues.length) {
           tempObject.filters[0].checked = true;
           tempData.extraInfo.filterExpression = tempObject.filters

package/packages/BaseGrid/src/index.vue

@@ -2558,6 +2558,14 @@ export default {
         this.$refs.baseGrid.getTableColumn().collectColumn
       // 表格排序信息更新
       XEUtils.arrayEach(tableCollectColumn, (loopCol) => {
+        if(loopCol.type==='seq'){
+          loopCol.params.sort = 1
+          return
+        }
+        if(loopCol.type==='checkbox'){
+          loopCol.params.sort = 2
+          return
+        }
         const find = XEUtils.find(
           emitColumns.fields,
           (item) => loopCol.field === item.field
@@ -2651,11 +2659,21 @@ export default {
       let tableCollectColumn = XEUtils.toTreeArray(
         this.$refs.baseGrid.getTableColumn().collectColumn
       )
+      let tempColumns = []
+      //先查询固定列左边的
+      let leftColumns =XEUtils.orderBy(XEUtils.filter(tableCollectColumn,p=>p.fixed==='left'),p=>p.sortNumber)
+      //然后查询不是固定列的
+      let commonColumns =XEUtils.orderBy(XEUtils.filter(tableCollectColumn,p=>p.fixed!=='left' && p.fixed!=='right'),p=>p.sortNumber)
+      //最后再试固定列右边
+      let rightColumns =XEUtils.orderBy(XEUtils.filter(tableCollectColumn,p=>p.fixed==='right'),p=>p.sortNumber)
+      
+      tempColumns = [...leftColumns,...commonColumns,...rightColumns]
+      // console.debug('tableCollectColumn',tempColumns)
       if (this.isSeqPopover) {
-        this.userDefineColumns = tableCollectColumn
+        this.userDefineColumns = tempColumns
       } else {
         this.userDefineColumns = XEUtils.filter(
-          tableCollectColumn,
+          tempColumns,
           (p) =>
             !p.children &&
             p.params.disableUserVisible !== true &&
@@ -3135,32 +3153,35 @@ export default {
     },
     reloadColumn(columns) {
       this.internalColumns = []
-      if (this.showSeq) {
+      
+      columns.forEach((column) => {
+        this.internalColumns.push(this.initColumns(column))
+      })
+      //注意，不能移到上面添加，会出现布局问题，暂时不知道什么原因????
+      if (this.showCheckBox) {
         this.internalColumns.push({
-          type: 'seq',
+          type: 'checkbox',
           fixed: 'left',
-          width: 50,
-          slots: {
-            header: 'seqHeader',
-          },
+          width: 40,
           params: {
             disableUserVisible: true,
           },
         })
       }
-      if (this.showCheckBox) {
+      if (this.showSeq) {
         this.internalColumns.push({
-          type: 'checkbox',
+          type: 'seq',
           fixed: 'left',
-          width: 40,
+          width: 50,
+          slots: {
+            header: 'seqHeader',
+          },
           params: {
             disableUserVisible: true,
           },
         })
       }
-      columns.forEach((column) => {
-        this.internalColumns.push(this.initColumns(column))
-      })
+      
       //设置验证规则信息，如果没有验证规则的情况下一定要设置null值，设置{}的话会导致点击编辑行会有问题
       this.editRules =XEUtils.isEmpty(this.validRules)?null:this.validRules