vxe-table 3.4.0 → 3.4.3

package/lib/table/src/methods.js

@@ -478,12 +478,12 @@ var Methods = {
       // 树结构自动转换
       if (treeOpts.transform) {
         if (process.env.NODE_ENV === 'development') {
-          if (!treeOpts.rowtKey) {
-            _tools.UtilTools.error('vxe.error.reqProp', ['table.tree-config.rowtKey']);
+          if (!treeOpts.rowField) {
+            _tools.UtilTools.error('vxe.error.reqProp', ['table.tree-config.rowField']);
           }
 
-          if (!treeOpts.parentKey) {
-            _tools.UtilTools.error('vxe.error.reqProp', ['table.tree-config.parentKey']);
+          if (!treeOpts.parentField) {
+            _tools.UtilTools.error('vxe.error.reqProp', ['table.tree-config.parentField']);
           }
 
           if (!treeOpts.children) {
@@ -498,8 +498,8 @@ var Methods = {
         }
 
         treeData = _xeUtils.default.toArrayTree(fullData, {
-          key: treeOpts.rowtKey,
-          parentKey: treeOpts.parentKey,
+          key: treeOpts.rowField,
+          parentKey: treeOpts.parentField,
           children: treeOpts.children
         });
         fullData = treeData.slice(0);
@@ -652,18 +652,15 @@ var Methods = {
 
       if (oRow && row) {
         if (field) {
-          _xeUtils.default.set(oRow, field, _xeUtils.default.get(record || row, field));
-        } else {
-          if (record) {
-            tableSourceData[rowIndex] = record;
+          var newValue = _xeUtils.default.get(record || row, field);
 
-            _xeUtils.default.clear(row, undefined);
+          _xeUtils.default.set(row, field, newValue);
 
-            Object.assign(row, this.defineField(Object.assign({}, record)));
-            this.cacheRowMap(true);
-          } else {
-            _xeUtils.default.destructuring(oRow, _xeUtils.default.clone(row, true));
-          }
+          _xeUtils.default.set(oRow, field, newValue);
+        } else {
+          var newRecord = _xeUtils.default.clone(_objectSpread({}, record), true);
+
+          _xeUtils.default.destructuring(oRow, Object.assign(row, newRecord));
         }
       }
 
@@ -2918,7 +2915,8 @@ var Methods = {
             treeOpts = _this24.treeOpts,
             highlightCurrentRow = _this24.highlightCurrentRow,
             currentRow = _this24.currentRow,
-            bodyCtxMenu = _this24.bodyCtxMenu;
+            bodyCtxMenu = _this24.bodyCtxMenu,
+            rowOpts = _this24.rowOpts;
         var selected = editStore.selected,
             actived = editStore.actived;
         var keyCode = evnt.keyCode;
@@ -2988,7 +2986,7 @@ var Methods = {
           _this24.keyCtxTimeout = setTimeout(function () {
             _this24._keyCtx = false;
           }, 1000);
-        } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && highlightCurrentRow && currentRow)) {
+        } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           // 退出选中
           if (hasCtrlKey) {
             // 如果是激活编辑状态，则取消编辑
@@ -3022,7 +3020,7 @@ var Methods = {
                   _this24.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                 }
               }
-            } else if (treeConfig && highlightCurrentRow && currentRow) {
+            } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果是树形表格当前行回车移动到子节点
               var childrens = currentRow[treeOpts.children];
 
@@ -3047,7 +3045,7 @@ var Methods = {
             // 如果按下了方向键
             if (selected.row && selected.column) {
               _this24.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-            } else if ((isUpArrow || isDwArrow) && highlightCurrentRow) {
+            } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
               _this24.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
@@ -3059,7 +3057,7 @@ var Methods = {
           } else if (actived.row || actived.column) {
             _this24.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
-        } else if (keyboardConfig && (isDel || (treeConfig && highlightCurrentRow && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+        } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
           if (!isEditStatus) {
             var delMethod = keyboardOpts.delMethod,
                 backMethod = keyboardOpts.backMethod; // 如果是删除键
@@ -3093,7 +3091,7 @@ var Methods = {
                 // 如果按下 del 键，更新表尾数据
                 _this24.updateFooter();
               }
-            } else if (isBack && keyboardOpts.isArrow && treeConfig && highlightCurrentRow && currentRow) {
+            } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
               var _XEUtils$findTree = _xeUtils.default.findTree(_this24.afterFullData, function (item) {
                 return item === currentRow;
@@ -4209,12 +4207,13 @@ var Methods = {
    * @param {Row} row 行对象
    */
   setCurrentRow: function setCurrentRow(row) {
-    var $el = this.$el;
+    var $el = this.$el,
+        rowOpts = this.rowOpts;
     this.clearCurrentRow();
     this.clearCurrentColumn();
     this.currentRow = row;
 
-    if (this.highlightCurrentRow) {
+    if (rowOpts.isCurrent || this.highlightCurrentRow) {
       if ($el) {
         _xeUtils.default.arrayEach($el.querySelectorAll("[rowid=\"".concat(getRowid(this, row), "\"]")), function (elem) {
           return addClass(elem, 'row--current');
@@ -4275,7 +4274,7 @@ var Methods = {
    * 用于当前行，获取当前行的数据
    */
   getCurrentRecord: function getCurrentRecord() {
-    return this.highlightCurrentRow ? this.currentRow : null;
+    return this.rowOpts.isCurrent || this.highlightCurrentRow ? this.currentRow : null;
   },
 
   /**
@@ -4370,7 +4369,7 @@ var Methods = {
       cell: cell
     }, params), evnt);
 
-    if (this.highlightCurrentColumn) {
+    if (this.columnOpts.isCurrent || this.highlightCurrentColumn) {
       return this.setCurrentColumn(column);
     }
 
@@ -4382,7 +4381,7 @@ var Methods = {
     }, params), evnt);
   },
   getCurrentColumn: function getCurrentColumn() {
-    return this.highlightCurrentColumn ? this.currentColumn : null;
+    return this.columnOpts.isCurrent || this.highlightCurrentColumn ? this.currentColumn : null;
   },
 
   /**
@@ -4447,7 +4446,8 @@ var Methods = {
         treeOpts = this.treeOpts,
         editConfig = this.editConfig,
         editOpts = this.editOpts,
-        checkboxOpts = this.checkboxOpts;
+        checkboxOpts = this.checkboxOpts,
+        rowOpts = this.rowOpts;
     var actived = editStore.actived;
     var _params = params,
         row = _params.row,
@@ -4486,7 +4486,7 @@ var Methods = {
     if (!triggerTreeNode) {
       if (!triggerExpandNode) {
         // 如果是高亮行
-        if (highlightCurrentRow) {
+        if (rowOpts.isCurrent || highlightCurrentRow) {
           if (!triggerCheckbox && !triggerRadio) {
             this.triggerCurrentRowEvent(evnt, params);
           }
@@ -4815,7 +4815,7 @@ var Methods = {
    * 重新懒加载展开行，并展开内容
    * @param {Row} row 行对象
    */
-  lazyExpandContent: function lazyExpandContent(row) {
+  reloadRowExpand: function reloadRowExpand(row) {
     var _this36 = this;
 
     var expandOpts = this.expandOpts,
@@ -4832,11 +4832,11 @@ var Methods = {
   },
   reloadExpandContent: function reloadExpandContent(row) {
     if (process.env.NODE_ENV === 'development') {
-      _tools.UtilTools.warn('vxe.error.delFunc', ['reloadExpandContent', 'lazyExpandContent']);
+      _tools.UtilTools.warn('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
     } // 即将废弃
 
 
-    return this.lazyExpandContent(row);
+    return this.reloadRowExpand(row);
   },
 
   /**
@@ -5108,7 +5108,7 @@ var Methods = {
    * 重新懒加载树节点，并展开该节点
    * @param {Row} row 行对象
    */
-  lazyTreeChildren: function lazyTreeChildren(row) {
+  reloadTreeExpand: function reloadTreeExpand(row) {
     var _this40 = this;
 
     var treeOpts = this.treeOpts,
@@ -5133,11 +5133,11 @@ var Methods = {
   },
   reloadTreeChilds: function reloadTreeChilds(row) {
     if (process.env.NODE_ENV === 'development') {
-      _tools.UtilTools.warn('vxe.error.delFunc', ['reloadTreeChilds', 'lazyTreeChildren']);
+      _tools.UtilTools.warn('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
     } // 即将废弃
 
 
-    return this.lazyTreeChildren(row);
+    return this.reloadTreeExpand(row);
   },
 
   /**
@@ -5356,9 +5356,11 @@ var Methods = {
         treeOpts = this.treeOpts,
         treeFullData = this.treeFullData;
     var fullData = [];
+    var expandMaps = new Map();
 
     _xeUtils.default.eachTree(treeFullData, function (row, index, items, path, parent) {
-      if (!parent || treeExpandeds.indexOf(parent) > -1) {
+      if (!parent || expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1) {
+        expandMaps.set(row, 1);
         fullData.push(row);
       }
     }, treeOpts);