vxe-table 3.12.10-beta.9 → 3.12.11

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

@@ -623,7 +623,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 = [];
@@ -644,12 +655,12 @@ 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) => {
                         if (colIndex < fields.length) {
-                            item[fields[colIndex]] = getTxtCellValue(val, vMaps);
+                            item[fields[colIndex]] = getTxtCellValue(val.trim(), vMaps);
                         }
                     });
                     rows.push(item);
@@ -659,13 +670,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');
@@ -676,9 +687,9 @@ function parseHTML(columns, content) {
         if (tableNodes.length) {
             const theadNodes = getElementsByTagName(tableNodes[0], 'thead');
             if (theadNodes.length) {
-                XEUtils.arrayEach(getElementsByTagName(theadNodes[0], 'tr'), (rowNode) => {
-                    XEUtils.arrayEach(getElementsByTagName(rowNode, 'th'), (cellNode) => {
-                        fields.push(cellNode.textContent);
+                XEUtils.arrayEach(getElementsByTagName(theadNodes[0], 'tr'), rowNode => {
+                    XEUtils.arrayEach(getElementsByTagName(rowNode, 'th'), cellNode => {
+                        fields.push(toExportField(tableConf, cellNode.textContent || ''));
                     });
                 });
                 const tbodyNodes = getElementsByTagName(tableNodes[0], 'tbody');
@@ -698,7 +709,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');
@@ -709,8 +720,8 @@ function parseXML(columns, content) {
         if (tableNodes.length) {
             const rowNodes = getElementsByTagName(tableNodes[0], 'Row');
             if (rowNodes.length) {
-                XEUtils.arrayEach(getElementsByTagName(rowNodes[0], 'Cell'), (cellNode) => {
-                    fields.push(cellNode.textContent);
+                XEUtils.arrayEach(getElementsByTagName(rowNodes[0], 'Cell'), cellNode => {
+                    fields.push(toExportField(tableConf, cellNode.textContent || ''));
                 });
                 XEUtils.arrayEach(rowNodes, (rowNode, index) => {
                     if (index) {
@@ -729,52 +740,54 @@ function parseXML(columns, content) {
     }
     return { fields, rows };
 }
-/**
- * 检查导入的列是否完整
- * @param {Array} fields 字段名列表
- * @param {Array} rows 数据列表
- */
-function checkImportData(columns, fields) {
-    const tableFields = [];
-    columns.forEach((column) => {
+function handleImport($xeTable, content, opts) {
+    const internalData = $xeTable;
+    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) {
-            tableFields.push(field);
+            tableFieldMaps[field] = column;
+        }
+        if (title) {
+            tableTitleMaps[column.getTitle()] = column;
         }
     });
-    return fields.some(field => tableFields.indexOf(field) > -1);
-}
-function handleImport($xetable, content, opts) {
-    const { tableFullColumn, _importResolve, _importReject } = $xetable;
-    let rest = { fields: [], rows: [] };
+    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)
+        $xeTable.createData(rows)
             .then((data) => {
             let loadRest;
             if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
-                loadRest = $xetable.insertAt(data, -1);
+                loadRest = $xeTable.insertAt(data, -1);
             }
             if (opts.mode === 'insertTop') {
-                loadRest = $xetable.insert(data);
+                loadRest = $xeTable.insert(data);
             }
             else {
-                loadRest = $xetable.reloadData(data);
+                loadRest = $xeTable.reloadData(data);
             }
             if (opts.message !== false) {
                 // 检测弹窗模块
@@ -943,6 +956,48 @@ export function readLocalFile(options = {}) {
         fileInput.click();
     });
 }
+function 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;
+    });
+}
+function 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);
+}
 function handleExportAndPrint($xeTable, options, isPrint) {
     const props = $xeTable;
     const reactData = $xeTable;
@@ -972,7 +1027,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     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 {
@@ -995,38 +1050,19 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     // 默认选中
     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/mixin.js

@@ -1,4 +1,5 @@
 import XEUtils from 'xe-utils';
+import { getRefElem } from '../../src/util';
 import { browse, hasClass, getAbsolutePos, addClass, removeClass } from '../../../ui/src/dom';
 function getTargetOffset(target, container) {
     let offsetTop = 0;
@@ -22,36 +23,66 @@ function getTargetOffset(target, container) {
     return { offsetTop, offsetLeft };
 }
 function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
+    const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
+    const { showOverflow } = props;
+    const { fullAllDataRowIdData, isResizeCellHeight } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    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 || rowRest.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 || rowRest.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);
@@ -217,15 +248,27 @@ export default {
         },
         handleCheckboxRangeEvent(evnt, params) {
             const $xeTable = this;
+            const internalData = $xeTable;
+            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, elemStore } = this;
+                let bodyWrapperElem = bodyScrollElem;
+                if (leftScrollElem && column.fixed === 'left') {
+                    bodyWrapperElem = leftScrollElem;
+                }
+                else if (rightScrollElem && column.fixed === 'right') {
+                    bodyWrapperElem = rightScrollElem;
+                }
+                if (!bodyWrapperElem) {
+                    return;
+                }
+                const el = $xeTable.$refs.refElem;
                 const disX = evnt.clientX;
                 const disY = evnt.clientY;
-                const bodyWrapperElem = elemStore[`${column.fixed || 'main'}-body-wrapper`] || elemStore['main-body-wrapper'];
                 const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
-                const domMousemove = document.onmousemove;
-                const domMouseup = document.onmouseup;
                 const trElem = cell.parentNode;
                 const selectRecords = this.getCheckboxRecords();
                 let lastRangeRows = [];
@@ -331,7 +374,7 @@ export default {
                         }
                     }, 50);
                 };
-                addClass($el, 'drag--range');
+                addClass(el, 'drag--range');
                 document.onmousemove = evnt => {
                     evnt.preventDefault();
                     evnt.stopPropagation();
@@ -359,10 +402,10 @@ export default {
                 };
                 document.onmouseup = (evnt) => {
                     stopMouseScroll();
-                    removeClass($el, 'drag--range');
+                    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);

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

@@ -57,6 +57,8 @@ export default {
          * 快捷菜单事件处理
          */
         handleGlobalContextmenuEvent(evnt) {
+            const $xeTable = this;
+            const internalData = $xeTable;
             const { $refs, tId, editStore, menuConfig, contextMenu, ctxMenuStore, ctxMenuOpts, mouseConfig, mouseOpts } = this;
             const { selected } = editStore;
             const layoutList = ['header', 'body', 'footer'];
@@ -65,7 +67,7 @@ export default {
                     evnt.preventDefault();
                     return;
                 }
-                if (this._keyCtx) {
+                if (internalData._keyCtx) {
                     const type = 'body';
                     const params = { type, $grid: this.$xegrid, $table: this, keyboard: true, columns: this.visibleColumn.slice(0), $event: evnt };
                     // 如果开启单元格区域