doway-coms 2.11.28 → 2.11.30

package/package.json

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

package/packages/BaseGrid/src/SeqSetting.vue

@@ -214,7 +214,7 @@ 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:{}

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
@@ -3135,32 +3143,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
 

package/packages/styles/hps/default.less

@@ -1,12 +1,25 @@
 .vxe-table--render-default.border--full .vxe-body--column, .vxe-table--render-default.border--full .vxe-footer--column, .vxe-table--render-default.border--full .vxe-header--column{
-    /* background-image: linear-gradient(#a7a6a6, #a7a6a6), linear-gradient(#a7a6a6, #a7a6a6) !important; */
-    background-image:none !important;
-    box-shadow: 0 0 0 0.5px #a7a6a6;
-    /* border-bottom:1px solid #a7a6a6!important;
-    border-right:1px solid #a7a6a6!important;
-    border-left:1px solid #a7a6a6!important; */
-  }
-  .vxe-table--render-default.border--full .vxe-header--column{
-    border-bottom:2px solid #a7a6a6;
-    background: #9ccaf4;
-  }
+  /* background-image: linear-gradient(#a7a6a6, #a7a6a6), linear-gradient(#a7a6a6, #a7a6a6) !important; */
+  background-image:none !important;
+  box-shadow: 0 0 0 0.5px #a7a6a6;
+  /* border-bottom:1px solid #a7a6a6!important;
+  border-right:1px solid #a7a6a6!important;
+  border-left:1px solid #a7a6a6!important; */
+}
+.vxe-table--render-default.border--full .vxe-header--column{
+  border-bottom:2px solid #a7a6a6;
+  background: #9ccaf4;
+}
+.vxe-table--fixed-left-wrapper .vxe-body--column.col--last{
+  border-right:2px solid #a7a6a6!important;
+}
+.vxe-table--fixed-left-wrapper .vxe-header--column.col--last{
+  border-right:2px solid #a7a6a6!important;
+}
+.vxe-table--fixed-right-wrapper .vxe-body--column.col--last{
+  border-left:2px solid #a7a6a6!important;
+}
+.vxe-table--fixed-right-wrapper .vxe-header--column.col--last{
+  border-left:2px solid #a7a6a6!important;
+}
+