vxe-table 4.11.17 → 4.11.19

package/lib/table/src/table.js

@@ -3183,7 +3183,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
           // }
           if (props.spanMethod) {
-            (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
+            (0, _log.errLog)('vxe.error.scrollErrProp', ['table.span-method']);
           }
         }
         handleReserveStatus();
@@ -3944,6 +3944,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     tableMethods = {
       dispatchEvent,
+      getEl() {
+        return refElem.value;
+      },
       /**
        * 重置表格的一切数据状态
        */
@@ -4309,6 +4312,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const {
           fullAllDataRowIdData,
+          fullDataRowIdData,
           tableSourceData,
           sourceDataRowIdData,
           tableFullData,
@@ -4320,7 +4324,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = treeOpts;
         if (!keepSource) {
           if (process.env.NODE_ENV === 'development') {
-            (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
+            (0, _log.errLog)('vxe.error.reqProp', ['keep-source']);
           }
           return (0, _vue.nextTick)();
         }
@@ -4334,22 +4338,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         let reDelFlag = false;
         if (targetRows.length) {
-          targetRows.forEach(row => {
-            if (!$xeTable.isInsertByRow(row)) {
-              const rowid = (0, _util.getRowid)($xeTable, row);
-              const oRow = sourceDataRowIdData[rowid];
-              if (oRow && row) {
-                if (field) {
-                  _xeUtils.default.set(row, field, _xeUtils.default.clone(_xeUtils.default.get(oRow, field), true));
-                } else {
-                  _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
-                }
-                if ($xeTable.isRemoveByRow(row)) {
-                  const rowRest = fullAllDataRowIdData[rowid];
-                  if (rowRest) {
-                    const reRow = rowRest.row;
-                    tableFullData.unshift(reRow);
-                    afterFullData.unshift(reRow);
+          targetRows.forEach(item => {
+            const rowid = (0, _util.getRowid)($xeTable, item);
+            const rowRest = fullAllDataRowIdData[rowid];
+            if (rowRest) {
+              const row = rowRest.row;
+              if (!$xeTable.isInsertByRow(row)) {
+                const oRow = sourceDataRowIdData[rowid];
+                if (oRow && row) {
+                  if (field) {
+                    _xeUtils.default.set(row, field, _xeUtils.default.clone(_xeUtils.default.get(oRow, field), true));
+                  } else {
+                    _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
+                  }
+                  if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                    tableFullData.unshift(row);
+                    afterFullData.unshift(row);
                     reDelFlag = true;
                   }
                 }
@@ -4528,10 +4532,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       /**
        * 检查行或列数据是否发生改变
-       * @param {Row} row 行对象
+       * @param {Row} rowOrId 行对象
        * @param {String} field 字段名
        */
-      isUpdateByRow(row, field) {
+      isUpdateByRow(rowOrId, field) {
         const {
           keepSource
         } = props;
@@ -4541,11 +4545,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
           sourceDataRowIdData
         } = internalData;
         if (keepSource) {
-          const rowid = (0, _util.getRowid)($xeTable, 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 row = rowRest.row;
           const oRow = sourceDataRowIdData[rowid];
           if (oRow) {
             if (arguments.length > 1) {
@@ -4609,6 +4615,108 @@ var _default = exports.default = (0, _vue.defineComponent)({
           tableColumn: reactData.tableColumn.slice(0)
         };
       },
+      /**
+       * 移动列到指定列的位置
+       * @param fieldOrColumn
+       * @param targetFieldOrColumn
+       * @param options
+       */
+      moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+        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 {
+          treeConfig
+        } = props;
+        const {
+          fullAllDataRowIdData,
+          afterFullData
+        } = internalData;
+        const {
+          dragToChild,
+          dragPos,
+          isCrossDrag
+        } = Object.assign({}, options);
+        const treeOpts = computeTreeOpts.value;
+        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);
+      },
       /**
        * 获取表格的全量列
        */
@@ -7586,7 +7694,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (el) {
           const parentElem = el.parentNode;
           const parentPaddingSize = height === '100%' || height === 'auto' ? (0, _dom.getPaddingTopBottomSize)(parentElem) : 0;
-          return Math.floor($xeGrid ? $xeGrid.getParentHeight() : _xeUtils.default.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+          let parentWrapperHeight = 0;
+          if (parentElem) {
+            if ($xeGrid && (0, _dom.hasClass)(parentElem, 'vxe-grid--table-wrapper')) {
+              parentWrapperHeight = $xeGrid.getParentHeight();
+            } else {
+              parentWrapperHeight = parentElem.clientHeight;
+            }
+          }
+          return Math.floor(parentWrapperHeight - parentPaddingSize);
         }
         return 0;
       },
@@ -9352,6 +9468,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = internalData;
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+        const errRest = {
+          status: false
+        };
         if (prevDragRow && dragRow) {
           // 判断是否有拖动
           if (prevDragRow !== dragRow) {
@@ -9366,7 +9485,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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;
@@ -9397,11 +9516,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
                       if (isPeerDrag && !isCrossDrag) {
                         if (oldRest.row[parentField] !== newRest.row[parentField]) {
                           // 非同级
-                          return;
+                          return errRest;
                         }
                       } else {
                         if (!isCrossDrag) {
-                          return;
+                          return errRest;
                         }
                         if (oldAllMaps[newRowid]) {
                           isSelfToChildStatus = true;
@@ -9412,19 +9531,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
                                 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;
@@ -9435,7 +9554,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                               content: getI18n('vxe.error.treeDragChild')
                             });
                           }
-                          return;
+                          return errRest;
                         }
                       }
                     } else {
@@ -9493,26 +9612,34 @@ var _default = exports.default = (0, _vue.defineComponent)({
               if (reactData.scrollYLoad) {
                 $xeTable.updateScrollYSpace();
               }
-              (0, _vue.nextTick)().then(() => {
+              if (evnt) {
+                dispatchEvent('row-dragend', {
+                  oldRow: dragRow,
+                  newRow: prevDragRow,
+                  dragRow,
+                  dragPos: prevDragPos,
+                  dragToChild: isDragToChildFlag,
+                  offsetIndex: dragOffsetIndex,
+                  _index: {
+                    newIndex: nafIndex,
+                    oldIndex: oafIndex
+                  }
+                }, evnt);
+              }
+              return (0, _vue.nextTick)().then(() => {
                 $xeTable.updateCellAreas();
                 $xeTable.recalculate();
+              }).then(() => {
+                return {
+                  status: true
+                };
               });
-              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 {
@@ -9681,6 +9808,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           collectColumn
         } = internalData;
         const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
+        const errRest = {
+          status: false
+        };
         if (prevDragCol && dragCol) {
           // 判断是否有拖动
           if (prevDragCol !== dragCol) {
@@ -9697,7 +9827,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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;
@@ -9711,11 +9841,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 if (isPeerDrag && !isCrossDrag) {
                   if (dragColumn.parentId !== newColumn.parentId) {
                     // 非同级
-                    return;
+                    return errRest;
                   }
                 } else {
                   if (!isCrossDrag) {
-                    return;
+                    return errRest;
                   }
                   if (oldAllMaps[newColumn.id]) {
                     isSelfToChildStatus = true;
@@ -9726,19 +9856,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
                           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;
@@ -9749,7 +9879,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                         content: getI18n('vxe.error.treeDragChild')
                       });
                     }
-                    return;
+                    return errRest;
                   }
                 }
               } else {
@@ -9818,25 +9948,32 @@ var _default = exports.default = (0, _vue.defineComponent)({
                   $xeTable.clearCopyCellArea();
                 }
               }
-              dispatchEvent('column-dragend', {
-                oldColumn: dragColumn,
-                newColumn,
-                dragColumn,
-                dragPos: prevDragPos,
-                dragToChild: isDragToChildFlag,
-                offsetIndex: dragOffsetIndex,
-                _index: {
-                  newIndex: nafIndex,
-                  oldIndex: oafIndex
-                }
-              }, evnt);
+              if (evnt) {
+                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 {