vxe-table 3.18.0-beta.4 → 3.18.0-beta.6

package/es/table/src/cell.js

@@ -369,6 +369,8 @@ export const Cell = {
         const { isRowGroupStatus } = tableReactData;
         const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
         const renderOpts = editRender || cellRender;
+        const defaultSlot = slots ? slots.default : null;
+        const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null;
         let cellValue = '';
         if (isRowGroupStatus && field && row.isAggregate) {
             const aggRow = row;
@@ -387,15 +389,23 @@ export const Cell = {
                 groupColumn: (colRest ? colRest.column : null),
                 column,
                 groupValue: groupContent,
-                children: childList,
+                childList,
                 childCount,
                 aggValue: null,
+                /**
+                 * 已废弃
+                 * @deprecated
+                 */
+                children: childList,
                 /**
                  * 已废弃
                  * @deprecated
                  */
                 totalValue: childCount
             };
+            if (gcSlot) {
+                return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childList, childCount }, params), h));
+            }
             if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
                 cellValue = groupContent;
                 if (contentMethod) {
@@ -416,8 +426,8 @@ export const Cell = {
             }
         }
         else {
-            if (slots && slots.default) {
-                return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
+            if (defaultSlot) {
+                return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
             }
             if (renderOpts) {
                 const compConf = renderer.get(renderOpts.name);
@@ -1116,10 +1126,14 @@ export const Cell = {
         return Cell.renderDeepNodeBtn(h, params, Cell.renderCellEdit(h, params));
     },
     runRenderer(h, params, _vm, isEdit) {
-        const { $table, column } = params;
-        const { slots, editRender, formatter } = column;
+        const { $table, row, column } = params;
+        const tableReactData = $table;
+        const { isRowGroupStatus } = tableReactData;
+        const { slots, field, editRender, formatter } = column;
         const compConf = renderer.get(editRender.name);
         const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null;
+        const defaultSlot = slots ? slots.default : null;
+        const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null;
         const cellParams = Object.assign({ $type: '', isEdit }, params);
         if (isEdit) {
             if (slots && slots.edit) {
@@ -1130,8 +1144,22 @@ export const Cell = {
             }
             return [];
         }
-        if (slots && slots.default) {
-            return renderCellBaseVNs(h, params, $table.callSlot(slots.default, cellParams, h));
+        if (isRowGroupStatus && field && row.isAggregate) {
+            const aggRow = row;
+            const aggregateOpts = $table.computeAggregateOpts;
+            const { mapChildrenField } = aggregateOpts;
+            const groupField = aggRow.groupField;
+            const groupContent = aggRow.groupContent;
+            const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : [];
+            const childCount = aggRow.childCount;
+            if (gcSlot) {
+                return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childList, childCount }, params), h));
+            }
+        }
+        else {
+            if (defaultSlot) {
+                return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, cellParams, h));
+            }
         }
         if (formatter) {
             return renderCellBaseVNs(h, params, [

package/es/table/src/methods.js

@@ -3032,6 +3032,7 @@ function loadTableData($xeTable, datas, isReset) {
     }).then(() => {
         computeScrollLoad($xeTable);
     }).then(() => {
+        const virtualYOpts = $xeTable.computeVirtualYOpts;
         // 是否启用了虚拟滚动
         if (sYLoad) {
             scrollYStore.endIndex = scrollYStore.visibleSize;
@@ -3040,6 +3041,9 @@ function loadTableData($xeTable, datas, isReset) {
             if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
                 errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
             }
+            if (virtualYOpts.mode === 'scroll' && expandOpts.mode === 'fixed') {
+                warnLog('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside']);
+            }
             // if (showOverflow) {
             //   if (!rowOpts.height) {
             //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -3756,7 +3760,7 @@ const Methods = {
         const $xeGGWrapper = $xeGrid || $xeGantt;
         if (slotFunc) {
             if ($xeGGWrapper) {
-                return $xeGGWrapper.callSlot(slotFunc, params, h, vNodes);
+                return $xeGGWrapper.callSlot(slotFunc, params, h);
             }
             // if (XEUtils.isString(slotFunc)) {
             //   slotFunc = slots[slotFunc] || null

package/es/table/src/table.js

@@ -1471,6 +1471,15 @@ export default {
         if (props.resizable) {
             warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable']);
         }
+        if (props.virtualXConfig && props.scrollX) {
+            warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null']);
+        }
+        if (props.virtualYConfig && props.scrollY) {
+            warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null']);
+        }
+        if (props.aggregateConfig && props.rowGroupConfig) {
+            warnLog('vxe.error.notSupportProp', ['aggregate-config', 'row-group-config', 'row-group-config=null']);
+        }
         // if (props.scrollY) {
         //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
         // }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.18.0-beta.4";
+export const version = "3.18.0-beta.6";
 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.18.0-beta.4"}`;
+const version = `table v${"3.18.0-beta.6"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.0-beta.4";
+const version = "3.18.0-beta.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2678,7 +2678,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.0-beta.4"}`;
+const log_version = `table v${"3.18.0-beta.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4105,6 +4105,8 @@ const Cell = {
       aggFunc
     } = column;
     const renderOpts = editRender || cellRender;
+    const defaultSlot = slots ? slots.default : null;
+    const gcSlot = slots ? slots.groupContent || slots['group-content'] : null;
     let cellValue = '';
     if (isRowGroupStatus && field && row.isAggregate) {
       const aggRow = row;
@@ -4132,15 +4134,28 @@ const Cell = {
         groupColumn: colRest ? colRest.column : null,
         column,
         groupValue: groupContent,
-        children: childList,
+        childList,
         childCount,
         aggValue: null,
+        /**
+         * 已废弃
+         * @deprecated
+         */
+        children: childList,
         /**
          * 已废弃
          * @deprecated
          */
         totalValue: childCount
       };
+      if (gcSlot) {
+        return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({
+          groupField,
+          groupContent,
+          childList,
+          childCount
+        }, params), h));
+      }
       if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
         cellValue = groupContent;
         if (contentMethod) {
@@ -4158,8 +4173,8 @@ const Cell = {
         }
       }
     } else {
-      if (slots && slots.default) {
-        return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
+      if (defaultSlot) {
+        return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
       }
       if (renderOpts) {
         const compConf = cell_renderer.get(renderOpts.name);
@@ -5029,15 +5044,23 @@ const Cell = {
   runRenderer(h, params, _vm, isEdit) {
     const {
       $table,
+      row,
       column
     } = params;
+    const tableReactData = $table;
+    const {
+      isRowGroupStatus
+    } = tableReactData;
     const {
       slots,
+      field,
       editRender,
       formatter
     } = column;
     const compConf = cell_renderer.get(editRender.name);
     const rtEdit = compConf ? compConf.renderTableEdit || compConf.renderEdit : null;
+    const defaultSlot = slots ? slots.default : null;
+    const gcSlot = slots ? slots.groupContent || slots['group-content'] : null;
     const cellParams = Object.assign({
       $type: '',
       isEdit
@@ -5051,8 +5074,28 @@ const Cell = {
       }
       return [];
     }
-    if (slots && slots.default) {
-      return renderCellBaseVNs(h, params, $table.callSlot(slots.default, cellParams, h));
+    if (isRowGroupStatus && field && row.isAggregate) {
+      const aggRow = row;
+      const aggregateOpts = $table.computeAggregateOpts;
+      const {
+        mapChildrenField
+      } = aggregateOpts;
+      const groupField = aggRow.groupField;
+      const groupContent = aggRow.groupContent;
+      const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
+      const childCount = aggRow.childCount;
+      if (gcSlot) {
+        return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({
+          groupField,
+          groupContent,
+          childList,
+          childCount
+        }, params), h));
+      }
+    } else {
+      if (defaultSlot) {
+        return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, cellParams, h));
+      }
     }
     if (formatter) {
       return renderCellBaseVNs(h, params, [h('span', {
@@ -9310,6 +9353,7 @@ function loadTableData($xeTable, datas, isReset) {
   }).then(() => {
     computeScrollLoad($xeTable);
   }).then(() => {
+    const virtualYOpts = $xeTable.computeVirtualYOpts;
     // 是否启用了虚拟滚动
     if (sYLoad) {
       scrollYStore.endIndex = scrollYStore.visibleSize;
@@ -9318,6 +9362,9 @@ function loadTableData($xeTable, datas, isReset) {
       if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
         errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
       }
+      if (virtualYOpts.mode === 'scroll' && expandOpts.mode === 'fixed') {
+        warnLog('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside']);
+      }
       // if (showOverflow) {
       //   if (!rowOpts.height) {
       //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -10141,7 +10188,7 @@ const Methods = {
     const $xeGGWrapper = $xeGrid || $xeGantt;
     if (slotFunc) {
       if ($xeGGWrapper) {
-        return $xeGGWrapper.callSlot(slotFunc, params, h, vNodes);
+        return $xeGGWrapper.callSlot(slotFunc, params, h);
       }
       // if (XEUtils.isString(slotFunc)) {
       //   slotFunc = slots[slotFunc] || null
@@ -30176,6 +30223,15 @@ function renderBody(h, $xeTable) {
     if (props.resizable) {
       warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable']);
     }
+    if (props.virtualXConfig && props.scrollX) {
+      warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null']);
+    }
+    if (props.virtualYConfig && props.scrollY) {
+      warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null']);
+    }
+    if (props.aggregateConfig && props.rowGroupConfig) {
+      warnLog('vxe.error.notSupportProp', ['aggregate-config', 'row-group-config', 'row-group-config=null']);
+    }
     // if (props.scrollY) {
     //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
     // }