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

package/es/table/src/cell.js

@@ -389,9 +389,14 @@ export const Cell = {
                 groupColumn: (colRest ? colRest.column : null),
                 column,
                 groupValue: groupContent,
-                children: childList,
+                childList,
                 childCount,
                 aggValue: null,
+                /**
+                 * 已废弃
+                 * @deprecated
+                 */
+                children: childList,
                 /**
                  * 已废弃
                  * @deprecated
@@ -399,7 +404,7 @@ export const Cell = {
                 totalValue: childCount
             };
             if (gcSlot) {
-                return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childCount }, params), h));
+                return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childList, childCount }, params), h));
             }
             if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
                 cellValue = groupContent;
@@ -1121,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) {
@@ -1135,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/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.5";
+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.5"}`;
+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.5";
+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.5"}`;
+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
@@ -4134,9 +4134,14 @@ const Cell = {
         groupColumn: colRest ? colRest.column : null,
         column,
         groupValue: groupContent,
-        children: childList,
+        childList,
         childCount,
         aggValue: null,
+        /**
+         * 已废弃
+         * @deprecated
+         */
+        children: childList,
         /**
          * 已废弃
          * @deprecated
@@ -4147,6 +4152,7 @@ const Cell = {
         return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({
           groupField,
           groupContent,
+          childList,
           childCount
         }, params), h));
       }
@@ -5038,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
@@ -5060,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', {
@@ -30189,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'])
     // }