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

package/es/table/module/custom/panel.js

@@ -894,8 +894,6 @@ export default {
         const VxeUIRadioGroupComponent = VxeUI.getComponent('VxeRadioGroup');
         $xeTableCustomPanel.$nextTick(() => {
             const $xeTable = $xeTableCustomPanel.$xeTable;
-            const $xeGantt = $xeTable.$xeGantt;
-            const tableInternalData = $xeTable;
             const { customOpts } = $xeTable;
             const { mode } = customOpts;
             if (!VxeUIModalComponent && (mode === 'modal')) {
@@ -913,26 +911,8 @@ export default {
             if (!VxeUIRadioGroupComponent) {
                 errLog('vxe.error.reqComp', ['vxe-radio-group']);
             }
-            if ($xeGantt) {
-                const { teleportToWrapperElem } = tableInternalData;
-                const el = $xeTableCustomPanel.$refs.refElem;
-                if (el && teleportToWrapperElem) {
-                    teleportToWrapperElem.appendChild(el);
-                }
-            }
         });
     },
-    beforeDestroy() {
-        const $xeTableCustomPanel = this;
-        const $xeTable = $xeTableCustomPanel.$xeTable;
-        const $xeGantt = $xeTable.$xeGantt;
-        if ($xeGantt) {
-            const el = $xeTableCustomPanel.$refs.refElem;
-            if (el && el.parentElement) {
-                el.parentElement.removeChild(el);
-            }
-        }
-    },
     render(h) {
         const $xeTableCustomPanel = this;
         const $xeTable = $xeTableCustomPanel.$xeTable;

package/es/table/src/anime.js

@@ -16,10 +16,10 @@ export function moveRowAnimateToTb(elemList, offsetTop) {
         });
     });
 }
-export function clearRowAnimate(elem) {
+export function clearRowAnimate(elem, clss) {
     setTimeout(() => {
         if (elem) {
-            XEUtils.arrayEach(elem.querySelectorAll(`.vxe-body--row.${rowMoveCls}`), elem => removeClass(elem, rowMoveCls));
+            XEUtils.arrayEach(elem.querySelectorAll(clss.map(cls => `${cls}.${rowMoveCls}`).join(',')), elem => removeClass(elem, rowMoveCls));
         }
     }, 500);
 }
@@ -37,10 +37,10 @@ export function moveColAnimateToLr(elemList, offsetLeft) {
         });
     });
 }
