vxe-table 3.14.0-beta.7 → 3.14.0-beta.9

package/lib/table/src/methods.js

@@ -965,6 +965,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     reserve,
     checkMethod
   } = checkboxOpts;
+  // indeterminateField 仅支持读取
   const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
   const selectRowMaps = {};
   /**
@@ -2631,6 +2632,10 @@ const Methods = {
     }
     return [];
   },
+  getEl() {
+    const $xeTable = this;
+    return $xeTable.$refs.refElem;
+  },
   /**
    * 获取父容器元素
    */
@@ -3056,8 +3061,6 @@ const Methods = {
           oTop: 0,
           expandHeight: 0
         };
-        fullDataRowIdMaps[rowid] = rowRest;
-        fullAllDataRowIdMaps[rowid] = rowRest;
       }
       rowRest.treeLoaded = false;
       rowRest.expandLoaded = false;
@@ -3067,6 +3070,8 @@ const Methods = {
       rowRest.level = level;
       rowRest.index = currIndex;
       rowRest.treeIndex = index;
+      fullDataRowIdMaps[rowid] = rowRest;
+      fullAllDataRowIdMaps[rowid] = rowRest;
     };
     if (treeConfig) {
       _xeUtils.default.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
@@ -3096,24 +3101,26 @@ const Methods = {
     reactData.treeExpandedMaps = treeTempExpandedMaps;
   },
   cacheSourceMap(fullData) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const treeOpts = $xeTable.computeTreeOpts;
     let {
-      treeConfig,
-      treeOpts,
       sourceDataRowIdData
-    } = this;
+    } = internalData;
     const sourceData = _xeUtils.default.clone(fullData, true);
