vxe-table 3.4.5 → 3.4.6

package/lib/index.umd.js

@@ -8494,6 +8494,9 @@ var iconPrefix = 'vxe-icon--';
     mouseConfig: {
       extension: true
     },
+    keyboardConfig: {
+      isEsc: true
+    },
     areaConfig: {
       selectCellByHeader: true
     },
@@ -10695,6 +10698,12 @@ var Icon = {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__("a9e3");
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
+var es_object_assign = __webpack_require__("cca6");
+
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
+var es_array_iterator = __webpack_require__("e260");
+
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.map.js
 var es_map = __webpack_require__("4ec9");
 
@@ -11872,18 +11881,12 @@ function _objectSpread2(target) {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
 var es_promise = __webpack_require__("e6cf");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
-var es_object_assign = __webpack_require__("cca6");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim.js
 var es_string_trim = __webpack_require__("498a");
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.sort.js
 var es_array_sort = __webpack_require__("4e82");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
-var es_array_iterator = __webpack_require__("e260");
-
 // CONCATENATED MODULE: ./packages/table/src/cell.js
 
 
@@ -15517,7 +15520,8 @@ var Methods = {
         editStore = this.editStore,
         keyboardConfig = this.keyboardConfig,
         mouseConfig = this.mouseConfig,
-        mouseOpts = this.mouseOpts;
+        mouseOpts = this.mouseOpts,
+        keyboardOpts = this.keyboardOpts;
     var actived = editStore.actived;
     var keyCode = evnt.keyCode;
     var isEsc = keyCode === 27;
@@ -15531,19 +15535,21 @@ var Methods = {
 
           _this23.closeFilter();
 
-          _this23.closeMenu(); // 如果是激活编辑状态，则取消编辑
-
+          _this23.closeMenu();
 
-          if (actived.row) {
-            var params = actived.args;
+          if (keyboardConfig && keyboardOpts.isEsc) {
+            // 如果是激活编辑状态，则取消编辑
+            if (actived.row) {
+              var params = actived.args;
 
-            _this23.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this23.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
-            if (mouseConfig && mouseOpts.selected) {
-              _this23.$nextTick(function () {
-                return _this23.handleSelected(params, evnt);
-              });
+              if (mouseConfig && mouseOpts.selected) {
+                _this23.$nextTick(function () {
+                  return _this23.handleSelected(params, evnt);
+                });
+              }
             }
           }
         }
@@ -18825,6 +18831,8 @@ funcs.forEach(function (name) {
 
 
 
+
+
 /**
  * 渲染浮固定列
  * 分别渲染左边固定列和右边固定列
@@ -18995,35 +19003,35 @@ function handleUupdateResize(_vm) {
         return conf.table.showHeader;
       }
     },
-    // 是否要高亮当前选中行
+    // （即将废弃）是否要高亮当前选中行
     highlightCurrentRow: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightCurrentRow;
       }
     },
-    // 鼠标移到行是否要高亮显示
+    // （即将废弃）鼠标移到行是否要高亮显示
     highlightHoverRow: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightHoverRow;
       }
     },
-    // 是否要高亮当前选中列
+    // （即将废弃）是否要高亮当前选中列
     highlightCurrentColumn: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightCurrentColumn;
       }
     },
-    // 鼠标移到列是否要高亮显示
+    // （即将废弃）鼠标移到列是否要高亮显示
     highlightHoverColumn: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightHoverColumn;
       }
     },
-    // 激活单元格编辑时是否高亮显示
+    // （即将废弃）激活单元格编辑时是否高亮显示
     highlightCell: Boolean,
     // 是否显示表尾合计
     showFooter: Boolean,
@@ -19171,7 +19179,7 @@ function handleUupdateResize(_vm) {
     scrollX: Object,
     // 纵向虚拟滚动配置项
     scrollY: Object,
-    // 优化相关
+    // （即将废弃）优化相关
     animat: {
       type: Boolean,
       default: function _default() {
@@ -27637,6 +27645,11 @@ var es_string_repeat = __webpack_require__("38cf");
 
 
 
+
+
+
+
+
 
 
 
@@ -27676,15 +27689,26 @@ function hasTreeChildren($xetable, row) {
   return row[treeOpts.children] && row[treeOpts.children].length > 0;
 }
 
-function getSeq($xetable, row, rowIndex, column, columnIndex) {
+function getSeq($xetable, row, rowIndex, column, columnIndex, paths) {
   var seqOpts = $xetable.seqOpts;
   var seqMethod = seqOpts.seqMethod || column.seqMethod;
-  return seqMethod ? seqMethod({
-    row: row,
-    rowIndex: rowIndex,
-    column: column,
-    columnIndex: columnIndex
-  }) : seqOpts.startIndex + rowIndex + 1;
+
+  if (seqMethod) {
+    return seqMethod({
+      row: row,
+      rowIndex: rowIndex,
+      column: column,
+      columnIndex: columnIndex
+    });
+  }
+
+  if (paths) {
+    return paths.map(function (num, i) {
+      return i % 2 === 0 ? Number(num) + 1 : '.';
+    }).join('');
+  }
+
+  return seqOpts.startIndex + rowIndex + 1;
 }
 
 function defaultFilterExportColumn(column) {
@@ -27721,11 +27745,12 @@ function getLabelData($xetable, opts, columns, datas) {
   if (treeConfig) {
     // 如果是树表格只允许导出数据源
     var rest = [];
+    var expandMaps = new Map();
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(datas, function (item, rowIndex, items, path, parent, nodes) {
       var row = item._row || item;
       var parentRow = parent && parent._row ? parent._row : parent;
 
-      if (isAllExpand || !parentRow || $xetable.isTreeExpandByRow(parentRow)) {
+      if (isAllExpand || !parentRow || expandMaps.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)) {
         var hasRowChild = hasTreeChildren($xetable, row);
         var _item = {
           _row: row,
@@ -27756,7 +27781,7 @@ function getLabelData($xetable, opts, columns, datas) {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex);
+                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, path);
                 break;
 
               case 'checkbox':
@@ -27798,6 +27823,7 @@ function getLabelData($xetable, opts, columns, datas) {
 
           _item[column.id] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(cellValue);
         });
+        expandMaps.set(row, 1);
         rest.push(Object.assign(_item, row));
       }
     }, treeOpts);
@@ -27831,7 +27857,7 @@ function getLabelData($xetable, opts, columns, datas) {
       } else {
         switch (column.type) {
           case 'seq':
-            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex);
+            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, null);
             break;
 
           case 'checkbox':
@@ -27939,6 +27965,10 @@ function getFooterData(opts, footerTableData) {
 
 function getCsvCellTypeLabel(column, cellValue) {
   if (cellValue) {
+    if (column.type === 'seq') {
+      return "\t".concat(cellValue);
+    }
+
     switch (column.cellType) {
       case 'string':
         if (!isNaN(cellValue)) {
@@ -31476,6 +31506,8 @@ var Colgroup = Object.assign(src_group, {
 
 
 
+
+
 var grid_methods = {};
 var propKeys = Object.keys(packages_table.props);
 
@@ -32328,7 +32360,12 @@ Object.keys(packages_table.methods).forEach(function (name) {
               } // 只校验新增和修改的数据
 
 
-              return this.validate(_body.insertRecords.concat(updateRecords)).then(function () {
+              return this.validate(_body.insertRecords.concat(updateRecords)).then(function (errMap) {
+                if (errMap) {
+                  // 如果校验不通过
+                  return;
+                }
+
                 if (_body.insertRecords.length || _removeRecords.length || updateRecords.length || _body.pendingRecords.length) {
                   _this5.tableLoading = true;
                   return Promise.resolve((beforeSave || _ajaxMethods2).apply(void 0, _toConsumableArray(_applyArgs2))).then(function (rest) {
@@ -32376,8 +32413,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
                     });
                   }
                 }
-              }).catch(function (errMap) {
-                return errMap;
               });
             } else {
               if (false) {}