vxe-table 3.22.5 → 3.22.6

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.22.5";
+const version = "3.22.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3851,6 +3851,7 @@ var es_iterator_reduce = __webpack_require__(8237);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.some.js
 var es_iterator_some = __webpack_require__(3579);
 ;// ./packages/ui/src/dom.ts
+/* unused harmony import specifier */ var XEUtils;
 
 
 const reClsMap = {};
@@ -4082,17 +4083,24 @@ function wheelScrollTopTo(diffNum, cb) {
     wtaFrame = null;
   });
 }
+function getPopupContainer(appendTo) {
+  const selectElem = appendTo && XEUtils.isFunction(appendTo) ? appendTo({}) : appendTo;
+  if (XEUtils.isString(selectElem)) {
+    return document.querySelector(selectElem) || document.body;
+  }
+  return selectElem || document.body;
+}
 ;// ./packages/ui/src/log.ts
 
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.22.5"}`;
+const tableVersion = `table v${"3.22.6"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
   const designVersion = core_.VxeUI.designVersion ? `design v${core_.VxeUI.designVersion}` : '';
-  const versionInfo = [uiVersion, tableVersion, ganttVersion, designVersion].join(' ');
+  const versionInfo = [uiVersion, tableVersion, ganttVersion, designVersion].filter(v => v).join(' ');
   return {
     warnLog: log_log.create('warn', versionInfo + '] [' + name),
     errLog: log_log.create('error', versionInfo + '] [' + name)
@@ -17002,7 +17010,7 @@ function toTxtCellLabel(val) {
   if (/[",\s\n]/.test(val)) {
     return `"${val.replace(/"/g, '""')}"`;
   }
-  return val;
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val) ? '' : val;
 }
 function toCsv($xeTable, opts, columns, datas) {
   const reactData = $xeTable;
@@ -17857,19 +17865,23 @@ function handleFilterColumns(exportOpts, column, columns) {
     return false;
   });
 }