-    const rowkey = (0, _util.getRowkey)(this);
-    sourceDataRowIdData = this.sourceDataRowIdData = {};
+    const rowkey = (0, _util.getRowkey)($xeTable);
+    sourceDataRowIdData = internalData.sourceDataRowIdData = {};
     const handleSourceRow = row => {
-      let rowid = (0, _util.getRowid)(this, row);
+      let rowid = (0, _util.getRowid)($xeTable, row);
       if ((0, _utils.eqEmptyValue)(rowid)) {
         rowid = (0, _util.getRowUniqueId)();
         _xeUtils.default.set(row, rowkey, rowid);
       }
-      sourceDataRowIdData[rowid] = {
-        row,
-        rowid
-      };
+      sourceDataRowIdData[rowid] = row;
     };
     // 源数据缓存
     if (treeConfig) {
@@ -3124,7 +3131,7 @@ const Methods = {
     } else {
       sourceData.forEach(handleSourceRow);
     }
-    this.tableSourceData = sourceData;
+    internalData.tableSourceData = sourceData;
   },
   getParams() {
     return this.params;
@@ -3485,6 +3492,9 @@ const Methods = {
       keepSource,
       treeConfig
     } = props;
+    const {
+      editStore
+    } = reactData;
     const {
       fullAllDataRowIdData,
       fullDataRowIdData,
@@ -3493,6 +3503,7 @@ const Methods = {
       tableFullData,
       afterFullData
     } = internalData;
+    const removeTempMaps = Object.assign({}, editStore.removeMaps);
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform
@@ -3527,6 +3538,7 @@ const Methods = {
                 _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
               }
               if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                delete removeTempMaps[rowid];
                 tableFullData.unshift(row);
                 afterFullData.unshift(row);
                 reDelFlag = true;
@@ -3538,6 +3550,7 @@ const Methods = {
     }
     if (rows) {
       if (reDelFlag) {
+        editStore.removeMaps = removeTempMaps;
         $xeTable.updateFooter();
         $xeTable.cacheRowMap(false);
         $xeTable.handleTableData(treeConfig && transform);
@@ -3717,25 +3730,31 @@ const Methods = {
   },
   /**
    * 检查行或列数据是否发生改变
-   * @param {Row} row 行对象
+   * @param {Row} rowOrId 行对象
    * @param {String} field 字段名
    */
-  isUpdateByRow(row, field) {
+  isUpdateByRow(rowOrId, field) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      keepSource
+    } = props;
     const {
       tableFullColumn,
-      keepSource,
-      sourceDataRowIdData,
-      fullDataRowIdData
-    } = this;
+      fullDataRowIdData,
+      sourceDataRowIdData
+    } = internalData;
     if (keepSource) {
-      const rowid = (0, _util.getRowid)(this, row);
+      const rowid = _xeUtils.default.isString(rowOrId) || _xeUtils.default.isNumber(rowOrId) ? rowOrId : (0, _util.getRowid)($xeTable, rowOrId);
+      const rowRest = fullDataRowIdData[rowid];
       // 新增的数据不需要检测
-      if (!fullDataRowIdData[rowid]) {
+      if (!rowRest) {
         return false;
       }
-      const oldRest = sourceDataRowIdData[rowid];
-      if (oldRest) {
-        const oRow = oldRest.row;
+      const row = rowRest.row;
+      const oRow = sourceDataRowIdData[rowid];
+      if (oRow) {
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field);
         }
@@ -3797,6 +3816,113 @@ const Methods = {
       tableColumn: this.tableColumn.slice(0)
     };
   },
+  /**
+   * 移动列到指定列的位置
+   * @param fieldOrColumn
+   * @param targetFieldOrColumn
+   * @param options
+   */
+  moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullColumnIdData,
+      visibleColumn
+    } = internalData;
+    const {
+      dragToChild,
+      dragPos,
+      isCrossDrag
+    } = Object.assign({}, options);
+    const dragCol = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
+    let prevDragCol = null;
+    const colRest = dragCol ? fullColumnIdData[dragCol.id] : null;
+    let defPos = 'left';
+    if (_xeUtils.default.isNumber(targetFieldOrColumn)) {
+      if (colRest && targetFieldOrColumn) {
+        let currList = colRest.items;
+        let offsetIndex = colRest._index + targetFieldOrColumn;
+        if (isCrossDrag) {
+          currList = visibleColumn;
+          offsetIndex = colRest._index + targetFieldOrColumn;
+        }
+        if (offsetIndex > 0 && offsetIndex < currList.length - 1) {
+          prevDragCol = currList[offsetIndex];
+        }
+        if (targetFieldOrColumn > 0) {
+          defPos = 'right';
+        }
+      }
+    } else {
+      prevDragCol = (0, _util.handleFieldOrColumn)($xeTable, targetFieldOrColumn);
+      const targetColRest = prevDragCol ? fullColumnIdData[prevDragCol.id] : null;
+      if (colRest && targetColRest) {
+        if (targetColRest._index > colRest._index) {
+          defPos = 'right';
+        }
+      }
+    }
+    return $xeTable.handleColDragSwapEvent(null, true, dragCol, prevDragCol, dragPos || defPos, dragToChild === true);
+  },
+  /**
+   * 移动行到指定行的位置
+   * @param rowidOrRow
+   * @param targetRowidOrRow
+   * @param options
+   */
+  moveRowTo(rowidOrRow, targetRowidOrRow, options) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      fullAllDataRowIdData,
+      afterFullData
+    } = internalData;
+    const {
+      dragToChild,
+      dragPos,
+      isCrossDrag
+    } = Object.assign({}, options);
+    const treeOpts = $xeTable.computeTreeOpts;
+    const dragRow = (0, _util.handleRowidOrRow)($xeTable, rowidOrRow);
+    let prevDragRow = null;
+    let defPos = 'top';
+    const rowRest = dragRow ? fullAllDataRowIdData[(0, _util.getRowid)($xeTable, dragRow)] : null;
+    if (_xeUtils.default.isNumber(targetRowidOrRow)) {
+      if (rowRest && targetRowidOrRow) {
+        let currList = afterFullData;
+        let offsetIndex = rowRest._index + targetRowidOrRow;
+        if (treeConfig) {
+          currList = rowRest.items;
+          if (treeOpts.transform) {
+            offsetIndex = rowRest.treeIndex + targetRowidOrRow;
+            if (isCrossDrag) {
+              currList = afterFullData;
+              offsetIndex = rowRest._index + targetRowidOrRow;
+            }
+          }
+        }
+        if (offsetIndex >= 0 && offsetIndex <= currList.length - 1) {
+          prevDragRow = currList[offsetIndex];
+        }
+        if (targetRowidOrRow > 0) {
+          defPos = 'bottom';
+        }
+      }
+    } else {
+      prevDragRow = (0, _util.handleRowidOrRow)($xeTable, targetRowidOrRow);
+      const targetRowRest = prevDragRow ? fullAllDataRowIdData[(0, _util.getRowid)($xeTable, prevDragRow)] : null;
+      if (rowRest && targetRowRest) {
+        if (targetRowRest._index > rowRest._index) {
+          defPos = 'bottom';
+        }
+      }
+    }
+    return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+  },
   /**
    * 获取表格的全量列
    */
