vxe-table 3.15.47 → 3.15.49

package/packages/table/src/methods.ts

@@ -7063,7 +7063,8 @@ const Methods = {
         const childList: any[] = vals[2]
         let sLen = 0 // 已选
         let hLen = 0 // 半选
-        let vLen = 0 // 有效行
+        let vLen = 0 // 有效子行
+        const cLen = childList.length // 有效子行
         childList.forEach(
           checkMethod
             ? (item) => {
@@ -7096,15 +7097,25 @@ const Methods = {
             }
         )
 
-        let isSelected = (sLen >= vLen && (vLen >= 1 || hLen >= 1))
-        if (checkMethod) {
-          if (checkMethod({ $table: $xeTable, row })) {
-            isSelected = sLen >= vLen
+        let isSelected = false
+        if (cLen > 0) {
+          if (vLen > 0) {
+            isSelected = (sLen > 0 || hLen > 0) && sLen >= vLen
           } else {
-            isSelected = selectCheckboxMaps[rowid]
+            // 如果存在子项禁用
+            if ((sLen > 0 && sLen >= vLen)) {
+              isSelected = true
+            } else if (selectCheckboxMaps[rowid]) {
+              isSelected = true
+            } else {
+              isSelected = false
+            }
           }
+        } else {
+          // 如果无子项
+          isSelected = selectCheckboxMaps[rowid]
         }
-        const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1)
+        const halfSelect = !isSelected && (sLen > 0 || hLen > 0)
 
         if (checkField) {
           XEUtils.set(row, checkField, isSelected)
@@ -7148,7 +7159,9 @@ const Methods = {
     const { handleGetRowId } = createHandleGetRowId($xeTable)
 
     let sLen = 0 // 已选
+    let dsLen = 0 // 禁用的已选
     let hLen = 0 // 半选
+    let dhLen = 0 // 禁用的半选
     let vLen = 0 // 有效行
 
     const rootList = (treeConfig ? afterTreeFullData : (isRowGroupStatus ? afterGroupFullData : afterFullData))
@@ -7165,9 +7178,9 @@ const Methods = {
           vLen++
         } else {
           if (selected) {
-            sLen++
+            dsLen++
           } else if (treeIndeterminateRowMaps[childRowid]) {
-            hLen++
+            dhLen++
           }
         }
       }
@@ -7183,7 +7196,7 @@ const Methods = {
       })
 
     const isSelected = rootList.length > 0 ? (vLen > 0 ? (sLen >= vLen) : (sLen >= rootList.length)) : false
-    let halfSelect = !isSelected && (sLen >= 1 || hLen >= 1)
+    let halfSelect = !isSelected && (sLen > 0 || hLen > 0 || dsLen > 0 || dhLen > 0)
 
     // 如果复选框启用保留记录，当保留数据存在时显示半选
     if (!isSelected && !halfSelect && showReserveStatus) {
@@ -9164,12 +9177,24 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     const { aggregateConfig, rowGroupConfig } = props
+    const aggregateOpts = $xeTable.computeAggregateOpts
+    const { maxGroupSize } = aggregateOpts
     if (!(aggregateConfig || rowGroupConfig)) {
       errLog('vxe.error.reqProp', ['aggregate-config'])
       return $xeTable.$nextTick()
     }
-    if (fieldOrColumns) {
-      handleUpdateRowGroup($xeTable, (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]).map(fieldOrColumn => {
+    const confList = fieldOrColumns ? (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]) : []
+    if (maxGroupSize && confList.length > maxGroupSize) {
+      if (VxeUI.modal) {
+        VxeUI.modal.message({
+          status: 'error',
+          content: getI18n('vxe.table.maxGroupCol', [maxGroupSize])
+        })
+      }
+      return $xeTable.$nextTick()
+    }
+    if (confList.length) {
+      handleUpdateRowGroup($xeTable, confList.map(fieldOrColumn => {
         return XEUtils.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field
       }))
       return loadTableData($xeTable, internalData.tableSynchData, true)

package/packages/table/src/table.ts

@@ -1193,10 +1193,10 @@ export default {
       const reactData = $xeTable as unknown as TableReactData
       const internalData = $xeTable as unknown as TableInternalData
 
-      const { rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData
+      const { tableData, rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData
       const { visibleDataRowIdData, rowExpandedMaps } = internalData
       const expandList: any[] = []
-      if (expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
+      if (tableData.length && expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
         XEUtils.each(rowExpandedMaps, (row, rowid) => {
           if (visibleDataRowIdData[rowid]) {
             expandList.push(row)

package/packages/ui/index.ts

@@ -150,7 +150,8 @@ VxeUI.setConfig({
       mapChildrenField: '_X_ROW_CHILD_LIST',
       indent: 20,
       showIcon: true,
-      maxGroupSize: 4
+      maxGroupSize: 4,
+      showAggFuncTitle: true
     },
     treeConfig: {
       padding: true,

package/styles/components/table-module/custom.scss

@@ -218,12 +218,16 @@
 
 .vxe-table-custom-popup--body-wrapper {
   position: relative;
-  overflow: auto;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
   height: 100%;
   outline: 0;
 }
 .vxe-table-custom-popup--handle-wrapper {
+  flex-grow: 1;
   outline: 0;
+  overflow: auto;
 }
 
 .vxe-table-custom-popup--table-wrapper {