vxe-table 3.23.2 → 3.23.4

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

@@ -497,6 +497,12 @@ export default {
         },
         handleCustomStyle() {
             const $xeTable = this;
+            const reactData = $xeTable.reactData;
+            const { customStore } = reactData;
+            if (!customStore.visible) {
+                return $xeTable.$nextTick();
+            }
+            reactData.isCustomDragStatus = false;
             return updatePopupStyle($xeTable);
         }
     }

package/es/table/module/export/export-panel.js

@@ -163,9 +163,10 @@ export default {
             const { hasMerge, columns } = storeData;
             const checkedAll = $xeExportPanel.computeCheckedAll;
             const supportMerge = $xeExportPanel.computeSupportMerge;
-            const expColumns = XEUtils.searchTree(columns, column => column.checked, { children: 'children', mapChildren: 'childNodes', original: true });
+            // 内部导出使用 _columns -> _children 为自定义子集
+            const expColumns = XEUtils.searchTree(columns, column => column.checked, { children: 'children', mapChildren: '_children', original: true });
             return Object.assign({}, defaultOptions, {
-                columns: expColumns,
+                _columns: expColumns,
                 isMerge: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false
             });
         },

package/es/table/module/export/mixin.js

@@ -1183,7 +1183,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     const exportOpts = $xeTable.computeExportOpts;
     const hasTree = !!treeConfig;
     const hasRowGroup = rowGroupList.length > 0;
-    const customOpts = $xeTable.computeCustomOpts;
+    const printOpts = $xeTable.computePrintOpts;
     const selectRecords = $xeTable.getCheckboxRecords();
     const proxyOpts = $xeGGWrapper ? $xeGGWrapper.computeProxyOpts : {};
     const hasFooter = !!footerTableData.length;
@@ -1204,9 +1204,9 @@ function handleExportAndPrint($xeTable, options, isPrint) {
         warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
         defOpts.isTreeAllExpanded = defOpts.isAllExpand;
     }
-    const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps);
+    const types = isPrint ? [] : (defOpts.types || XEUtils.keys(exportOpts._typeMaps));
     const modes = defOpts.modes || [];
-    const checkMethod = customOpts.checkMethod;
+    const checkMethod = (isPrint ? printOpts : exportOpts).checkMethod;
     const exportColumns = collectColumn.slice(0);
     const { columns, excludeFields, includeFields, extraFields } = defOpts;
     // 处理类型
