vxe-table 3.11.30 → 3.11.31

package/lib/table/src/methods.js

@@ -916,7 +916,6 @@ const Methods = {
    */
   loadData(datas) {
     const {
-      inited,
       initStatus
     } = this;
     return this.loadTableData(datas).then(() => {
@@ -925,9 +924,6 @@ const Methods = {
       if (!initStatus) {
         this.handleLoadDefaults();
       }
-      if (!inited) {
-        this.handleInitDefaults();
-      }
       return this.recalculate();
     });
   },
@@ -936,18 +932,12 @@ const Methods = {
    * @param {Array} datas 数据
    */
   reloadData(datas) {
-    const {
-      inited
-    } = this;
     return this.clearAll().then(() => {
       this.inited = true;
       this.initStatus = true;
       return this.loadTableData(datas);
     }).then(() => {
       this.handleLoadDefaults();
-      if (!inited) {
-        this.handleInitDefaults();
-      }
       return this.recalculate();
     });
   },
@@ -4671,29 +4661,84 @@ const Methods = {
    * @param {Array/Row} rows 行数据
    * @param {Boolean} value 是否选中
    */
-  setCheckboxRow(rows, value) {
+  setCheckboxRow(rows, checked) {
+    const $xeTable = this;
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
     }
-    return this.handleCheckedCheckboxRow(rows, value, true);
+    return $xeTable.handleCheckedCheckboxRow(rows, checked, true);
+  },
+  setCheckboxRowKey(keys, checked) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    if (keys && !_xeUtils.default.isArray(keys)) {
+      keys = [keys];
+    }
+    const rows = [];
+    keys.forEach(rowid => {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (rowRest) {
+        rows.push(rowRest.row);
+      }
+    });
+    return $xeTable.handleCheckedCheckboxRow(rows, checked, true);
   },
   isCheckedByCheckboxRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       selectCheckboxMaps
-    } = this;
+    } = reactData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField
-    } = this.checkboxOpts;
+    } = checkboxOpts;
     if (checkField) {
       return _xeUtils.default.get(row, checkField);
     }
-    return !!selectCheckboxMaps[(0, _util.getRowid)(this, row)];
+    return !!selectCheckboxMaps[(0, _util.getRowid)($xeTable, row)];
+  },
+  isCheckedByCheckboxRowKey(rowid) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      selectCheckboxMaps
+    } = reactData;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    const {
+      checkField
+    } = checkboxOpts;
+    if (checkField) {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (rowRest) {
+        return _xeUtils.default.get(rowRest.row, checkField);
+      }
+      return false;
+    }
+    return !!selectCheckboxMaps[rowid];
   },
   isIndeterminateByCheckboxRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       treeIndeterminateMaps
-    } = this;
-    return !!treeIndeterminateMaps[(0, _util.getRowid)(this, row)] && !this.isCheckedByCheckboxRow(row);
+    } = reactData;
+    return !!treeIndeterminateMaps[(0, _util.getRowid)($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
+  },
+  isIndeterminateByCheckboxRowKey(rowid) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      treeIndeterminateMaps
+    } = reactData;
+    return !!treeIndeterminateMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
   },
   /**
    * 切换选中
@@ -5599,7 +5644,26 @@ const Methods = {
     return this.$nextTick();
   },
   isCheckedByRadioRow(row) {
-    return this.selectRadioRow === row;
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      selectRadioRow
+    } = reactData;
+    if (row && selectRadioRow) {
+      return $xeTable.eqRow(selectRadioRow, row);
+    }
+    return false;
+  },
+  isCheckedByRadioRowKey(key) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      selectRadioRow
+    } = reactData;
+    if (selectRadioRow) {
+      return key === (0, _util.getRowid)($xeTable, selectRadioRow);
+    }
+    return false;
   },
   handleCheckedRadioRow(row, isForce) {
     const {
@@ -5621,7 +5685,24 @@ const Methods = {
    * @param {Row} row 行对象
    */
   setRadioRow(row) {
-    return this.handleCheckedRadioRow(row, true);
+    const $xeTable = this;
+    return $xeTable.handleCheckedRadioRow(row, true);
+  },
+  /**
+   * 用于单选行，设置某一行为选中状态
+   * @param key 行主键
+   */
+  setRadioRowKey(rowid) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const rowRest = fullAllDataRowIdData[rowid];
+    if (rowRest) {
+      return $xeTable.handleCheckedRadioRow(rowRest.row, true);
+    }
+    return $xeTable.$nextTick();
   },
   /**
    * 用于当前行，手动清空当前高亮的状态
@@ -5776,6 +5857,7 @@ const Methods = {
    * 如果是双击模式，则单击后选中状态
    */
   triggerCellClickEvent(evnt, params) {
+    const $xeTable = this;
     const {
       highlightCurrentRow,
       editStore,
@@ -5865,6 +5947,20 @@ const Methods = {
         }
       }
     }
