vxe-table 3.19.28 → 3.19.29

package/lib/table/src/methods.js

@@ -3078,6 +3078,16 @@ function clearDragStatus($xeTable) {
     reactData.dragCol = null;
   }
 }
+function handleRowDragEndClearStatus($xeTable) {
+  clearRowDragData($xeTable);
+  clearCrossTableDragStatus($xeTable);
+  handleRecalculateStyle($xeTable, false, true, true);
+}
+function handleColDragEndClearStatus($xeTable) {
+  clearColDragData($xeTable);
+  clearCrossTableDragStatus($xeTable);
+  handleRecalculateStyle($xeTable, true, true, true);
+}
 function clearRowDropOrigin($xeTable) {
   const el = $xeTable.$el;
   if (el) {
@@ -3824,7 +3834,7 @@ function handleGroupData($xeTable, list, rowGroups) {
  * 加载表格数据
  * @param {Array} datas 数据
  */
-function loadTableData($xeTable, datas, isReset) {
+function loadTableData($xeTable, datas, isReload, isReset) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -3839,6 +3849,7 @@ function loadTableData($xeTable, datas, isReset) {
     scrollYLoad: oldScrollYLoad
   } = reactData;
   const {
+    initStatus,
     scrollYStore,
     scrollXStore,
     lastScrollLeft,
@@ -3981,6 +3992,18 @@ function loadTableData($xeTable, datas, isReset) {
     }
     handleReserveStatus($xeTable);
     $xeTable.checkSelectionStatus();
+    if (initStatus) {
+      $xeTable.dispatchEvent('data-rendered', {
+        isReload,
+        visibleColumn: internalData.visibleColumn,
+        visibleData: internalData.afterFullData
+      }, null);
+    } else {
+      $xeTable.dispatchEvent('init-rendered', {
+        visibleColumn: internalData.visibleColumn,
+        visibleData: internalData.afterFullData
+      }, null);
+    }
     $xeTable.dispatchEvent('data-change', {
       visibleColumn: internalData.visibleColumn,
       visibleData: internalData.afterFullData
@@ -4046,7 +4069,14 @@ function handleLoadDefaults($xeTable) {
   handleDefaultMergeCells($xeTable);
   handleDefaultMergeHeaderItems($xeTable);
   handleDefaultMergeFooterItems($xeTable);
-  $xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()));
+  $xeTable.$nextTick(() => {
+    const internalData = $xeTable;
+    $xeTable.dispatchEvent('init-rendered', {
+      visibleColumn: internalData.visibleColumn,
+      visibleData: internalData.afterFullData
+    }, null);
+    setTimeout(() => $xeTable.recalculate());
+  });
 }
 /**
  * 处理初始化的默认行为
@@ -5057,7 +5087,7 @@ const tableMethods = {
     (0, _log.errLog)('vxe.error.delFunc', ['syncData', 'getData']);
     return $xeTable.$nextTick().then(() => {
       reactData.tableData = [];
-      return $xeTable.$nextTick().then(() => loadTableData($xeTable, internalData.tableFullData, true));
+      return $xeTable.$nextTick().then(() => loadTableData($xeTable, internalData.tableFullData, true, true));
     });
   },
   /**
@@ -5135,7 +5165,8 @@ const tableMethods = {
     const {
       data
     } = props;
-    loadTableData($xeTable, data || [], true).then(() => {
+    $xeTable.dispatchEvent('ready', {}, null);
+    loadTableData($xeTable, data || [], true, true).then(() => {
       if (data && data.length) {
         internalData.inited = true;
         internalData.initStatus = true;
@@ -5153,9 +5184,9 @@ const tableMethods = {
    * 加载表格数据
    * @param {Array} datas 数据
    */
-  loadTableData(datas, isReset) {
+  loadTableData(datas, isReload, isReset) {
     const $xeTable = this;
-    return loadTableData($xeTable, datas, isReset);
+    return loadTableData($xeTable, datas, isReload, isReset);
   },
   /**
    * 重新加载数据，不会清空表格状态
@@ -5163,13 +5194,14 @@ const tableMethods = {
    */
   loadData(datas) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
       initStatus
-    } = this;
-    return loadTableData($xeTable, datas, false).then(() => {
-      this.inited = true;
-      this.initStatus = true;
-      if (!initStatus) {
+    } = internalData;
+    return loadTableData($xeTable, datas, false, false).then(() => {
+      internalData.inited = true;
+      internalData.initStatus = true;
+      if (initStatus) {
         handleLoadDefaults($xeTable);
       }
       return handleLazyRecalculate($xeTable, false, true, true);
@@ -5181,10 +5213,11 @@ const tableMethods = {
    */
   reloadData(datas) {
     const $xeTable = this;
-    return this.clearAll().then(() => {
-      this.inited = true;
-      this.initStatus = true;
-      return loadTableData($xeTable, datas, true);
+    const internalData = $xeTable;
+    return $xeTable.clearAll().then(() => {
+      internalData.inited = true;
+      internalData.initStatus = true;
+      return loadTableData($xeTable, datas, true, true);
     }).then(() => {
       handleLoadDefaults($xeTable);
       return handleLazyRecalculate($xeTable, false, true, true);
@@ -5194,6 +5227,7 @@ const tableMethods = {
    * 修改行数据
    */
   setRow(rows, record) {
+    const $xeTable = this;
     if (record) {
       let rest = rows;
       if (!_xeUtils.default.isArray(rows)) {
@@ -5201,7 +5235,7 @@ const tableMethods = {
       }
       rest.forEach(item => Object.assign(item, record));
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 局部加载行数据并恢复到初始状态
@@ -10239,77 +10273,48 @@ const tableMethods = {
         dragToChild: !!prevDragToChild,
         offsetIndex: dragOffsetIndex
       };
-      const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
-      return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
-        if (!status) {
-          return errRest;
-        }
-        const dragRowid = (0, _util.getRowid)($xeTable, dragRow);
-        const dragRowRest = fullAllDataRowIdData[dragRowid] || {};
-        const _dragRowIndex = dragRowRest._index;
-        let dragRowHeight = 0;
-        let dragOffsetTop = -1;
-        if (animation) {
-          dragRowHeight = (0, _util.getCellRestHeight)(dragRowRest, cellOpts, rowOpts, defaultRowHeight);
-          const oldTrEl = el.querySelector(`.vxe-body--row[rowid="${dragRowid}"]`);
-          if (oldTrEl) {
-            dragOffsetTop = oldTrEl.offsetTop;
-          }
-        }
-        let oafIndex = -1;
-        let nafIndex = -1;
-        // 如果为树结构
-        if (treeConfig) {
-          if (transform) {
-            // 移出源位置
-            const oldRest = dragRowRest;
-            const newRowid = (0, _util.getRowid)($xeTable, prevDragRow);
-            const newRest = fullAllDataRowIdData[newRowid];
-            if (oldRest && newRest) {
-              const {
-                level: oldLevel
-              } = oldRest;
-              const {
-                level: newLevel
-              } = newRest;
-              const oldAllMaps = {};
-              _xeUtils.default.eachTree([dragRow], item => {
-                oldAllMaps[(0, _util.getRowid)($xeTable, item)] = item;
-              }, {
-                children: mapChildrenField
-              });
-              let isSelfToChildStatus = false;
-              if (oldLevel && newLevel) {
-                // 子到子
-                if (isPeerDrag && !isCrossDrag) {
-                  if (oldRest.row[parentField] !== newRest.row[parentField]) {
-                    // 非同级
-                    return errRest;
-                  }
-                } else {
-                  if (!isCrossDrag) {
-                    return errRest;
-                  }
-                  if (oldAllMaps[newRowid]) {
-                    isSelfToChildStatus = true;
-                    if (!(isCrossDrag && isSelfToChildDrag)) {
-                      if (_ui.VxeUI.modal) {
-                        _ui.VxeUI.modal.message({
-                          status: 'error',
-                          content: getI18n('vxe.error.treeDragChild')
-                        });
-                      }
-                      return errRest;
-                    }
-                  }
-                }
-              } else if (oldLevel) {
-                // 子到根
-                if (!isCrossDrag) {
+      const dragRowid = (0, _util.getRowid)($xeTable, dragRow);
+      const dragRowRest = fullAllDataRowIdData[dragRowid] || {};
+      const _dragRowIndex = dragRowRest._index;
+      let dragRowHeight = 0;
+      let dragOffsetTop = -1;
+      if (animation) {
+        dragRowHeight = (0, _util.getCellRestHeight)(dragRowRest, cellOpts, rowOpts, defaultRowHeight);
+        const oldTrEl = el.querySelector(`.vxe-body--row[rowid="${dragRowid}"]`);
+        if (oldTrEl) {
+          dragOffsetTop = oldTrEl.offsetTop;
+        }
+      }
+      let oafIndex = -1;
+      let nafIndex = -1;
+      const oldRest = dragRowRest;
+      const newRowid = (0, _util.getRowid)($xeTable, prevDragRow);
+      const newRest = fullAllDataRowIdData[newRowid];
+      const oldAllMaps = {};
+      let isSelfToChildStatus = false;
+      // 如果为树结构
+      if (treeConfig) {
+        if (transform) {
+          if (oldRest && newRest) {
+            const {
+              level: oldLevel
+            } = oldRest;
+            const {
+              level: newLevel
+            } = newRest;
+            _xeUtils.default.eachTree([dragRow], item => {
+              oldAllMaps[(0, _util.getRowid)($xeTable, item)] = item;
+            }, {
+              children: mapChildrenField
+            });
+            if (oldLevel && newLevel) {
+              // 子到子
+              if (isPeerDrag && !isCrossDrag) {
+                if (oldRest.row[parentField] !== newRest.row[parentField]) {
+                  // 非同级
                   return errRest;
                 }
-              } else if (newLevel) {
-                // 根到子
+              } else {
                 if (!isCrossDrag) {
                   return errRest;
                 }
@@ -10325,9 +10330,45 @@ const tableMethods = {
                     return errRest;
                   }
                 }
-              } else {
-                // 根到根
               }
+            } else if (oldLevel) {
+              // 子到根
+              if (!isCrossDrag) {
+                return errRest;
+              }
+            } else if (newLevel) {
+              // 根到子
+              if (!isCrossDrag) {
+                return errRest;
+              }
+              if (oldAllMaps[newRowid]) {
+                isSelfToChildStatus = true;
+                if (!(isCrossDrag && isSelfToChildDrag)) {
+                  if (_ui.VxeUI.modal) {
+                    _ui.VxeUI.modal.message({
+                      status: 'error',
+                      content: getI18n('vxe.error.treeDragChild')
+                    });
+                  }
+                  return errRest;
+                }
+              }
+            } else {
+              // 根到根
+            }
+          }
+        }
+      }
+      const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+      return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
+        if (!status) {
+          return errRest;
+        }
+        // 如果为树结构
+        if (treeConfig) {
+          if (transform) {
+            // 移出源位置
+            if (oldRest && newRest) {
               const fullList = _xeUtils.default.toTreeArray(internalData.afterTreeFullData, {
                 key: rowField,
                 parentKey: parentField,
@@ -10476,19 +10517,16 @@ const tableMethods = {
       }).catch(() => {
         return errRest;
       }).then(rest => {
-        clearRowDragData($xeTable);
-        clearCrossTableDragStatus($xeTable);
+        handleRowDragEndClearStatus($xeTable);
         return rest;
       });
     }
-    clearRowDragData($xeTable);
-    clearCrossTableDragStatus($xeTable);
+    handleRowDragEndClearStatus($xeTable);
     return Promise.resolve(errRest);
   },
   handleCrossTableRowDragCancelEvent() {
     const $xeTable = this;
-    clearRowDragData($xeTable);
-    clearCrossTableDragStatus($xeTable);
+    handleRowDragEndClearStatus($xeTable);
   },
   /**
    * 处理跨表拖拽完成
@@ -10563,8 +10601,7 @@ const tableMethods = {
         $xeTable.dispatchEvent('row-remove-dragend', {
           row: dragRow
         }, evnt);
-        clearRowDragData($xeTable);
-        clearCrossTableDragStatus($xeTable);
+        handleRowDragEndClearStatus($xeTable);
       }
     }
   },
@@ -10672,8 +10709,7 @@ const tableMethods = {
                 $oldTable.handleCrossTableRowDragCancelEvent(evnt);
               }
             }
-            clearRowDragData($xeTable);
-            clearCrossTableDragStatus($xeTable);
+            handleRowDragEndClearStatus($xeTable);
             return errRest;
           }
           let insertRest = Promise.resolve();
@@ -11018,75 +11054,49 @@ const tableMethods = {
         dragToChild: !!prevDragToChild,
         offsetIndex: dragOffsetIndex
       };
-      const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
-      return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
-        if (!status) {
-          return errRest;
-        }
-        let dragTargetColumn = null;
-        const dragAllTargetCols = [];
-        let dragColWidth = 0;
-        if (animation) {
-          _xeUtils.default.eachTree([dragColumn], column => {
-            if (!dragTargetColumn && (!column.children || !column.children.length)) {
-              dragTargetColumn = column;
-              dragColWidth += column.renderWidth;
-            }
-            dragAllTargetCols.push(column);
-          });
-        }
-        if (!dragTargetColumn) {
-          dragTargetColumn = dragColumn;
-        }
-        const dragColRest = fullColumnIdData[dragTargetColumn.id] || {};
-        const _dragColIndex = dragColRest._index;
-        let dragOffsetLeft = -1;
-        if (animation) {
-          const oldTrEl = el.querySelector(`.vxe-table--column[colid="${dragTargetColumn.id}"]`);
-          if (oldTrEl) {
-            dragOffsetLeft = oldTrEl.offsetLeft;
-          }
-        }
-        let oafIndex = -1;
-        let nafIndex = -1;
-        const oldAllMaps = {};
+      let dragTargetColumn = null;
+      const dragAllTargetCols = [];
+      let dragColWidth = 0;
+      if (animation) {
         _xeUtils.default.eachTree([dragColumn], column => {
-          oldAllMaps[column.id] = column;
-        });
-        let isSelfToChildStatus = false;
-        if (dragColumn.parentId && newColumn.parentId) {
-          // 子到子
-          if (isPeerDrag && !isCrossDrag) {
-            if (dragColumn.parentId !== newColumn.parentId) {
-              // 非同级
-              return errRest;
-            }
-          } else {
-            if (!isCrossDrag) {
-              return errRest;
-            }
-            if (oldAllMaps[newColumn.id]) {
-              isSelfToChildStatus = true;
-              if (!(isCrossDrag && isSelfToChildDrag)) {
-                if (_ui.VxeUI.modal) {
-                  _ui.VxeUI.modal.message({
-                    status: 'error',
-                    content: getI18n('vxe.error.treeDragChild')
-                  });
-                }
-                return errRest;
-              }
-            }
+          if (!dragTargetColumn && (!column.children || !column.children.length)) {
+            dragTargetColumn = column;
+            dragColWidth += column.renderWidth;
           }
-        } else if (dragColumn.parentId) {
-          // 子到根
-          if (!isCrossDrag) {
-            return errRest;
+          dragAllTargetCols.push(column);
+        });
+      }
+      if (!dragTargetColumn) {
+        dragTargetColumn = dragColumn;
+      }
+      const dragColRest = fullColumnIdData[dragTargetColumn.id] || {};
+      const _dragColIndex = dragColRest._index;
+      let dragOffsetLeft = -1;
+      if (animation) {
+        const oldTrEl = el.querySelector(`.vxe-table--column[colid="${dragTargetColumn.id}"]`);
+        if (oldTrEl) {
+          dragOffsetLeft = oldTrEl.offsetLeft;
+        }
+      }
+      let oafIndex = -1;
+      let nafIndex = -1;
+      const oldAllMaps = {};
+      _xeUtils.default.eachTree([dragColumn], column => {
+        oldAllMaps[column.id] = column;
+      });
+      let isSelfToChildStatus = false;
+      if (dragColumn.parentId && newColumn.parentId) {
+        // 子到子
+        if (isPeerDrag && !isCrossDrag) {
+          if (dragColumn.parentId !== newColumn.parentId) {
+            // 非同级
+            handleColDragEndClearStatus($xeTable);
+            return Promise.resolve(errRest);
           }
-        } else if (newColumn.parentId) {
-          // 根到子
+        } else {
           if (!isCrossDrag) {
-            return errRest;
+            handleColDragEndClearStatus($xeTable);
+            return Promise.resolve(errRest);
           }
           if (oldAllMaps[newColumn.id]) {
             isSelfToChildStatus = true;
@@ -11097,11 +11107,43 @@ const tableMethods = {
                   content: getI18n('vxe.error.treeDragChild')
                 });
               }
-              return errRest;
+              handleColDragEndClearStatus($xeTable);
+              return Promise.resolve(errRest);
             }
           }
-        } else {
-          // 根到根
+        }
+      } else if (dragColumn.parentId) {
+        // 子到根
+        if (!isCrossDrag) {
+          handleColDragEndClearStatus($xeTable);
+          return Promise.resolve(errRest);
+        }
+      } else if (newColumn.parentId) {
+        // 根到子
+        if (!isCrossDrag) {
+          handleColDragEndClearStatus($xeTable);
+          return Promise.resolve(errRest);
+        }
+        if (oldAllMaps[newColumn.id]) {
+          isSelfToChildStatus = true;
+          if (!(isCrossDrag && isSelfToChildDrag)) {
+            if (_ui.VxeUI.modal) {
+              _ui.VxeUI.modal.message({
+                status: 'error',
+                content: getI18n('vxe.error.treeDragChild')
+              });
+            }
+            handleColDragEndClearStatus($xeTable);
+            return Promise.resolve(errRest);
+          }
+        }
+      } else {
+        // 根到根
+      }
+      const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+      return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
+        if (!status) {
+          return errRest;
         }
         const oldewMatchRest = _xeUtils.default.findTree(collectColumn, item => item.id === dragColumn.id);
         // 改变层级
@@ -11272,13 +11314,11 @@ const tableMethods = {
       }).catch(() => {
         return errRest;
       }).then(rest => {
-        clearColDragData($xeTable);
-        clearCrossTableDragStatus($xeTable);
+        handleColDragEndClearStatus($xeTable);
         return rest;
       });
     }
-    clearColDragData($xeTable);
-    clearCrossTableDragStatus($xeTable);
+    handleColDragEndClearStatus($xeTable);
     return Promise.resolve(errRest);
   },
   handleHeaderCellDragDragendEvent(evnt) {
@@ -12129,7 +12169,7 @@ const tableMethods = {
       handleUpdateRowGroup($xeTable, confList.map(fieldOrColumn => {
         return _xeUtils.default.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field;
       }));
-      return loadTableData($xeTable, internalData.tableSynchData, true);
+      return loadTableData($xeTable, internalData.tableSynchData, false, true);
     }
     return $xeTable.$nextTick();
   },
@@ -12180,7 +12220,7 @@ const tableMethods = {
       return $xeTable.$nextTick();
     }
     handleUpdateRowGroup($xeTable, []);
-    return loadTableData($xeTable, internalData.tableSynchData, true);
+    return loadTableData($xeTable, internalData.tableSynchData, false, true);
   },
   isRowGroupRecord(row) {
     const $xeTable = this;
@@ -13982,7 +14022,7 @@ const tableMethods = {
   handleUpdateAggData() {
     const $xeTable = this;
     const internalData = $xeTable;
-    return loadTableData($xeTable, internalData.tableSynchData, true);
+    return loadTableData($xeTable, internalData.tableSynchData, false, true);
   },
   updateZindex() {
     if (this.zIndex) {