@@ -1313,10 +1313,10 @@ function handleExportAndPrint($xeTable, options, isPrint) {
         }
     }
     if (!modeList.some(item => item.value === mode)) {
-        exportParams.mode = modeList[0].value;
+        exportParams.mode = modeList.length ? modeList[0].value : '';
     }
     if (!typeList.some(item => item.value === type)) {
-        exportParams.type = typeList[0].value;
+        exportParams.type = typeList.length ? typeList[0].value : '';
     }
     if (!exportParams.widthMode) {
         exportParams.widthMode = '';
@@ -1458,7 +1458,13 @@ export default {
             }
             let isCustomCol = false;
             let customCols = [];
-            if (columns) {
+            const _columns = opts._columns;
+            if (_columns) {
+                // 内部导出使用 _columns -> _children 为自定义子集
+                isCustomCol = true;
+                customCols = XEUtils.searchTree(_columns, () => true, { children: '_children', mapChildren: 'childNodes', original: true });
+            }
+            else if (columns) {
                 isCustomCol = true;
                 customCols = XEUtils.searchTree(columns, () => true, { children: 'children', mapChildren: 'childNodes', original: true });
             }

package/es/table/module/filter/mixin.js

@@ -5,6 +5,97 @@ import { toCssUnit, triggerEvent, getDomNode } from '../../../ui/src/dom';
 import { isEnableConf } from '../../../ui/src/utils';
 const { renderer } = VxeUI;
 const sourceType = 'table';
+function updatePopupStyle($xeTable) {
+    const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
+    const { filterStore } = reactData;
+    const { elemStore } = internalData;
+    const { column, targetEl } = filterStore;
+    if (!column || !targetEl) {
+        return $xeTable.$nextTick();
+    }
+    const tableEl = $xeTable.$refs.refElem;
+    const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
+    const filterOpts = $xeTable.computeFilterOpts;
+    const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts;
+    const currEl = targetEl;
+    const tableRect = tableEl.getBoundingClientRect();
+    const filterRender = column ? column.filterRender : null;
+    const compConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
+    const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+    if (!headerScrollElem) {
+        return $xeTable.$nextTick();
+    }
+    const tableFilter = $xeTable.$refs.refTableFilter;
+    const filterWrapperElem = tableFilter ? tableFilter.$el : null;
+    if (!filterWrapperElem) {
+        return $xeTable.$nextTick();
+    }
+    const btnRect = currEl.getBoundingClientRect();
+    const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
+    const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
+    const filterWidth = filterWrapperElem.offsetWidth;
+    const centerWidth = currEl ? filterWidth / 2 : ((filterWidth - column.renderWidth) / 2);
+    let left = 0;
+    let top = 0;
+    let maxHeight = 0;
+    /**
+     * 是否显示筛选按钮图标
+     * 如果不存在图标，则相对单元格居中显示
+     */
+    if (transfer) {
+        left = btnRect.left - centerWidth + scrollLeft;
+        top = btnRect.top + currEl.clientHeight + scrollTop;
+        maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28));
+        if (left < 16) {
+            left = 16;
+        }
+        else if (left > (visibleWidth - filterWidth - 16)) {
+            left = visibleWidth - filterWidth - 16;
+        }
+    }
+    else {
+        left = btnRect.left - tableRect.left - centerWidth;
+        top = btnRect.top - tableRect.top + currEl.clientHeight;
+        maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
+        if (left < 1) {
+            left = 1;
+        }
+        else if (left > (tableEl.clientWidth - filterWidth - 1)) {
+            left = tableEl.clientWidth - filterWidth - 1;
+        }
+        if ($xeGGWrapper) {
+            const wrapperEl = $xeGGWrapper.$refs.refElem;
+            if (wrapperEl) {
+                const wrapperRect = wrapperEl.getBoundingClientRect();
+                top += tableRect.top - wrapperRect.top;
+            }
+        }
+    }
+    const fStys = {
+        top: toCssUnit(top),
+        left: toCssUnit(left)
+    };
+    if (zIndex) {
+        fStys.zIndex = zIndex;
+    }
+    filterStore.style = fStys;
+    // 筛选面板是自适应表格高度
+    if (compConf ? !compConf.tableFilterAutoHeight : false) {
+        maxHeight = 0;
+    }
+    else {
+        if (customMaxHeight) {
+            maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
+        }
+    }
+    // 判断面板不能大于表格高度
+    filterStore.maxHeight = maxHeight;
+    return $xeTable.$nextTick();
+}
 export default {
     methods: {
         /**
@@ -93,96 +184,22 @@ export default {
         },
         handleOpenFilterColumn(evnt, btnEl, colEl, column, params) {
             const $xeTable = this;
-            const $xeGrid = $xeTable.$xeGrid;
-            const $xeGantt = $xeTable.$xeGantt;
             const reactData = $xeTable;
             const internalData = $xeTable;
-            const $xeGGWrapper = $xeGrid || $xeGantt;
             const { initStore, filterStore } = reactData;
-            const { elemStore } = internalData;
             if (filterStore.column === column && filterStore.visible) {
                 filterStore.visible = false;
             }
             else {
-                const tableEl = $xeTable.$refs.refElem;
-                const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
-                const filterOpts = $xeTable.computeFilterOpts;
-                const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts;
                 const currEl = btnEl || colEl;
-                const tableRect = tableEl.getBoundingClientRect();
-                const filterRender = column ? column.filterRender : null;
-                const compConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
                 $xeTable.handleFilterOptions(column);
                 internalData._currFilterParams = params;
+                filterStore.targetEl = currEl;
                 filterStore.style = null;
                 filterStore.visible = true;
                 initStore.filter = true;
                 $xeTable.$nextTick(() => {
-                    const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
-                    if (!headerScrollElem) {
-                        return;
-                    }
-                    const tableFilter = $xeTable.$refs.refTableFilter;
-                    const filterWrapperElem = tableFilter ? tableFilter.$el : null;
-                    if (!filterWrapperElem) {
-                        return;
-                    }
-                    const btnRect = currEl.getBoundingClientRect();
-                    const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
-                    const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
-                    const filterWidth = filterWrapperElem.offsetWidth;
-                    const centerWidth = filterWidth / 2;
-                    let left = 0;
-                    let top = 0;
-                    let maxHeight = 0;
-                    if (transfer) {
-                        left = btnRect.left - centerWidth + scrollLeft;
-                        top = btnRect.top + currEl.clientHeight + scrollTop;
-                        maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28));
-                        if (left < 16) {
-                            left = 16;
-                        }
-                        else if (left > (visibleWidth - filterWidth - 16)) {
-                            left = visibleWidth - filterWidth - 16;
-                        }
-                    }
-                    else {
-                        left = btnRect.left - tableRect.left - centerWidth;
-                        top = btnRect.top - tableRect.top + currEl.clientHeight;
-                        maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
-                        if (left < 1) {
-                            left = 1;
-                        }
-                        else if (left > (tableEl.clientWidth - filterWidth - 1)) {
-                            left = tableEl.clientWidth - filterWidth - 1;
-                        }
-                        if ($xeGGWrapper) {
-                            const wrapperEl = $xeGGWrapper.$refs.refElem;
-                            if (wrapperEl) {
-                                const wrapperRect = wrapperEl.getBoundingClientRect();
-                                top += tableRect.top - wrapperRect.top;
-                            }
-                        }
-                    }
-                    const fStys = {
-                        top: toCssUnit(top),
-                        left: toCssUnit(left)
-                    };
-                    if (zIndex) {
-                        fStys.zIndex = zIndex;
-                    }
-                    filterStore.style = fStys;
-                    // 筛选面板是自适应表格高度
-                    if (compConf ? !compConf.tableFilterAutoHeight : false) {
-                        maxHeight = 0;
-                    }
-                    else {
-                        if (customMaxHeight) {
-                            maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
-                        }
-                    }
-                    // 判断面板不能大于表格高度
-                    filterStore.maxHeight = maxHeight;
+                    updatePopupStyle($xeTable);
                 });
             }
             $xeTable.dispatchEvent('filter-visible', { column, field: column.field, property: column.field, filterList: $xeTable.getCheckedFilters(), visible: filterStore.visible }, evnt);
@@ -443,6 +460,15 @@ export default {
                 }
             }
         },
+        handleFilterStyle() {
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const { filterStore } = reactData;
+            if (!filterStore.visible) {
+                return $xeTable.$nextTick();
+            }
+            return updatePopupStyle($xeTable);
+        },
         /**
          * 清空指定列的筛选条件
          * 如果为空则清空所有列的筛选条件

package/es/table/render/index.js

@@ -1484,16 +1484,25 @@ renderer.mixin({
             ];
         },
         renderTableCell(h, renderOpts, params) {
-            const { row, column } = params;
+            const { $table, row, column } = params;
+            const { props } = renderOpts;
+            const customSize = props ? props.size : null;
+            const vSize = customSize || $table.computeSize;
             const cellValue = XEUtils.get(row, column.field);
             return h('span', {
-                class: 'vxe-color-picker--readonly'
+                class: ['vxe-color-picker--readonly', {
+                        [`size--${vSize}`]: vSize
+                    }]
             }, [
                 h('div', {
-                    class: 'vxe-color-picker--readonly-color',
-                    style: {
-                        backgroundColor: cellValue
-                    }
+                    class: ['vxe-color-picker--readonly-color', {
+                            'is--empty': !cellValue
+                        }],
+                    style: cellValue
+                        ? {
+                            backgroundColor: cellValue
+                        }
+                        : undefined
                 })
             ]);
         }

package/es/table/src/methods.js

@@ -7618,6 +7618,12 @@ const tableMethods = {
     },
     handleGlobalScrollEvent(evnt) {
         const $xeTable = this;
+        const reactData = $xeTable;
+        const { filterStore } = reactData;
+        const filterOpts = $xeTable.computeFilterOpts;
+        if (filterStore.visible && filterOpts.transfer) {
+            $xeTable.handleFilterStyle();
+        }
         reUpdateCustomStyleEvent($xeTable, evnt);
     },
     /**
@@ -7635,10 +7641,14 @@ const tableMethods = {
      */
     keydownEvent(evnt) {
         const $xeTable = this;
-        const { filterStore, ctxMenuStore, editStore, keyboardConfig, mouseConfig, mouseOpts, keyboardOpts } = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const { mouseConfig, keyboardConfig } = props;
+        const { filterStore, ctxMenuStore, editStore } = reactData;
+        const mouseOpts = $xeTable.computeMouseOpts;
+        const keyboardOpts = $xeTable.computeKeyboardOpts;
         const { actived } = editStore;
-        const { keyCode } = evnt;
-        const isEsc = keyCode === 27;
+        const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
         if (isEsc) {
             this.preventEvent(evnt, 'event.keydown', null, () => {
                 $xeTable.dispatchEvent('keydown-start', {}, evnt);

package/es/table/src/util.js

@@ -230,6 +230,7 @@ export function createReactData() {
         customColumnList: [],
         // 当前选中的筛选列
         filterStore: {
+            targetEl: null,
             isAllSelected: false,
             isIndeterminate: false,
             style: null,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.23.2";
+export const version = "3.23.4";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/dom.js

@@ -15,7 +15,7 @@ export function getTpImg() {
     return tpImgEl;
 }
 export function getPropClass(property, params) {
-    return property ? XEUtils.isFunction(property) ? property(params) : property : '';
+    return property ? (XEUtils.isFunction(property) ? property(params) : property) || '' : '';
 }
 function getClsRE(cls) {
     if (!reClsMap[cls]) {

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"3.23.2"}`;
+const tableVersion = `table v${"3.23.4"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';