doway-coms 2.10.67 → 2.10.68

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1926,6 +1926,9 @@ export default {
       if(originCol.cellStyle){
         colParams['cellStyle'] =originCol.cellStyle
       }
+      if(originCol.headerCellStyle){
+        colParams['headerCellStyle'] =originCol.headerCellStyle
+      }
 
       if (originCol.footerSum === true) {
         this.showFooter = true
@@ -3124,7 +3127,14 @@ export default {
         }
         // console.debug('customStyle',customStyle)
         if(this.headerCellStyle){
-          customStyle =  this.headerCellStyle
+          for(let loopProp in this.headerCellStyle){
+              customStyle[loopProp] = this.headerCellStyle[loopProp]
+            }
+        }
+        if(scope.column?.params.headerCellStyle){
+            for(let loopProp in scope.column.params.headerCellStyle){
+              customStyle[loopProp] = scope.column.params.headerCellStyle[loopProp]
+            }
         }
         this.$emit('headerCellStyleCallback',scope,customStyle)
         return customStyle
@@ -3143,7 +3153,9 @@ export default {
             customStyle = this.cellStyle
         }
         if(scope.column?.params.cellStyle){
-            customStyle =scope.column.params.cellStyle
+            for(let loopProp in scope.column.params.cellStyle){
+              customStyle[loopProp] = scope.column.params.cellStyle[loopProp]
+            }
         }
         this.$emit('cellStyleCallback',scope,customStyle)
         return customStyle