+    // 如果是双击编辑模式
+    if ((0, _utils.isEnableConf)(editConfig) && editOpts.trigger === 'dblclick') {
+      if (actived.row && actived.column) {
+        if (editOpts.mode === 'row') {
+          if (!$xeTable.eqRow(actived.row, row)) {
+            $xeTable.handleClearEdit(evnt);
+          }
+        } else if (editOpts.mode === 'cell') {
+          if (!$xeTable.eqRow(actived.row, row) || actived.column.id !== column.id) {
+            $xeTable.handleClearEdit(evnt);
+          }
+        }
+      }
+    }
     this.emitEvent('cell-click', params, evnt);
   },
   /**
@@ -6546,62 +6642,67 @@ const Methods = {
     reactData.isDragColMove = false;
   },
   setPendingRow(rows, status) {
-    const pendingMaps = Object.assign({}, this.pendingRowMaps);
-    const pendingList = [...this.pendingRowList];
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
     }
     if (status) {
       rows.forEach(row => {
-        const rowid = (0, _util.getRowid)(this, row);
+        const rowid = (0, _util.getRowid)($xeTable, row);
         if (rowid && !pendingMaps[rowid]) {
-          pendingList.push(row);
           pendingMaps[rowid] = row;
         }
       });
     } else {
       rows.forEach(row => {
-        const rowid = (0, _util.getRowid)(this, row);
+        const rowid = (0, _util.getRowid)($xeTable, row);
         if (rowid && pendingMaps[rowid]) {
-          const pendingIndex = this.findRowIndexOf(pendingList, row);
-          if (pendingIndex > -1) {
-            pendingList.splice(pendingIndex, 1);
-          }
           delete pendingMaps[rowid];
         }
       });
     }
-    this.pendingRowMaps = pendingMaps;
-    this.pendingRowList = pendingList;
-    return this.$nextTick();
+    reactData.pendingRowMaps = pendingMaps;
+    return $xeTable.$nextTick();
   },
   togglePendingRow(rows) {
-    const pendingMaps = Object.assign({}, this.pendingRowMaps);
-    const pendingList = [...this.pendingRowList];
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
     }
     rows.forEach(row => {
-      const rowid = (0, _util.getRowid)(this, row);
+      const rowid = (0, _util.getRowid)($xeTable, row);
       if (rowid) {
         if (pendingMaps[rowid]) {
-          const pendingIndex = this.findRowIndexOf(pendingList, row);
-          if (pendingIndex > -1) {
-            pendingList.splice(pendingIndex, 1);
-          }
           delete pendingMaps[rowid];
         } else {
-          pendingList.push(row);
           pendingMaps[rowid] = row;
         }
       }
     });
-    this.pendingRowMaps = pendingMaps;
-    this.pendingRowList = pendingList;
-    return this.$nextTick();
+    reactData.pendingRowMaps = pendingMaps;
+    return $xeTable.$nextTick();
   },
   getPendingRecords() {
-    return this.pendingRowList.slice(0);
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      pendingRowMaps
+    } = reactData;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const insertRecords = [];
+    _xeUtils.default.each(pendingRowMaps, (row, rowid) => {
+      if (fullAllDataRowIdData[rowid]) {
+        insertRecords.push(row);
+      }
+    });
+    return insertRecords;
   },
   hasPendingByRow(row) {
     const {
@@ -6612,7 +6713,6 @@ const Methods = {
   },
   clearPendingRow() {
     this.pendingRowMaps = {};
-    this.pendingRowList = [];
     return this.$nextTick();
   },
   sort(sortConfs, sortOrder) {
@@ -7746,6 +7846,8 @@ const Methods = {
       }
       internalData.lastScrollTop = scrollTop;
     }
+    reactData.isDragColMove = false;
+    reactData.isDragRowMove = false;
     reactData.lastScrollTime = Date.now();
     const evntParams = Object.assign({
       scrollTop,