vxe-table 3.15.52 → 3.16.0-beta.1

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

@@ -86,14 +86,11 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         }
     });
 }
-// function insertGroupRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, newRecords: any[], isAppend: boolean) {
-// }
 function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { treeConfig } = props;
-    const { isRowGroupStatus } = reactData;
     const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const { transform, rowField, mapChildrenField } = treeOpts;
@@ -107,14 +104,6 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         if (treeConfig && transform) {
             insertTreeRow($xeTable, newRecords, false);
         }
-        else if (isRowGroupStatus) {
-            // 如果分组
-            if (treeConfig) {
-                throw new Error(getI18n('vxe.error.noTree', ['insert']));
-            }
-            warnLog(getI18n('vxe.error.noGroup', ['remove']));
-            // insertGroupRow($xeTable, newRecords, false)
-        }
         else {
             newRecords.forEach(item => {
                 const rowid = getRowid($xeTable, item);
@@ -139,14 +128,6 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             if (treeConfig && transform) {
                 insertTreeRow($xeTable, newRecords, true);
             }
-            else if (isRowGroupStatus) {
-                // 如果分组
-                if (treeConfig) {
-                    throw new Error(getI18n('vxe.error.noTree', ['insert']));
-                }
-                warnLog(getI18n('vxe.error.noGroup', ['remove']));
-                // insertGroupRow($xeTable, newRecords, false)
-            }
             else {
                 newRecords.forEach(item => {
                     const rowid = getRowid($xeTable, item);
@@ -211,13 +192,6 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     insertTreeRow($xeTable, 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']));
@@ -515,7 +489,7 @@ export default {
             const reactData = $xeTable;
             const internalData = $xeTable;
             const { treeConfig } = props;
-            const { editStore, isRowGroupStatus } = reactData;
+            const { editStore } = reactData;
             const { tableFullTreeData, selectCheckboxMaps, afterFullData, mergeBodyList, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData;
             const checkboxOpts = $xeTable.computeCheckboxOpts;
             const treeOpts = $xeTable.computeTreeOpts;
@@ -574,10 +548,6 @@ export default {
                         }
                     });
                 }
-                else if (isRowGroupStatus) {
-                    // 如果分组
-                    warnLog(getI18n('vxe.error.noGroup', ['remove']));
-                }
                 else {
                     rows.forEach((row) => {
                         const tfIndex = this.findRowIndexOf(tableFullData, row);

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

@@ -352,8 +352,8 @@ export default {
         handleCellMousedownEvent(evnt, params) {
             const $xeTable = this;
             const { editConfig, editOpts, handleSelected, checkboxConfig, checkboxOpts, mouseConfig, mouseOpts } = this;
-            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

@@ -9,7 +9,7 @@ export class ColumnInfo {
     constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
         const tableProps = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
-        const proxyOpts = $xeGrid ? $xeGrid.proxyOpts : null;
+        const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
         const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
@@ -48,11 +48,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/methods.js

@@ -6844,8 +6844,7 @@ const Methods = {
                 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);
@@ -6879,29 +6878,16 @@ const Methods = {
                         }
                         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);
                 }
@@ -6944,9 +6930,7 @@ 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
@@ -6964,10 +6948,10 @@ const Methods = {
                 }
                 else {
                     if (selected) {
-                        dsLen++;
+                        sLen++;
                     }
                     else if (treeIndeterminateRowMaps[childRowid]) {
-                        dhLen++;
+                        hLen++;
                     }
                 }
             }
@@ -6983,7 +6967,7 @@ const Methods = {
                 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);
@@ -7900,8 +7884,6 @@ const Methods = {
                         }, evnt);
                     }
                     return $xeTable.$nextTick().then(() => {
-                        updateRowOffsetTop($xeTable);
-                        updateRowExpandStyle($xeTable);
                         $xeTable.updateCellAreas();
                         $xeTable.recalculate();
                     }).then(() => {

package/es/table/src/table.js

@@ -1111,10 +1111,10 @@ export default {
             const $xeTable = this;
             const reactData = $xeTable;
             const internalData = $xeTable;
-            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);
@@ -1557,7 +1557,7 @@ export default {
         if (rowOpts.height && !this.showOverflow) {
             warnLog('vxe.error.notProp', ['table.show-overflow']);
         }
-        if (!$xeTable.triggerCellAreaMousedownEvent) {
+        if (!$xeTable.triggerCellAreaMousednEvent) {
             if (props.areaConfig) {
                 warnLog('vxe.error.notProp', ['area-config']);
             }
@@ -1742,7 +1742,6 @@ export default {
         $xeTable.$nextTick(() => {
             if (props.loading) {
                 if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
-                    errLog('vxe.error.errProp', ['loading=true', 'loading=false | <template #loading>...</template>']);
                     errLog('vxe.error.reqComp', ['vxe-loading']);
                 }
             }
@@ -1751,24 +1750,6 @@ export default {
                 (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 = "3.15.52";
+export const version = "3.16.0-beta.1";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -253,7 +253,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${"3.15.52"}`;
+const version = `table v${"3.16.0-beta.1"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);