vxe-table 3.12.10-beta.21 → 3.12.10-beta.23

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) {
                 // 检测弹窗模块

package/es/table/src/body.js

@@ -316,13 +316,11 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
             ]));
         }
     }
+    let showAreaRowStatus = false;
     if (mouseConfig && mouseOpts.area && selectCellToRow) {
-        if ((!$columnIndex && selectCellToRow === true) ||
+        if ((!_columnIndex && selectCellToRow === true) ||
             (selectCellToRow === column.field)) {
-            tdVNs.push(h('div', {
-                key: 'tca',
-                class: 'vxe-cell--area-status'
-            }));
+            showAreaRowStatus = true;
         }
     }
     if (rowResize && rowOpts.resizable) {
@@ -347,6 +345,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
                 'col--tree-node': treeNode,
                 'col--edit': isEdit,
                 'col--ellipsis': hasEllipsis,
+                'col--to-row': showAreaRowStatus,
                 'col--auto-height': isVNAutoHeight,
                 'fixed--width': !isAutoCellWidth,
                 'fixed--hidden': fixedHiddenColumn,
@@ -777,6 +776,9 @@ export default {
                         }),
                         h('span', {
                             class: 'vxe-table--cell-active-area'
+                        }),
+                        h('span', {
+                            class: 'vxe-table--cell-row-status-area'
                         })
                     ])
                     : renderEmptyElement($xeTable),

package/es/table/src/header.js

@@ -249,9 +249,10 @@ export default {
         const { xID } = $xeTable;
         const { fixedType, fixedColumn, tableColumn } = props;
         const { headerColumn } = this;
-        const { showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps;
+        const { mouseConfig, showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps;
         const { isGroup, scrollXLoad, scrollYLoad, dragCol } = tableReactData;
         const { visibleColumn, fullColumnIdData } = tableInternalData;
+        const mouseOpts = $xeTable.computeMouseOpts;
         let renderHeaderList = headerColumn;
         let renderColumnList = tableColumn;
         let isOptimizeMode = false;
@@ -354,7 +355,31 @@ export default {
                      */
                     h('thead', {
                         ref: 'refHeaderTHead'
-                    }, renderHeads(h, this, isGroup, isOptimizeMode, renderHeaderList))
+                    }, renderHeads(h, this, isGroup, isOptimizeMode, renderHeaderList)),
+                    mouseConfig && mouseOpts.area
+                        ? h('div', {
+                            class: 'vxe-table--cell-area'
+                        }, [
+                            h('span', {
+                                class: 'vxe-table--cell-main-area'
+                            }),
+                            h('span', {
+                                class: 'vxe-table--cell-copy-area'
+                            }),
+                            h('span', {
+                                class: 'vxe-table--cell-extend-area'
+                            }),
+                            h('span', {
+                                class: 'vxe-table--cell-multi-area'
+                            }),
+                            h('span', {
+                                class: 'vxe-table--cell-active-area'
+                            }),
+                            h('span', {
+                                class: 'vxe-table--cell-col-status-area'
+                            })
+                        ])
+                        : renderEmptyElement($xeTable)
                 ]),
                 /**
                  * 其他

package/es/table/style.css

@@ -1901,19 +1901,17 @@
 .vxe-table--cell-extend-area,
 .vxe-table--cell-active-area,
 .vxe-table--cell-copy-area,
-.vxe-table--cell-status {
+.vxe-table--cell-col-status-area,
+.vxe-table--cell-row-status-area {
   display: none;
   position: absolute;
   pointer-events: none;
   z-index: 1;
 }
 
-.vxe-table--cell-status {
+.vxe-table--header-wrapper .vxe-table--cell-col-status-area {
   top: 0;
-  left: 0;
-  width: var(--vxe-ui-table-cell-area-status-border-width);
-  height: 0;
-  background-color: var(--vxe-ui-font-primary-color);
+  height: 100%;
 }
 
 .vxe-table--fixed-left-wrapper .vxe-table--checkbox-range,
@@ -1921,11 +1919,15 @@
 .vxe-table--fixed-left-wrapper .vxe-table--cell-extend-area,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-active-area,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-copy-area,
+.vxe-table--fixed-left-wrapper .vxe-table--cell-col-status-area,
+.vxe-table--fixed-left-wrapper .vxe-table--cell-row-status-area,
 .vxe-table--fixed-right-wrapper .vxe-table--checkbox-range,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-main-area,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-extend-area,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-active-area,
-.vxe-table--fixed-right-wrapper .vxe-table--cell-copy-area {
+.vxe-table--fixed-right-wrapper .vxe-table--cell-copy-area,
+.vxe-table--fixed-right-wrapper .vxe-table--cell-col-status-area,
+.vxe-table--fixed-right-wrapper .vxe-table--cell-row-status-area {
   z-index: 2;
 }
 
@@ -1979,6 +1981,10 @@
 .vxe-table--cell-area .vxe-table--cell-extend-area {
   border: var(--vxe-ui-table-cell-extend-area-border-width) solid var(--vxe-ui-table-cell-extend-area-border-color);
 }
+.vxe-table--cell-area .vxe-table--cell-col-status-area,
+.vxe-table--cell-area .vxe-table--cell-row-status-area {
+  background-color: var(--vxe-ui-table-checkbox-range-background-color);
+}
 
 @keyframes moveCopyCellBorder {
   to {