vxe-table 3.15.49 → 3.15.50

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

@@ -86,11 +86,14 @@ 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;
@@ -104,6 +107,13 @@ 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']));
+            }
+            // insertGroupRow($xeTable, newRecords, false)
+        }
         else {
             newRecords.forEach(item => {
                 const rowid = getRowid($xeTable, item);
@@ -128,6 +138,13 @@ 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']));
+                }
+                // insertGroupRow($xeTable, newRecords, false)
+            }
             else {
                 newRecords.forEach(item => {
                     const rowid = getRowid($xeTable, item);
@@ -192,6 +209,12 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     insertTreeRow($xeTable, 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']));
@@ -489,7 +512,7 @@ export default {
             const reactData = $xeTable;
             const internalData = $xeTable;
             const { treeConfig } = props;
-            const { editStore } = reactData;
+            const { editStore, isRowGroupStatus } = reactData;
             const { tableFullTreeData, selectCheckboxMaps, afterFullData, mergeBodyList, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData;
             const checkboxOpts = $xeTable.computeCheckboxOpts;
             const treeOpts = $xeTable.computeTreeOpts;
@@ -548,6 +571,9 @@ export default {
                         }
                     });
                 }
+                else if (isRowGroupStatus) {
+                    // 如果分组
+                }
                 else {
                     rows.forEach((row) => {
                         const tfIndex = this.findRowIndexOf(tableFullData, row);

package/es/table/src/columnInfo.js

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

@@ -1742,6 +1742,7 @@ 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']);
                 }
             }
@@ -1750,6 +1751,24 @@ 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.49";
+export const version = "3.15.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${"3.15.49"}`;
+const version = `table v${"3.15.50"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3234,7 +3234,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.15.49";
+const version = "3.15.50";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3906,7 +3906,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.49"}`;
+const log_version = `table v${"3.15.50"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3969,6 +3969,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,
@@ -24211,6 +24216,8 @@ 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;
@@ -24218,6 +24225,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
   const {
     treeConfig
   } = props;
+  const {
+    isRowGroupStatus
+  } = reactData;
   const {
     tableFullTreeData,
     afterFullData,
@@ -24245,6 +24255,12 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     // 如果为虚拟树
     if (treeConfig && transform) {
       insertTreeRow($xeTable, newRecords, false);
+    } else if (isRowGroupStatus) {
+      // 如果分组
+      if (treeConfig) {
+        throw new Error(mixin_getI18n('vxe.error.noTree', ['insert']));
+      }
+      // insertGroupRow($xeTable, newRecords, false)
     } else {
       newRecords.forEach(item => {
         const rowid = getRowid($xeTable, item);
@@ -24284,6 +24300,12 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
       // 如果为虚拟树
       if (treeConfig && transform) {
         insertTreeRow($xeTable, newRecords, true);
+      } else if (isRowGroupStatus) {
+        // 如果分组
+        if (treeConfig) {
+          throw new Error(mixin_getI18n('vxe.error.noTree', ['insert']));
+        }
+        // insertGroupRow($xeTable, newRecords, false)
       } else {
         newRecords.forEach(item => {
           const rowid = getRowid($xeTable, item);
@@ -24384,6 +24406,11 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           warnLog('vxe.error.unableInsert');
           insertTreeRow($xeTable, newRecords, true);
         }
+      } else if (isRowGroupStatus) {
+        // 如果分组
+        if (treeConfig) {
+          throw new Error(mixin_getI18n('vxe.error.noTree', ['insert']));
+        }
       } else {
         if (treeConfig) {
           throw new Error(mixin_getI18n('vxe.error.noTree', ['insert']));
@@ -24730,7 +24757,8 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
         treeConfig
       } = props;
       const {
-        editStore
+        editStore,
+        isRowGroupStatus
       } = reactData;
       const {
         tableFullTreeData,
@@ -24807,6 +24835,8 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
               afterFullData.splice(afIndex, 1);
             }
           });
+        } else if (isRowGroupStatus) {
+          // 如果分组
         } else {
           rows.forEach(row => {
             const tfIndex = this.findRowIndexOf(tableFullData, row);
@@ -30729,11 +30759,30 @@ function renderBody(h, $xeTable) {
     $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']);
         }
       }
       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']);
         }
       }