vxe-table 4.10.6-beta.8 → 4.10.6

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

@@ -123,7 +123,18 @@ function getTxtCellValue(val, vMaps) {
     const rest = replaceTxtCell(val, vMaps);
     return rest.replace(/^"+$/g, (qVal) => '"'.repeat(Math.ceil(qVal.length / 2)));
 }
-function parseCsvAndTxt(columns, content, cellSeparator) {
+function toExportField(tableConf, field) {
+    const { fieldMaps, titleMaps } = tableConf;
+    // title 转 field
+    if (!fieldMaps[field]) {
+        const teCol = titleMaps[field];
+        if (teCol && teCol.field) {
+            field = teCol.field;
+        }
+    }
+    return field;
+}
+function parseCsvAndTxt(tableConf, content, cellSeparator) {
     const list = content.split(enterSymbol);
     const rows = [];
     let fields = [];
@@ -144,7 +155,7 @@ function parseCsvAndTxt(columns, content, cellSeparator) {
                 });
                 const cells = rVal.split(cellSeparator);
                 if (!fields.length) {
-                    fields = cells.map((val) => getTxtCellValue(val.trim(), vMaps));
+                    fields = cells.map((val) => toExportField(tableConf, getTxtCellValue(val.trim(), vMaps)));
                 }
                 else {
                     cells.forEach((val, colIndex) => {
@@ -159,13 +170,13 @@ function parseCsvAndTxt(columns, content, cellSeparator) {
     }
     return { fields, rows };
 }
-function parseCsv(columns, content) {
-    return parseCsvAndTxt(columns, content, ',');
+function parseCsv(tableConf, content) {
+    return parseCsvAndTxt(tableConf, content, ',');
 }
-function parseTxt(columns, content) {
-    return parseCsvAndTxt(columns, content, '\t');
+function parseTxt(tableConf, content) {
+    return parseCsvAndTxt(tableConf, content, '\t');
 }
-function parseHTML(columns, content) {
+function parseHTML(tableConf, content) {
     const domParser = new DOMParser();
     const xmlDoc = domParser.parseFromString(content, 'text/html');
     const bodyNodes = getElementsByTagName(xmlDoc, 'body');
@@ -178,7 +189,7 @@ function parseHTML(columns, content) {
             if (theadNodes.length) {
                 XEUtils.arrayEach(getElementsByTagName(theadNodes[0], 'tr'), rowNode => {
                     XEUtils.arrayEach(getElementsByTagName(rowNode, 'th'), cellNode => {
-                        fields.push(cellNode.textContent);
+                        fields.push(toExportField(tableConf, cellNode.textContent || ''));
                     });
                 });
                 const tbodyNodes = getElementsByTagName(tableNodes[0], 'tbody');
@@ -198,7 +209,7 @@ function parseHTML(columns, content) {
     }
     return { fields, rows };
 }
-function parseXML(columns, content) {
+function parseXML(tableConf, content) {
     const domParser = new DOMParser();
     const xmlDoc = domParser.parseFromString(content, 'application/xml');
     const sheetNodes = getElementsByTagName(xmlDoc, 'Worksheet');
@@ -210,7 +221,7 @@ function parseXML(columns, content) {
             const rowNodes = getElementsByTagName(tableNodes[0], 'Row');
             if (rowNodes.length) {
                 XEUtils.arrayEach(getElementsByTagName(rowNodes[0], 'Cell'), cellNode => {
-                    fields.push(cellNode.textContent);
+                    fields.push(toExportField(tableConf, cellNode.textContent || ''));
                 });
                 XEUtils.arrayEach(rowNodes, (rowNode, index) => {
                     if (index) {
@@ -238,21 +249,6 @@ function clearColumnConvert(columns) {
         delete column.childNodes;
     }, { children: 'children' });
 }
-/**
- * 检查导入的列是否完整
- * @param {Array} fields 字段名列表
- * @param {Array} rows 数据列表
- */
-function checkImportData(columns, fields) {
-    const tableFields = [];
-    columns.forEach((column) => {
-        const field = column.field;
-        if (field) {
-            tableFields.push(field);
-        }
-    });
-    return fields.some(field => tableFields.indexOf(field) > -1);
-}
 const tableExportMethodKeys = ['exportData', 'importByFile', 'importData', 'saveFile', 'readFile', 'print', 'getPrintHtml', 'openImport', 'closeImport', 'openExport', 'closeExport', 'openPrint', 'closePrint'];
 hooks.add('tableExportModule', {
     setupTable($xeTable) {
@@ -772,22 +768,38 @@ hooks.add('tableExportModule', {
         const handleImport = (content, opts) => {
             const { tableFullColumn, _importResolve, _importReject } = internalData;
             let rest = { fields: [], rows: [] };
+            const tableFieldMaps = {};
+            const tableTitleMaps = {};
+            tableFullColumn.forEach((column) => {
+                const field = column.field;
+                const title = column.getTitle();
+                if (field) {
+                    tableFieldMaps[field] = column;
+                }
+                if (title) {
+                    tableTitleMaps[column.getTitle()] = column;
+                }
+            });
+            const tableConf = {
+                fieldMaps: tableFieldMaps,
+                titleMaps: tableTitleMaps
+            };
             switch (opts.type) {
                 case 'csv':
-                    rest = parseCsv(tableFullColumn, content);
+                    rest = parseCsv(tableConf, content);
                     break;
                 case 'txt':
-                    rest = parseTxt(tableFullColumn, content);
+                    rest = parseTxt(tableConf, content);
                     break;
                 case 'html':
-                    rest = parseHTML(tableFullColumn, content);
+                    rest = parseHTML(tableConf, content);
                     break;
                 case 'xml':
-                    rest = parseXML(tableFullColumn, content);
+                    rest = parseXML(tableConf, content);
                     break;
             }
             const { fields, rows } = rest;
-            const status = checkImportData(tableFullColumn, fields);
+            const status = fields.some(field => tableFieldMaps[field] || tableTitleMaps[field]);
             if (status) {
                 $xeTable.createData(rows)
                     .then((data) => {
@@ -897,6 +909,48 @@ hooks.add('tableExportModule', {
                 return Promise.reject(e);
             });
         };
+        const handleFilterColumns = (exportOpts, column, columns) => {
+            return columns.some((item) => {
+                if (isColumnInfo(item)) {
+                    return column.id === item.id;
+                }
+                else if (XEUtils.isString(item)) {
+                    return column.field === item;
+                }
+                else {
+                    const colid = item.id || item.colId;
+                    const type = item.type;
+                    const field = item.field;
+                    if (colid) {
+                        return column.id === colid;
+                    }
+                    else if (field && type) {
+                        return column.field === field && column.type === type;
+                    }
+                    else if (field) {
+                        return column.field === field;
+                    }
+                    else if (type) {
+                        return column.type === type;
+                    }
+                }
+                return false;
+            });
+        };
+        const handleFilterFields = (exportOpts, column, includeFields, excludeFields) => {
+            if (excludeFields) {
+                if (XEUtils.includes(excludeFields, column.field)) {
+                    return false;
+                }
+            }
+            if (includeFields) {
+                if (XEUtils.includes(includeFields, column.field)) {
+                    return true;
+                }
+                return false;
+            }
+            return exportOpts.original ? column.field : defaultFilterExportColumn(column);
+        };
         const handleExportAndPrint = (options, isPrint) => {
             const { treeConfig, showHeader, showFooter } = props;
             const { initStore, mergeList, mergeFooterList, isGroup, footerTableData, exportStore, exportParams } = reactData;
@@ -922,7 +976,7 @@ hooks.add('tableExportModule', {
             const modes = defOpts.modes || [];
             const checkMethod = customOpts.checkMethod;
             const exportColumns = collectColumn.slice(0);
-            const { columns } = defOpts;
+            const { columns, excludeFields, includeFields } = defOpts;
             // 处理类型
             const typeList = types.map((value) => {
                 return {
@@ -945,38 +999,19 @@ hooks.add('tableExportModule', {
             // 默认选中
             XEUtils.eachTree(exportColumns, (column, index, items, path, parent) => {
                 const isColGroup = column.children && column.children.length;
-                if (isColGroup || defaultFilterExportColumn(column)) {
-                    column.checked = columns
-                        ? columns.some((item) => {
-                            if (isColumnInfo(item)) {
-                                return column.id === item.id;
-                            }
-                            else if (XEUtils.isString(item)) {
-                                return column.field === item;
-                            }
-                            else {
-                                const colid = item.id || item.colId;
-                                const type = item.type;
-                                const field = item.field;
-                                if (colid) {
-                                    return column.id === colid;
-                                }
-                                else if (field && type) {
-                                    return column.field === field && column.type === type;
-                                }
-                                else if (field) {
-                                    return column.field === field;
-                                }
-                                else if (type) {
-                                    return column.type === type;
-                                }
-                            }
-                            return false;
-                        })
-                        : column.visible;
-                    column.halfChecked = false;
-                    column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ column }) : false);
+                let isChecked = false;
+                if (columns && columns.length) {
+                    isChecked = handleFilterColumns(defOpts, column, columns);
+                }
+                else if (excludeFields || includeFields) {
+                    isChecked = handleFilterFields(defOpts, column, includeFields, excludeFields);
+                }
+                else {
+                    isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
                 }
+                column.checked = isChecked;
+                column.halfChecked = false;
+                column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ column }) : false);
             });
             // 更新条件
             Object.assign(exportStore, {

package/es/table/module/keyboard/hook.js

@@ -28,36 +28,65 @@ hooks.add('tableKeyboardModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;
         const { refElem } = $xeTable.getRefMaps();
-        const { computeEditOpts, computeCheckboxOpts, computeMouseOpts, computeTreeOpts } = $xeTable.getComputeMaps();
+        const { computeEditOpts, computeCheckboxOpts, computeMouseOpts, computeTreeOpts, computeRowOpts, computeCellOpts, computeDefaultRowHeight } = $xeTable.getComputeMaps();
         function getCheckboxRangeRows(evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
+            const { showOverflow } = props;
+            const { fullAllDataRowIdData, isResizeCellHeight } = internalData;
+            const rowOpts = computeRowOpts.value;
+            const cellOpts = computeCellOpts.value;
+            const defaultRowHeight = computeDefaultRowHeight.value;
+            const { row } = params;
             let countHeight = 0;
             let rangeRows = [];
             let moveSize = 0;
             const isDown = moveRange > 0;
-            const { scrollYLoad, rowHeight } = reactData;
+            const { scrollYLoad } = reactData;
             const { afterFullData } = internalData;
+            if (isDown) {
+                moveSize = offsetClientTop + moveRange;
+            }
+            else {
+                moveSize = (trRect.height - offsetClientTop) + Math.abs(moveRange);
+            }
             if (scrollYLoad) {
-                if (isDown) {
-                    moveSize = offsetClientTop + moveRange;
-                }
-                else {
-                    moveSize = (trRect.height - offsetClientTop) + Math.abs(moveRange);
-                }
-                const _rowIndex = $xeTable.getVTRowIndex(params.row);
-                if (isDown) {
-                    rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / rowHeight));
+                const _rowIndex = $xeTable.getVTRowIndex(row);
+                const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+                if (!isCustomCellHeight && showOverflow) {
+                    if (isDown) {
+                        rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / defaultRowHeight));
+                    }
+                    else {
+                        rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / defaultRowHeight), _rowIndex + 1);
+                    }
                 }
                 else {
-                    rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / rowHeight), _rowIndex + 1);
+                    if (isDown) {
+                        for (let i = _rowIndex; i < afterFullData.length; i++) {
+                            const item = afterFullData[i];
+                            const rowid = $xeTable.getRowid(item);
+                            const rowRest = fullAllDataRowIdData[rowid] || {};
+                            countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+                            rangeRows.push(item);
+                            if (countHeight > moveSize) {
+                                return rangeRows;
+                            }
+                        }
+                    }
+                    else {
+                        for (let len = _rowIndex; len >= 0; len--) {
+                            const item = afterFullData[len];
+                            const rowid = $xeTable.getRowid(item);
+                            const rowRest = fullAllDataRowIdData[rowid] || {};
+                            countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+                            rangeRows.push(item);
+                            if (countHeight > moveSize) {
+                                return rangeRows;
+                            }
+                        }
+                    }
                 }
             }
             else {
-                if (isDown) {
-                    moveSize = evnt.clientY - trRect.y;
-                }
-                else {
-                    moveSize = trRect.y - evnt.clientY + trRect.height;
-                }
                 const siblingProp = isDown ? 'next' : 'previous';
                 while (targetTrElem && countHeight < moveSize) {
                     const rowNodeRest = $xeTable.getRowNode(targetTrElem);
@@ -71,19 +100,26 @@ hooks.add('tableKeyboardModule', {
             return rangeRows;
         }
         const handleCheckboxRangeEvent = (evnt, params) => {
+            const { elemStore } = internalData;
+            const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+            const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+            const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
             const { column, cell } = params;
             if (column.type === 'checkbox') {
-                const el = refElem.value;
-                const { elemStore } = internalData;
-                const disX = evnt.clientX;
-                const disY = evnt.clientY;
-                const bodyWrapperElem = getRefElem(elemStore[`${column.fixed || 'main'}-body-wrapper`] || elemStore['main-body-wrapper']);
+                let bodyWrapperElem = bodyScrollElem;
+                if (leftScrollElem && column.fixed === 'left') {
+                    bodyWrapperElem = leftScrollElem;
+                }
+                else if (rightScrollElem && column.fixed === 'right') {
+                    bodyWrapperElem = rightScrollElem;
+                }
                 if (!bodyWrapperElem) {
                     return;
                 }
+                const el = refElem.value;
+                const disX = evnt.clientX;
+                const disY = evnt.clientY;
                 const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
-                const domMousemove = document.onmousemove;
-                const domMouseup = document.onmouseup;
                 const trElem = cell.parentElement;
                 const selectRecords = $xeTable.getCheckboxRecords();
                 let lastRangeRows = [];
@@ -219,8 +255,8 @@ hooks.add('tableKeyboardModule', {
                     stopMouseScroll();
                     removeClass(el, 'drag--range');
                     checkboxRangeElem.removeAttribute('style');
-                    document.onmousemove = domMousemove;
-                    document.onmouseup = domMouseup;
+                    document.onmousemove = null;
+                    document.onmouseup = null;
                     triggerEvent('end', evnt);
                 };
                 triggerEvent('start', evnt);