vxe-table 3.17.11 → 3.17.12

package/es/table/src/methods.js

@@ -3018,6 +3018,7 @@ function loadTableData($xeTable, datas, isReset) {
     }).then(() => {
         computeScrollLoad($xeTable);
     }).then(() => {
+        const virtualYOpts = $xeTable.computeVirtualYOpts;
         // 是否启用了虚拟滚动
         if (sYLoad) {
             scrollYStore.endIndex = scrollYStore.visibleSize;
@@ -3026,6 +3027,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)

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.17.11";
+export const version = "3.17.12";
 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.17.11"}`;
+const version = `table v${"3.17.12"}`;
 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.17.11";
+const version = "3.17.12";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3918,7 +3918,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.11"}`;
+const log_version = `table v${"3.17.12"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5344,6 +5344,7 @@ const Cell = {
       aggFunc
     } = column;
     const renderOpts = editRender || cellRender;
+    const gcSlot = slots ? slots.groupContent || slots['group-content'] : null;
     let cellValue = '';
     if (isRowGroupStatus && field && row.isAggregate) {
       const aggRow = row;
@@ -5380,6 +5381,13 @@ const Cell = {
          */
         totalValue: childCount
       };
+      if (gcSlot) {
+        return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({
+          groupField,
+          groupContent,
+          childCount
+        }, params), h));
+      }
       if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
         cellValue = groupContent;
         if (contentMethod) {
@@ -10554,6 +10562,7 @@ function loadTableData($xeTable, datas, isReset) {
   }).then(() => {
     computeScrollLoad($xeTable);
   }).then(() => {
+    const virtualYOpts = $xeTable.computeVirtualYOpts;
     // 是否启用了虚拟滚动
     if (sYLoad) {
       scrollYStore.endIndex = scrollYStore.visibleSize;
@@ -10562,6 +10571,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)