-function handleFilterFields(exportOpts, column, includeFields, excludeFields) {
-  if (excludeFields) {
-    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(excludeFields, column.field)) {
-      return false;
-    }
+function handleFilterFields(exportOpts, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps) {
+  const {
+    field
+  } = column;
+  if (excludeFdMaps[field]) {
+    return false;
   }
   if (includeFields) {
-    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(includeFields, column.field)) {
+    if (includeFdMaps[field]) {
       return true;
     }
     return false;
   }
-  return exportOpts.original ? !!column.field : defaultFilterExportColumn(column);
+  if (extraFdMaps[field]) {
+    return true;
+  }
+  return exportOpts.original ? !!field : defaultFilterExportColumn(column);
 }
 function handleExportAndPrint($xeTable, options, isPrint) {
   const props = $xeTable;
@@ -17927,7 +17939,8 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   const {
     columns,
     excludeFields,
-    includeFields
+    includeFields,
+    extraFields
   } = defOpts;
   // 处理类型
   const typeList = types.map(value => {
@@ -17948,20 +17961,44 @@ function handleExportAndPrint($xeTable, options, isPrint) {
       label: export_mixin_getI18n(`vxe.export.modes.${item}`)
     };
   });
+  const excludeFdMaps = {};
+  if (excludeFields && excludeFields.length) {
+    excludeFields.forEach(field => {
+      excludeFdMaps[field] = 1;
+    });
+  }
+  const includeFdMaps = {};
+  if (includeFields && includeFields.length) {
+    includeFields.forEach(field => {
+      includeFdMaps[field] = 1;
+    });
+  }
+  const extraFdMaps = {};
+  if (extraFields) {
+    extraFields.forEach(field => {
+      extraFdMaps[field] = 1;
+    });
+  }
   // 默认选中
-  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(exportColumns, (column, index, items, path, parent) => {
+  // 优先级 columns > excludeFields > (includeFields || extraFields)
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(exportColumns, (column, index, items, path, parentColumn) => {
     const isColGroup = column.children && column.children.length > 0;
     let isChecked = false;
+    const isExtraChecked = extraFdMaps[column.field];
     if (columns && columns.length) {
       isChecked = handleFilterColumns(defOpts, column, columns);
     } else if (excludeFields || includeFields) {
-      isChecked = handleFilterFields(defOpts, column, includeFields, excludeFields);
+      isChecked = handleFilterFields(defOpts, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps);
     } else {
-      isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
+      if (isExtraChecked) {
+        isChecked = true;
+      } else {
+        isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
+      }
     }
     column.checked = isChecked;
     column.halfChecked = false;
-    column.disabled = parent && parent.disabled || (checkMethod ? !checkMethod({
+    column.disabled = parentColumn && parentColumn.disabled || (checkMethod ? !checkMethod({
       $table: $xeTable,
       column
     }) : false);
@@ -18147,32 +18184,59 @@ const convertToRows = originColumns => {
         type,
         mode,
         columns,
-        original,
         columnFilterMethod,
         beforeExportMethod,
         includeFields,
-        excludeFields
+        excludeFields,
+        extraFields
       } = opts;
       let groups = [];
       const selectRecords = $xeTable.getCheckboxRecords();
       if (!mode) {
         mode = selectRecords.length ? 'selected' : 'current';
       }
+      const excludeFdMaps = {};
+      if (excludeFields && excludeFields.length) {
+        excludeFields.forEach(field => {
+          excludeFdMaps[field] = 1;
+        });
+      }
+      const includeFdMaps = {};
+      if (includeFields && includeFields.length) {
+        includeFields.forEach(field => {
+          includeFdMaps[field] = 1;
+        });
+      }
+      const extraFdMaps = {};
+      if (extraFields) {
+        extraFields.forEach(field => {
+          extraFdMaps[field] = 1;
+        });
+      }
       let isCustomCol = false;
       let customCols = [];
       if (columns && columns.length) {
         isCustomCol = true;
-        customCols = columns;
+        customCols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(columns, () => true, {
+          children: 'children',
+          mapChildren: 'childNodes',
+          original: true
+        });
       } else {
         customCols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(collectColumn, column => {
           const isColGroup = column.children && column.children.length > 0;
           let isChecked = false;
+          const isExtraChecked = extraFdMaps[column.field];
           if (columns && columns.length) {
             isChecked = handleFilterColumns(opts, column, columns);
           } else if (excludeFields || includeFields) {
-            isChecked = handleFilterFields(opts, column, includeFields, excludeFields);
+            isChecked = handleFilterFields(opts, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps);
           } else {
-            isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
+            if (isExtraChecked) {
+              isChecked = true;
+            } else {
+              isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
+            }
           }
           return isChecked;
         }, {
@@ -18190,20 +18254,7 @@ const convertToRows = originColumns => {
       if (!isCustomCol && !columnFilterMethod) {
         columnFilterMethod = ({
           column
-        }) => {
-          if (excludeFields) {
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(excludeFields, column.field)) {
-              return false;
-            }
-          }
-          if (includeFields) {
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(includeFields, column.field)) {
-              return true;
-            }
-            return false;
-          }
-          return original ? !!column.field : defaultFilterExportColumn(column);
-        };
+        }) => handleFilterFields(handleOptions, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps);
         handleOptions.columnFilterMethod = columnFilterMethod;
       }
       if (customCols) {
@@ -21953,15 +22004,16 @@ function renderBody(h, $xeTable) {
       } = editDirtyOpts;
       const kpFields = [];
       if (updateColFlag) {
-        if (includeFields && includeFields.length) {
-          return includeFields;
-        }
+        // 优先级 excludeFields > (includeFields || extraFields)
         const excludeFdMaps = {};
         if (excludeFields && excludeFields.length) {
           excludeFields.forEach(field => {
             excludeFdMaps[field] = 1;
           });
         }
+        if (includeFields && includeFields.length) {
+          return excludeFields && excludeFields.length ? includeFields.filter(field => !excludeFdMaps[field]) : includeFields;
+        }
         const addFdMaps = {};
         if (extraFields && extraFields.length) {
           extraFields.forEach(field => {
@@ -28446,7 +28498,7 @@ const Toolbar = VxeToolbar;
       expMode: '选择数据',
       expCurrentColumn: '全部字段',
       expColumn: '选择字段',
-      widthMode: '列宽方式',
+      widthMode: '列宽设置',
       wModeTitle: '设置打印时列宽的渲染方式',
       wdModes: {
         default: '默认',