vxe-table 3.17.10 → 3.18.0-beta.1

package/es/table/src/methods.js

@@ -280,8 +280,11 @@ function cacheColumnMap($xeTable) {
             fullColFieldData[field] = rest;
         }
         else {
-            if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
-                errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
+            if (storage && !type) {
+                errLog('vxe.error.reqSupportProp', ['storage', `${column.getTitle() || type || ''} -> field=?`]);
+            }
+            if (columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
+                errLog('vxe.error.reqSupportProp', ['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag', `${column.getTitle() || type || ''} -> field=?`]);
             }
         }
         if (!hasFixed && fixed) {
@@ -3745,9 +3748,11 @@ const Methods = {
         const $xeTable = this;
         // const slots = $xeTable.$scopedSlots
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         if (slotFunc) {
-            if ($xeGrid) {
-                return $xeGrid.callSlot(slotFunc, params, h, vNodes);
+            if ($xeGGWrapper) {
+                return $xeGGWrapper.callSlot(slotFunc, params, h, vNodes);
             }
             // if (XEUtils.isString(slotFunc)) {
             //   slotFunc = slots[slotFunc] || null
@@ -3768,8 +3773,10 @@ const Methods = {
     getParentElem() {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         const { $el } = this;
-        return $xeGrid ? $xeGrid.$el.parentNode : $el.parentNode;
+        return $xeGGWrapper ? $xeGGWrapper.$el.parentNode : $el.parentNode;
     },
     /**
      * 获取父容器的高度
@@ -3777,6 +3784,8 @@ const Methods = {
     getParentHeight() {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         const props = $xeTable;
         const { height } = props;
         const el = $xeTable.$refs.refElem;
@@ -3785,8 +3794,8 @@ const Methods = {
             const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
             let parentWrapperHeight = 0;
             if (parentElem) {
-                if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
-                    parentWrapperHeight = $xeGrid.getParentHeight();
+                if ($xeGGWrapper && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+                    parentWrapperHeight = $xeGGWrapper.getParentHeight();
                 }
                 else {
                     parentWrapperHeight = parentElem.clientHeight;
@@ -3804,7 +3813,9 @@ const Methods = {
     getExcludeHeight() {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
-        return $xeGrid ? $xeGrid.getExcludeHeight() : 0;
+        const $xeGantt = $xeTable.$xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
+        return $xeGGWrapper ? $xeGGWrapper.getExcludeHeight() : 0;
     },
     /**
      * 重置表格的一切数据状态
@@ -5982,6 +5993,7 @@ const Methods = {
     preventEvent(evnt, type, args, next, end) {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
         let evntList = interceptor.get(type);
         // 兼容老版本
         if (!evntList.length && type === 'event.clearEdit') {
@@ -5995,7 +6007,7 @@ const Methods = {
         let isStop = false;
         for (let i = 0; i < evntList.length; i++) {
             const func = evntList[i];
-            const fnRest = func(Object.assign({ $grid: $xeGrid, $table: $xeTable, $event: evnt }, args));
+            const fnRest = func(Object.assign({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt }, args));
             if (fnRest === false) {
                 isStop = true;
                 break;
@@ -6022,6 +6034,8 @@ const Methods = {
     handleGlobalMousedownEvent(evnt) {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         const { $el, $refs, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, areaOpts, filterStore, customStore, getRowNode } = this;
         const { actived } = editStore;
         const tableFilter = $refs.refTableFilter;
@@ -6113,7 +6127,7 @@ const Methods = {
             }
         }
         else if (mouseConfig) {
-            if (!getEventTargetNode(evnt, $el).flag && !($xeGrid && getEventTargetNode(evnt, $xeGrid.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
+            if (!getEventTargetNode(evnt, $el).flag && !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
                 if (this.clearSelected) {
                     this.clearSelected();
                 }
@@ -6135,7 +6149,7 @@ const Methods = {
         if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.$el).flag) {
             this.closeMenu();
         }
-        const isActivated = getEventTargetNode(evnt, ($xeGrid || this).$el).flag;
+        const isActivated = getEventTargetNode(evnt, ($xeGGWrapper || $xeTable).$el).flag;
         // 如果存在校验，点击了表格之外则清除
         if (!isActivated && editRules && validOpts.autoClear) {
             this.validErrorMaps = {};
@@ -6202,6 +6216,7 @@ const Methods = {
         const internalData = $xeTable;
         const reactData = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
         // 该行为只对当前激活的表格有效
         if (internalData.isActivated) {
             $xeTable.preventEvent(evnt, 'event.keydown', null, () => {
@@ -6419,7 +6434,8 @@ const Methods = {
                             column: selected.column,
                             columnIndex: $xeTable.getColumnIndex(selected.column),
                             $table: $xeTable,
-                            $grid: $xeGrid
+                            $grid: $xeGrid,
+                            $gantt: $xeGantt
                         };
                         // 是否被禁用
                         if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -6446,7 +6462,8 @@ const Methods = {
                                 column: selected.column,
                                 columnIndex: $xeTable.getColumnIndex(selected.column),
                                 $table: $xeTable,
-                                $grid: $xeGrid
+                                $grid: $xeGrid,
+                                $gantt: $xeGantt
                             };
                             // 是否被禁用
                             if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -6475,7 +6492,8 @@ const Methods = {
                             rowIndex: $xeTable.getRowIndex(parentRow),
                             $rowIndex: $xeTable.getVMRowIndex(parentRow),
                             $table: $xeTable,
-                            $grid: $xeGrid
+                            $grid: $xeGrid,
+                            $gantt: $xeGantt
                         };
                         $xeTable.setTreeExpand(parentRow, false)
                             .then(() => $xeTable.scrollToRow(parentRow))
@@ -6497,7 +6515,8 @@ const Methods = {
                             column: selected.column,
                             columnIndex: $xeTable.getColumnIndex(selected.column),
                             $table: $xeTable,
-                            $grid: $xeGrid
+                            $grid: $xeGrid,
+                            $gantt: $xeGantt
                         };
                         if (!beforeEditMethod || beforeEditMethod(params)) {
                             if (editMethod) {
@@ -7534,15 +7553,22 @@ const Methods = {
      * @param {Row} row 行对象
      */
     setCurrentRow(row) {
-        const { $el, rowOpts } = this;
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const $xeGanttView = internalData.xeGanttView;
+        const el = $xeTable.$refs.refElem;
+        const rowOpts = $xeTable.computeRowOpts;
         this.clearCurrentRow();
         // this.clearCurrentColumn()
         this.currentRow = row;
         if (rowOpts.isCurrent || this.highlightCurrentRow) {
-            if ($el) {
-                XEUtils.arrayEach($el.querySelectorAll(`[rowid="${getRowid(this, row)}"]`), elem => addClass(elem, 'row--current'));
+            if (el) {
+                XEUtils.arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'));
             }
         }
+        if ($xeGanttView) {
+            $xeGanttView.handleUpdateCurrentRow(row);
+        }
         return this.$nextTick();
     },
     isCheckedByRadioRow(row) {
@@ -7589,13 +7615,20 @@ const Methods = {
      * 用于当前行，手动清空当前高亮的状态
      */
     clearCurrentRow() {
-        const { $el } = this;
-        this.currentRow = null;
-        this.hoverRow = null;
-        if ($el) {
-            XEUtils.arrayEach($el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const $xeGanttView = internalData.xeGanttView;
+        const el = $xeTable.$refs.refElem;
+        reactData.currentRow = null;
+        internalData.hoverRow = null;
+        if (el) {
+            XEUtils.arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
         }
-        return this.$nextTick();
+        if ($xeGanttView) {
+            $xeGanttView.handleUpdateCurrentRow();
+        }
+        return $xeTable.$nextTick();
     },
     /**
      * 用于单选行，手动清空用户的选择
@@ -7657,20 +7690,31 @@ const Methods = {
         this.setHoverRow(row);
     },
     setHoverRow(row) {
-        const { $el } = this;
-        const rowid = getRowid(this, row);
-        this.clearHoverRow();
-        if ($el) {
-            XEUtils.arrayEach($el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const $xeGanttView = internalData.xeGanttView;
+        const el = $xeTable.$refs.refElem;
+        $xeTable.clearHoverRow();
+        if (el) {
+            XEUtils.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--hover'));
+        }
+        internalData.hoverRow = row;
+        if ($xeGanttView) {
+            $xeGanttView.handleUpdateHoverRow(row);
         }
-        this.hoverRow = row;
     },
     clearHoverRow() {
-        const { $el } = this;
-        if ($el) {
-            XEUtils.arrayEach($el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const $xeGanttView = internalData.xeGanttView;
+        const el = $xeTable.$refs.refElem;
+        if (el) {
+            XEUtils.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
+        }
+        internalData.hoverRow = null;
+        if ($xeGanttView) {
+            $xeGanttView.handleUpdateHoverRow();
         }
-        this.hoverRow = null;
     },
     triggerHeaderCellClickEvent(evnt, params) {
         const $xeTable = this;
@@ -10704,6 +10748,7 @@ const Methods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
         const { showFooter, footerData, footerMethod } = props;
         const { visibleColumn, afterFullData } = internalData;
         let footData = [];
@@ -10711,7 +10756,7 @@ const Methods = {
             footData = footerData.slice(0);
         }
         else if (showFooter && footerMethod) {
-            footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: afterFullData, $table: $xeTable, $grid: $xeGrid }) : [];
+            footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: afterFullData, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }) : [];
         }
         reactData.footerTableData = footData;
         $xeTable.handleUpdateFooterMerge();
@@ -10871,13 +10916,15 @@ const Methods = {
     dispatchEvent(type, params, evnt) {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
-        $xeTable.$emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid }, params));
+        const $xeGantt = $xeTable.$xeGantt;
+        $xeTable.$emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }, params));
     },
     // 已废弃，使用 dispatchEvent
     emitEvent(type, params, evnt) {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
-        this.$emit(type, Object.assign({ $table: $xeTable, $grid: $xeGrid, $event: evnt }, params));
+        const $xeGantt = $xeTable.$xeGantt;
+        $xeTable.$emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt }));
     },
     focus() {
         this.isActivated = true;

package/es/table/src/table.js

@@ -96,10 +96,11 @@ function renderFixed(h, $xeTable, fixedType) {
 function renderEmptyBody(h, $xeTable) {
     const slots = $xeTable.$scopedSlots;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const emptyOpts = $xeTable.computeEmptyOpts;
     const emptySlot = slots.empty;
     let emptyContent = '';
-    const emptyParams = { $table: $xeTable, $grid: $xeGrid };
+    const emptyParams = { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt };
     if (emptySlot) {
         emptyContent = emptySlot.call($xeTable, emptyParams);
     }
@@ -199,6 +200,7 @@ function renderRowExpandedVNs(h, $xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const { treeConfig } = props;
     const { expandColumn, isRowGroupStatus } = reactData;
     const tableRowExpandedList = $xeTable.computeTableRowExpandedList;
@@ -259,8 +261,9 @@ function renderRowExpandedVNs(h, $xeTable) {
                 _columnIndex = colRest._index;
             }
             const expandParams = {
-                $grid: $xeGrid,
                 $table: $xeTable,
+                $grid: $xeGrid,
+                $gantt: $xeGantt,
                 seq,
                 column: expandColumn,
                 columnIndex,
@@ -713,10 +716,11 @@ export default {
             const $xeTable = this;
             const props = $xeTable;
             const $xeGrid = $xeTable.$xeGrid;
+            const $xeGantt = $xeTable.$xeGantt;
             const { id } = props;
             if (id) {
                 if (XEUtils.isFunction(id)) {
-                    return `${id({ $table: $xeTable, $grid: $xeGrid }) || ''}`;
+                    return `${id({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }) || ''}`;
                 }
                 return `${id}`;
             }
@@ -1766,6 +1770,7 @@ export default {
         const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
         const props = $xeTable;
         const slots = $xeTable.$scopedSlots;
         const reactData = $xeTable;
@@ -1931,7 +1936,7 @@ export default {
                     },
                     scopedSlots: loadingSlot
                         ? {
-                            default: () => $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }, h)
+                            default: () => $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading }, h)
                         }
                         : {}
                 })
@@ -1940,7 +1945,7 @@ export default {
                         class: ['vxe-loading--custom-wrapper', {
                                 'is--visible': currLoading
                             }]
-                    }, $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }, h))
+                    }, $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading }, h))
                     : renderEmptyElement($xeTable),
             /**
              * 自定义列

package/es/table/style.css

@@ -2670,9 +2670,6 @@
 .vxe-table--render-default .vxe-body--row.row--hover.row--current > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-hover-current-background-color);
 }
-.vxe-table--render-default .vxe-table--footer-wrapper {
-  border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
-}
 .vxe-table--render-default.border--default .vxe-table--scroll-y-top-corner::before,
 .vxe-table--render-default.border--default .vxe-table--scroll-y-bottom-corner::before, .vxe-table--render-default.border--full .vxe-table--scroll-y-top-corner::before,
 .vxe-table--render-default.border--full .vxe-table--scroll-y-bottom-corner::before, .vxe-table--render-default.border--outer .vxe-table--scroll-y-top-corner::before,
@@ -2740,6 +2737,9 @@
   background-size: 100% var(--vxe-ui-table-border-width);
   background-position: right bottom;
 }
+.vxe-table--render-default.border--default .vxe-table--footer-wrapper, .vxe-table--render-default.border--full .vxe-table--footer-wrapper, .vxe-table--render-default.border--inner .vxe-table--footer-wrapper {
+  border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
+}
 .vxe-table--render-default.border--default .vxe-table--scroll-y-top-corner::before, .vxe-table--render-default.border--full .vxe-table--scroll-y-top-corner::before {
   border-left-width: var(--vxe-ui-table-border-width);
   border-right-width: var(--vxe-ui-table-border-width);