vxe-table 4.13.49 → 4.13.50

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

@@ -93,8 +93,11 @@ 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;
@@ -108,6 +111,13 @@ hooks.add('tableEditModule', {
                 if (treeConfig && transform) {
                     insertTreeRow(newRecords, false);
                 }
+                else if (isRowGroupStatus) {
+                    // 如果分组
+                    if (treeConfig) {
+                        throw new Error(getI18n('vxe.error.noTree', ['insert']));
+                    }
+                    // insertGroupRow(newRecords, false)
+                }
                 else {
                     newRecords.forEach(item => {
                         const rowid = getRowid($xeTable, item);
@@ -132,6 +142,13 @@ hooks.add('tableEditModule', {
                     if (treeConfig && transform) {
                         insertTreeRow(newRecords, true);
                     }
+                    else if (isRowGroupStatus) {
+                        // 如果分组
+                        if (treeConfig) {
+                            throw new Error(getI18n('vxe.error.noTree', ['insert']));
+                        }
+                        // insertGroupRow(newRecords, true)
+                    }
                     else {
                         newRecords.forEach(item => {
                             const rowid = getRowid($xeTable, item);
@@ -196,6 +213,12 @@ hooks.add('tableEditModule', {
                             insertTreeRow(newRecords, true);
                         }
                     }
+                    else if (isRowGroupStatus) {
+                        // 如果分组
+                        if (treeConfig) {
+                            throw new Error(getI18n('vxe.error.noTree', ['insert']));
+                        }
+                    }
                     else {
                         if (treeConfig) {
                             throw new Error(getI18n('vxe.error.noTree', ['insert']));
@@ -481,7 +504,7 @@ hooks.add('tableEditModule', {
              */
             remove(rows) {
                 const { treeConfig } = props;
-                const { editStore } = reactData;
+                const { editStore, isRowGroupStatus } = reactData;
                 const { tableFullTreeData, selectCheckboxMaps, afterFullData, mergeBodyList, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const treeOpts = computeTreeOpts.value;
@@ -540,6 +563,9 @@ hooks.add('tableEditModule', {
                             }
                         });
                     }
+                    else if (isRowGroupStatus) {
+                        // 如果分组
+                    }
                     else {
                         rows.forEach((row) => {
                             const tfIndex = $xeTable.findRowIndexOf(tableFullData, row);

package/es/table/src/columnInfo.js

@@ -43,6 +43,11 @@ 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

@@ -11673,6 +11673,7 @@ 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']);
                 }
             }
@@ -11681,6 +11682,24 @@ 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.49";
+export const version = "4.13.50";
 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${"4.13.49"}`;
+const version = `table v${"4.13.50"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3233,7 +3233,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.13.49";
+const version = "4.13.50";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3721,7 +3721,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.13.49"}`;
+const log_version = `table v${"4.13.50"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3781,6 +3781,11 @@ 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,
@@ -11910,7 +11915,7 @@ if(importConfig&&importOpts.types&&!importOpts.importMethod&&!external_root_XEUt
 //   }
 // }
 // 检查是否有安装需要的模块
-if(props.editConfig&&!$xeTable.insert){errLog('vxe.error.reqModule',['Edit']);}if(props.editRules&&!$xeTable.validate){errLog('vxe.error.reqModule',['Validator']);}if((checkboxOpts.range||props.keyboardConfig||props.mouseConfig)&&!$xeTable.handleCellMousedownEvent){errLog('vxe.error.reqModule',['Keyboard']);}if((props.printConfig||props.importConfig||props.exportConfig)&&!$xeTable.exportData){errLog('vxe.error.reqModule',['Export']);}Object.assign(scrollYStore,{startIndex:0,endIndex:0,visibleSize:0});Object.assign(scrollXStore,{startIndex:0,endIndex:0,visibleSize:0});loadTableData(data||[],true).then(()=>{if(data&&data.length){internalData.inited=true;internalData.initStatus=true;handleLoadDefaults();}handleInitDefaults();updateStyle();});if(props.autoResize){const el=refElem.value;const parentEl=tablePrivateMethods.getParentElem();resizeObserver=table_globalResize.create(()=>{if(props.autoResize){tableMethods.recalculate(true);}});if(el){resizeObserver.observe(el);}if(parentEl){resizeObserver.observe(parentEl);}}});if(virtualYOpts.mode!=='scroll'){const tableViewportEl=refTableViewportElem.value;if(tableViewportEl){tableViewportEl.addEventListener('wheel',$xeTable.triggerBodyWheelEvent,{passive:false});}}table_globalEvents.on($xeTable,'paste',handleGlobalPasteEvent);table_globalEvents.on($xeTable,'copy',handleGlobalCopyEvent);table_globalEvents.on($xeTable,'cut',handleGlobalCutEvent);table_globalEvents.on($xeTable,'mousedown',handleGlobalMousedownEvent);table_globalEvents.on($xeTable,'blur',handleGlobalBlurEvent);table_globalEvents.on($xeTable,'mousewheel',handleGlobalMousewheelEvent);table_globalEvents.on($xeTable,'keydown',handleGlobalKeydownEvent);table_globalEvents.on($xeTable,'resize',handleGlobalResizeEvent);table_globalEvents.on($xeTable,'contextmenu',$xeTable.handleGlobalContextmenuEvent);tablePrivateMethods.preventEvent(null,'mounted',{$table:$xeTable});});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.onBeforeUnmount)(()=>{const tableViewportEl=refTableViewportElem.value;if(tableViewportEl){tableViewportEl.removeEventListener('wheel',$xeTable.triggerBodyWheelEvent);}internalData.cvCacheMaps={};internalData.prevDragRow=null;internalData.prevDragCol=null;if(resizeObserver){resizeObserver.disconnect();}tableMethods.closeFilter();if($xeTable.closeMenu){$xeTable.closeMenu();}tablePrivateMethods.preventEvent(null,'beforeUnmount',{$table:$xeTable});});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.onUnmounted)(()=>{table_globalEvents.off($xeTable,'paste');table_globalEvents.off($xeTable,'copy');table_globalEvents.off($xeTable,'cut');table_globalEvents.off($xeTable,'mousedown');table_globalEvents.off($xeTable,'blur');table_globalEvents.off($xeTable,'mousewheel');table_globalEvents.off($xeTable,'keydown');table_globalEvents.off($xeTable,'resize');table_globalEvents.off($xeTable,'contextmenu');tablePrivateMethods.preventEvent(null,'unmounted',{$table:$xeTable});});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{if(props.loading){if(!VxeUILoadingComponent&&!slots.loading){errLog('vxe.error.reqComp',['vxe-loading']);}}if(props.showOverflow===true||props.showOverflow==='tooltip'||props.showHeaderOverflow===true||props.showHeaderOverflow==='tooltip'||props.showFooterOverflow===true||props.showFooterOverflow==='tooltip'||props.tooltipConfig||props.editRules){if(!VxeUITooltipComponent){errLog('vxe.error.reqComp',['vxe-tooltip']);}}});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeColgroup',null);(0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeTable',$xeTable);$xeTable.renderVN=renderVN;return $xeTable;},render(){return this.renderVN();}}));
+if(props.editConfig&&!$xeTable.insert){errLog('vxe.error.reqModule',['Edit']);}if(props.editRules&&!$xeTable.validate){errLog('vxe.error.reqModule',['Validator']);}if((checkboxOpts.range||props.keyboardConfig||props.mouseConfig)&&!$xeTable.handleCellMousedownEvent){errLog('vxe.error.reqModule',['Keyboard']);}if((props.printConfig||props.importConfig||props.exportConfig)&&!$xeTable.exportData){errLog('vxe.error.reqModule',['Export']);}Object.assign(scrollYStore,{startIndex:0,endIndex:0,visibleSize:0});Object.assign(scrollXStore,{startIndex:0,endIndex:0,visibleSize:0});loadTableData(data||[],true).then(()=>{if(data&&data.length){internalData.inited=true;internalData.initStatus=true;handleLoadDefaults();}handleInitDefaults();updateStyle();});if(props.autoResize){const el=refElem.value;const parentEl=tablePrivateMethods.getParentElem();resizeObserver=table_globalResize.create(()=>{if(props.autoResize){tableMethods.recalculate(true);}});if(el){resizeObserver.observe(el);}if(parentEl){resizeObserver.observe(parentEl);}}});if(virtualYOpts.mode!=='scroll'){const tableViewportEl=refTableViewportElem.value;if(tableViewportEl){tableViewportEl.addEventListener('wheel',$xeTable.triggerBodyWheelEvent,{passive:false});}}table_globalEvents.on($xeTable,'paste',handleGlobalPasteEvent);table_globalEvents.on($xeTable,'copy',handleGlobalCopyEvent);table_globalEvents.on($xeTable,'cut',handleGlobalCutEvent);table_globalEvents.on($xeTable,'mousedown',handleGlobalMousedownEvent);table_globalEvents.on($xeTable,'blur',handleGlobalBlurEvent);table_globalEvents.on($xeTable,'mousewheel',handleGlobalMousewheelEvent);table_globalEvents.on($xeTable,'keydown',handleGlobalKeydownEvent);table_globalEvents.on($xeTable,'resize',handleGlobalResizeEvent);table_globalEvents.on($xeTable,'contextmenu',$xeTable.handleGlobalContextmenuEvent);tablePrivateMethods.preventEvent(null,'mounted',{$table:$xeTable});});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.onBeforeUnmount)(()=>{const tableViewportEl=refTableViewportElem.value;if(tableViewportEl){tableViewportEl.removeEventListener('wheel',$xeTable.triggerBodyWheelEvent);}internalData.cvCacheMaps={};internalData.prevDragRow=null;internalData.prevDragCol=null;if(resizeObserver){resizeObserver.disconnect();}tableMethods.closeFilter();if($xeTable.closeMenu){$xeTable.closeMenu();}tablePrivateMethods.preventEvent(null,'beforeUnmount',{$table:$xeTable});});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.onUnmounted)(()=>{table_globalEvents.off($xeTable,'paste');table_globalEvents.off($xeTable,'copy');table_globalEvents.off($xeTable,'cut');table_globalEvents.off($xeTable,'mousedown');table_globalEvents.off($xeTable,'blur');table_globalEvents.off($xeTable,'mousewheel');table_globalEvents.off($xeTable,'keydown');table_globalEvents.off($xeTable,'resize');table_globalEvents.off($xeTable,'contextmenu');tablePrivateMethods.preventEvent(null,'unmounted',{$table:$xeTable});});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.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']);}}if(props.showOverflow===true||props.showOverflow==='tooltip'||props.showHeaderOverflow===true||props.showHeaderOverflow==='tooltip'||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']);}}});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeColgroup',null);(0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeTable',$xeTable);$xeTable.renderVN=renderVN;return $xeTable;},render(){return this.renderVN();}}));
 ;// ./packages/toolbar/src/toolbar.ts
 
 
@@ -15364,10 +15369,15 @@ edit_hook_hooks.add('tableEditModule', {
         }
       });
     };
+    // const insertGroupRow = (newRecords: any[], isAppend: boolean) => {
+    // }
     const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
       const {
         treeConfig
       } = props;
+      const {
+        isRowGroupStatus
+      } = reactData;
       const {
         tableFullTreeData,
         afterFullData,
@@ -15395,6 +15405,12 @@ edit_hook_hooks.add('tableEditModule', {
         // 如果为虚拟树
         if (treeConfig && transform) {
           insertTreeRow(newRecords, false);
+        } else if (isRowGroupStatus) {
+          // 如果分组
+          if (treeConfig) {
+            throw new Error(hook_getI18n('vxe.error.noTree', ['insert']));
+          }
+          // insertGroupRow(newRecords, false)
         } else {
           newRecords.forEach(item => {
             const rowid = getRowid($xeTable, item);
@@ -15434,6 +15450,12 @@ edit_hook_hooks.add('tableEditModule', {
           // 如果为虚拟树
           if (treeConfig && transform) {
             insertTreeRow(newRecords, true);
+          } else if (isRowGroupStatus) {
+            // 如果分组
+            if (treeConfig) {
+              throw new Error(hook_getI18n('vxe.error.noTree', ['insert']));
+            }
+            // insertGroupRow(newRecords, true)
           } else {
             newRecords.forEach(item => {
               const rowid = getRowid($xeTable, item);
@@ -15534,6 +15556,11 @@ edit_hook_hooks.add('tableEditModule', {
               warnLog('vxe.error.unableInsert');
               insertTreeRow(newRecords, true);
             }
+          } else if (isRowGroupStatus) {
+            // 如果分组
+            if (treeConfig) {
+              throw new Error(hook_getI18n('vxe.error.noTree', ['insert']));
+            }
           } else {
             if (treeConfig) {
               throw new Error(hook_getI18n('vxe.error.noTree', ['insert']));
@@ -15868,7 +15895,8 @@ edit_hook_hooks.add('tableEditModule', {
           treeConfig
         } = props;
         const {
-          editStore
+          editStore,
+          isRowGroupStatus
         } = reactData;
         const {
           tableFullTreeData,
@@ -15945,6 +15973,8 @@ edit_hook_hooks.add('tableEditModule', {
                 afterFullData.splice(afIndex, 1);
               }
             });
+          } else if (isRowGroupStatus) {
+            // 如果分组
           } else {
             rows.forEach(row => {
               const tfIndex = $xeTable.findRowIndexOf(tableFullData, row);