vxe-table 4.13.47 → 4.13.49

package/packages/table/src/table.ts

@@ -772,10 +772,10 @@ export default defineVxeComponent({
     })
 
     const computeTableRowExpandedList = computed(() => {
-      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)
@@ -6241,7 +6241,6 @@ export default defineVxeComponent({
       },
       setRowGroups (fieldOrColumns) {
         const { aggregateConfig, rowGroupConfig } = props
-        const { rowGroupList } = reactData
         const aggregateOpts = computeAggregateOpts.value
         const { maxGroupSize } = aggregateOpts
         if (!(aggregateConfig || rowGroupConfig)) {
@@ -6249,7 +6248,7 @@ export default defineVxeComponent({
           return nextTick()
         }
         const confList = fieldOrColumns ? (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]) : []
-        if (maxGroupSize && (rowGroupList.length + confList.length > maxGroupSize)) {
+        if (maxGroupSize && confList.length > maxGroupSize) {
           if (VxeUI.modal) {
             VxeUI.modal.message({
               status: 'error',
@@ -8422,7 +8421,8 @@ export default defineVxeComponent({
             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) => {
@@ -8455,15 +8455,25 @@ export default defineVxeComponent({
                 }
             )
 
-            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)
@@ -8502,7 +8512,9 @@ export default defineVxeComponent({
         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))
@@ -8519,9 +8531,9 @@ export default defineVxeComponent({
               vLen++
             } else {
               if (selected) {
-                sLen++
+                dsLen++
               } else if (treeIndeterminateRowMaps[childRowid]) {
-                hLen++
+                dhLen++
               }
             }
           }
@@ -8537,7 +8549,7 @@ export default defineVxeComponent({
           })
 
         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) {

package/packages/ui/index.ts

@@ -149,7 +149,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 {