vxe-table 4.15.8 → 4.16.0-beta.1

package/es/table/src/table.js

@@ -330,12 +330,13 @@ export default defineVxeComponent({
         const refScrollYSpaceElem = ref();
         const $xeGrid = inject('$xeGrid', null);
         const $xeGantt = inject('$xeGantt', null);
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         let $xeToolbar;
         const computeTableId = computed(() => {
             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}`;
             }
@@ -1504,8 +1505,11 @@ export default defineVxeComponent({
                     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) {
@@ -4070,7 +4074,7 @@ export default defineVxeComponent({
             }
         };
         const dispatchEvent = (type, params, evnt) => {
-            emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid }, params));
+            emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }, params));
         };
         const handleScrollToRowColumn = (fieldOrColumn, row) => {
             const { fullColumnIdData } = internalData;
@@ -5630,6 +5634,7 @@ export default defineVxeComponent({
              * @param {Row} row 行对象
              */
             setCurrentRow(row) {
+                const $xeGanttView = internalData.xeGanttView;
                 const rowOpts = computeRowOpts.value;
                 const el = refElem.value;
                 tableMethods.clearCurrentRow();
@@ -5640,6 +5645,9 @@ export default defineVxeComponent({
                         XEUtils.arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'));
                     }
                 }
+                if ($xeGanttView) {
+                    $xeGanttView.handleUpdateCurrentRow(row);
+                }
                 return nextTick();
             },
             isCheckedByRadioRow(row) {
@@ -5679,12 +5687,16 @@ export default defineVxeComponent({
              * 用于当前行，手动清空当前高亮的状态
              */
             clearCurrentRow() {
+                const $xeGanttView = internalData.xeGanttView;
                 const el = refElem.value;
                 reactData.currentRow = null;
                 internalData.hoverRow = null;
                 if (el) {
                     XEUtils.arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
                 }
+                if ($xeGanttView) {
+                    $xeGanttView.handleUpdateCurrentRow();
+                }
                 return nextTick();
             },
             /**
@@ -6714,7 +6726,7 @@ export default defineVxeComponent({
                     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();
@@ -7089,7 +7101,7 @@ export default defineVxeComponent({
                 }
             }
             else if (mouseConfig) {
-                if (!getEventTargetNode(evnt, el).flag && !($xeGrid && getEventTargetNode(evnt, $xeGrid.getRefMaps().refElem.value).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) && !($xeToolbar && getEventTargetNode(evnt, $xeToolbar.getRefMaps().refElem.value).flag)) {
+                if (!getEventTargetNode(evnt, el).flag && !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.getRefMaps().refElem.value).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) && !($xeToolbar && getEventTargetNode(evnt, $xeToolbar.getRefMaps().refElem.value).flag)) {
                     if ($xeTable.clearSelected) {
                         $xeTable.clearSelected();
                     }
@@ -7113,7 +7125,7 @@ export default defineVxeComponent({
                     $xeTable.closeMenu();
                 }
             }
-            const isActivated = getEventTargetNode(evnt, $xeGrid ? $xeGrid.getRefMaps().refElem.value : el).flag;
+            const isActivated = getEventTargetNode(evnt, $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : el).flag;
             // 如果存在校验，点击了表格之外则清除
             if (!isActivated && editRules && validOpts.autoClear) {
                 reactData.validErrorMaps = {};
@@ -7401,7 +7413,8 @@ export default defineVxeComponent({
                                 column: selected.column,
                                 columnIndex: tableMethods.getColumnIndex(selected.column),
                                 $table: $xeTable,
-                                $grid: $xeGrid
+                                $grid: $xeGrid,
+                                $gantt: $xeGantt
                             };
                             // 是否被禁用
                             if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7428,7 +7441,8 @@ export default defineVxeComponent({
                                     column: selected.column,
                                     columnIndex: $xeTable.getColumnIndex(selected.column),
                                     $table: $xeTable,
-                                    $grid: $xeGrid
+                                    $grid: $xeGrid,
+                                    $gantt: $xeGantt
                                 };
                                 // 是否被禁用
                                 if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7454,7 +7468,8 @@ export default defineVxeComponent({
                                 rowIndex: $xeTable.getRowIndex(parentRow),
                                 $rowIndex: $xeTable.getVMRowIndex(parentRow),
                                 $table: $xeTable,
-                                $grid: $xeGrid
+                                $grid: $xeGrid,
+                                $gantt: $xeGantt
                             };
                             $xeTable.setTreeExpand(parentRow, false)
                                 .then(() => $xeTable.scrollToRow(parentRow))
@@ -7476,9 +7491,10 @@ export default defineVxeComponent({
                                 column: selected.column,
                                 columnIndex: $xeTable.getColumnIndex(selected.column),
                                 $table: $xeTable,
-                                $grid: $xeGrid
+                                $grid: $xeGrid,
+                                $gantt: $xeGantt
                             };
-                            if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, selected.args), { $table: $xeTable, $grid: $xeGrid }))) {
+                            if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, selected.args), { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }))) {
                                 if (editMethod) {
                                     editMethod(params);
                                 }
@@ -7791,8 +7807,8 @@ export default defineVxeComponent({
         };
         const callSlot = (slotFunc, params) => {
             if (slotFunc) {
-                if ($xeGrid) {
-                    return $xeGrid.callSlot(slotFunc, params);
+                if ($xeGGWrapper) {
+                    return $xeGGWrapper.callSlot(slotFunc, params);
                 }
                 // if (XEUtils.isString(slotFunc)) {
                 //   slotFunc = slots[slotFunc] || null
@@ -7817,8 +7833,8 @@ export default defineVxeComponent({
              */
             getParentElem() {
                 const el = refElem.value;
-                if ($xeGrid) {
-                    const gridEl = $xeGrid.getRefMaps().refElem.value;
+                if ($xeGGWrapper) {
+                    const gridEl = $xeGGWrapper.getRefMaps().refElem.value;
                     return gridEl ? gridEl.parentNode : null;
                 }
                 return el ? el.parentNode : null;
@@ -7834,8 +7850,8 @@ export default defineVxeComponent({
                     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;
@@ -7851,7 +7867,7 @@ export default defineVxeComponent({
              * 如果存在表尾合计滚动条，则需要排除滚动条高度
              */
             getExcludeHeight() {
-                return $xeGrid ? $xeGrid.getExcludeHeight() : 0;
+                return $xeGGWrapper ? $xeGGWrapper.getExcludeHeight() : 0;
             },
             /**
              * 定义行数据中的列属性，如果不存在则定义
@@ -8506,7 +8522,7 @@ export default defineVxeComponent({
                 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;
@@ -11018,6 +11034,7 @@ export default defineVxeComponent({
                 tablePrivateMethods.setHoverRow(row);
             },
             setHoverRow(row) {
+                const $xeGanttView = internalData.xeGanttView;
                 const rowid = getRowid($xeTable, row);
                 const el = refElem.value;
                 tablePrivateMethods.clearHoverRow();
@@ -11025,13 +11042,20 @@ export default defineVxeComponent({
                     XEUtils.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
                 }
                 internalData.hoverRow = row;
+                if ($xeGanttView) {
+                    $xeGanttView.handleUpdateHoverRow(row);
+                }
             },
             clearHoverRow() {
+                const $xeGanttView = internalData.xeGanttView;
                 const el = refElem.value;
                 if (el) {
                     XEUtils.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
                 }
                 internalData.hoverRow = null;
+                if ($xeGanttView) {
+                    $xeGanttView.handleUpdateHoverRow();
+                }
             },
             /**
              * 已废弃，被 getCellElement 替换
@@ -11118,7 +11142,7 @@ export default defineVxeComponent({
         const renderEmptyBody = () => {
             const emptyOpts = computeEmptyOpts.value;
             const emptySlot = slots.empty;
-            const emptyParams = { $table: $xeTable, $grid: $xeGrid };
+            const emptyParams = { $table: $xeTable, $grid: $xeGrid, gantt: $xeGantt };
             if (emptySlot) {
                 return emptySlot(emptyParams);
             }
@@ -11262,8 +11286,9 @@ export default defineVxeComponent({
                         _columnIndex = colRest._index;
                     }
                     const expandParams = {
-                        $grid: $xeGrid,
                         $table: $xeTable,
+                        $grid: $xeGrid,
+                        $gantt: $xeGantt,
                         seq,
                         column: expandColumn,
                         columnIndex,
@@ -11578,7 +11603,7 @@ export default defineVxeComponent({
                         text: loadingOpts.text
                     }, loadingSlot
                         ? {
-                            default: () => callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading })
+                            default: () => callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading })
                         }
                         : {})
                     : loadingSlot
@@ -11586,7 +11611,7 @@ export default defineVxeComponent({
                             class: ['vxe-loading--custom-wrapper', {
                                     'is--visible': currLoading
                                 }]
-                        }, callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }))
+                        }, callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading }))
                         : 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);