vxe-table 4.16.17 → 4.16.19

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

@@ -8,6 +8,9 @@ const { renderer, hooks } = VxeUI;
 const tableFilterMethodKeys = ['openFilter', 'setFilter', 'clearFilter', 'saveFilterPanel', 'saveFilterPanelByEvent', 'resetFilterPanel', 'resetFilterPanelByEvent', 'getCheckedFilters', 'updateFilterOptionStatus'];
 hooks.add('tableFilterModule', {
     setupTable($xeTable) {
+        const $xeGrid = $xeTable.xeGrid;
+        const $xeGantt = $xeTable.xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         const { props, reactData, internalData } = $xeTable;
         const { refElem, refTableFilter } = $xeTable.getRefMaps();
         const { computeFilterOpts, computeMouseOpts } = $xeTable.getComputeMaps();
@@ -69,12 +72,14 @@ hooks.add('tableFilterModule', {
                     filterStore.visible = false;
                 }
                 else {
-                    const el = refElem.value;
+                    const tableEl = refElem.value;
                     const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
                     const filterOpts = computeFilterOpts.value;
                     const { transfer } = filterOpts;
-                    const tableRect = el.getBoundingClientRect();
+                    const tableRect = tableEl.getBoundingClientRect();
                     const btnElem = evnt.currentTarget;
+                    const filterRender = column ? column.filterRender : null;
+                    const compConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
                     $xeTable.handleFilterOptions(column);
                     internalData._currFilterParams = params;
                     filterStore.style = null;
@@ -112,18 +117,29 @@ hooks.add('tableFilterModule', {
                         else {
                             left = btnRect.left - tableRect.left - centerWidth;
                             top = btnRect.top - tableRect.top + btnElem.clientHeight;
-                            maxHeight = Math.max(40, el.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
+                            maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
                             if (left < 1) {
                                 left = 1;
                             }
-                            else if (left > (el.clientWidth - filterWidth - 1)) {
-                                left = el.clientWidth - filterWidth - 1;
+                            else if (left > (tableEl.clientWidth - filterWidth - 1)) {
+                                left = tableEl.clientWidth - filterWidth - 1;
+                            }
+                            if ($xeGGWrapper) {
+                                const wrapperEl = $xeGGWrapper.getRefMaps().refElem.value;
+                                if (wrapperEl) {
+                                    const wrapperRect = wrapperEl.getBoundingClientRect();
+                                    top += tableRect.top - wrapperRect.top;
+                                }
                             }
                         }
                         filterStore.style = {
                             top: toCssUnit(top),
                             left: toCssUnit(left)
                         };
+                        // 筛选面板是自适应表格高度
+                        if (compConf ? !compConf.tableFilterAutoHeight : false) {
+                            maxHeight = 0;
+                        }
                         // 判断面板不能大于表格高度
                         filterStore.maxHeight = maxHeight;
                     });

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

@@ -2,7 +2,7 @@ import { h, ref, computed, inject, Teleport } from 'vue';
 import { defineVxeComponent } from '../../../ui/src/comp';
 import { VxeUI } from '../../../ui';
 import { formatText, isEnableConf } from '../../../ui/src/utils';
-import { getPropClass } from '../../../ui/src/dom';
+import { getPropClass, toCssUnit } from '../../../ui/src/dom';
 import { getSlotVNs } from '../../../ui/src/vn';
 import { warnLog } from '../../../ui/src/log';
 import XEUtils from 'xe-utils';
@@ -105,7 +105,7 @@ export default defineVxeComponent({
                         class: 'vxe-table--filter-template',
                         style: maxHeight
                             ? {
-                                maxHeight: `${maxHeight}px`
+                                maxHeight: toCssUnit(maxHeight)
                             }
                             : {}
                     }, $xeTable.callSlot(filterSlot, params))
@@ -117,7 +117,7 @@ export default defineVxeComponent({
                         class: 'vxe-table--filter-template',
                         style: maxHeight
                             ? {
-                                maxHeight: `${maxHeight}px`
+                                maxHeight: toCssUnit(maxHeight)
                             }
                             : {}
                     }, getSlotVNs(rtFilter(filterRender, params)))
@@ -154,7 +154,7 @@ export default defineVxeComponent({
                     class: 'vxe-table--filter-body',
                     style: maxHeight
                         ? {
-                            maxHeight: `${maxHeight}px`
+                            maxHeight: toCssUnit(maxHeight)
                         }
                         : {}
                 }, filterStore.options.map((item) => {

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

@@ -1,8 +1,9 @@
 import { h, Teleport, inject, ref } from 'vue';
 import { defineVxeComponent } from '../../../ui/src/comp';
+import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { getFuncText } from '../../../ui/src/utils';
-import XEUtils from 'xe-utils';
+import { getSlotVNs } from '../../../ui/src/vn';
 const { getIcon, renderEmptyElement } = VxeUI;
 export default defineVxeComponent({
     name: 'VxeTableMenuPanel',
@@ -46,7 +47,9 @@ export default defineVxeComponent({
                             }, options.map((item, index) => {
                                 const hasChildMenus = item.children && item.children.some((child) => child.visible !== false);
                                 const prefixOpts = Object.assign({}, item.prefixConfig);
+                                const prefixIcon = prefixOpts.icon || item.prefixIcon;
                                 const suffixOpts = Object.assign({}, item.suffixConfig);
+                                const suffixIcon = suffixOpts.icon || item.suffixIcon;
                                 const menuContent = getFuncText(item.name);
                                 return item.visible === false
                                     ? renderEmptyElement($xeTable)
@@ -72,9 +75,11 @@ export default defineVxeComponent({
                                             h('div', {
                                                 class: ['vxe-context-menu--link-prefix', prefixOpts.className || '']
                                             }, [
-                                                h('i', {
-                                                    class: prefixOpts.icon || item.prefixIcon
-                                                }),
+                                                prefixIcon && XEUtils.isFunction(prefixIcon)
+                                                    ? h('span', {}, getSlotVNs(prefixIcon({})))
+                                                    : h('i', {
+                                                        class: prefixIcon
+                                                    }),
                                                 prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : renderEmptyElement($xeTable)
                                             ]),
                                             h('div', {
@@ -84,20 +89,24 @@ export default defineVxeComponent({
                                             h('div', {
                                                 class: ['vxe-context-menu--link-suffix', suffixOpts.className || '']
                                             }, [
-                                                h('i', {
-                                                    class: (suffixOpts.icon || item.suffixIcon) || (hasChildMenus ? getIcon().TABLE_MENU_OPTIONS : '')
-                                                }),
+                                                suffixIcon && XEUtils.isFunction(suffixIcon)
+                                                    ? h('span', {}, getSlotVNs(suffixIcon({})))
+                                                    : h('i', {
+                                                        class: suffixIcon || (hasChildMenus ? getIcon().TABLE_MENU_OPTIONS : '')
+                                                    }),
                                                 suffixOpts.content ? h('span', `${suffixOpts.content}`) : renderEmptyElement($xeTable)
                                             ])
                                         ]),
-                                        hasChildMenus
+                                        hasChildMenus && item.children
                                             ? h('ul', {
                                                 class: ['vxe-table--context-menu-clild-wrapper', {
                                                         'is--show': item === ctxMenuStore.selected && ctxMenuStore.showChild
                                                     }]
                                             }, item.children.map((child, cIndex) => {
                                                 const childPrefixOpts = Object.assign({}, child.prefixConfig);
+                                                const childPrefixIcon = childPrefixOpts.icon || child.prefixIcon;
                                                 const childSuffixOpts = Object.assign({}, child.suffixConfig);
+                                                const childSuffixIcon = childSuffixOpts.icon || child.suffixIcon;
                                                 const childMenuContent = getFuncText(child.name);
                                                 return child.visible === false
                                                     ? null
@@ -123,9 +132,11 @@ export default defineVxeComponent({
                                                             h('div', {
                                                                 class: ['vxe-context-menu--link-prefix', childPrefixOpts.className || '']
                                                             }, [
-                                                                h('i', {
-                                                                    class: childPrefixOpts.icon || child.prefixIcon
-                                                                }),
+                                                                childPrefixIcon && XEUtils.isFunction(childPrefixIcon)
+                                                                    ? h('span', {}, getSlotVNs(childPrefixIcon({})))
+                                                                    : h('i', {
+                                                                        class: childPrefixIcon
+                                                                    }),
                                                                 childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : renderEmptyElement($xeTable)
                                                             ]),
                                                             h('div', {
@@ -135,9 +146,11 @@ export default defineVxeComponent({
                                                             h('div', {
                                                                 class: ['vxe-context-menu--link-suffix', childSuffixOpts.className || '']
                                                             }, [
-                                                                h('i', {
-                                                                    class: childSuffixOpts.icon
-                                                                }),
+                                                                childSuffixIcon && XEUtils.isFunction(childSuffixIcon)
+                                                                    ? h('span', {}, getSlotVNs(childSuffixIcon({})))
+                                                                    : h('i', {
+                                                                        class: childSuffixIcon
+                                                                    }),
                                                                 childSuffixOpts.content ? h('span', `${childSuffixOpts.content}`) : renderEmptyElement($xeTable)
                                                             ])
                                                         ])

package/es/table/src/cell.js

@@ -1090,22 +1090,25 @@ export const Cell = {
         }
         let editIconVNs = [];
         if (isEnableConf(editConfig)) {
+            const { showAsterisk, showIcon, icon } = editOpts;
             editIconVNs = [
-                isRequired && editOpts.showAsterisk
+                isRequired && showAsterisk
                     ? h('span', {
                         class: 'vxe-cell--required-icon'
                     }, [
                         h('i')
                     ])
                     : renderEmptyElement($table),
-                isEnableConf(editRender) && editOpts.showIcon
+                isEnableConf(editRender) && showIcon
                     ? h('span', {
                         class: 'vxe-cell--edit-icon'
-                    }, [
-                        h('i', {
-                            class: editOpts.icon || getIcon().TABLE_EDIT
-                        })
-                    ])
+                    }, XEUtils.isFunction(icon)
+                        ? getSlotVNs(icon({}))
+                        : [
+                            h('i', {
+                                class: icon || getIcon().TABLE_EDIT
+                            })
+                        ])
                     : renderEmptyElement($table)
             ];
         }

package/es/table/src/table.js

@@ -11715,16 +11715,16 @@ export default defineVxeComponent({
             }
         };
         // 检测对应模块是否安装
-        'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
-            $xeTable[name] = function () {
-                errLog('vxe.error.reqModule', ['Export']);
-            };
-        });
-        'clearValidate,fullValidate,validate'.split(',').forEach(name => {
-            $xeTable[name] = function () {
-                errLog('vxe.error.reqModule', ['Validator']);
-            };
-        });
+        // 'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
+        //   ($xeTable as any)[name] = function () {
+        //     errLog('vxe.error.reqModule', ['Export'])
+        //   }
+        // })
+        // 'clearValidate,fullValidate,validate'.split(',').forEach(name => {
+        //   ($xeTable as any)[name] = function () {
+        //     errLog('vxe.error.reqModule', ['Validator'])
+        //   }
+        // })
         Object.assign($xeTable, tableMethods, tablePrivateMethods);
         /**
          * 渲染浮固定列
@@ -12832,18 +12832,18 @@ export default defineVxeComponent({
                 //   }
                 // }
                 // 检查是否有安装需要的模块
-                if (props.editConfig && !$xeTable.insert) {
-                    errLog('vxe.error.reqModule', ['Edit']);
-                }
-                if (props.editRules && !$xeTable.validate) {
-                    errLog('vxe.error.reqModule', ['Validator']);
-                }
-                if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
-                    errLog('vxe.error.reqModule', ['Keyboard']);
-                }
-                if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
-                    errLog('vxe.error.reqModule', ['Export']);
-                }
+                // if (props.editConfig && !$xeTable.insert) {
+                //   errLog('vxe.error.reqModule', ['Edit'])
+                // }
+                // if (props.editRules && !$xeTable.validate) {
+                //   errLog('vxe.error.reqModule', ['Validator'])
+                // }
+                // if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
+                //   errLog('vxe.error.reqModule', ['Keyboard'])
+                // }
+                // if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
+                //   errLog('vxe.error.reqModule', ['Export'])
+                // }
                 Object.assign(scrollYStore, {
                     startIndex: 0,
                     endIndex: 0,