vxe-table 3.18.14 → 3.18.16

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.14";
+const version = "3.18.16";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2096,9 +2096,11 @@ core_.VxeUI.setConfig({
     footerCellConfig: {
       height: 'unset'
     },
-    // menuConfig: {
-    //   visibleMethod () {}
-    // },
+    menuConfig: {
+      // visibleMethod () {},
+      // transfer: false,
+      destroyOnClose: true
+    },
     customConfig: {
       // enabled: false,
       allowVisible: true,
@@ -2145,8 +2147,9 @@ core_.VxeUI.setConfig({
     filterConfig: {
       // remote: false,
       // filterMethod: null,
-      // destroyOnClose: false,
       // isEvery: false,
+      // transfer: false,
+      destroyOnClose: true,
       multiple: true,
       showIcon: true
     },
@@ -2686,7 +2689,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.14"}`;
+const log_version = `table v${"3.18.16"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3021,6 +3024,7 @@ function createInternalData() {
     // 表尾高度
     tFooterHeight: 0,
     teleportToWrapperElem: null,
+    popupToWrapperElem: null,
     inited: false,
     tooltipTimeout: null,
     initStatus: false,
@@ -3432,6 +3436,24 @@ function getColReMinWidth(params) {
   }
   return mWidth;
 }
+function getFirstChildColumn(column) {
+  const {
+    children
+  } = column;
+  if (children && children.length) {
+    return getFirstChildColumn(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().first(children));
+  }
+  return column;
+}
+function getLastChildColumn(column) {
+  const {
+    children
+  } = column;
+  if (children && children.length) {
+    return getFirstChildColumn(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(children));
+  }
+  return column;
+}
 const lineOffsetSizes = {
   mini: 3,
   small: 2,
@@ -10037,6 +10059,7 @@ function initColumnHierarchy($xeTable) {
   internalData.fullColumnFieldData = fullColFieldData;
 }
 function handleInitColumn($xeTable, collectColumn) {
+  const props = $xeTable;
   const $xeToolbar = $xeTable.$refs.$xeToolbar;
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -10075,6 +10098,10 @@ function handleInitColumn($xeTable, collectColumn) {
       if ($xeTable.handleUpdateCustomColumn) {
         $xeTable.handleUpdateCustomColumn();
       }
+      const columnOpts = $xeTable.computeColumnOpts;
+      if (props.showCustomHeader && reactData.isGroup && (columnOpts.resizable || props.resizable)) {
+        warnLog('vxe.error.notConflictProp', ['show-custom-header & colgroup', 'column-config.resizable=false']);
+      }
       reactData.isColLoading = false;
       return handleLazyRecalculate($xeTable, false, true, true);
     });
@@ -12542,18 +12569,16 @@ const Methods = {
       clientX: dragClientX
     } = evnt;
     const dragBtnElem = evnt.target;
+    let cell = dragBtnElem.parentElement;
     let resizeColumn = column;
     const isDragGroupCol = column.children && column.children.length;
     if (isDragGroupCol) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(column.children, childColumn => {
-        resizeColumn = childColumn;
-      });
-    }
-    let cell = dragBtnElem.parentElement;
-    if (isDragGroupCol) {
-      const trEl = cell ? cell.parentElement : null;
-      const theadEl = trEl ? trEl.parentElement : null;
-      cell = theadEl ? theadEl.querySelector(`.vxe-header--column[colid="${resizeColumn.id}"]`) : null;
+      resizeColumn = getLastChildColumn(column);
+      if (isDragGroupCol) {
+        const trEl = cell ? cell.parentElement : null;
+        const theadEl = trEl ? trEl.parentElement : null;
+        cell = theadEl ? theadEl.querySelector(`.vxe-header--column[colid="${resizeColumn.id}"]`) : null;
+      }
     }
     if (!cell) {
       return;
@@ -18150,7 +18175,7 @@ const Methods = {
       const xThreshold = $xeTable.computeScrollXThreshold;
       isLeft = scrollLeft <= 0;
       if (!isLeft) {
-        isRight = scrollLeft + bodyWidth >= scrollWidth;
+        isRight = scrollLeft + bodyWidth >= scrollWidth - 1;
       }
       if (scrollLeft > lastScrollLeft) {
         direction = 'right';
@@ -18170,7 +18195,7 @@ const Methods = {
       const yThreshold = $xeTable.computeScrollYThreshold;
       isTop = scrollTop <= 0;
       if (!isTop) {
-        isBottom = scrollTop + bodyHeight >= scrollHeight;
+        isBottom = scrollTop + bodyHeight >= scrollHeight - 1;
       }
       if (scrollTop > lastScrollTop) {
         direction = 'bottom';
@@ -20644,7 +20669,9 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIn
     } else {
       tcStyle.minHeight = `${currCellHeight}px`;
     }
-    if (isColGroup && !isLastRow) {
+    if (showCustomHeader) {
+      // custom
+    } else if (isColGroup && !isLastRow) {
       const firstCol = getColumnFirstChild(column);
       const lastCol = getColumnLastChild(column);
       if (firstCol && lastCol && firstCol.id !== lastCol.id) {
@@ -22937,11 +22964,12 @@ function renderFooter($xeFilterPanel, h) {
     const vSize = $xeFilterPanel.computeSize;
     const filterOpts = $xeTable.computeFilterOpts;
     const {
-      destroyOnClose
+      destroyOnClose,
+      className
     } = filterOpts;
     return h('div', {
       ref: 'refElem',
-      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', getClass(filterClassName, params), {
+      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', className, compConf && compConf.className ? compConf.className : '', getClass(filterClassName, params), {
         [`size--${vSize}`]: vSize,
         'is--animat': tableProps.animat,
         'is--multiple': multiple,
@@ -23784,30 +23812,52 @@ const {
     ctxMenuStore: Object,
     ctxMenuOpts: Object
   },
+  inject: {
+    $xeTable: {
+      default: null
+    }
+  },
   mounted() {
-    document.body.appendChild(this.$el);
+    const $xeMenuPanel = this;
+    const $xeTable = $xeMenuPanel.$xeTable;
+    const menuOpts = $xeTable.computeMenuOpts;
+    const {
+      transfer
+    } = menuOpts;
+    const el = this.$refs.refElem;
+    if (transfer && el) {
+      document.body.appendChild(el);
+    }
   },
   beforeDestroy() {
-    const {
-      $el
-    } = this;
-    if ($el.parentNode) {
-      $el.parentNode.removeChild($el);
+    const el = this.$refs.refElem;
+    if (el && el.parentNode) {
+      el.parentNode.removeChild(el);
     }
   },
   render(h) {
-    const $xeTable = this.$parent;
+    const $xeMenuPanel = this;
+    const $xeTable = $xeMenuPanel.$xeTable;
     const tableReactData = $xeTable;
     const {
       ctxMenuStore
     } = tableReactData;
     const menuOpts = $xeTable.computeMenuOpts;
+    const {
+      destroyOnClose
+    } = menuOpts;
+    const {
+      visible,
+      list,
+      className
+    } = ctxMenuStore;
     return h('div', {
-      class: ['vxe-table--context-menu-wrapper', menuOpts.className, {
-        'is--visible': ctxMenuStore.visible
+      ref: 'refElem',
+      class: ['vxe-table--context-menu-wrapper', className, {
+        'is--visible': visible
       }],
       style: ctxMenuStore.style
-    }, ctxMenuStore.list.map((options, gIndex) => {
+    }, (destroyOnClose ? visible : true) ? list.map((options, gIndex) => {
       return options.every(item => item.visible === false) ? menu_panel_renderEmptyElement($xeTable) : h('ul', {
         class: 'vxe-context-menu--option-wrapper',
         key: gIndex
@@ -23816,7 +23866,7 @@ const {
         const prefixOpts = Object.assign({}, item.prefixConfig);
         const suffixOpts = Object.assign({}, item.suffixConfig);
         const menuContent = getFuncText(item.name);
-        return item.visible === false ? null : h('li', {
+        return item.visible === false ? menu_panel_renderEmptyElement($xeTable) : h('li', {
           class: [item.className, {
             'link--disabled': item.disabled,
             'link--active': item === ctxMenuStore.selected
@@ -23891,7 +23941,7 @@ const {
           }), childSuffixOpts.content ? h('span', `${childSuffixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)])])]);
         })) : null]);
       }));
