vxe-table 4.23.3 → 4.23.5

package/es/table/module/edit/hook.js

@@ -306,7 +306,7 @@ hooks.add('tableEditModule', {
             }
             reactData.removeRowFlag++;
             reactData.insertRowFlag++;
-            $xeTable.cacheRowMap(false);
+            $xeTable.cacheRowMap(false, false);
             $xeTable.updateScrollYStatus();
             $xeTable.handleTableData(treeConfig && transform);
             if (!(treeConfig && transform)) {
@@ -673,7 +673,7 @@ hooks.add('tableEditModule', {
                 reactData.removeRowFlag++;
                 reactData.insertRowFlag++;
                 reactData.pendingRowFlag++;
-                $xeTable.cacheRowMap(false);
+                $xeTable.cacheRowMap(false, false);
                 $xeTable.handleTableData(treeConfig && transform);
                 $xeTable.updateFooter();
                 $xeTable.handleUpdateBodyMerge();

package/es/table/src/table.js

@@ -993,7 +993,7 @@ export default defineVxeComponent({
         };
         const calcVarRowHeightConfig = (sizeKey, sizeEl) => {
             const { rowHeightStore } = reactData;
-            if (sizeEl && sizeEl.clientHeight) {
+            if (sizeKey && sizeEl && sizeEl.clientHeight) {
                 rowHeightStore[sizeKey] = sizeEl.clientHeight;
             }
         };
@@ -1627,7 +1627,7 @@ export default defineVxeComponent({
                     internalData.tableFullGroupData = groupRest.treeData;
                     reactData.isRowGroupStatus = true;
                     reactData.rowGroupList = aggGroupConfs;
-                    $xeTable.cacheRowMap(false);
+                    $xeTable.cacheRowMap(false, false);
                 }
                 // 如果自定义了顺序
                 if (isCustomSort && sortData) {
@@ -3160,7 +3160,7 @@ export default defineVxeComponent({
                 }
             }
         };
-        const handleAsyncTreeExpandChilds = (row) => {
+        const handleAsyncTreeExpandChilds = (row, autoExpand) => {
             const treeOpts = computeTreeOpts.value;
             const checkboxOpts = computeCheckboxOpts.value;
             const { transform, loadMethod } = treeOpts;
@@ -3184,7 +3184,7 @@ export default defineVxeComponent({
                         if (childRecords) {
                             return $xeTable.loadTreeChildren(row, childRecords).then(childRows => {
                                 const { treeExpandedMaps } = internalData;
-                                if (childRows.length && !treeExpandedMaps[rowid]) {
+                                if (autoExpand && childRows.length && !treeExpandedMaps[rowid]) {
                                     treeExpandedMaps[rowid] = row;
                                 }
                                 reactData.treeExpandedFlag++;
@@ -3403,7 +3403,9 @@ export default defineVxeComponent({
             }
             const varEl = refVarElem.value;
             if (varEl) {
-                const [defEl, mediumEl, smallEl, miniEl] = varEl.children;
+                const [dxlargeEl, largeEl, defEl, mediumEl, smallEl, miniEl] = varEl.children;
+                calcVarRowHeightConfig('xlarge', dxlargeEl);
+                calcVarRowHeightConfig('large', largeEl);
                 calcVarRowHeightConfig('default', defEl);
                 calcVarRowHeightConfig('medium', mediumEl);
                 calcVarRowHeightConfig('small', smallEl);
@@ -3890,7 +3892,7 @@ export default defineVxeComponent({
             internalData.tableFullTreeData = isRGroup ? [] : treeData;
             internalData.tableFullGroupData = isRGroup ? treeData : [];
             // 缓存数据
-            $xeTable.cacheRowMap(isReset);
+            $xeTable.cacheRowMap(isReset, true);
             // 原始数据
             internalData.tableSynchData = datas;
             if (isReset) {
@@ -4361,7 +4363,7 @@ export default defineVxeComponent({
                             const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
                             // 是否使用懒加载
                             if (isLoad) {
-                                result.push(handleAsyncTreeExpandChilds(row));
+                                result.push(handleAsyncTreeExpandChilds(row, true));
                             }
                             else {
                                 if (row[childrenField] && row[childrenField].length) {
@@ -5352,7 +5354,7 @@ export default defineVxeComponent({
                     if (reDelFlag) {
                         reactData.removeRowFlag++;
                         $xeTable.updateFooter();
-                        $xeTable.cacheRowMap(false);
+                        $xeTable.cacheRowMap(false, true);
                         $xeTable.handleTableData(treeConfig && transform);
                         if (!(treeConfig && transform)) {
                             $xeTable.updateAfterDataIndex();
@@ -7594,7 +7596,7 @@ export default defineVxeComponent({
              * 重新懒加载树节点，并展开该节点
              * @param {Row} row 行对象
              */
-            reloadTreeExpand(row) {
+            reloadTreeExpand(row, autoExpand = true) {
                 const { treeExpandLazyLoadedMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
@@ -7602,7 +7604,7 @@ export default defineVxeComponent({
                 const rowid = getRowid($xeTable, row);
                 if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
                     return $xeTable.clearTreeExpandLoaded(row).then(() => {
-                        return handleAsyncTreeExpandChilds(row);
+                        return handleAsyncTreeExpandChilds(row, autoExpand);
                     }).then(() => {
                         if (transform) {
                             handleVirtualTreeToList();
@@ -9502,7 +9504,7 @@ export default defineVxeComponent({
             internalData.insertRowMaps = iRowMaps;
             internalData.removeRowMaps = rRowMaps;
             internalData.afterFullData = afterFullList;
-            $xeTable.cacheRowMap(false);
+            $xeTable.cacheRowMap(false, false);
             $xeTable.handleTableData(treeConfig && transform);
             $xeTable.updateFooter();
             $xeTable.handleUpdateBodyMerge();
@@ -9730,7 +9732,7 @@ export default defineVxeComponent({
             /**
              * 更新数据行的 Map
              */
-            cacheRowMap(isReset) {
+            cacheRowMap(isReset, isReLoaded) {
                 const { treeConfig } = props;
                 const { isRowGroupStatus } = reactData;
                 const { currKeyField, fullAllDataRowIdData, tableFullData, tableFullTreeData, tableFullGroupData, treeExpandedMaps, rowExpandedMaps, selectCheckboxMaps } = internalData;
@@ -9749,8 +9751,10 @@ export default defineVxeComponent({
                         fullDataRowIdMaps[rowid] = rowRest;
                         fullAllDataRowIdMaps[rowid] = rowRest;
                     }
-                    rowRest.treeLoaded = false;
-                    rowRest.expandLoaded = false;
+                    if (isReset || isReLoaded) {
+                        rowRest.treeLoaded = false;
+                        rowRest.expandLoaded = false;
+                    }
                     rowRest._seq = rowNum++;
                     rowRest.row = row;
                     rowRest.items = items;
@@ -11786,7 +11790,7 @@ export default defineVxeComponent({
                         }
                         $xeTable.handleClearStack();
                         $xeTable.handleTableData(treeConfig && transform);
-                        $xeTable.cacheRowMap(false);
+                        $xeTable.cacheRowMap(false, false);
                         updateScrollYStatus();
                         if (!(treeConfig && transform)) {
                             $xeTable.updateAfterDataIndex();
@@ -12143,31 +12147,62 @@ export default defineVxeComponent({
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const { prevDragRow, prevDragPos } = internalData;
                 const rowDragOpts = computeRowDragOpts.value;
-                const { isCrossTableDrag } = rowDragOpts;
+                const { isCrossDrag, isCrossTableDrag, isAutoExpandToChild, isAutoLazyLoadToChild } = rowDragOpts;
+                const childrenField = treeOpts.children || treeOpts.childrenField;
                 // 跨表拖拽
-                if (isCrossTableDrag && crossTableDragRowObj) {
+                if (isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj) {
                     const { $newTable } = crossTableDragRowObj;
                     if ($newTable && $newTable.xID !== $xeTable.xID) {
                         $newTable.handleCrossTableRowDragInsertEvent(evnt);
                         return;
                     }
                 }
-                if (treeConfig && lazy && prevDragToChild) {
+                if (treeConfig && prevDragToChild) {
                     // 懒加载
-                    const newRowid = getRowid($xeTable, prevDragRow);
-                    const rowRest = fullAllDataRowIdData[newRowid];
-                    if (prevDragRow[hasChildField]) {
-                        if (rowRest && rowRest.treeLoaded) {
+                    const prevRowid = getRowid($xeTable, prevDragRow);
+                    const rowRest = fullAllDataRowIdData[prevRowid];
+                    if (!rowRest) {
+                        handleRowDragEndClearStatus();
+                        return;
+                    }
+                    const hasLazyChilds = prevDragRow[hasChildField];
+                    const rowChilds = prevDragRow[childrenField];
+                    // 如果懒加载节点未被加载
+                    if (isAutoExpandToChild) {
+                        // 判断目标节点是否有树子级
+                        if ((lazy && hasLazyChilds) || (rowChilds && rowChilds.length)) {
+                            hideDropTip();
+                            $xeTable.setTreeExpand(prevDragRow, true).then(() => {
+                                $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                            });
+                            return;
+                        }
+                        $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild).then(() => {
+                            if (!$xeTable.isTreeExpandByRow(prevDragRow)) {
+                                $xeTable.setTreeExpand(prevDragRow, true);
+                            }
+                        });
+                        return;
+                    }
+                    // 如果是懒加载节点。只加载不自动展开
+                    if ((lazy && hasLazyChilds) && isAutoLazyLoadToChild) {
+                        if (rowChilds && rowChilds.length) {
                             $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                            return;
                         }
+                        hideDropTip();
+                        $xeTable.reloadTreeExpand(prevDragRow, false).then(() => {
+                            $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                        });
+                        return;
                     }
-                    else {
-                        $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                    // 懒加载的行默认需要先展开过后才允许拖拽，除非启用 isAutoExpandToChild | isAutoLazyLoadToChild
+                    if (lazy && hasLazyChilds && !rowRest.treeLoaded) {
+                        handleRowDragEndClearStatus();
+                        return;
                     }
                 }
-                else {
-                    $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
-                }
+                $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
             },
             handleRowDragDragoverEvent(evnt) {
                 const { treeConfig } = props;
@@ -12177,7 +12212,7 @@ export default defineVxeComponent({
                 const { lazy, transform, parentField } = treeOpts;
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const rowDragOpts = computeRowDragOpts.value;
-                const { isPeerDrag, isCrossDrag, isToChildDrag, isCrossTableDrag } = rowDragOpts;
+                const { isPeerDrag, isCrossDrag, isToChildDrag, isCrossTableDrag, isAutoLazyLoadToChild, isAutoExpandToChild } = rowDragOpts;
                 if (!dragRow && !(isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj)) {
                     evnt.preventDefault();
                     return;
@@ -12221,7 +12256,7 @@ export default defineVxeComponent({
                         }
                     }
                     if ($xeTable.eqRow(dragRow, row) ||
-                        (isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded) ||
+                        (isControlKey && treeConfig && lazy && row[hasChildField] && (rowRest && !rowRest.treeLoaded) && !isAutoLazyLoadToChild && !isAutoExpandToChild) ||
                         (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rowRest.level))) {
                         showDropTip(evnt, trEl, null, false, dragPos);
                         return;
@@ -14166,12 +14201,20 @@ export default defineVxeComponent({
                  * 隐藏列
                  */
                 h('div', {
+                    key: 'tss',
                     class: 'vxe-table-slots'
                 }, slots.default ? slots.default({}) : []),
                 h('div', {
+                    key: 'tvr',
                     ref: refVarElem,
                     class: 'vxe-table-vars'
                 }, [
+                    h('div', {
+                        class: 'vxe-table-var-xlarge'
+                    }),
+                    h('div', {
+                        class: 'vxe-table-var-large'
+                    }),
                     h('div', {
                         class: 'vxe-table-var-default'
                     }),

package/es/table/style.css

@@ -1580,6 +1580,25 @@
   vertical-align: middle;
 }
 
+.vxe-table--filter-wrapper {
+  --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-default);
+}
+.vxe-table--filter-wrapper.size--xlarge {
+  --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-xlarge);
+}
+.vxe-table--filter-wrapper.size--large {
+  --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-large);
+}
+.vxe-table--filter-wrapper.size--medium {
+  --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-medium);
+}
+.vxe-table--filter-wrapper.size--small {
+  --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-small);
+}
+.vxe-table--filter-wrapper.size--mini {
+  --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-mini);
+}
+
 .vxe-cell--filter {
   padding: 0 0.1em 0 0.2em;
   text-align: center;
@@ -1618,8 +1637,12 @@
   z-index: 15;
   max-height: var(--vxe-ui-vxe-table-filter-default-max-height);
 }
+.vxe-table--filter-wrapper[class^=size--], .vxe-table--filter-wrapper[class*=" size--"] {
+  font-size: var(--vxe-ui-table-filter-current-font-size);
+}
 .vxe-table--filter-wrapper:not(.is--multiple) .vxe-table--filter-header,
-.vxe-table--filter-wrapper:not(.is--multiple) .vxe-table--filter-body {
+.vxe-table--filter-wrapper:not(.is--multiple) .vxe-table--filter-body,
+.vxe-table--filter-wrapper:not(.is--multiple) .vxe-table--scrollbar-filter-body {
   text-align: center;
 }
 .vxe-table--filter-wrapper.is--active {
@@ -1746,16 +1769,6 @@
   vertical-align: middle;
 }
 
-.vxe-table--filter-wrapper.size--medium {
-  font-size: var(--vxe-ui-font-size-medium);
-}
-.vxe-table--filter-wrapper.size--small {
-  font-size: var(--vxe-ui-font-size-small);
-}
-.vxe-table--filter-wrapper.size--mini {
-  font-size: var(--vxe-ui-font-size-mini);
-}
-
 .vxe-table--context-menu-wrapper {
   display: none;
 }
@@ -1892,6 +1905,12 @@
           user-select: none;
   pointer-events: none;
 }
+.vxe-table-vars .vxe-table-var-xlarge {
+  height: var(--vxe-ui-table-row-height-xlarge);
+}
+.vxe-table-vars .vxe-table-var-large {
+  height: var(--vxe-ui-table-row-height-large);
+}
 .vxe-table-vars .vxe-table-var-default {
   height: var(--vxe-ui-table-row-height-default);
 }