doway-coms 2.10.67 → 2.10.69

package/package.json

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

package/packages/BaseForm/src/index.vue

@@ -852,7 +852,7 @@ export default {
   top: 0px;
   right: 0px;
   padding: 4px 8px;
-  z-index: 1000;
+  z-index: 100;
   background-color: #fff; // 添加背景色使按钮更突出
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); // 添加阴影效果
   border-radius: 4px;

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
@@ -3063,7 +3066,7 @@ export default {
         }
       }
     },
-    cellClick({ row, column }) {
+    async cellClick({ row, column }) {
       this.$emit('cellClick', { row, column })
       //判断是否可以跳转
       if (
@@ -3101,6 +3104,32 @@ export default {
         return
       }
       // column.editRender.enabled = false
+
+          // 检查其他行的编辑状态
+  const checkEditStatus = async () => {
+    let maxAttempts = 10 // 最大尝试次数
+    let attempt = 0
+    
+    while (attempt < maxAttempts) {
+      const editingRecord = this.$refs.baseGrid.getEditRecord()
+      // 如果没有正在编辑的行，或者只有当前行在编辑，则退出等待
+      if (!editingRecord || editingRecord.row===row) {
+        // console.debug('当前行编辑')
+        return true
+      }
+      // console.debug('等待',editingRecord.sort)
+      // 等待100ms后重试
+      await new Promise(resolve => setTimeout(resolve, 5))
+      attempt++
+    }
+    return false
+  }
+  // 等待其他行编辑状态关闭
+  await checkEditStatus()
+
+      //检查是否存在其他行还是编辑状态，如果还是编辑状态就等待关闭编辑状态后再执行当前行的编辑
+      //因为会存在如果有校验的话会存在切换快，并且页面卡顿的情况的话会出现当前行打开编辑后又
+
       if (column.editRender && column.editRender.enabled === true) {
         this.$refs.baseGrid.setEditCell(row, column)
       } else {
@@ -3124,7 +3153,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 +3179,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

package/packages/BasePulldown/src/index.vue

@@ -1317,6 +1317,9 @@ export default {
 
     //   清除筛选条件
     clearColumnFilter() {
+      if(!this.$refs.pupupGridView){
+        return
+      }
       let columns = []
       let vm = this
       try {