vxe-table 3.18.18 → 3.18.19

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

@@ -65,8 +65,11 @@ export default {
          */
         triggerFilterEvent(evnt, column, params) {
             const $xeTable = this;
+            const $xeGrid = $xeTable.$xeGrid;
+            const $xeGantt = $xeTable.$xeGantt;
             const reactData = $xeTable;
             const internalData = $xeTable;
+            const $xeGGWrapper = $xeGrid || $xeGantt;
             const { filterStore } = this;
             if (filterStore.column === column && filterStore.visible) {
                 filterStore.visible = false;
@@ -78,12 +81,14 @@ export default {
                     filterStore.visible = false;
                 }
                 else {
-                    const el = $xeTable.$refs.refElem;
+                    const tableEl = $xeTable.$refs.refElem;
                     const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
                     const filterOpts = $xeTable.computeFilterOpts;
                     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;
@@ -121,18 +126,29 @@ export default {
                         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.$refs.refElem;
+                                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

@@ -1,5 +1,6 @@
 import { VxeUI } from '../../../ui';
-import { formatText, isEnableConf, getClass } from '../../../ui/src/utils';
+import { formatText, isEnableConf } from '../../../ui/src/utils';
+import { getPropClass, toCssUnit } from '../../../ui/src/dom';
 import { getSlotVNs } from '../../../ui/src/vn';
 import { warnLog } from '../../../ui/src/log';
 const { getI18n, getIcon, renderer, globalMixins } = VxeUI;
@@ -19,7 +20,7 @@ function renderOptions($xeFilterPanel, h, filterRender, compConf) {
                 class: 'vxe-table--filter-template',
                 style: maxHeight
                     ? {
-                        maxHeight: `${maxHeight}px`
+                        maxHeight: toCssUnit(maxHeight)
                     }
                     : {}
             }, $xeTable.callSlot(filterSlot, params, h))
@@ -31,7 +32,7 @@ function renderOptions($xeFilterPanel, h, filterRender, compConf) {
                 class: 'vxe-table--filter-template',
                 style: maxHeight
                     ? {
-                        maxHeight: `${maxHeight}px`
+                        maxHeight: toCssUnit(maxHeight)
                     }
                     : {}
             }, getSlotVNs(rtFilter.call($xeTable, h, filterRender, params)))
@@ -72,7 +73,7 @@ function renderOptions($xeFilterPanel, h, filterRender, compConf) {
             class: 'vxe-table--filter-body',
             style: maxHeight
                 ? {
-                    maxHeight: `${maxHeight}px`
+                    maxHeight: toCssUnit(maxHeight)
                 }
                 : {}
         }, filterStore.options.map((item) => {
@@ -196,7 +197,7 @@ export default {
                 'filter--prevent-default',
                 className,
                 compConf && compConf.className ? compConf.className : '',
-                getClass(filterClassName, params),
+                getPropClass(filterClassName, params),
                 {
                     [`size--${vSize}`]: vSize,
                     'is--animat': tableProps.animat,

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

@@ -1,5 +1,7 @@
 import { VxeUI } from '../../../ui';
+import XEUtils from 'xe-utils';
 import { getFuncText } from '../../../ui/src/utils';
+import { getSlotVNs } from '../../../ui/src/vn';
 const { getIcon, renderEmptyElement } = VxeUI;
 export default {
     name: 'VxeTableMenuPanel',
@@ -52,7 +54,9 @@ export default {
                     }, 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)
@@ -80,9 +84,11 @@ export default {
                                     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.call($xeTable, {})))
+                                            : h('i', {
+                                                class: prefixIcon
+                                            }),
                                         prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : renderEmptyElement($xeTable)
                                     ]),
                                     h('span', {
@@ -94,20 +100,24 @@ export default {
                                     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.call($xeTable, {})))
+                                            : 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
@@ -135,9 +145,11 @@ export default {
                                                     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.call($xeTable, {})))
+                                                            : h('i', {
+                                                                class: childPrefixIcon
+                                                            }),
                                                         childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : renderEmptyElement($xeTable)
                                                     ]),
                                                     h('span', {
@@ -149,9 +161,11 @@ export default {
                                                     h('div', {
                                                         class: ['vxe-context-menu--link-suffix', childSuffixOpts.className || '']
                                                     }, [
-                                                        h('i', {
-                                                            class: childSuffixOpts.icon
-                                                        }),
+                                                        childSuffixIcon && XEUtils.isFunction(childSuffixIcon)
+                                                            ? h('span', {}, getSlotVNs(childSuffixIcon.call($xeTable, {})))
+                                                            : h('i', {
+                                                                class: childSuffixIcon
+                                                            }),
                                                         childSuffixOpts.content ? h('span', `${childSuffixOpts.content}`) : renderEmptyElement($xeTable)
                                                     ])
                                                 ])

package/es/table/src/cell.js

@@ -1094,8 +1094,9 @@ export const Cell = {
         }
         let editIconVNs = [];
         if (isEnableConf(editConfig)) {
+            const { showAsterisk, showIcon, icon } = editOpts;
             editIconVNs = [
-                isRequired && editOpts.showAsterisk
+                isRequired && showAsterisk
                     ? h('i', {
                         class: 'vxe-cell--required-icon'
                     }, [
@@ -1104,14 +1105,16 @@ export const Cell = {
                         })
                     ])
                     : renderEmptyElement($table),
-                isEnableConf(editRender) && editOpts.showIcon
+                isEnableConf(editRender) && showIcon
                     ? h('i', {
                         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

@@ -1757,7 +1757,7 @@ export default {
             }
         }
         if ($xeGGWrapper) {
-            const popupContainerElem = $xeGantt.$refs.refPopupContainerElem;
+            const popupContainerElem = $xeGGWrapper.$refs.refPopupContainerElem;
             const popupWrapperEl = $xeTable.$refs.refPopupWrapperElem;
             if (popupContainerElem) {
                 if (popupWrapperEl) {

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.18.18"}`;
+const version = `table v${"3.18.19"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.18";
+const version = "3.18.19";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2513,7 +2513,7 @@ function getTpImg() {
   return tpImgEl;
 }
 function getPropClass(property, params) {
-  return property ? XEUtils.isFunction(property) ? property(params) : property : '';
+  return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(property) ? property(params) : property : '';
 }
 function getClsRE(cls) {
   if (!reClsMap[cls]) {
@@ -2689,7 +2689,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.18"}`;
+const log_version = `table v${"3.18.19"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5126,14 +5126,19 @@ const Cell = {
     }
     let editIconVNs = [];
     if (isEnableConf(editConfig)) {
-      editIconVNs = [isRequired && editOpts.showAsterisk ? h('i', {
+      const {
+        showAsterisk,
+        showIcon,
+        icon
+      } = editOpts;
+      editIconVNs = [isRequired && showAsterisk ? h('i', {
         class: 'vxe-cell--required-icon'
       }, [h('i', {
         class: 'vxe-cell--required-icon'
-      })]) : renderEmptyElement($table), isEnableConf(editRender) && editOpts.showIcon ? h('i', {
+      })]) : renderEmptyElement($table), isEnableConf(editRender) && showIcon ? h('i', {
         class: 'vxe-cell--edit-icon'
-      }, [h('i', {
-        class: editOpts.icon || cell_getIcon().TABLE_EDIT
+      }, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(icon) ? getSlotVNs(icon({})) : [h('i', {
+        class: icon || cell_getIcon().TABLE_EDIT
       })]) : renderEmptyElement($table)];
     }
     return renderHeaderCellBaseVNs(h, params, editIconVNs.concat(Cell.renderHeaderTitle(h, params)).concat(sortable ? Cell.renderSortIcon(h, params) : []).concat(filters ? Cell.renderFilterIcon(h, params) : []));
@@ -22790,6 +22795,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
 
 
 
+
 const {
   getI18n: filter_panel_getI18n,
   getIcon: filter_panel_getIcon,
@@ -22819,14 +22825,14 @@ function renderOptions($xeFilterPanel, h, filterRender, compConf) {
     return [h('div', {
       class: 'vxe-table--filter-template',
       style: maxHeight ? {
-        maxHeight: `${maxHeight}px`
+        maxHeight: toCssUnit(maxHeight)
       } : {}
     }, $xeTable.callSlot(filterSlot, params, h))];
   } else if (rtFilter) {
     return [h('div', {
       class: 'vxe-table--filter-template',
       style: maxHeight ? {
-        maxHeight: `${maxHeight}px`
+        maxHeight: toCssUnit(maxHeight)
       } : {}
     }, getSlotVNs(rtFilter.call($xeTable, h, filterRender, params)))];
   }
@@ -22854,7 +22860,7 @@ function renderOptions($xeFilterPanel, h, filterRender, compConf) {
   }, filter_panel_getI18n('vxe.table.allFilter'))]))]), h('ul', {
     class: 'vxe-table--filter-body',
     style: maxHeight ? {
-      maxHeight: `${maxHeight}px`
+      maxHeight: toCssUnit(maxHeight)
     } : {}
   }, filterStore.options.map(item => {
     const isChecked = item._checked;
@@ -22977,7 +22983,7 @@ function renderFooter($xeFilterPanel, h) {
     } = filterOpts;
     return h('div', {
       ref: 'refElem',
-      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', className, compConf && compConf.className ? compConf.className : '', getClass(filterClassName, params), {
+      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', className, compConf && compConf.className ? compConf.className : '', getPropClass(filterClassName, params), {
         [`size--${vSize}`]: vSize,
         'is--animat': tableProps.animat,
         'is--multiple': multiple,
@@ -23810,6 +23816,8 @@ const {
 ;// CONCATENATED MODULE: ./packages/table/module/menu/panel.ts
 
 
+
+
 const {
   getIcon: menu_panel_getIcon,
   renderEmptyElement: menu_panel_renderEmptyElement
@@ -23872,7 +23880,9 @@ const {
       }, 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 ? menu_panel_renderEmptyElement($xeTable) : h('li', {
           class: [item.className, {
@@ -23895,8 +23905,8 @@ const {
           }
         }, [h('div', {
           class: ['vxe-context-menu--link-prefix', prefixOpts.className || '']
-        }, [h('i', {
-          class: prefixOpts.icon || item.prefixIcon
+        }, [prefixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(prefixIcon) ? h('span', {}, getSlotVNs(prefixIcon.call($xeTable, {}))) : h('i', {
+          class: prefixIcon
         }), prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), h('span', {
           class: 'vxe-context-menu--link-content',
           attrs: {
@@ -23904,15 +23914,17 @@ const {
           }
         }, menuContent), h('div', {
           class: ['vxe-context-menu--link-suffix', suffixOpts.className || '']
-        }, [h('i', {
-          class: suffixOpts.icon || item.suffixIcon || (hasChildMenus ? menu_panel_getIcon().TABLE_MENU_OPTIONS : '')
-        }), suffixOpts.content ? h('span', `${suffixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)])]), hasChildMenus ? h('ul', {
+        }, [suffixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(suffixIcon) ? h('span', {}, getSlotVNs(suffixIcon.call($xeTable, {}))) : h('i', {
+          class: suffixIcon || (hasChildMenus ? menu_panel_getIcon().TABLE_MENU_OPTIONS : '')
+        }), suffixOpts.content ? h('span', `${suffixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)])]), 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 : h('li', {
             class: [child.className, {
@@ -23935,8 +23947,8 @@ const {
             }
           }, [h('div', {
             class: ['vxe-context-menu--link-prefix', childPrefixOpts.className || '']
-          }, [h('i', {
-            class: childPrefixOpts.icon || child.prefixIcon
+          }, [childPrefixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(childPrefixIcon) ? h('span', {}, getSlotVNs(childPrefixIcon.call($xeTable, {}))) : h('i', {
+            class: childPrefixIcon
           }), childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), h('span', {
             class: 'vxe-context-menu--link-content',
             attrs: {
@@ -23944,8 +23956,8 @@ const {
             }
           }, childMenuContent), h('div', {
             class: ['vxe-context-menu--link-suffix', childSuffixOpts.className || '']
-          }, [h('i', {
-            class: childSuffixOpts.icon
+          }, [childSuffixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(childSuffixIcon) ? h('span', {}, getSlotVNs(childSuffixIcon.call($xeTable, {}))) : h('i', {
+            class: childSuffixIcon
           }), childSuffixOpts.content ? h('span', `${childSuffixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)])])]);
         })) : null]);
       }));
