vxe-table 3.5.8 → 3.5.9-beta.10

package/lib/table/src/methods.js

@@ -232,14 +232,14 @@ function setMerges(_vm, merges, mList, rowList) {
     var treeConfig = _vm.treeConfig,
         visibleColumn = _vm.visibleColumn;
 
-    if (treeConfig) {
-      throw new Error(_utils.default.getLog('vxe.error.noTree', ['merge-footer-items']));
-    }
-
     if (!_xeUtils.default.isArray(merges)) {
       merges = [merges];
     }
 
+    if (treeConfig && merges.length) {
+      (0, _log.errLog)('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+    }
+
     merges.forEach(function (item) {
       var row = item.row,
           col = item.col,
@@ -297,14 +297,14 @@ function removeMerges(_vm, merges, mList, rowList) {
     var treeConfig = _vm.treeConfig,
         visibleColumn = _vm.visibleColumn;
 
-    if (treeConfig) {
-      throw new Error(_utils.default.getLog('vxe.error.noTree', ['merge-cells']));
-    }
-
     if (!_xeUtils.default.isArray(merges)) {
       merges = [merges];
     }
 
+    if (treeConfig && merges.length) {
+      (0, _log.errLog)('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+    }
+
     merges.forEach(function (item) {
       var row = item.row,
           col = item.col;
@@ -524,7 +524,9 @@ var Methods = {
         scrollXStore = this.scrollXStore,
         lastScrollLeft = this.lastScrollLeft,
         lastScrollTop = this.lastScrollTop,
-        oldScrollYLoad = this.scrollYLoad;
+        oldScrollYLoad = this.scrollYLoad,
+        sXOpts = this.sXOpts,
+        sYOpts = this.sYOpts;
     var treeData = [];
     var fullData = datas ? datas.slice(0) : [];
 
@@ -636,12 +638,23 @@ var Methods = {
         _this4.$nextTick().then(function () {
           return _this4.recalculate();
         }).then(function () {
-          // 是否变更虚拟滚动
+          var targetScrollLeft = lastScrollLeft;
+          var targetScrollTop = lastScrollTop; // 是否在更新数据之后自动滚动重置滚动条
+
+          if (sXOpts.scrollToLeftOnChange) {
+            targetScrollLeft = 0;
+          }
+
+          if (sYOpts.scrollToTopOnChange) {
+            targetScrollTop = 0;
+          } // 是否变更虚拟滚动
+
+
           if (oldScrollYLoad === sYLoad) {
-            (0, _util.restoreScrollLocation)(_this4, lastScrollLeft, lastScrollTop).then(resolve);
+            (0, _util.restoreScrollLocation)(_this4, targetScrollLeft, targetScrollTop).then(resolve);
           } else {
             setTimeout(function () {
-              return (0, _util.restoreScrollLocation)(_this4, lastScrollLeft, lastScrollTop).then(resolve);
+              return (0, _util.restoreScrollLocation)(_this4, targetScrollLeft, targetScrollTop).then(resolve);
             });
           }
         });
@@ -951,7 +964,7 @@ var Methods = {
 
     var handleFunc = function handleFunc(column, index, items, path, parent) {
       var colid = column.id,
-          property = column.property,
+          field = column.field,
           fixed = column.fixed,
           type = column.type,
           treeNode = column.treeNode;
@@ -963,14 +976,14 @@ var Methods = {
         parent: parent
       };
 
-      if (property) {
+      if (field) {
         if (process.env.NODE_ENV === 'development') {
-          if (fullColumnFieldData[property]) {
-            (0, _log.warnLog)('vxe.error.colRepet', ['field', property]);
+          if (fullColumnFieldData[field]) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['field', field]);
           }
         }
 
-        fullColumnFieldData[property] = rest;
+        fullColumnFieldData[field] = rest;
       }
 
       if (!hasFixed && fixed) {
@@ -1235,10 +1248,10 @@ var Methods = {
         expandOpts = this.expandOpts;
     var rowkey = (0, _util.getRowkey)(this);
     this.tableFullColumn.forEach(function (column) {
-      var property = column.property,
+      var field = column.field,
           editRender = column.editRender;
 
-      if (property && !_xeUtils.default.has(record, property)) {
+      if (field && !_xeUtils.default.has(record, field)) {
         var cellValue = null;
 
         if (editRender) {
@@ -1253,7 +1266,7 @@ var Methods = {
           }
         }
 
-        _xeUtils.default.set(record, property, cellValue);
+        _xeUtils.default.set(record, field, cellValue);
       }
     });
     var otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField];
@@ -1355,7 +1368,7 @@ var Methods = {
           var rowIndex = _this15.getRowIndex(row);
 
           if (treeConfig && rowIndex === -1) {
-            throw new Error(_utils.default.getLog('vxe.error.noTree', ['revertData']));
+            (0, _log.errLog)('vxe.error.noTree', ['revertData']);
           }
 
           var oRow = tableSourceData[rowIndex];
@@ -1404,7 +1417,7 @@ var Methods = {
     } else {
       rows.forEach(function (row) {
         visibleColumn.forEach(function (column) {
-          if (column.property) {
+          if (column.field) {
             setCellValue(row, column, null);
           }
         });
@@ -1476,7 +1489,7 @@ var Methods = {
         }
 
         for (var index = 0, len = visibleColumn.length; index < len; index++) {
-          property = visibleColumn[index].property;
+          property = visibleColumn[index].field;
 
           if (property && !eqCellValue(oRow, row, property)) {
             return true;
@@ -1550,20 +1563,20 @@ var Methods = {
     var transform = treeOpts.transform,
         children = treeOpts.children,
         mapChildren = treeOpts.mapChildren;
-    var property = checkboxOpts.checkField;
+    var checkField = checkboxOpts.checkField;
     var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
 
-    if (property) {
+    if (checkField) {
       if (treeConfig) {
         rowList = _xeUtils.default.filterTree(currTableData, function (row) {
-          return _xeUtils.default.get(row, property);
+          return _xeUtils.default.get(row, checkField);
         }, {
           children: transform ? mapChildren : children
         });
       } else {
         rowList = currTableData.filter(function (row) {
-          return _xeUtils.default.get(row, property);
+          return _xeUtils.default.get(row, checkField);
         });
       }
     } else {
@@ -1643,7 +1656,7 @@ var Methods = {
     var filterColumns = [];
     var orderColumns = [];
     tableFullColumn.forEach(function (column) {
-      var property = column.property,
+      var field = column.field,
           sortable = column.sortable,
           order = column.order,
           filters = column.filters;
@@ -1670,8 +1683,8 @@ var Methods = {
       if (!allRemoteSort && sortable && order) {
         orderColumns.push({
           column: column,
-          field: column.property,
-          property: property,
+          field: field,
+          property: field,
           order: order,
           sortTime: column.sortTime
         });
@@ -1691,7 +1704,8 @@ var Methods = {
 
           if (valueList.length && !allRemoteFilter) {
             var filterMethod = column.filterMethod,
-                filterRender = column.filterRender;
+                filterRender = column.filterRender,
+                field = column.field;
             var compConf = filterRender ? _vXETable.default.renderer.get(filterRender.name) : null;
             var compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null;
             var defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
@@ -1741,7 +1755,7 @@ var Methods = {
               });
             }
 
-            return valueList.indexOf(_xeUtils.default.get(row, column.property)) > -1;
+            return valueList.indexOf(_xeUtils.default.get(row, field)) > -1;
           }
 
           return true;
@@ -1799,7 +1813,8 @@ var Methods = {
           var _sortRests = allSortMethod({
             data: tableData,
             column: firstOrderColumn.column,
-            property: firstOrderColumn.property,
+            property: firstOrderColumn.field,
+            field: firstOrderColumn.field,
             order: firstOrderColumn.order,
             sortList: orderColumns,
             $table: this
@@ -1940,8 +1955,9 @@ var Methods = {
    * 根据行的唯一主键获取行
    * @param {String/Number} rowid 行主键
    */
-  getRowById: function getRowById(rowid) {
+  getRowById: function getRowById(cellValue) {
     var fullDataRowIdData = this.fullDataRowIdData;
+    var rowid = _xeUtils.default.eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
     return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
   },
 
@@ -3417,7 +3433,9 @@ var Methods = {
           // 如果是按下非功能键之外允许直接编辑
 
           if (selected.column && selected.row && (0, _utils.isEnableConf)(selected.column.editRender)) {
-            if (!editOpts.activeMethod || editOpts.activeMethod(_objectSpread(_objectSpread({}, selected.args), {}, {
+            var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+
+            if (!beforeEditMethod || beforeEditMethod(_objectSpread(_objectSpread({}, selected.args), {}, {
               $table: _this28
             }))) {
               if (editMethod) {
@@ -3786,10 +3804,10 @@ var Methods = {
     return this.$nextTick();
   },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
-    var property = this.checkboxOpts.checkField;
+    var checkField = this.checkboxOpts.checkField;
 
-    if (property) {
-      return _xeUtils.default.get(row, property);
+    if (checkField) {
+      return _xeUtils.default.get(row, checkField);
     }
 
     return this.selection.indexOf(row) > -1;
@@ -3812,25 +3830,25 @@ var Methods = {
         treeOpts = this.treeOpts,
         treeIndeterminates = this.treeIndeterminates,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField,
+    var checkField = checkboxOpts.checkField,
         checkStrictly = checkboxOpts.checkStrictly,
         checkMethod = checkboxOpts.checkMethod;
 
-    if (property) {
+    if (checkField) {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
           if (treeIndeterminates.indexOf(row) === -1) {
             treeIndeterminates.push(row);
           }
 
-          _xeUtils.default.set(row, property, false);
+          _xeUtils.default.set(row, checkField, false);
         } else {
           // 更新子节点状态
           _xeUtils.default.eachTree([row], function (item) {
             if (row === item || !checkMethod || checkMethod({
               row: item
             })) {
-              _xeUtils.default.set(item, property, value);
+              _xeUtils.default.set(item, checkField, value);
 
               _xeUtils.default.remove(treeIndeterminates, function (half) {
                 return half === item;
@@ -3862,7 +3880,7 @@ var Methods = {
             parentStatus = -1;
           } else {
             var selectItems = matchObj.items.filter(function (item) {
-              return _xeUtils.default.get(item, property);
+              return _xeUtils.default.get(item, checkField);
             });
             parentStatus = selectItems.filter(function (item) {
               return vItems.indexOf(item) > -1;
@@ -3877,7 +3895,7 @@ var Methods = {
         if (!checkMethod || checkMethod({
           row: row
         })) {
-          _xeUtils.default.set(row, property, value);
+          _xeUtils.default.set(row, checkField, value);
 
           this.handleCheckboxReserveRow(row, value);
         }
@@ -3973,9 +3991,9 @@ var Methods = {
   handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
     var selection = this.selection,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField;
+    var checkField = checkboxOpts.checkField;
     var row = params.row;
-    var value = property ? !_xeUtils.default.get(row, property) : selection.indexOf(row) === -1;
+    var value = checkField ? !_xeUtils.default.get(row, checkField) : selection.indexOf(row) === -1;
 
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value);
@@ -4022,7 +4040,7 @@ var Methods = {
         selection = this.selection,
         checkboxReserveRowMap = this.checkboxReserveRowMap,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField,
+    var checkField = checkboxOpts.checkField,
         reserve = checkboxOpts.reserve,
         checkStrictly = checkboxOpts.checkStrictly,
         checkMethod = checkboxOpts.checkMethod;
@@ -4038,7 +4056,7 @@ var Methods = {
        * 绑定属性方式（高性能，有污染）
        * 必须在行数据存在对应的属性，否则将不响应
        */
-      if (property) {
+      if (checkField) {
         var checkValFn = function checkValFn(row) {
           if (!checkMethod || checkMethod({
             row: row
@@ -4047,7 +4065,7 @@ var Methods = {
               selectRows.push(row);
             }
 
-            _xeUtils.default.set(row, property, value);
+            _xeUtils.default.set(row, checkField, value);
           }
         }; // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
@@ -4136,7 +4154,7 @@ var Methods = {
         }
       }
 
-      this.selection = property ? [] : beforeSelection.concat(selectRows);
+      this.selection = checkField ? [] : beforeSelection.concat(selectRows);
     }
 
     this.treeIndeterminates = [];
@@ -4442,17 +4460,17 @@ var Methods = {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField,
+    var checkField = checkboxOpts.checkField,
         reserve = checkboxOpts.reserve;
 
-    if (property) {
+    if (checkField) {
       if (treeConfig) {
         _xeUtils.default.eachTree(tableFullData, function (item) {
-          return _xeUtils.default.set(item, property, false);
+          return _xeUtils.default.set(item, checkField, false);
         }, treeOpts);
       } else {
         tableFullData.forEach(function (item) {
-          return _xeUtils.default.set(item, property, false);
+          return _xeUtils.default.set(item, checkField, false);
         });
       }
     }
@@ -4932,21 +4950,24 @@ var Methods = {
    */
   triggerSortEvent: function triggerSortEvent(evnt, column, order) {
     var sortOpts = this.sortOpts;
-    var property = column.property;
+    var field = column.field,
+        sortable = column.sortable,
+        remoteSort = column.remoteSort;
 
-    if (column.sortable || column.remoteSort) {
+    if (sortable || remoteSort) {
       if (!order || column.order === order) {
         this.clearSort(sortOpts.multiple ? column : null);
       } else {
         this.sort({
-          field: property,
+          field: field,
           order: order
         });
       }
 
       var params = {
         column: column,
-        property: property,
+        field: field,
+        property: field,
         order: column.order,
         sortList: this.getSortColumns()
       };
@@ -5065,14 +5086,14 @@ var Methods = {
         chronological = _this$sortOpts.chronological;
     var sortList = [];
     this.tableFullColumn.forEach(function (column) {
-      var property = column.property,
+      var field = column.field,
           order = column.order;
 
       if ((column.sortable || column.remoteSort) && order) {
         sortList.push({
           column: column,
-          field: column.property,
-          property: property,
+          field: field,
+          property: field,
           order: order,
           sortTime: column.sortTime
         });
@@ -5104,7 +5125,8 @@ var Methods = {
     if (visible) {
       this.emitEvent('filter-visible', {
         column: column,
-        property: column.property,
+        field: column.field,
+        property: column.field,
         filterList: this.getCheckedFilters(),
         visible: false
       }, null);