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

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.10-beta.21";
+const version = "3.12.10-beta.23";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2834,7 +2834,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.10-beta.21"}`;
+const log_version = `table v${"3.12.10-beta.23"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -15430,12 +15430,10 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       }, errorValidItem.content)]])]));
     }
   }
+  let showAreaRowStatus = false;
   if (mouseConfig && mouseOpts.area && selectCellToRow) {
-    if (!$columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
-      tdVNs.push(h('div', {
-        key: 'tca',
-        class: 'vxe-cell--area-status'
-      }));
+    if (!_columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
+      showAreaRowStatus = true;
     }
   }
   if (rowResize && rowOpts.resizable) {
@@ -15457,6 +15455,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,
@@ -15940,6 +15939,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       class: 'vxe-table--cell-multi-area'
     }), h('span', {
       class: 'vxe-table--cell-active-area'
+    }), h('span', {
+      class: 'vxe-table--cell-row-status-area'
     })]) : body_renderEmptyElement($xeTable), !fixedType ? h('div', {
       class: 'vxe-table--empty-block',
       ref: 'emptyBlock'
@@ -16262,6 +16263,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       headerColumn
     } = this;
     const {
+      mouseConfig,
       showHeaderOverflow: allColumnHeaderOverflow,
       spanMethod,
       footerSpanMethod
@@ -16276,6 +16278,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       visibleColumn,
       fullColumnIdData
     } = tableInternalData;
+    const mouseOpts = $xeTable.computeMouseOpts;
     let renderHeaderList = headerColumn;
     let renderColumnList = tableColumn;
     let isOptimizeMode = false;
@@ -16370,7 +16373,21 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
      */
     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'
+    })]) : header_renderEmptyElement($xeTable)]),
     /**
      * 其他
      */
@@ -21992,7 +22009,21 @@ 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 = [];
@@ -22013,11 +22044,11 @@ 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);
@@ -22030,13 +22061,13 @@ function parseCsvAndTxt(columns, content, cellSeparator) {
     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');
@@ -22049,7 +22080,7 @@ function parseHTML(columns, content) {
       if (theadNodes.length) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(getElementsByTagName(theadNodes[0], 'tr'), rowNode => {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(getElementsByTagName(rowNode, 'th'), cellNode => {
-            fields.push(cellNode.textContent);
+            fields.push(toExportField(tableConf, cellNode.textContent || ''));
           });
         });
         const tbodyNodes = getElementsByTagName(tableNodes[0], 'tbody');
@@ -22072,7 +22103,7 @@ function parseHTML(columns, content) {
     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');
@@ -22084,7 +22115,7 @@ function parseXML(columns, content) {
       const rowNodes = getElementsByTagName(tableNodes[0], 'Row');
       if (rowNodes.length) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(getElementsByTagName(rowNodes[0], 'Cell'), cellNode => {
-          fields.push(cellNode.textContent);
+          fields.push(toExportField(tableConf, cellNode.textContent || ''));
         });
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(rowNodes, (rowNode, index) => {
           if (index) {
@@ -22106,60 +22137,62 @@ function parseXML(columns, content) {
     rows
   };
 }
-/**
- * 检查导入的列是否完整
- * @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);
-}
-function handleImport($xetable, content, opts) {
+function handleImport($xeTable, content, opts) {
+  const internalData = $xeTable;
   const {
     tableFullColumn,
     _importResolve,
     _importReject
-  } = $xetable;
+  } = 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 => {
+    $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) {
         // 检测弹窗模块