vxe-table 3.22.5 → 3.22.6

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

@@ -420,7 +420,7 @@ function toTxtCellLabel(val) {
     if (/[",\s\n]/.test(val)) {
         return `"${val.replace(/"/g, '""')}"`;
     }
-    return val;
+    return XEUtils.eqNull(val) ? '' : val;
 }
 function toCsv($xeTable, opts, columns, datas) {
     const reactData = $xeTable;
@@ -1154,19 +1154,21 @@ function handleFilterColumns(exportOpts, column, columns) {
         return false;
     });
 }
-function handleFilterFields(exportOpts, column, includeFields, excludeFields) {
-    if (excludeFields) {
-        if (XEUtils.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 (XEUtils.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;
@@ -1206,7 +1208,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     const modes = defOpts.modes || [];
     const checkMethod = customOpts.checkMethod;
     const exportColumns = collectColumn.slice(0);
-    const { columns, excludeFields, includeFields } = defOpts;
+    const { columns, excludeFields, includeFields, extraFields } = defOpts;
     // 处理类型
     const typeList = types.map((value) => {
         return {
@@ -1226,22 +1228,47 @@ function handleExportAndPrint($xeTable, options, isPrint) {
             label: 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;
+        });
+    }
     // 默认选中
-    XEUtils.eachTree(exportColumns, (column, index, items, path, parent) => {
+    // 优先级 columns > excludeFields > (includeFields || extraFields)
+    XEUtils.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({ $table: $xeTable, column }) : false);
+        column.disabled = (parentColumn && parentColumn.disabled) || (checkMethod ? !checkMethod({ $table: $xeTable, column }) : false);
     });
     // 更新条件
     exportStore.columns = exportColumns;
@@ -1405,30 +1432,54 @@ export default {
                 warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
                 opts.isTreeAllExpanded = opts.isAllExpand;
             }
-            let { filename, sheetName, type, mode, columns, original, columnFilterMethod, beforeExportMethod, includeFields, excludeFields } = opts;
+            let { filename, sheetName, type, mode, columns, columnFilterMethod, beforeExportMethod, includeFields, 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 = XEUtils.searchTree(columns, () => true, { children: 'children', mapChildren: 'childNodes', original: true });
             }
             else {
                 customCols = XEUtils.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;
                 }, { children: 'children', mapChildren: 'childNodes', original: true });
@@ -1436,20 +1487,7 @@ export default {
             const handleOptions = Object.assign({}, opts, { filename: '', sheetName: '', _columnConfs: columns });
             // 如果设置源数据，则默认导出设置了字段的列
             if (!isCustomCol && !columnFilterMethod) {
-                columnFilterMethod = ({ column }) => {
-                    if (excludeFields) {
-                        if (XEUtils.includes(excludeFields, column.field)) {
-                            return false;
-                        }
-                    }
-                    if (includeFields) {
-                        if (XEUtils.includes(includeFields, column.field)) {
-                            return true;
-                        }
-                        return false;
-                    }
-                    return original ? !!column.field : defaultFilterExportColumn(column);
-                };
+                columnFilterMethod = ({ column }) => handleFilterFields(handleOptions, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps);
                 handleOptions.columnFilterMethod = columnFilterMethod;
             }
             if (customCols) {

package/es/table/src/table.js

@@ -1252,15 +1252,16 @@ export default {
             const { extraFields, includeFields, excludeFields } = 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 => {

package/es/table/style.css

@@ -3826,7 +3826,7 @@
   width: 100%;
   position: absolute;
   left: 50%;
-  font-size: 12px;
+  font-size: var(--vxe-ui-table-validate-error-font-size);
   line-height: 1em;
   transform: translate(-50%, -2px);
   text-align: left;