vxe-table 3.6.9 → 3.6.10-beta.1

package/lib/table/src/methods.js

@@ -3104,8 +3104,14 @@ var Methods = {
       column = params.column;
     var cell = evnt.currentTarget;
     this.handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
-    if ((0, _utils.isEnableConf)(editConfig)) {
-      if (editOpts.mode === 'row' && actived.row === row || actived.row === row && actived.column === column) {
+    // 单元格处于编辑状态时不触发提示框
+    if (column.editRender && (0, _utils.isEnableConf)(editConfig)) {
+      // 如果是行编辑模式
+      if (editOpts.mode === 'row' && actived.row === row) {
+        return;
+      }
+      // 如果是单元格编辑模式
+      if (actived.row === row && actived.column === column) {
         return;
       }
     }
@@ -3244,7 +3250,7 @@ var Methods = {
     var checkAll = checkboxOpts.checkAll,
       checkRowKeys = checkboxOpts.checkRowKeys;
     if (checkAll) {
-      this.setAllCheckboxRow(true);
+      this.handleCheckedAllCheckboxRow(true, true);
     } else if (checkRowKeys) {
       var defSelection = [];
       checkRowKeys.forEach(function (rowid) {
@@ -3252,15 +3258,10 @@ var Methods = {
           defSelection.push(fullDataRowIdData[rowid].row);
         }
       });
-      this.setCheckboxRow(defSelection, true);
+      this.handleCheckedCheckboxRow(defSelection, true, true);
     }
   },
-  /**
-   * 用于多选行，设置行为选中状态，第二个参数为选中与否
-   * @param {Array/Row} rows 行数据
-   * @param {Boolean} value 是否选中
-   */
-  setCheckboxRow: function setCheckboxRow(rows, value) {
+  handleCheckedCheckboxRow: function handleCheckedCheckboxRow(rows, value, isForce) {
     var _this32 = this;
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
@@ -3268,10 +3269,18 @@ var Methods = {
     rows.forEach(function (row) {
       return _this32.handleSelectRow({
         row: row
-      }, !!value);
+      }, !!value, isForce);
     });
     return this.$nextTick();
   },
+  /**
+   * 用于多选行，设置行为选中状态，第二个参数为选中与否
+   * @param {Array/Row} rows 行数据
+   * @param {Boolean} value 是否选中
+   */
+  setCheckboxRow: function setCheckboxRow(rows, value) {
+    return this.handleCheckedCheckboxRow(rows, value, true);
+  },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
     var selection = this.selection;
     var checkField = this.checkboxOpts.checkField;
@@ -3288,7 +3297,7 @@ var Methods = {
    * 多选，行选中事件
    * value 选中true 不选false 半选-1
    */
-  handleSelectRow: function handleSelectRow(_ref6, value) {
+  handleSelectRow: function handleSelectRow(_ref6, value, isForce) {
     var _this33 = this;
     var row = _ref6.row;
     var selection = this.selection,
@@ -3310,7 +3319,7 @@ var Methods = {
         } else {
           // 更新子节点状态
           _xeUtils.default.eachTree([row], function (item) {
-            if (_this33.eqRow(item, row) || !checkMethod || checkMethod({
+            if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
               row: item
             })) {
               _xeUtils.default.set(item, checkField, value);
@@ -3327,7 +3336,7 @@ var Methods = {
         }, treeOpts);
         if (matchObj && matchObj.parent) {
           var parentStatus;
-          var vItems = checkMethod ? matchObj.items.filter(function (item) {
+          var vItems = !isForce && checkMethod ? matchObj.items.filter(function (item) {
             return checkMethod({
               row: item
             });
@@ -3347,10 +3356,10 @@ var Methods = {
           }
           return this.handleSelectRow({
             row: matchObj.parent
-          }, parentStatus);
+          }, parentStatus, isForce);
         }
       } else {
-        if (!checkMethod || checkMethod({
+        if (isForce || !checkMethod || checkMethod({
           row: row
         })) {
           _xeUtils.default.set(row, checkField, value);
@@ -3369,9 +3378,9 @@ var Methods = {
         } else {
           // 更新子节点状态
           _xeUtils.default.eachTree([row], function (item) {
-            if (_this33.eqRow(item, row) || !checkMethod || checkMethod({
+            if (_this33.eqRow(item, row) || isForce && (!checkMethod || checkMethod({
               row: item
-            })) {
+            }))) {
               if (value) {
                 selection.push(item);
               } else {
@@ -3392,7 +3401,7 @@ var Methods = {
         }, treeOpts);
         if (_matchObj && _matchObj.parent) {
           var _parentStatus;
-          var _vItems = checkMethod ? _matchObj.items.filter(function (item) {
+          var _vItems = !isForce && checkMethod ? _matchObj.items.filter(function (item) {
             return checkMethod({
               row: item
             });
@@ -3412,10 +3421,10 @@ var Methods = {
           }
           return this.handleSelectRow({
             row: _matchObj.parent
-          }, _parentStatus);
+          }, _parentStatus, isForce);
         }
       } else {
-        if (!checkMethod || checkMethod({
+        if (isForce || !checkMethod || checkMethod({
           row: row
         })) {
           if (value) {
@@ -3463,16 +3472,16 @@ var Methods = {
    * 多选，切换某一行的选中状态
    */
   toggleCheckboxRow: function toggleCheckboxRow(row) {
-    this.handleToggleCheckRowEvent(null, {
+    var selection = this.selection,
+      checkboxOpts = this.checkboxOpts;
+    var checkField = checkboxOpts.checkField;
+    var value = checkField ? !_xeUtils.default.get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
+    this.handleSelectRow({
       row: row
-    });
+    }, value, true);
     return this.$nextTick();
   },
-  /**
-   * 用于多选行，设置所有行的选中状态
-   * @param {Boolean} value 是否选中
-   */
-  setAllCheckboxRow: function setAllCheckboxRow(value) {
+  handleCheckedAllCheckboxRow: function handleCheckedAllCheckboxRow(value, isForce) {
     var _this34 = this;
     var afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
@@ -3497,7 +3506,7 @@ var Methods = {
        */
       if (checkField) {
         var checkValFn = function checkValFn(row) {
-          if (!checkMethod || checkMethod({
+          if (isForce || !checkMethod || checkMethod({
             row: row
           })) {
             if (value) {
@@ -3525,7 +3534,7 @@ var Methods = {
              * 如果方法成立，则添加到临时集合中
              */
             _xeUtils.default.eachTree(afterFullData, function (row) {
-              if (!checkMethod || checkMethod({
+              if (isForce || !checkMethod || checkMethod({
                 row: row
               })) {
                 selectRows.push(row);
@@ -3536,7 +3545,7 @@ var Methods = {
              * 如果是树取消
              * 如果方法成立，则不添加到临时集合中
              */
-            if (checkMethod) {
+            if (!isForce && checkMethod) {
               _xeUtils.default.eachTree(afterFullData, function (row) {
                 if (checkMethod({
                   row: row
@@ -3553,7 +3562,7 @@ var Methods = {
              * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
              * 如果不存在选中方法，则添加所有数据到临时集合中
              */
-            if (checkMethod) {
+            if (!isForce && checkMethod) {
               selectRows = afterFullData.filter(function (row) {
                 return _this34.findRowIndexOf(selection, row) > -1 || checkMethod({
                   row: row
@@ -3568,7 +3577,7 @@ var Methods = {
              * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
              * 如果不存在选中方法，无需处理，临时集合默认为空
              */
-            if (checkMethod) {
+            if (!isForce && checkMethod) {
               selectRows = afterFullData.filter(function (row) {
                 return checkMethod({
                   row: row
@@ -3593,6 +3602,14 @@ var Methods = {
     }
     this.treeIndeterminates = [];
     this.checkSelectionStatus();
+    return this.$nextTick();
+  },
+  /**
+   * 用于多选行，设置所有行的选中状态
+   * @param {Boolean} value 是否选中
+   */
+  setAllCheckboxRow: function setAllCheckboxRow(value) {
+    return this.handleCheckedAllCheckboxRow(value, true);
   },
   checkSelectionStatus: function checkSelectionStatus() {
     var _this35 = this;
@@ -3704,14 +3721,14 @@ var Methods = {
     if (radioOpts.reserve && radioReserveRow) {
       var rowid = (0, _util.getRowid)(this, radioReserveRow);
       if (fullDataRowIdData[rowid]) {
-        this.setRadioRow(fullDataRowIdData[rowid].row);
+        this.handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
       }
     }
     // 复选框
     this.selection = getRecoverRow(this, selection); // 刷新多选行状态
     // 还原保留选中状态
     if (checkboxOpts.reserve) {
-      this.setCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true);
+      this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
     }
     if (currentRow && !fullAllDataRowMap.has(currentRow)) {
       this.currentRow = null; // 刷新当前行状态
@@ -3833,7 +3850,7 @@ var Methods = {
    * 多选，选中所有事件
    */
   triggerCheckAllEvent: function triggerCheckAllEvent(evnt, value) {
-    this.setAllCheckboxRow(value);
+    this.handleCheckedAllCheckboxRow(value);
     this.emitEvent('checkbox-all', {
       records: this.getCheckboxRecords(),
       reserves: this.getCheckboxReserveRecords(),
@@ -3892,7 +3909,7 @@ var Methods = {
       reserve = radioOpts.reserve;
     if (rowid) {
       if (fullDataRowIdData[rowid]) {
-        this.setRadioRow(fullDataRowIdData[rowid].row);
+        this.handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
       }
       if (reserve) {
         var rowkey = (0, _util.getRowkey)(this);
@@ -3910,7 +3927,7 @@ var Methods = {
     var newValue = row;
     var isChange = oldValue !== newValue;
     if (isChange) {
-      this.setRadioRow(newValue);
+      this.handleCheckedRadioRow(newValue);
     } else if (!radioOpts.strict) {
       isChange = oldValue === newValue;
       if (isChange) {
@@ -3945,7 +3962,7 @@ var Methods = {
     var $el = this.$el,
       rowOpts = this.rowOpts;
     this.clearCurrentRow();
-    this.clearCurrentColumn();
+    // this.clearCurrentColumn()
     this.currentRow = row;
     if (rowOpts.isCurrent || this.highlightCurrentRow) {
       if ($el) {
@@ -3959,14 +3976,10 @@ var Methods = {
   isCheckedByRadioRow: function isCheckedByRadioRow(row) {
     return this.selectRow === row;
   },
-  /**
-   * 用于单选行，设置某一行为选中状态
-   * @param {Row} row 行对象
-   */
-  setRadioRow: function setRadioRow(row) {
+  handleCheckedRadioRow: function handleCheckedRadioRow(row, isForce) {
     var radioOpts = this.radioOpts;
     var checkMethod = radioOpts.checkMethod;
-    if (row && (!checkMethod || checkMethod({
+    if (row && (isForce || !checkMethod || checkMethod({
       row: row
     }))) {
       this.selectRow = row;
@@ -3974,6 +3987,13 @@ var Methods = {
     }
     return this.$nextTick();
   },
+  /**
+   * 用于单选行，设置某一行为选中状态
+   * @param {Row} row 行对象
+   */
+  setRadioRow: function setRadioRow(row) {
+    return this.handleCheckedRadioRow(row, true);
+  },
   /**
    * 用于当前行，手动清空当前高亮的状态
    */
@@ -4098,7 +4118,7 @@ var Methods = {
   setCurrentColumn: function setCurrentColumn(fieldOrColumn) {
     var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
     if (column) {
-      this.clearCurrentRow();
+      // this.clearCurrentRow()
       this.clearCurrentColumn();
       this.currentColumn = column;
     }
@@ -4857,7 +4877,7 @@ var Methods = {
             }
             // 如果当前节点已选中，则展开后子节点也被选中
             if (!checkStrictly && _this48.isCheckedByCheckboxRow(row)) {
-              _this48.setCheckboxRow(childRows, true);
+              _this48.handleCheckedCheckboxRow(childRows, true, true);
             }
             return _this48.$nextTick().then(function () {
               if (transform) {