doway-coms 2.10.58 → 2.10.60

package/package.json

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

package/packages/BaseForm/src/index.vue

@@ -447,10 +447,12 @@ export default {
       let layoutFormStyle = {
         display: 'flex',
         columnGap: this.flexGap+ 'px',
+        rowGap:'7px',
         flexFlow: 'row wrap',
         justifyContent: 'flex-start',
         padding: '5px 5px 0px 5px',
-        overflowY: 'auto'
+        overflowY: 'auto',
+        paddingBottom:'7px'
        }
 
        if(this.layoutType==='grid'){

package/packages/BaseGrid/src/index.vue

@@ -3124,6 +3124,9 @@ export default {
     },
     headerCellStyleFunc(scope){
         let customStyle = {}
+        if(this.$store.getters.baseSetting?.gridHeaderCellStyle){
+          customStyle = this.$store.getters.baseSetting.gridHeaderCellStyle
+        }
         if(this.headerCellStyle){
           customStyle =  this.headerCellStyle
         }

package/packages/utils/store.js

@@ -49,6 +49,9 @@ export default new Vuex.Store({
         SET_STAFFID: (state, staffId) => {
             state.staffId = staffId
         },
+        SET_GRID_HEADER_CELL_STYLE(state,gridHeaderCellStyle){
+            state.
+        },
         SET_INDUSTRY_VERSION: (state, industryVersion) => {
             state.industryVersion = industryVersion
         },