-    }));
+    }) : []);
   }
 });
 ;// CONCATENATED MODULE: ./packages/table/module/filter/mixin.ts
@@ -24503,7 +24553,10 @@ const {
       const isContentMenu = $xeTable.computeIsContentMenu;
       const menuOpts = $xeTable.computeMenuOpts;
       const config = menuOpts[type];
-      const visibleMethod = menuOpts.visibleMethod;
+      const {
+        transfer,
+        visibleMethod
+      } = menuOpts;
       if (config) {
         const {
           options,
@@ -24517,14 +24570,20 @@ const {
             if (!visibleMethod || visibleMethod(params)) {
               evnt.preventDefault();
               $xeTable.updateZindex();
+              const el = $xeTable.$refs.refElem;
+              const tableRect = el.getBoundingClientRect();
               const {
                 scrollTop,
                 scrollLeft,
                 visibleHeight,
                 visibleWidth
               } = getDomNode();
-              let top = evnt.clientY + scrollTop;
-              let left = evnt.clientX + scrollLeft;
+              let top = evnt.clientY - tableRect.y;
+              let left = evnt.clientX - tableRect.x;
+              if (transfer) {
+                top = evnt.clientY + scrollTop;
+                left = evnt.clientX + scrollLeft;
+              }
               const handleVisible = () => {
                 internalData._currMenuParams = params;
                 Object.assign(ctxMenuStore, {
@@ -31465,7 +31524,9 @@ function renderBody(h, $xeTable) {
     const $xeTable = this;
     const props = $xeTable;
     const internalData = $xeTable;
+    const $xeGrid = $xeTable.$xeGrid;
     const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const columnOpts = $xeTable.computeColumnOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const customOpts = $xeTable.computeCustomOpts;
@@ -31480,6 +31541,16 @@ function renderBody(h, $xeTable) {
         internalData.teleportToWrapperElem = classifyWrapperEl;
       }
     }
+    if ($xeGGWrapper) {
+      const popupContainerElem = $xeGantt.$refs.refPopupContainerElem;
+      const popupWrapperEl = $xeTable.$refs.refPopupWrapperElem;
+      if (popupContainerElem) {
+        if (popupWrapperEl) {
+          popupContainerElem.appendChild(popupWrapperEl);
+        }
+        internalData.popupToWrapperElem = popupContainerElem;
+      }
+    }
     if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
       initTpImg();
     }
@@ -31492,10 +31563,10 @@ function renderBody(h, $xeTable) {
     if (!this.tooltipConfig && ($listeners['cell-mouseenter'] || $listeners['cell-mouseleave'])) {
       warnLog('vxe.error.reqProp', ['tooltip-config']);
     }
-    // 使用已安装的组件，如果未安装则不渲染
-    const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
-    const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
     $xeTable.$nextTick(() => {
+      // 使用已安装的组件，如果未安装则不渲染
+      const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
+      const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
       if (props.loading) {
         if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
           errLog('vxe.error.errProp', ['loading=true', 'loading=false | <template #loading>...</template>']);
@@ -31570,6 +31641,10 @@ function renderBody(h, $xeTable) {
     if (teleportWrapperEl && teleportWrapperEl.parentElement) {
       teleportWrapperEl.parentElement.removeChild(teleportWrapperEl);
     }
+    const popupWrapperEl = $xeTable.$refs.refPopupWrapperElem;
+    if (popupWrapperEl && popupWrapperEl.parentElement) {
+      popupWrapperEl.parentElement.removeChild(popupWrapperEl);
+    }
     const tableViewportEl = $xeTable.$refs.refTableViewportElem;
     if (tableViewportEl) {
       tableViewportEl.removeEventListener('wheel', $xeTable.triggerBodyWheelEvent);
@@ -31820,7 +31895,11 @@ function renderBody(h, $xeTable) {
     /**
      * 拖拽提示
      */
-    table_renderDragTip(h, this)])]),
+    table_renderDragTip(h, this)])]), h('div', {
+      key: 'tpw'
+    }, [h('div', {
+      ref: 'refPopupWrapperElem'
+    }, [
     /**
      * 筛选
      */
@@ -31831,6 +31910,17 @@ function renderBody(h, $xeTable) {
         filterStore
       }
     }) : table_renderEmptyElement($xeTable),
+    /**
+     * 快捷菜单
+     */
+    isContentMenu ? h(menu_panel, {
+      key: 'tm',
+      ref: 'refTableMenu',
+      props: {
+        ctxMenuStore: this.ctxMenuStore,
+        ctxMenuOpts: this.ctxMenuOpts
+      }
+    }) : table_renderEmptyElement($xeTable)])]),
     /**
      * 导入
      */
@@ -31850,17 +31940,6 @@ function renderBody(h, $xeTable) {
         defaultOptions: this.exportParams,
         storeData: this.exportStore
       }
-    }) : table_renderEmptyElement($xeTable),
-    /**
-     * 快捷菜单
-     */
-    isContentMenu ? h(menu_panel, {
-      key: 'tm',
-      ref: 'refTableMenu',
-      props: {
-        ctxMenuStore: this.ctxMenuStore,
-        ctxMenuOpts: this.ctxMenuOpts
-      }
     }) : table_renderEmptyElement($xeTable), h('div', {}, [
     /**
      * 提示相关
@@ -34676,7 +34755,9 @@ function grid_createInternalData() {
         class: 'vxe-grid--layout-aside-right-wrapper'
       }, asideRightSlot({})) : grid_renderEmptyElement($xeGrid)]), h('div', {
         class: 'vxe-grid--layout-footer-wrapper'
-      }, $xeGrid.renderChildLayout(h, footKeys))];
+      }, $xeGrid.renderChildLayout(h, footKeys)), h('div', {
+        ref: 'refPopupContainerElem'
+      })];
     },
     renderVN(h) {
       const $xeGrid = this;