@@ -24030,8 +24042,11 @@ const {
      */
     triggerFilterEvent(evnt, column, params) {
       const $xeTable = this;
+      const $xeGrid = $xeTable.$xeGrid;
+      const $xeGantt = $xeTable.$xeGantt;
       const reactData = $xeTable;
       const internalData = $xeTable;
+      const $xeGGWrapper = $xeGrid || $xeGantt;
       const {
         filterStore
       } = this;
@@ -24048,7 +24063,7 @@ const {
         if (filterStore.column === column && filterStore.visible) {
           filterStore.visible = false;
         } else {
-          const el = $xeTable.$refs.refElem;
+          const tableEl = $xeTable.$refs.refElem;
           const {
             scrollTop,
             scrollLeft,
@@ -24059,8 +24074,10 @@ const {
           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) ? mixin_renderer.get(filterRender.name) : null;
           $xeTable.handleFilterOptions(column);
           internalData._currFilterParams = params;
           filterStore.style = null;
@@ -24096,17 +24113,28 @@ const {
             } 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.$refs.refElem;
+                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;
           });
@@ -31550,7 +31578,7 @@ function renderBody(h, $xeTable) {
       }
     }
     if ($xeGGWrapper) {
-      const popupContainerElem = $xeGantt.$refs.refPopupContainerElem;
+      const popupContainerElem = $xeGGWrapper.$refs.refPopupContainerElem;
       const popupWrapperEl = $xeTable.$refs.refPopupWrapperElem;
       if (popupContainerElem) {
         if (popupWrapperEl) {