vxe-table 3.15.48 → 3.15.49

package/es/table/src/methods.js

@@ -6844,7 +6844,8 @@ const Methods = {
                 const childList = vals[2];
                 let sLen = 0; // 已选
                 let hLen = 0; // 半选
-                let vLen = 0; // 有效行
+                let vLen = 0; // 有效子行
+                const cLen = childList.length; // 有效子行
                 childList.forEach(checkMethod
                     ? (item) => {
                         const childRowid = handleGetRowId(item);
@@ -6878,16 +6879,29 @@ const Methods = {
                         }
                         vLen++;
                     });
-                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;
+                        }
                     }
                 }
-                const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
+                else {
+                    // 如果无子项
+                    isSelected = selectCheckboxMaps[rowid];
+                }
+                const halfSelect = !isSelected && (sLen > 0 || hLen > 0);
                 if (checkField) {
                     XEUtils.set(row, checkField, isSelected);
                 }
@@ -6930,7 +6944,9 @@ const Methods = {
         const { checkField, checkMethod, showReserveStatus } = checkboxOpts;
         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));
         rootList.forEach(checkMethod
@@ -6948,10 +6964,10 @@ const Methods = {
                 }
                 else {
                     if (selected) {
-                        sLen++;
+                        dsLen++;
                     }
                     else if (treeIndeterminateRowMaps[childRowid]) {
-                        hLen++;
+                        dhLen++;
                     }
                 }
             }
@@ -6967,7 +6983,7 @@ const Methods = {
                 vLen++;
             });
         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) {
             halfSelect = !XEUtils.isEmpty(checkboxReserveRowMap);

package/es/table/src/table.js

@@ -1111,10 +1111,10 @@ export default {
             const $xeTable = this;
             const reactData = $xeTable;
             const internalData = $xeTable;
-            const { rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData;
+            const { tableData, rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData;
             const { visibleDataRowIdData, rowExpandedMaps } = internalData;
             const expandList = [];
-            if (expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
+            if (tableData.length && expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
                 XEUtils.each(rowExpandedMaps, (row, rowid) => {
                     if (visibleDataRowIdData[rowid]) {
                         expandList.push(row);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.48";
+export const version = "3.15.49";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.15.48"}`;
+const version = `table v${"3.15.49"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.common.js

@@ -17,6 +17,5 @@ Object.keys(VxeTableExport).forEach(function (key) {
     }
   });
 });
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 var _default = exports.default = VxeTableExport;