-export function clearColAnimate(elem) {
+export function clearColAnimate(elem, clss) {
     setTimeout(() => {
         if (elem) {
-            XEUtils.arrayEach(elem.querySelectorAll(`.vxe-table--column.${colMoveClass}`), elem => removeClass(elem, colMoveClass));
+            XEUtils.arrayEach(elem.querySelectorAll(clss.map(cls => `${cls}.${rowMoveCls}`).join(',')), elem => removeClass(elem, colMoveClass));
         }
     }, 500);
 }

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/methods.js

@@ -2442,19 +2442,26 @@ function updateColDropTipContent($xeTable, tdEl) {
     reactData.dragTipText = tipContent;
 }
 function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
+    const $xeGantt = $xeTable.$xeGantt;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const el = $xeTable.$refs.refElem;
-    if (!el) {
+    let wrapperEl = $xeTable.$refs.refElem;
+    if ($xeGantt && trEl) {
+        const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+        if (ganttContainerElem) {
+            wrapperEl = ganttContainerElem;
+        }
+    }
+    if (!wrapperEl) {
         return;
     }
     const { overflowX, scrollbarWidth, overflowY, scrollbarHeight } = reactData;
     const { prevDragToChild } = internalData;
-    const wrapperRect = el.getBoundingClientRect();
+    const wrapperRect = wrapperEl.getBoundingClientRect();
     const osbWidth = overflowY ? scrollbarWidth : 0;
     const osbHeight = overflowX ? scrollbarHeight : 0;
-    const tableWrapperWidth = el.clientWidth;
-    const tableWrapperHeight = el.clientHeight;
+    const tableWrapperWidth = wrapperEl.clientWidth;
+    const tableWrapperHeight = wrapperEl.clientHeight;
     if (trEl) {
         const rdLineEl = $xeTable.$refs.refDragRowLineElem;
         if (rdLineEl) {
@@ -2522,8 +2529,8 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     const rdTipEl = $xeTable.$refs.refDragTipElem;
     if (rdTipEl) {
         rdTipEl.style.display = 'block';
-        rdTipEl.style.top = `${Math.min(el.clientHeight - el.scrollTop - rdTipEl.clientHeight, evnt.clientY - wrapperRect.y)}px`;
-        rdTipEl.style.left = `${Math.min(el.clientWidth - el.scrollLeft - rdTipEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px`;
+        rdTipEl.style.top = `${Math.min(wrapperEl.clientHeight - wrapperEl.scrollTop - rdTipEl.clientHeight, evnt.clientY - wrapperRect.y)}px`;
+        rdTipEl.style.left = `${Math.min(wrapperEl.clientWidth - wrapperEl.scrollLeft - rdTipEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px`;
         rdTipEl.setAttribute('drag-status', showLine ? (prevDragToChild ? 'sub' : 'normal') : 'disabled');
     }
 }
@@ -5515,7 +5522,7 @@ const Methods = {
         if (!cell) {
             return;
         }
-        const cellParams = XEUtils.assign(params, { cell });
+        const cellParams = XEUtils.assign(params, { cell, $table: $xeTable });
         let dragLeft = 0;
         const tableRect = tableEl.getBoundingClientRect();
         const rightContainerRect = rightContainerElem ? rightContainerElem.getBoundingClientRect() : null;
@@ -5645,7 +5652,7 @@ const Methods = {
             const colRest = fullColumnIdData[colid];
             const dragBtnElem = evnt.target;
             const cell = dragBtnElem.parentNode;
-            const cellParams = Object.assign(params, { cell });
+            const cellParams = Object.assign(params, { cell, $table: $xeTable });
             const colMinWidth = getColReMinWidth(cellParams);
             el.setAttribute('data-calc-col', 'Y');
             let resizeWidth = calcColumnAutoWidth($xeTable, resizeColumn, el);
@@ -5673,6 +5680,7 @@ const Methods = {
         const internalData = $xeTable;
         evnt.stopPropagation();
         evnt.preventDefault();
+        const $xeGantt = $xeTable.$xeGantt;
         const { row } = params;
         const { showOverflow } = props;
         const { overflowX, scrollbarWidth, overflowY, scrollbarHeight } = reactData;
@@ -5683,7 +5691,13 @@ const Methods = {
         const resizableOpts = $xeTable.computeResizableOpts;
         const rowOpts = $xeTable.computeRowOpts;
         const cellOpts = $xeTable.computeCellOpts;
-        const tableEl = $xeTable.$refs.refElem;
+        let tableEl = $xeTable.$refs.refElem;
+        if ($xeGantt) {
+            const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+            if (ganttContainerElem) {
+                tableEl = ganttContainerElem;
+            }
+        }
         const resizeBarElem = $xeTable.$refs.refRowResizeBar;
         if (!resizeBarElem) {
             return;
@@ -8115,6 +8129,7 @@ const Methods = {
     },
     handleRowDragSwapEvent(evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
         const $xeTable = this;
+        const $xeGantt = $xeTable.$xeGantt;
         const props = $xeTable;
         const reactData = $xeTable;
         const internalData = $xeTable;
@@ -8307,6 +8322,13 @@ const Methods = {
                         const _newRowIndex = dragRowRest._index;
                         const firstRow = tableData[0];
                         const firstRowRest = fullAllDataRowIdData[getRowid($xeTable, firstRow)];
+                        let wrapperEl = el;
+                        if ($xeGantt) {
+                            const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+                            if (ganttContainerElem) {
+                                wrapperEl = ganttContainerElem;
+                            }
+                        }
                         if (firstRowRest) {
                             const _firstRowIndex = firstRowRest._index;
                             const _lastRowIndex = _firstRowIndex + tableData.length;
@@ -8340,14 +8362,26 @@ const Methods = {
                             }
                             const dragRangeList = tableData.slice(rsIndex, reIndex);
                             if (dragRangeList.length) {
-                                const dtTrList = el.querySelectorAll(dragRangeList.map(row => `.vxe-body--row[rowid="${getRowid($xeTable, row)}"]`).join(','));
+                                const dtClss = [];
+                                dragRangeList.forEach(row => {
+                                    const rowid = getRowid($xeTable, row);
+                                    dtClss.push(`.vxe-body--row[rowid="${rowid}"]`);
+                                    if ($xeGantt) {
+                                        dtClss.push(`.vxe-gantt-view--body-row[rowid="${rowid}"]`, `.vxe-gantt-view--chart-row[rowid="${rowid}"]`);
+                                    }
+                                });
+                                const dtTrList = wrapperEl.querySelectorAll(dtClss.join(','));
                                 moveRowAnimateToTb(dtTrList, offsetRate * dragRowHeight);
                             }
                         }
-                        const newTrList = el.querySelectorAll(`.vxe-body--row[rowid="${dragRowid}"]`);
-                        const newTrEl = newTrList[0];
+                        const drClss = [`.vxe-body--row[rowid="${dragRowid}"]`];
+                        if ($xeGantt) {
+                            drClss.push(`.vxe-gantt-view--body-row[rowid="${dragRowid}"]`, `.vxe-gantt-view--chart-row[rowid="${dragRowid}"]`);
+                        }
+                        const newDtTrList = wrapperEl.querySelectorAll(drClss.join(','));
+                        const newTrEl = newDtTrList[0];
                         if (dragOffsetTop > -1 && newTrEl) {
-                            moveRowAnimateToTb(newTrList, dragOffsetTop - newTrEl.offsetTop);
+                            moveRowAnimateToTb(newDtTrList, dragOffsetTop - newTrEl.offsetTop);
                         }
                     }
                     updateRowOffsetTop($xeTable);
@@ -8367,6 +8401,7 @@ const Methods = {
     },
     handleRowDragDragendEvent(evnt) {
         const $xeTable = this;
+        const $xeGantt = $xeTable.$xeGantt;
         const props = $xeTable;
         const reactData = $xeTable;
         const internalData = $xeTable;
@@ -8377,7 +8412,7 @@ const Methods = {
         const { lazy } = treeOpts;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
         const { prevDragRow, prevDragPos } = internalData;
-        const el = $xeTable.$refs.refElem;
+        let wrapperEl = $xeTable.$refs.refElem;
         if (treeConfig && lazy && prevDragToChild) {
             // 懒加载
             const newRowid = getRowid($xeTable, prevDragRow);
@@ -8394,9 +8429,17 @@ const Methods = {
         else {
             $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
         }
+        const dtClss = ['.vxe-body--row'];
+        if ($xeGantt) {
+            const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+            if (ganttContainerElem) {
+                wrapperEl = ganttContainerElem;
+            }
+            dtClss.push('.vxe-gantt-view--body-row', '.vxe-gantt-view--chart-row');
+        }
         hideDropTip($xeTable);
         clearRowDropOrigin($xeTable);
-        clearRowAnimate(el);
+        clearRowAnimate(wrapperEl, dtClss);
         internalData.prevDragToChild = false;
         reactData.dragRow = null;
         reactData.dragCol = null;
@@ -8785,7 +8828,7 @@ const Methods = {
         $xeTable.handleColDragSwapEvent(evnt, true, dragCol, prevDragCol, prevDragPos, prevDragToChild);
         hideDropTip($xeTable);
         clearColDropOrigin($xeTable);
-        clearColAnimate(el);
+        clearColAnimate(el, ['.vxe-table--column']);
         internalData.prevDragToChild = false;
         reactData.dragRow = null;
         reactData.dragCol = 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'])
         // }
@@ -1559,6 +1568,14 @@ export default {
         if (checkboxOpts.halfField) {
             warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
         }
+        if (treeConfig) {
+            XEUtils.arrayEach(['rowField', 'parentField', 'childrenField', 'hasChildField', 'mapChildrenField'], key => {
+                const val = treeOpts[key];
+                if (val && val.indexOf('.') > -1) {
+                    errLog('vxe.error.errProp', [`${key}=${val}`, `${key}=${val.split('.')[0]}`]);
+                }
+            });
+        }
         // 在 v3.0 中废弃 context-menu
         if (this.contextMenu) {
             warnLog('vxe.error.delProp', ['context-menu', 'menu-config']);
@@ -1671,7 +1688,11 @@ export default {
         const virtualYOpts = $xeTable.computeVirtualYOpts;
         if ($xeGantt) {
             const classifyWrapperEl = $xeGantt.$refs.refClassifyWrapperElem;
+            const teleportWrapperEl = $xeTable.$refs.refTeleportWrapper;
             if (classifyWrapperEl) {
+                if (teleportWrapperEl) {
+                    classifyWrapperEl.appendChild(teleportWrapperEl);
+                }
                 internalData.teleportToWrapperElem = classifyWrapperEl;
             }
         }
@@ -1749,6 +1770,10 @@ export default {
     },
     beforeDestroy() {
         const $xeTable = this;
+        const teleportWrapperEl = $xeTable.$refs.refTeleportWrapper;
+        if (teleportWrapperEl && teleportWrapperEl.parentElement) {
+            teleportWrapperEl.parentElement.removeChild(teleportWrapperEl);
+        }
         const tableViewportEl = $xeTable.$refs.refTableViewportElem;
         if (tableViewportEl) {
             tableViewportEl.removeEventListener('wheel', $xeTable.triggerBodyWheelEvent);
@@ -1919,57 +1944,69 @@ export default {
                     })
                 ]
                 : []),
-            /**
-             * 行高线
-             */
             h('div', {
-                key: 'trl',
-                ref: 'refRowResizeBar',
-                class: 'vxe-table--resizable-row-bar'
-            }, resizableOpts.showDragTip
-                ? [
+                key: 'ttw'
+            }, [
+                h('div', {
+                    ref: 'refTeleportWrapper'
+                }, [
+                    /**
+                     * 行高线
+                     */
                     h('div', {
-                        class: 'vxe-table--resizable-number-tip'
-                    })
-                ]
-                : []),
-            /**
-             * 加载中
-             */
-            VxeUILoadingComponent
-                ? h(VxeUILoadingComponent, {
-                    key: 'lg',
-                    class: 'vxe-table--loading',
-                    props: {
-                        value: currLoading,
-                        icon: loadingOpts.icon,
-                        text: loadingOpts.text
-                    },
-                    scopedSlots: loadingSlot
-                        ? {
-                            default: () => $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading }, h)
-                        }
-                        : {}
-                })
-                : loadingSlot
-                    ? h('div', {
-                        class: ['vxe-loading--custom-wrapper', {
-                                'is--visible': currLoading
-                            }]
-                    }, $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading }, h))
-                    : renderEmptyElement($xeTable),
-            /**
-             * 自定义列
-             */
-            initStore.custom
-                ? h(TableCustomPanelComponent, {
-                    key: 'cs',
-                    ref: 'refTableCustom',
-                    props: {
-                        customStore
-                    }
-                })
-                : renderEmptyElement($xeTable),
+                        key: 'trl',
+                        ref: 'refRowResizeBar',
+                        class: 'vxe-table--resizable-row-bar'
+                    }, resizableOpts.showDragTip
+                        ? [
+                            h('div', {
+                                class: 'vxe-table--resizable-number-tip'
+                            })
+                        ]
+                        : []),
+                    /**
+                     * 自定义列
+                     */
+                    initStore.custom
+                        ? h(TableCustomPanelComponent, {
+                            key: 'cs',
+                            ref: 'refTableCustom',
+                            props: {
+                                customStore
+                            }
+                        })
+                        : renderEmptyElement($xeTable),
+                    /**
+                     * 加载中
+                     */
+                    VxeUILoadingComponent
+                        ? h(VxeUILoadingComponent, {
+                            key: 'lg',
+                            class: 'vxe-table--loading',
+                            props: {
+                                value: currLoading,
+                                icon: loadingOpts.icon,
+                                text: loadingOpts.text
+                            },
+                            scopedSlots: loadingSlot
+                                ? {
+                                    default: () => $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading }, h)
+                                }
+                                : {}
+                        })
+                        : loadingSlot
+                            ? h('div', {
+                                class: ['vxe-loading--custom-wrapper', {
+                                        'is--visible': currLoading
+                                    }]
+                            }, $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading }, h))
+                            : renderEmptyElement($xeTable),
+                    /**
+                     * 拖拽提示
+                     */
+                    renderDragTip(h, this)
+                ])
+            ]),
             /**
              * 筛选
              */
@@ -2007,8 +2044,8 @@ export default {
                 })
                 : renderEmptyElement($xeTable),
             /**
-               * 快捷菜单
-               */
+             * 快捷菜单
+             */
             isMenu
                 ? h(TableMenuPanelComponent, {
                     key: 'tm',
@@ -2019,10 +2056,6 @@ export default {
                     }
                 })
                 : renderEmptyElement($xeTable),
-            /**
-             * 拖拽提示
-             */
-            renderDragTip(h, this),
             h('div', {}, [
                 /**
                  * 提示相关