vxe-table 3.23.2 → 3.23.3

package/lib/index.umd.js

@@ -3314,7 +3314,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.23.2";
+const version = "3.23.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3877,7 +3877,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]) {
@@ -4112,7 +4112,7 @@ function getPopupAppendElement(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.23.2"}`;
+const tableVersion = `table v${"3.23.3"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -4625,6 +4625,7 @@ function createReactData() {
     customColumnList: [],
     // 当前选中的筛选列
     filterStore: {
+      targetEl: null,
       isAllSelected: false,
       isIndeterminate: false,
       style: null,
@@ -8334,11 +8335,11 @@ if(ctxMenuStore.visible&&tableMenu&&!getEventTargetNode(evnt,tableMenu.$el).flag
 if(!isActivated&&editRules&&validOpts.autoClear){reactData.validErrorMaps={};}// 最后激活的表格
 internalData.isActivated=isActivated;}},/**
      * 窗口失焦事件处理
-     */handleGlobalBlurEvent(){const $xeTable=this;$xeTable.closeFilter();$xeTable.closeMenu();},handleGlobalScrollEvent(evnt){const $xeTable=this;reUpdateCustomStyleEvent($xeTable,evnt);},/**
+     */handleGlobalBlurEvent(){const $xeTable=this;$xeTable.closeFilter();$xeTable.closeMenu();},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);},/**
      * 全局滚动事件
      */handleGlobalMousewheelEvent(){const $xeTable=this;$xeTable.closeTooltip();if($xeTable.closeMenu){$xeTable.closeMenu();}},/**
      * 表格键盘事件
-     */keydownEvent(evnt){const $xeTable=this;const{filterStore,ctxMenuStore,editStore,keyboardConfig,mouseConfig,mouseOpts,keyboardOpts}=this;const{actived}=editStore;const{keyCode}=evnt;const isEsc=keyCode===27;if(isEsc){this.preventEvent(evnt,'event.keydown',null,()=>{$xeTable.dispatchEvent('keydown-start',{},evnt);if(keyboardConfig&&mouseConfig&&mouseOpts.area&&$xeTable.handleKdClAreaEvent){$xeTable.handleKdClAreaEvent(evnt);}else if(actived.row||filterStore.visible||ctxMenuStore.visible){evnt.stopPropagation();// 如果按下了 Esc 键，关闭快捷菜单、筛选
+     */keydownEvent(evnt){const $xeTable=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 isEsc=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ESCAPE);if(isEsc){this.preventEvent(evnt,'event.keydown',null,()=>{$xeTable.dispatchEvent('keydown-start',{},evnt);if(keyboardConfig&&mouseConfig&&mouseOpts.area&&$xeTable.handleKdClAreaEvent){$xeTable.handleKdClAreaEvent(evnt);}else if(actived.row||filterStore.visible||ctxMenuStore.visible){evnt.stopPropagation();// 如果按下了 Esc 键，关闭快捷菜单、筛选
 this.closeFilter();this.closeMenu();if(keyboardConfig&&keyboardOpts.isEsc){// 如果是激活编辑状态，则取消编辑
 if(actived.row){const params=actived.args;this.handleClearEdit(evnt);// 如果配置了选中功能，则为选中状态
 if(mouseConfig&&mouseOpts.selected){this.$nextTick(()=>this.handleSelected(params,evnt));}}}}$xeTable.dispatchEvent('keydown',{},evnt);$xeTable.dispatchEvent('keydown-end',{},evnt);});}},contextMenuEvent(evnt){const $xeTable=this;$xeTable.dispatchEvent('context-menu',{},evnt);},/**
@@ -13515,13 +13516,14 @@ const {
       } = storeData;
       const checkedAll = $xeExportPanel.computeCheckedAll;
       const supportMerge = $xeExportPanel.computeSupportMerge;
+      // 内部导出使用 _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
       });
     },
@@ -14136,6 +14138,109 @@ const {
   renderer: mixin_renderer
 } = core_.VxeUI;
 const mixin_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) ? mixin_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();
+}
 /* harmony default export */ var mixin = ({
   methods: {
     /**
@@ -14233,105 +14338,24 @@ const mixin_sourceType = 'table';
     },
     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) ? mixin_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', {
@@ -14658,6 +14682,17 @@ const mixin_sourceType = 'table';
         }
       }
     },
+    handleFilterStyle() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        filterStore
+      } = reactData;
+      if (!filterStore.visible) {
+        return $xeTable.$nextTick();
+      }
+      return updatePopupStyle($xeTable);
+    },
     /**
      * 清空指定列的筛选条件
      * 如果为空则清空所有列的筛选条件
@@ -18039,7 +18074,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;
@@ -18060,9 +18095,9 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     export_mixin_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,
@@ -18177,10 +18212,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 = '';
@@ -18343,7 +18378,16 @@ const convertToRows = originColumns => {
       }
       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',
@@ -20259,7 +20303,7 @@ function beginValidate($xeTable, rows, cols, cb, isFull) {
 
 
 const customColumnCssKeys = ['checkbox', 'sort', 'title', 'width', 'fixed', 'align', 'header-align', 'footer-align'];
-function updatePopupStyle($xeTable) {
+function mixin_updatePopupStyle($xeTable) {
   const $xeGrid = $xeTable.$xeGrid;
   const $xeGantt = $xeTable.$xeGantt;
   const $xeGGWrapper = $xeGrid || $xeGantt;
@@ -20420,8 +20464,8 @@ function emitCustomEvent($xeTable, type, evnt) {
       initStore.custom = true;
       $xeTable.handleUpdateCustomColumn();
       $xeTable.checkCustomStatus();
-      updatePopupStyle($xeTable);
-      return $xeTable.$nextTick().then(() => updatePopupStyle($xeTable));
+      mixin_updatePopupStyle($xeTable);
+      return $xeTable.$nextTick().then(() => mixin_updatePopupStyle($xeTable));
     },
     _closeCustom() {
       const $xeTable = this;
@@ -20860,7 +20904,15 @@ function emitCustomEvent($xeTable, type, evnt) {
     },
     handleCustomStyle() {
       const $xeTable = this;
-      return updatePopupStyle($xeTable);
+      const reactData = $xeTable.reactData;
+      const {
+        customStore
+      } = reactData;
+      if (!customStore.visible) {
+        return $xeTable.$nextTick();
+      }
+      reactData.isCustomDragStatus = false;
+      return mixin_updatePopupStyle($xeTable);
     }
   }
 });