vxe-table 4.1.6 → 4.1.9

package/lib/table/src/table.js

@@ -311,8 +311,9 @@ var _default = (0, _vue.defineComponent)({
       tableFullColumn: [],
       // 渲染所有列
       visibleColumn: [],
-      // 缓存数据集
+      // 总的缓存数据集
       fullAllDataRowIdData: {},
+      // 渲染中缓存数据
       fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
@@ -1300,29 +1301,100 @@ var _default = (0, _vue.defineComponent)({
         return cellValue;
       };
     };
+    /**
+     * 预编译
+     * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
+     */
+
 
     var updateAfterDataIndex = function updateAfterDataIndex() {
+      var treeConfig = props.treeConfig;
       var afterFullData = internalData.afterFullData,
-          fullDataRowIdData = internalData.fullDataRowIdData;
-      afterFullData.forEach(function (row, _index) {
-        var rowid = (0, _util.getRowid)($xetable, row);
-        var rest = fullDataRowIdData[rowid];
+          fullDataRowIdData = internalData.fullDataRowIdData,
+          fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+      var treeFullData = internalData.treeFullData;
+      var treeOpts = computeTreeOpts.value;
 
-        if (rest) {
-          rest._index = _index;
-        } else {
-          fullDataRowIdData[rowid] = {
-            row: row,
-            rowid: rowid,
-            index: -1,
-            $index: -1,
-            _index: _index,
-            items: [],
-            parent: null,
-            level: 0
-          };
-        }
-      });
+      if (treeConfig) {
+        _xeUtils.default.eachTree(treeFullData, function (row, index, items, path) {
+          var rowid = (0, _util.getRowid)($xetable, row);
+          var allrest = fullAllDataRowIdData[rowid];
+          var fullrest = fullDataRowIdData[rowid];
+          var seq = path.map(function (num, i) {
+            return i % 2 === 0 ? Number(num) + 1 : '.';
+          }).join('');
+
+          if (allrest) {
+            allrest.seq = seq;
+          }
+
+          if (fullrest) {
+            fullrest.seq = seq;
+          } else {
+            fullAllDataRowIdData[rowid] = {
+              row: row,
+              rowid: rowid,
+              seq: seq,
+              index: -1,
+              $index: -1,
+              _index: index,
+              items: [],
+              parent: null,
+              level: 0
+            };
+            fullDataRowIdData[rowid] = {
+              row: row,
+              rowid: rowid,
+              seq: seq,
+              index: -1,
+              $index: -1,
+              _index: index,
+              items: [],
+              parent: null,
+              level: 0
+            };
+          }
+        }, treeOpts);
+      } else {
+        afterFullData.forEach(function (row, index) {
+          var rowid = (0, _util.getRowid)($xetable, row);
+          var allrest = fullAllDataRowIdData[rowid];
+          var fullrest = fullDataRowIdData[rowid];
+          var seq = index + 1;
+
+          if (allrest) {
+            allrest.seq = seq;
+          }
+
+          if (fullrest) {
+            fullrest.seq = seq;
+            fullrest._index = index;
+          } else {
+            fullAllDataRowIdData[rowid] = {
+              row: row,
+              rowid: rowid,
+              seq: seq,
+              index: -1,
+              $index: -1,
+              _index: index,
+              items: [],
+              parent: null,
+              level: 0
+            };
+            fullDataRowIdData[rowid] = {
+              row: row,
+              rowid: rowid,
+              seq: seq,
+              index: -1,
+              $index: -1,
+              _index: index,
+              items: [],
+              parent: null,
+              level: 0
+            };
+          }
+        });
+      }
     };
     /**
      * 获取处理后全量的表格数据
@@ -2543,12 +2615,12 @@ var _default = (0, _vue.defineComponent)({
       }
 
       reactData.scrollXLoad = scrollXLoad;
-      visibleColumn.forEach(function (column, _index) {
+      visibleColumn.forEach(function (column, index) {
         var colid = column.id;
         var rest = fullColumnIdData[colid];
 
         if (rest) {
-          rest._index = _index;
+          rest._index = index;
         }
       });
       internalData.visibleColumn = visibleColumn;
@@ -2758,6 +2830,39 @@ var _default = (0, _vue.defineComponent)({
       }
     };
 
+    var createGetRowCacheProp = function createGetRowCacheProp(prop) {
+      return function (row) {
+        var fullDataRowIdData = internalData.fullDataRowIdData;
+
+        if (row) {
+          var rowid = (0, _util.getRowid)($xetable, row);
+          var rest = fullDataRowIdData[rowid];
+
+          if (rest) {
+            return rest[prop];
+          }
+        }
+
+        return -1;
+      };
+    };
+
+    var createGetColumnCacheProp = function createGetColumnCacheProp(prop) {
+      return function (column) {
+        var fullColumnIdData = internalData.fullColumnIdData;
+
+        if (column) {
+          var rest = fullColumnIdData[column.id];
+
+          if (rest) {
+            return rest[prop];
+          }
+        }
+
+        return -1;
+      };
+    };
+
     var debounceScrollY = _xeUtils.default.debounce(function (evnt) {
       loadScrollYData(evnt);
     }, 20, {
@@ -2918,6 +3023,7 @@ var _default = (0, _vue.defineComponent)({
             var rest = {
               row: childRow,
               rowid: rowid,
+              seq: -1,
               index: -1,
               _index: -1,
               $index: -1,
@@ -3013,115 +3119,46 @@ var _default = (0, _vue.defineComponent)({
       },
 
       /**
-       * 根据 row 获取相对于 data 中的索引
+       * 根据 row 获取序号
        * @param {Row} row 行对象
        */
-      getRowIndex: function getRowIndex(row) {
-        var fullDataRowIdData = internalData.fullDataRowIdData;
+      getRowSeq: createGetRowCacheProp('seq'),
 
-        if (row) {
-          var rowid = (0, _util.getRowid)($xetable, row);
-          var rest = fullDataRowIdData[rowid];
-
-          if (rest) {
-            return rest.index;
-          }
-        }
-
-        return -1;
-      },
+      /**
+       * 根据 row 获取相对于 data 中的索引
+       * @param {Row} row 行对象
+       */
+      getRowIndex: createGetRowCacheProp('index'),
 
       /**
        * 根据 row 获取相对于当前数据中的索引
        * @param {Row} row 行对象
        */
-      getVTRowIndex: function getVTRowIndex(row) {
-        var fullDataRowIdData = internalData.fullDataRowIdData;
-
-        if (row) {
-          var rowid = (0, _util.getRowid)($xetable, row);
-          var rest = fullDataRowIdData[rowid];
-
-          if (rest) {
-            return rest._index;
-          }
-        }
-
-        return -1;
-      },
+      getVTRowIndex: createGetRowCacheProp('_index'),
 
       /**
        * 根据 row 获取渲染中的虚拟索引
        * @param {Row} row 行对象
        */
-      getVMRowIndex: function getVMRowIndex(row) {
-        var fullDataRowIdData = internalData.fullDataRowIdData;
-
-        if (row) {
-          var rowid = (0, _util.getRowid)($xetable, row);
-          var rest = fullDataRowIdData[rowid];
-
-          if (rest) {
-            return rest.$index;
-          }
-        }
-
-        return -1;
-      },
+      getVMRowIndex: createGetRowCacheProp('$index'),
 
       /**
        * 根据 column 获取相对于 columns 中的索引
        * @param {ColumnInfo} column 列配置
        */
-      getColumnIndex: function getColumnIndex(column) {
-        var fullColumnIdData = internalData.fullColumnIdData;
-
-        if (column) {
-          var rest = fullColumnIdData[column.id];
-
-          if (rest) {
-            return rest.index;
-          }
-        }
-
-        return -1;
-      },
+      getColumnIndex: createGetColumnCacheProp('index'),
 
       /**
        * 根据 column 获取相对于当前表格列中的索引
        * @param {ColumnInfo} column 列配置
        */
-      getVTColumnIndex: function getVTColumnIndex(column) {
-        var fullColumnIdData = internalData.fullColumnIdData;
-
-        if (column) {
-          var rest = fullColumnIdData[column.id];
-
-          if (rest) {
-            return rest._index;
-          }
-        }
-
-        return -1;
-      },
+      getVTColumnIndex: createGetColumnCacheProp('_index'),
 
       /**
        * 根据 column 获取渲染中的虚拟索引
        * @param {ColumnInfo} column 列配置
        */
-      getVMColumnIndex: function getVMColumnIndex(column) {
-        var fullColumnIdData = internalData.fullColumnIdData;
-
-        if (column) {
-          var rest = fullColumnIdData[column.id];
-
-          if (rest) {
-            return rest.$index;
-          }
-        }
-
-        return -1;
-      },
+      getVMColumnIndex: createGetColumnCacheProp('$index'),
 
       /**
        * 创建 data 对象
@@ -4062,7 +4099,7 @@ var _default = (0, _vue.defineComponent)({
                 return selectRow;
               }
             } else {
-              if (afterFullData.indexOf(selectRow) > -1) {
+              if ($xetable.findRowIndexOf(afterFullData, selectRow) > -1) {
                 return selectRow;
               }
             }
@@ -5029,6 +5066,7 @@ var _default = (0, _vue.defineComponent)({
           ctxMenuStore = reactData.ctxMenuStore,
           editStore = reactData.editStore;
       var mouseOpts = computeMouseOpts.value;
+      var keyboardOpts = computeKeyboardOpts.value;
       var actived = editStore.actived;
       var isEsc = (0, _event.hasEventKey)(evnt, _event.EVENT_KEYS.ESCAPE);
 
@@ -5043,16 +5081,19 @@ var _default = (0, _vue.defineComponent)({
               $xetable.closeMenu();
             }
 
-            tableMethods.closeFilter(); // 如果是激活编辑状态，则取消编辑
+            tableMethods.closeFilter();
 
-            if (actived.row) {
-              var params_1 = actived.args;
-              $xetable.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+            if (keyboardConfig && keyboardOpts.isEsc) {
+              // 如果是激活编辑状态，则取消编辑
+              if (actived.row) {
+                var params_1 = actived.args;
+                $xetable.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
-              if (mouseOpts.selected) {
-                (0, _vue.nextTick)(function () {
-                  return $xetable.handleSelected(params_1, evnt);
-                });
+                if (mouseOpts.selected) {
+                  (0, _vue.nextTick)(function () {
+                    return $xetable.handleSelected(params_1, evnt);
+                  });
+                }
               }
             }
           }
@@ -5129,7 +5170,7 @@ var _default = (0, _vue.defineComponent)({
 
             tableMethods.closeFilter();
 
-            if (actived.row) {
+            if (keyboardConfig && keyboardOpts.isEsc) {
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
                 var params_2 = actived.args;
@@ -5580,6 +5621,8 @@ var _default = (0, _vue.defineComponent)({
 
         var handleCache = function handleCache(row, index, items, path, parent, nodes) {
           var rowid = (0, _util.getRowid)($xetable, row);
+          var seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
+          var level = nodes ? nodes.length - 1 : 0;
 
           if ((0, _utils.eqEmptyValue)(rowid)) {
             rowid = (0, _util.getRowUniqueId)();
@@ -5594,12 +5637,13 @@ var _default = (0, _vue.defineComponent)({
           var rest = {
             row: row,
             rowid: rowid,
+            seq: seq,
             index: treeConfig && parent ? -1 : index,
             _index: -1,
             $index: -1,
             items: items,
             parent: parent,
-            level: nodes ? nodes.length - 1 : 0
+            level: level
           };
 
           if (isSource) {