@@ -3819,16 +3945,26 @@ const Methods = {
    * 用于多选行，获取已选中的数据
    */
   getCheckboxRecords(isFull) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      selectCheckboxMaps
+    } = reactData;
     const {
       tableFullData,
       afterFullData,
-      treeConfig,
-      treeOpts,
-      checkboxOpts,
-      tableFullTreeData,
       afterTreeFullData,
+      tableFullTreeData,
+      fullDataRowIdData,
       afterFullRowMaps
-    } = this;
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       transform,
       mapChildrenField
@@ -3837,21 +3973,18 @@ const Methods = {
       checkField
     } = checkboxOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     let rowList = [];
     if (checkField) {
       if (treeConfig) {
+        const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
         rowList = _xeUtils.default.filterTree(currTableData, row => _xeUtils.default.get(row, checkField), {
           children: transform ? mapChildrenField : childrenField
         });
       } else {
+        const currTableData = isFull ? tableFullData : afterFullData;
         rowList = currTableData.filter(row => _xeUtils.default.get(row, checkField));
       }
     } else {
-      const {
-        selectCheckboxMaps,
-        fullDataRowIdData
-      } = this;
       _xeUtils.default.each(selectCheckboxMaps, (row, rowid) => {
         if (isFull) {
           if (fullDataRowIdData[rowid]) {
@@ -6326,6 +6459,7 @@ const Methods = {
       checkStrictly,
       checkMethod
     } = checkboxOpts;
+    // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
       // 树结构
@@ -6852,6 +6986,7 @@ const Methods = {
       reserve
     } = checkboxOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
+    // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
       const handleClearChecked = item => {
@@ -7623,6 +7758,9 @@ const Methods = {
     } = internalData;
     const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
     const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+    const errRest = {
+      status: false
+    };
     if (prevDragRow && dragRow) {
       // 判断是否有拖动
       if (prevDragRow !== dragRow) {
@@ -7637,7 +7775,7 @@ const Methods = {
         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
         return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
           if (!status) {
-            return;
+            return errRest;
           }
           let oafIndex = -1;
           let nafIndex = -1;
@@ -7668,11 +7806,11 @@ const Methods = {
                   if (isPeerDrag && !isCrossDrag) {
                     if (oldRest.row[parentField] !== newRest.row[parentField]) {
                       // 非同级
-                      return;
+                      return errRest;
                     }
                   } else {
                     if (!isCrossDrag) {
-                      return;
+                      return errRest;
                     }
                     if (oldAllMaps[newRowid]) {
                       isSelfToChildStatus = true;
@@ -7683,19 +7821,19 @@ const Methods = {
                             content: getI18n('vxe.error.treeDragChild')
                           });
                         }
-                        return;
+                        return errRest;
                       }
                     }
                   }
                 } else if (oldLevel) {
                   // 子到根
                   if (!isCrossDrag) {
-                    return;
+                    return errRest;
                   }
                 } else if (newLevel) {
                   // 根到子
                   if (!isCrossDrag) {
-                    return;
+                    return errRest;
                   }
                   if (oldAllMaps[newRowid]) {
                     isSelfToChildStatus = true;
@@ -7706,7 +7844,7 @@ const Methods = {
                           content: getI18n('vxe.error.treeDragChild')
                         });
                       }
-                      return;
+                      return errRest;
                     }
                   }
                 } else {
@@ -7764,26 +7902,34 @@ const Methods = {
           if (reactData.scrollYLoad) {
             $xeTable.updateScrollYSpace();
           }
-          $xeTable.$nextTick().then(() => {
+          if (evnt) {
+            $xeTable.dispatchEvent('row-dragend', {
+              oldRow: dragRow,
+              newRow: prevDragRow,
+              dragRow,
+              dragPos: prevDragPos,
+              dragToChild: isDragToChildFlag,
+              offsetIndex: dragOffsetIndex,
+              _index: {
+                newIndex: nafIndex,
+                oldIndex: oafIndex
+              }
+            }, evnt);
+          }
+          return $xeTable.$nextTick().then(() => {
             $xeTable.updateCellAreas();
             $xeTable.recalculate();
+          }).then(() => {
+            return {
+              status: true
+            };
           });
-          $xeTable.dispatchEvent('row-dragend', {
-            oldRow: dragRow,
-            newRow: prevDragRow,
-            dragRow,
-            dragPos: prevDragPos,
-            dragToChild: isDragToChildFlag,
-            offsetIndex: dragOffsetIndex,
-            _index: {
-              newIndex: nafIndex,
-              oldIndex: oafIndex
-            }
-          }, evnt);
-        }).catch(() => {});
+        }).catch(() => {
+          return errRest;
+        });
       }
     }
-    return Promise.resolve();
+    return Promise.resolve(errRest);
   },
   handleRowDragDragendEvent(evnt) {
     const $xeTable = this;
@@ -7970,6 +8116,9 @@ const Methods = {
       collectColumn
     } = internalData;
     const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
+    const errRest = {
+      status: false
+    };
     if (prevDragCol && dragCol) {
       // 判断是否有拖动
       if (prevDragCol !== dragCol) {
@@ -7986,7 +8135,7 @@ const Methods = {
         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
         return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
           if (!status) {
-            return;
+            return errRest;
           }
           let oafIndex = -1;
           let nafIndex = -1;
@@ -8000,11 +8149,11 @@ const Methods = {
             if (isPeerDrag && !isCrossDrag) {
               if (dragColumn.parentId !== newColumn.parentId) {
                 // 非同级
-                return;
+                return errRest;
               }
             } else {
               if (!isCrossDrag) {
-                return;
+                return errRest;
               }
               if (oldAllMaps[newColumn.id]) {
                 isSelfToChildStatus = true;
@@ -8015,19 +8164,19 @@ const Methods = {
                       content: getI18n('vxe.error.treeDragChild')
                     });
                   }
-                  return;
+                  return errRest;
                 }
               }
             }
           } else if (dragColumn.parentId) {
             // 子到根
             if (!isCrossDrag) {
-              return;
+              return errRest;
             }
           } else if (newColumn.parentId) {
             // 根到子
             if (!isCrossDrag) {
-              return;
+              return errRest;
             }
             if (oldAllMaps[newColumn.id]) {
               isSelfToChildStatus = true;
@@ -8038,7 +8187,7 @@ const Methods = {
                     content: getI18n('vxe.error.treeDragChild')
                   });
                 }
-                return;
+                return errRest;
               }
             }
           } else {
@@ -8107,25 +8256,32 @@ const Methods = {
               $xeTable.clearCopyCellArea();
             }
           }
-          $xeTable.dispatchEvent('column-dragend', {
-            oldColumn: dragColumn,
-            newColumn,
-            dragColumn,
-            dragPos: prevDragPos,
-            dragToChild: isDragToChildFlag,
-            offsetIndex: dragOffsetIndex,
-            _index: {
-              newIndex: nafIndex,
-              oldIndex: oafIndex
-            }
-          }, evnt);
+          if (evnt) {
+            $xeTable.dispatchEvent('column-dragend', {
+              oldColumn: dragColumn,
+              newColumn,
+              dragColumn,
+              dragPos: prevDragPos,
+              dragToChild: isDragToChildFlag,
+              offsetIndex: dragOffsetIndex,
+              _index: {
+                newIndex: nafIndex,
+                oldIndex: oafIndex
+              }
+            }, evnt);
+          }
           if (isSyncColumn) {
             $xeTable.handleColDragSwapColumn();
           }
-        }).catch(() => {});
+          return {
+            status: true
+          };
+        }).catch(() => {
+          return errRest;
+        });
       }
     }
-    return Promise.resolve();
+    return Promise.resolve(errRest);
   },
   handleHeaderCellDragDragendEvent(evnt) {
     const $xeTable = this;