vxe-table 4.13.52 → 4.14.0-beta.1

package/es/table/module/edit/hook.js

@@ -93,11 +93,8 @@ hooks.add('tableEditModule', {
                 }
             });
         };
-        // const insertGroupRow = (newRecords: any[], isAppend: boolean) => {
-        // }
         const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
             const { treeConfig } = props;
-            const { isRowGroupStatus } = reactData;
             const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const { transform, rowField, mapChildrenField } = treeOpts;
@@ -111,14 +108,6 @@ hooks.add('tableEditModule', {
                 if (treeConfig && transform) {
                     insertTreeRow(newRecords, false);
                 }
-                else if (isRowGroupStatus) {
-                    // 如果分组
-                    if (treeConfig) {
-                        throw new Error(getI18n('vxe.error.noTree', ['insert']));
-                    }
-                    warnLog(getI18n('vxe.error.noGroup', ['remove']));
-                    // insertGroupRow(newRecords, false)
-                }
                 else {
                     newRecords.forEach(item => {
                         const rowid = getRowid($xeTable, item);
@@ -143,14 +132,6 @@ hooks.add('tableEditModule', {
                     if (treeConfig && transform) {
                         insertTreeRow(newRecords, true);
                     }
-                    else if (isRowGroupStatus) {
-                        // 如果分组
-                        if (treeConfig) {
-                            throw new Error(getI18n('vxe.error.noTree', ['insert']));
-                        }
-                        warnLog(getI18n('vxe.error.noGroup', ['remove']));
-                        // insertGroupRow(newRecords, true)
-                    }
                     else {
                         newRecords.forEach(item => {
                             const rowid = getRowid($xeTable, item);
@@ -215,13 +196,6 @@ hooks.add('tableEditModule', {
                             insertTreeRow(newRecords, true);
                         }
                     }
-                    else if (isRowGroupStatus) {
-                        // 如果分组
-                        if (treeConfig) {
-                            throw new Error(getI18n('vxe.error.noTree', ['insert']));
-                        }
-                        warnLog(getI18n('vxe.error.noGroup', ['remove']));
-                    }
                     else {
                         if (treeConfig) {
                             throw new Error(getI18n('vxe.error.noTree', ['insert']));
@@ -507,7 +481,7 @@ hooks.add('tableEditModule', {
              */
             remove(rows) {
                 const { treeConfig } = props;
-                const { editStore, isRowGroupStatus } = reactData;
+                const { editStore } = reactData;
                 const { tableFullTreeData, selectCheckboxMaps, afterFullData, mergeBodyList, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const treeOpts = computeTreeOpts.value;
@@ -566,10 +540,6 @@ hooks.add('tableEditModule', {
                             }
                         });
                     }
-                    else if (isRowGroupStatus) {
-                        // 如果分组
-                        warnLog(getI18n('vxe.error.noGroup', ['remove']));
-                    }
                     else {
                         rows.forEach((row) => {
                             const tfIndex = $xeTable.findRowIndexOf(tableFullData, row);

package/es/table/module/filter/hook.js

@@ -5,7 +5,7 @@ import { toFilters, handleFieldOrColumn, getRefElem } from '../../src/util';
 import { toCssUnit, triggerEvent, getDomNode } from '../../../ui/src/dom';
 import { isEnableConf } from '../../../ui/src/utils';
 const { renderer, hooks } = VxeUI;
-const tableFilterMethodKeys = ['openFilter', 'setFilter', 'clearFilter', 'saveFilterPanel', 'saveFilterPanelByEvent', 'resetFilterPanel', 'resetFilterPanelByEvent', 'getCheckedFilters', 'updateFilterOptionStatus'];
+const tableFilterMethodKeys = ['openFilter', 'setFilter', 'clearFilter', 'saveFilterPanel', 'resetFilterPanel', 'getCheckedFilters', 'updateFilterOptionStatus'];
 hooks.add('tableFilterModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;

package/es/table/module/keyboard/hook.js

@@ -272,8 +272,8 @@ hooks.add('tableKeyboardModule', {
             const checkboxOpts = computeCheckboxOpts.value;
             const mouseOpts = computeMouseOpts.value;
             const editOpts = computeEditOpts.value;
-            if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaMousedownEvent) {
-                return $xeTable.triggerCellAreaMousedownEvent(evnt, params);
+            if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaMousednEvent) {
+                return $xeTable.triggerCellAreaMousednEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {

package/es/table/src/columnInfo.js

@@ -43,11 +43,6 @@ export class ColumnInfo {
                 }
             }
         }
-        if (_vm.aggFunc) {
-            if (!$xeTable.handlePivotTableAggregateData && _vm.aggFunc !== true) {
-                errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
-            }
-        }
         Object.assign(this, {
             // 基本属性
             type: _vm.type,

package/es/table/src/table.js

@@ -680,10 +680,10 @@ export default defineVxeComponent({
             return Object.assign({}, getConfig().table.customConfig, props.customConfig);
         });
         const computeTableRowExpandedList = computed(() => {
-            const { tableData, rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData;
+            const { rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData;
             const { visibleDataRowIdData, rowExpandedMaps } = internalData;
             const expandList = [];
-            if (tableData.length && expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
+            if (expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
                 XEUtils.each(rowExpandedMaps, (row, rowid) => {
                     if (visibleDataRowIdData[rowid]) {
                         expandList.push(row);
@@ -8285,8 +8285,7 @@ export default defineVxeComponent({
                         const childList = vals[2];
                         let sLen = 0; // 已选
                         let hLen = 0; // 半选
-                        let vLen = 0; // 有效子行
-                        const cLen = childList.length; // 有效子行
+                        let vLen = 0; // 有效行
                         childList.forEach(checkMethod
                             ? (item) => {
                                 const childRowid = handleGetRowId(item);
@@ -8320,29 +8319,16 @@ export default defineVxeComponent({
                                 }
                                 vLen++;
                             });
-                        let isSelected = false;
-                        if (cLen > 0) {
-                            if (vLen > 0) {
-                                isSelected = (sLen > 0 || hLen > 0) && sLen >= vLen;
+                        let isSelected = (sLen >= vLen && (vLen >= 1 || hLen >= 1));
+                        if (checkMethod) {
+                            if (checkMethod({ $table: $xeTable, row })) {
+                                isSelected = sLen >= vLen;
                             }
                             else {
-                                // 如果存在子项禁用
-                                if ((sLen > 0 && sLen >= vLen)) {
-                                    isSelected = true;
-                                }
-                                else if (selectCheckboxMaps[rowid]) {
-                                    isSelected = true;
-                                }
-                                else {
-                                    isSelected = false;
-                                }
+                                isSelected = selectCheckboxMaps[rowid];
                             }
                         }
-                        else {
-                            // 如果无子项
-                            isSelected = selectCheckboxMaps[rowid];
-                        }
-                        const halfSelect = !isSelected && (sLen > 0 || hLen > 0);
+                        const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
                         if (checkField) {
                             XEUtils.set(row, checkField, isSelected);
                         }
@@ -8381,9 +8367,7 @@ export default defineVxeComponent({
                 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
@@ -8401,10 +8385,10 @@ export default defineVxeComponent({
                         }
                         else {
                             if (selected) {
-                                dsLen++;
+                                sLen++;
                             }
                             else if (treeIndeterminateRowMaps[childRowid]) {
-                                dhLen++;
+                                hLen++;
                             }
                         }
                     }
@@ -8420,7 +8404,7 @@ export default defineVxeComponent({
                         vLen++;
                     });
                 const isSelected = rootList.length > 0 ? (vLen > 0 ? (sLen >= vLen) : (sLen >= rootList.length)) : false;
-                let halfSelect = !isSelected && (sLen > 0 || hLen > 0 || dsLen > 0 || dhLen > 0);
+                let halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
                 // 如果复选框启用保留记录，当保留数据存在时显示半选
                 if (!isSelected && !halfSelect && showReserveStatus) {
                     halfSelect = !XEUtils.isEmpty(checkboxReserveRowMap);
@@ -9387,8 +9371,6 @@ export default defineVxeComponent({
                                 }, evnt);
                             }
                             return nextTick().then(() => {
-                                updateRowOffsetTop();
-                                updateRowExpandStyle();
                                 $xeTable.updateCellAreas();
                                 $xeTable.recalculate();
                             }).then(() => {
@@ -11491,7 +11473,7 @@ export default defineVxeComponent({
                 if (rowOpts.height && !props.showOverflow) {
                     warnLog('vxe.error.notProp', ['table.show-overflow']);
                 }
-                if (!$xeTable.triggerCellAreaMousedownEvent) {
+                if (!$xeTable.triggerCellAreaMousednEvent) {
                     if (props.areaConfig) {
                         warnLog('vxe.error.notProp', ['area-config']);
                     }
@@ -11675,7 +11657,6 @@ export default defineVxeComponent({
         nextTick(() => {
             if (props.loading) {
                 if (!VxeUILoadingComponent && !slots.loading) {
-                    errLog('vxe.error.errProp', ['loading=true', 'loading=false | <template #loading>...</template>']);
                     errLog('vxe.error.reqComp', ['vxe-loading']);
                 }
             }
@@ -11684,24 +11665,6 @@ export default defineVxeComponent({
                 (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
                 props.tooltipConfig || props.editRules) {
                 if (!VxeUITooltipComponent) {
-                    if (props.showOverflow === true) {
-                        errLog('vxe.error.errProp', ['show-overflow=true', 'show-overflow=title']);
-                    }
-                    if (props.showOverflow === 'tooltip') {
-                        errLog('vxe.error.errProp', ['show-overflow=tooltip', 'show-overflow=title']);
-                    }
-                    if (props.showHeaderOverflow === true) {
-                        errLog('vxe.error.errProp', ['show-header-overflow=true', 'show-header-overflow=title']);
-                    }
-                    if (props.showHeaderOverflow === 'tooltip') {
-                        errLog('vxe.error.errProp', ['show-header-overflow=tooltip', 'show-header-overflow=title']);
-                    }
-                    if (props.showFooterOverflow === true) {
-                        errLog('vxe.error.errProp', ['show-footer-overflow=true', 'show-footer-overflow=title']);
-                    }
-                    if (props.showFooterOverflow === 'tooltip') {
-                        errLog('vxe.error.errProp', ['show-footer-overflow=tooltip', 'show-footer-overflow=title']);
-                    }
                     errLog('vxe.error.reqComp', ['vxe-tooltip']);
                 }
             }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.13.52";
+export const version = "4.14.0-beta.1";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -252,7 +252,7 @@ VxeUI.setConfig({
             autoLoad: true,
             showResponseMsg: true,
             showActiveMsg: true,
-            props: {
+            response: {
                 list: null,
                 result: 'result',
                 total: 'page.total',

package/es/ui/src/log.js

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