vxe-table 4.21.2 → 4.21.3

package/lib/index.umd.js

@@ -3313,7 +3313,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "4.21.2";
+const version = "4.21.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3879,7 +3879,7 @@ function getTpImg() {
   return tpImgEl;
 }
 function getPropClass(property, params) {
-  return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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]) {
@@ -4135,7 +4135,7 @@ function getPopupAppendElement(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"4.21.2"}`;
+const tableVersion = `table v${"4.21.3"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -4641,6 +4641,7 @@ function createReactData() {
     customColumnList: [],
     // 当前选中的筛选列
     filterStore: {
+      targetEl: null,
       isAllSelected: false,
       isIndeterminate: false,
       style: null,
@@ -12323,13 +12324,14 @@ const {
       } = storeData;
       const checkedAll = computeCheckedAll.value;
       const supportMerge = computeSupportMerge.value;
+      // 内部导出使用 _columns -> _children 为自定义子集
       const expColumns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(columns, column => column.checked, {
         children: 'children',
-        mapChildren: 'childNodes',
+        mapChildren: '_children',
         original: true
       });
       return Object.assign({}, defaultOptions, {
-        columns: expColumns,
+        _columns: expColumns,
         isMerge: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false
       });
     };
@@ -12873,6 +12875,104 @@ hook_hooks.add('tableFilterModule', {
       computeFilterOpts,
       computeMouseOpts
     } = $xeTable.getComputeMaps();
+    const updatePopupStyle = () => {
+      const {
+        filterStore
+      } = reactData;
+      const {
+        elemStore
+      } = internalData;
+      const {
+        column,
+        targetEl
+      } = filterStore;
+      if (!column || !targetEl) {
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      }
+      const tableEl = refElem.value;
+      const {
+        scrollTop,
+        scrollLeft,
+        visibleHeight,
+        visibleWidth
+      } = getDomNode();
+      const filterOpts = computeFilterOpts.value;
+      const {
+        maxHeight: customMaxHeight,
+        transfer,
+        zIndex
+      } = filterOpts;
+      const currEl = targetEl;
+      const tableRect = tableEl.getBoundingClientRect();
+      const filterRender = column ? column.filterRender : null;
+      const compConf = filterRender && isEnableConf(filterRender) ? hook_renderer.get(filterRender.name) : null;
+      const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+      if (!headerScrollElem) {
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      }
+      const tableFilter = refTableFilter.value;
+      const filterWrapperElem = tableFilter ? tableFilter.getRefMaps().refElem.value : null;
+      if (!filterWrapperElem) {
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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.getRefMaps().refElem.value;
+          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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
     const filterPrivateMethods = {
       checkFilterOptions() {
         const {
@@ -12892,102 +12992,20 @@ hook_hooks.add('tableFilterModule', {
           initStore,
           filterStore
         } = reactData;
-        const {
-          elemStore
-        } = internalData;
         if (filterStore.column === column && filterStore.visible) {
           filterStore.visible = false;
         } else {
-          const tableEl = refElem.value;
-          const {
-            scrollTop,
-            scrollLeft,
-            visibleHeight,
-            visibleWidth
-          } = getDomNode();
-          const filterOpts = computeFilterOpts.value;
-          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) ? hook_renderer.get(filterRender.name) : null;
           $xeTable.handleFilterOptions(column);
           internalData._currFilterParams = params;
+          filterStore.targetEl = currEl;
           filterStore.style = null;
           filterStore.visible = true;
           initStore.filter = true;
-          (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-            const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
-            if (!headerScrollElem) {
-              return;
-            }
-            const tableFilter = refTableFilter.value;
-            const filterWrapperElem = tableFilter ? tableFilter.getRefMaps().refElem.value : 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 = btnEl ? 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.getRefMaps().refElem.value;
-                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;
-          });
         }
+        (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+          updatePopupStyle();
+        });
         $xeTable.dispatchEvent('filter-visible', {
           column,
           field: column.field,
@@ -13192,6 +13210,15 @@ hook_hooks.add('tableFilterModule', {
             }, evnt);
           }
         }
+      },
+      handleFilterStyle() {
+        const {
+          filterStore
+        } = reactData;
+        if (!filterStore.visible) {
+          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        }
+        return updatePopupStyle();
       }
     };
     const filterMethods = {
@@ -15576,7 +15603,6 @@ export_hook_hooks.add('tableExportModule', {
       computePrintOpts,
       computeExportOpts,
       computeImportOpts,
-      computeCustomOpts,
       computeSeqOpts,
       computeRadioOpts,
       computeCheckboxOpts,
@@ -16746,9 +16772,9 @@ export_hook_hooks.add('tableExportModule', {
         mergeFooterList
       } = internalData;
       const exportOpts = computeExportOpts.value;
+      const printOpts = computePrintOpts.value;
       const hasTree = !!treeConfig;
       const hasRowGroup = rowGroupList.length > 0;
-      const customOpts = computeCustomOpts.value;
       const selectRecords = $xeTable.getCheckboxRecords();
       const proxyOpts = $xeGGWrapper ? $xeGGWrapper.getComputeMaps().computeProxyOpts.value : {};
       const hasFooter = !!footerTableData.length;
@@ -16769,9 +16795,9 @@ export_hook_hooks.add('tableExportModule', {
         export_hook_warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
         defOpts.isTreeAllExpanded = defOpts.isAllExpand;
       }
-      const types = defOpts.types || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps);
+      const types = isPrint ? [] : defOpts.types || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps);
       const modes = defOpts.modes || [];
-      const checkMethod = customOpts.checkMethod;
+      const checkMethod = (isPrint ? printOpts : exportOpts).checkMethod;
       const exportColumns = collectColumn.slice(0);
       const {
         columns,
@@ -16886,10 +16912,10 @@ export_hook_hooks.add('tableExportModule', {
         }
       }
       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 = '';
@@ -17002,7 +17028,16 @@ export_hook_hooks.add('tableExportModule', {
         }
         let isCustomCol = false;
         let customCols = [];
-        if (columns) {
+        const _columns = opts._columns;
+        if (_columns) {
+          // 内部导出使用 _columns -> _children 为自定义子集
+          isCustomCol = true;
+          customCols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(_columns, () => true, {
+            children: '_children',
+            mapChildren: 'childNodes',
+            original: true
+          });
+        } else if (columns) {
           isCustomCol = true;
           customCols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(columns, () => true, {
             children: 'children',
@@ -19488,6 +19523,12 @@ core_.VxeUI.hooks.add('tableCustomModule', {
       handleUpdateCustomColumn,
       handleCustomStyle() {
         const reactData = $xeTable.reactData;
+        const {
+          customStore
+        } = reactData;
+        if (!customStore.visible) {
+          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        }
         reactData.isCustomDragStatus = false;
         return updatePopupStyle();
       }
@@ -22254,7 +22295,7 @@ if($xeTable.closeMenu){if(ctxMenuStore.visible&&tableMenu&&!getEventTargetNode(e
 if(!isActivated&&editRules&&validOpts.autoClear){reactData.validErrorMaps={};}// 最后激活的表格
 internalData.isActivated=isActivated;}};/**
          * 窗口失焦事件处理
-         */const handleGlobalBlurEvent=()=>{$xeTable.closeFilter();if($xeTable.closeMenu){$xeTable.closeMenu();}};const reUpdateCustomStyleEvent=evnt=>{const{customStore}=reactData;const customOpts=computeCustomOpts.value;const{popupOptions}=customOpts;const{transfer}=popupOptions||{};if(transfer&&customStore.visible){const tableCustom=refTableCustom.value;if(tableCustom&&$xeTable.handleCustomStyle&&!checkTargetElement(evnt.target,[tableCustom.getRefMaps().refElem.value],evnt.currentTarget)){$xeTable.handleCustomStyle().then(()=>{$xeTable.handleCustomStyle();});}}};const handleGlobalScrollEvent=evnt=>{reUpdateCustomStyleEvent(evnt);};/**
+         */const handleGlobalBlurEvent=()=>{$xeTable.closeFilter();if($xeTable.closeMenu){$xeTable.closeMenu();}};const reUpdateCustomStyleEvent=evnt=>{const{customStore}=reactData;const customOpts=computeCustomOpts.value;const{popupOptions}=customOpts;const{transfer}=popupOptions||{};if(transfer&&customStore.visible){const tableCustom=refTableCustom.value;if(tableCustom&&$xeTable.handleCustomStyle&&!checkTargetElement(evnt.target,[tableCustom.getRefMaps().refElem.value],evnt.currentTarget)){$xeTable.handleCustomStyle().then(()=>{$xeTable.handleCustomStyle();});}}};const handleGlobalScrollEvent=evnt=>{const{filterStore}=reactData;const filterOpts=computeFilterOpts.value;if(filterStore.visible&&filterOpts.transfer){$xeTable.handleFilterStyle();}reUpdateCustomStyleEvent(evnt);};/**
          * 全局滚动事件
          */const handleGlobalMousewheelEvent=()=>{$xeTable.closeTooltip();if($xeTable.closeMenu){$xeTable.closeMenu();}};/**
          * 表格键盘事件