@leankylin-sheet/core 5.1.15 → 5.1.16

package/dist/index.js

@@ -46706,6 +46706,260 @@ function calculateSheetByCells(ctx, cells) {
   console.timeEnd("calculateSheetByCellsTime");
 }
 
+var imageProps = {
+  defaultWidth: 144,
+  defaultHeight: 84,
+  currentObj: null,
+  currentWinW: null,
+  currentWinH: null,
+  resize: null,
+  resizeXY: null,
+  move: false,
+  moveXY: null,
+  cursorStartPosition: null
+};
+function generateRandomId(prefix) {
+  if (prefix == null) {
+    prefix = "img";
+  }
+  var userAgent = window.navigator.userAgent.replace(/[^a-zA-Z0-9]/g, "").split("");
+  var mid = "";
+  for (var i = 0; i < 12; i += 1) {
+    mid += userAgent[Math.round(Math.random() * (userAgent.length - 1))];
+  }
+  var time = new Date().getTime();
+  return "".concat(prefix, "_").concat(mid, "_").concat(time);
+}
+function showImgChooser() {
+  var chooser = document.getElementById("leankylin-img-upload");
+  if (chooser) chooser.click();
+}
+function saveImage(ctx) {
+  var index = getSheetIndex(ctx, ctx.currentSheetId);
+  if (index == null) return;
+  var file = ctx.luckysheetfile[index];
+  file.images = ctx.insertedImgs;
+}
+function removeActiveImage(ctx) {
+  ctx.insertedImgs = ___default['default'].filter(ctx.insertedImgs, function (image) {
+    return image.id !== ctx.activeImg;
+  });
+  ctx.activeImg = undefined;
+  saveImage(ctx);
+}
+function insertImage(ctx, image) {
+  try {
+    var _ctx$luckysheet_selec;
+    var last = (_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec[ctx.luckysheet_select_save.length - 1];
+    var rowIndex = last === null || last === void 0 ? void 0 : last.row_focus;
+    var colIndex = last === null || last === void 0 ? void 0 : last.column_focus;
+    if (!last) {
+      rowIndex = 0;
+      colIndex = 0;
+    } else {
+      if (rowIndex == null) {
+        var _last$row = _slicedToArray(last.row, 1);
+        rowIndex = _last$row[0];
+      }
+      if (colIndex == null) {
+        var _last$column = _slicedToArray(last.column, 1);
+        colIndex = _last$column[0];
+      }
+    }
+    var flowdata = getFlowdata(ctx);
+    var left = colIndex === 0 ? 0 : ctx.visibledatacolumn[colIndex - 1];
+    var top = rowIndex === 0 ? 0 : ctx.visibledatarow[rowIndex - 1];
+    if (flowdata) {
+      var margeset = mergeBorder(ctx, flowdata, rowIndex, colIndex);
+      if (margeset) {
+        var _margeset$row = _slicedToArray(margeset.row, 1);
+        top = _margeset$row[0];
+        var _margeset$column = _slicedToArray(margeset.column, 1);
+        left = _margeset$column[0];
+      }
+    }
+    var width = image.width;
+    var height = image.height;
+    var img = {
+      id: generateRandomId("img"),
+      src: image.src,
+      left: left,
+      top: top,
+      width: width * 0.5,
+      height: height * 0.5,
+      originWidth: width,
+      originHeight: height
+    };
+    ctx.insertedImgs = (ctx.insertedImgs || []).concat(img);
+    saveImage(ctx);
+  } catch (err) {
+    console.info(err);
+  }
+}
+function getImagePosition() {
+  var box = document.getElementById("luckysheet-modal-dialog-activeImage");
+  if (!box) return undefined;
+  var _box$getBoundingClien = box.getBoundingClientRect(),
+    width = _box$getBoundingClien.width,
+    height = _box$getBoundingClien.height;
+  var left = box.offsetLeft;
+  var top = box.offsetTop;
+  return {
+    left: left,
+    top: top,
+    width: width,
+    height: height
+  };
+}
+function cancelActiveImgItem(ctx, globalCache) {
+  ctx.activeImg = undefined;
+  globalCache.image = undefined;
+}
+function onImageMoveStart(ctx, globalCache, e) {
+  var position = getImagePosition();
+  if (position) {
+    var top = position.top,
+      left = position.left;
+    ___default['default'].set(globalCache, "image", {
+      cursorMoveStartPosition: {
+        x: e.pageX,
+        y: e.pageY
+      },
+      imgInitialPosition: {
+        left: left,
+        top: top
+      }
+    });
+  }
+}
+function onImageMove(ctx, globalCache, e) {
+  if (ctx.allowEdit === false) return false;
+  var image = globalCache === null || globalCache === void 0 ? void 0 : globalCache.image;
+  var img = document.getElementById("luckysheet-modal-dialog-activeImage");
+  if (img && image && !image.resizingSide) {
+    var _image$cursorMoveStar = image.cursorMoveStartPosition,
+      startX = _image$cursorMoveStar.x,
+      startY = _image$cursorMoveStar.y;
+    var _image$imgInitialPosi = image.imgInitialPosition,
+      top = _image$imgInitialPosi.top,
+      left = _image$imgInitialPosi.left;
+    left += e.pageX - startX;
+    top += e.pageY - startY;
+    if (top < 0) top = 0;
+    img.style.left = "".concat(left, "px");
+    img.style.top = "".concat(top, "px");
+    return true;
+  }
+  return false;
+}
+function onImageMoveEnd(ctx, globalCache) {
+  var _globalCache$image;
+  var position = getImagePosition();
+  if (!((_globalCache$image = globalCache.image) === null || _globalCache$image === void 0 ? void 0 : _globalCache$image.resizingSide)) {
+    globalCache.image = undefined;
+    if (position) {
+      var img = ___default['default'].find(ctx.insertedImgs, function (v) {
+        return v.id === ctx.activeImg;
+      });
+      if (img) {
+        img.left = position.left / ctx.zoomRatio;
+        img.top = position.top / ctx.zoomRatio;
+        saveImage(ctx);
+      }
+    }
+  }
+}
+function onImageResizeStart(globalCache, e, resizingSide) {
+  var position = getImagePosition();
+  if (position) {
+    ___default['default'].set(globalCache, "image", {
+      cursorMoveStartPosition: {
+        x: e.pageX,
+        y: e.pageY
+      },
+      resizingSide: resizingSide,
+      imgInitialPosition: position
+    });
+  }
+}
+function onImageResize(ctx, globalCache, e) {
+  if (ctx.allowEdit === false) return false;
+  var image = globalCache === null || globalCache === void 0 ? void 0 : globalCache.image;
+  if (image === null || image === void 0 ? void 0 : image.resizingSide) {
+    var imgContainer = document.getElementById("luckysheet-modal-dialog-activeImage");
+    var img = imgContainer === null || imgContainer === void 0 ? void 0 : imgContainer.querySelector(".luckysheet-modal-dialog-content");
+    if (img == null) return false;
+    var _image$cursorMoveStar2 = image.cursorMoveStartPosition,
+      startX = _image$cursorMoveStar2.x,
+      startY = _image$cursorMoveStar2.y;
+    var _image$imgInitialPosi2 = image.imgInitialPosition,
+      top = _image$imgInitialPosi2.top,
+      left = _image$imgInitialPosi2.left,
+      width = _image$imgInitialPosi2.width,
+      height = _image$imgInitialPosi2.height;
+    var dx = e.pageX - startX;
+    var dy = e.pageY - startY;
+    var minHeight = 60 * ctx.zoomRatio;
+    var minWidth = 1.5 * 60 * ctx.zoomRatio;
+    if (["lm", "lt", "lb"].includes(image.resizingSide)) {
+      if (width - dx < minWidth) {
+        left += width - minWidth;
+        width = minWidth;
+      } else {
+        left += dx;
+        width -= dx;
+      }
+      if (left < 0) left = 0;
+      img.style.left = "".concat(left, "px");
+      imgContainer.style.left = "".concat(left, "px");
+    }
+    if (["rm", "rt", "rb"].includes(image.resizingSide)) {
+      width = width + dx < minWidth ? minWidth : width + dx;
+    }
+    if (["mt", "lt", "rt"].includes(image.resizingSide)) {
+      if (height - dy < minHeight) {
+        top += height - minHeight;
+        height = minHeight;
+      } else {
+        top += dy;
+        height -= dy;
+      }
+      if (top < 0) top = 0;
+      img.style.top = "".concat(top, "px");
+      imgContainer.style.top = "".concat(top, "px");
+    }
+    if (["mb", "lb", "rb"].includes(image.resizingSide)) {
+      height = height + dy < minHeight ? minHeight : height + dy;
+    }
+    img.style.width = "".concat(width, "px");
+    imgContainer.style.width = "".concat(width, "px");
+    img.style.height = "".concat(height, "px");
+    imgContainer.style.height = "".concat(height, "px");
+    img.style.backgroundSize = "".concat(width, "px ").concat(height, "px");
+    return true;
+  }
+  return false;
+}
+function onImageResizeEnd(ctx, globalCache) {
+  var _globalCache$image2;
+  if ((_globalCache$image2 = globalCache.image) === null || _globalCache$image2 === void 0 ? void 0 : _globalCache$image2.resizingSide) {
+    globalCache.image = undefined;
+    var position = getImagePosition();
+    if (position) {
+      var img = ___default['default'].find(ctx.insertedImgs, function (v) {
+        return v.id === ctx.activeImg;
+      });
+      if (img) {
+        img.left = position.left / ctx.zoomRatio;
+        img.top = position.top / ctx.zoomRatio;
+        img.width = position.width / ctx.zoomRatio;
+        img.height = position.height / ctx.zoomRatio;
+        saveImage(ctx);
+      }
+    }
+  }
+}
+
 function storeSheetParam(ctx) {
   var index = getSheetIndex(ctx, ctx.currentSheetId);
   if (index == null) return;
@@ -46949,8 +47203,56 @@ function expandRowsAndColumns(data, rowsToAdd, columnsToAdd) {
   }
   return data;
 }
-
-function mergeCells(ctx, sheetId, ranges, type) {
+function setNextSheet(draftCtx, nextSheetId, refs) {
+  var _draftCtx$luckysheetf, _luckysheetCellUpdate;
+  var sheet = draftCtx.luckysheetfile.find(function (_sheet) {
+    return _sheet.id === nextSheetId;
+  }) || ((_draftCtx$luckysheetf = draftCtx.luckysheetfile) === null || _draftCtx$luckysheetf === void 0 ? void 0 : _draftCtx$luckysheetf[0]);
+  draftCtx.sheetScrollRecord[draftCtx.currentSheetId] = {
+    scrollLeft: draftCtx.scrollLeft,
+    scrollTop: draftCtx.scrollTop,
+    luckysheet_select_status: draftCtx.luckysheet_select_status,
+    luckysheet_select_save: draftCtx.luckysheet_select_save,
+    luckysheet_selection_range: draftCtx.luckysheet_selection_range
+  };
+  var isBack = false;
+  var luckysheetCellUpdate = [];
+  if ((israngeseleciton(draftCtx) || draftCtx.formulaCache.rangestart) && !draftCtx.active_f) {
+    var _refs$fxInput$current, _draftCtx$sheetScroll;
+    draftCtx.active_f = {
+      r: draftCtx.luckysheet_select_save[0].row_focus,
+      c: draftCtx.luckysheet_select_save[0].column_focus,
+      sheetId: draftCtx.currentSheetId,
+      text: (_refs$fxInput$current = refs.fxInput.current) === null || _refs$fxInput$current === void 0 ? void 0 : _refs$fxInput$current.innerText
+    };
+    if ((_draftCtx$sheetScroll = draftCtx.sheetScrollRecord[nextSheetId]) === null || _draftCtx$sheetScroll === void 0 ? void 0 : _draftCtx$sheetScroll.luckysheet_select_save) {
+      draftCtx.sheetScrollRecord[nextSheetId].luckysheet_select_save = undefined;
+    }
+    moveToEnd(refs.fxInput.current);
+  } else if (draftCtx.active_f && draftCtx.active_f.sheetId === nextSheetId) {
+    var _refs$fxInput$current2;
+    luckysheetCellUpdate = [draftCtx.active_f.r, draftCtx.active_f.c];
+    isBack = true;
+    if ((_refs$fxInput$current2 = refs.fxInput.current) === null || _refs$fxInput$current2 === void 0 ? void 0 : _refs$fxInput$current2.innerHTML) {
+      var _refs$fxInput$current3;
+      refs.cellInput.current.innerHTML = ((_refs$fxInput$current3 = refs.fxInput.current) === null || _refs$fxInput$current3 === void 0 ? void 0 : _refs$fxInput$current3.innerHTML) || "";
+    }
+    moveToEnd(refs.cellInput.current);
+  }
+  var _update = ((_luckysheetCellUpdate = luckysheetCellUpdate) === null || _luckysheetCellUpdate === void 0 ? void 0 : _luckysheetCellUpdate.length) > 0 ? luckysheetCellUpdate : draftCtx.luckysheetCellUpdate;
+  draftCtx.currentSheetId = nextSheetId;
+  if ((_update === null || _update === void 0 ? void 0 : _update.length) > 0) ;
+  draftCtx.dataVerificationDropDownList = false;
+  draftCtx.zoomRatio = sheet.zoomRatio || 1;
+  cancelActiveImgItem(draftCtx, refs.globalCache);
+  cancelNormalSelected(draftCtx);
+  if (isBack) {
+    draftCtx.luckysheetCellUpdate = luckysheetCellUpdate;
+    draftCtx.active_f = undefined;
+  }
+}
+
+function mergeCells(ctx, sheetId, ranges, type) {
   var idx = getSheetIndex(ctx, sheetId);
   if (idx == null) return;
   var sheet = ctx.luckysheetfile[idx];
@@ -49345,296 +49647,15 @@ function overShowComment(ctx, e, scrollX, scrollY, container) {
     rc: rc,
     left: left,
     top: top,
-    width: width,
-    height: height,
-    size: size,
-    value: value,
-    autoFocus: false
-  };
-}
-function getCommentBoxPosition(commentId) {
-  var box = document.getElementById(commentId);
-  if (!box) return undefined;
-  var _box$getBoundingClien = box.getBoundingClientRect(),
-    width = _box$getBoundingClien.width,
-    height = _box$getBoundingClien.height;
-  var left = box.offsetLeft;
-  var top = box.offsetTop;
-  return {
-    left: left,
-    top: top,
-    width: width,
-    height: height
-  };
-}
-function onCommentBoxResizeStart(ctx, globalCache, e, _ref3, resizingId, resizingSide) {
-  var r = _ref3.r,
-    c = _ref3.c,
-    rc = _ref3.rc;
-  var position = getCommentBoxPosition(resizingId);
-  if (position) {
-    ___default['default'].set(globalCache, "commentBox", {
-      cursorMoveStartPosition: {
-        x: e.pageX,
-        y: e.pageY
-      },
-      resizingId: resizingId,
-      resizingSide: resizingSide,
-      commentRC: {
-        r: r,
-        c: c,
-        rc: rc
-      },
-      boxInitialPosition: position
-    });
-  }
-}
-function onCommentBoxResize(ctx, globalCache, e) {
-  if (ctx.allowEdit === false) return false;
-  var commentBox = globalCache === null || globalCache === void 0 ? void 0 : globalCache.commentBox;
-  if ((commentBox === null || commentBox === void 0 ? void 0 : commentBox.resizingId) && commentBox.resizingSide) {
-    var box = document.getElementById(commentBox.resizingId);
-    var _commentBox$cursorMov = commentBox.cursorMoveStartPosition,
-      startX = _commentBox$cursorMov.x,
-      startY = _commentBox$cursorMov.y;
-    var _commentBox$boxInitia = commentBox.boxInitialPosition,
-      top = _commentBox$boxInitia.top,
-      left = _commentBox$boxInitia.left,
-      width = _commentBox$boxInitia.width,
-      height = _commentBox$boxInitia.height;
-    var dx = e.pageX - startX;
-    var dy = e.pageY - startY;
-    var minHeight = 60 * ctx.zoomRatio;
-    var minWidth = 1.5 * 60 * ctx.zoomRatio;
-    if (["lm", "lt", "lb"].includes(commentBox.resizingSide)) {
-      if (width - dx < minWidth) {
-        left += width - minWidth;
-        width = minWidth;
-      } else {
-        left += dx;
-        width -= dx;
-      }
-      if (left < 0) left = 0;
-      box.style.left = "".concat(left, "px");
-    }
-    if (["rm", "rt", "rb"].includes(commentBox.resizingSide)) {
-      width = width + dx < minWidth ? minWidth : width + dx;
-    }
-    if (["mt", "lt", "rt"].includes(commentBox.resizingSide)) {
-      if (height - dy < minHeight) {
-        top += height - minHeight;
-        height = minHeight;
-      } else {
-        top += dy;
-        height -= dy;
-      }
-      if (top < 0) top = 0;
-      box.style.top = "".concat(top, "px");
-    }
-    if (["mb", "lb", "rb"].includes(commentBox.resizingSide)) {
-      height = height + dy < minHeight ? minHeight : height + dy;
-    }
-    box.style.width = "".concat(width, "px");
-    box.style.height = "".concat(height, "px");
-    return true;
-  }
-  return false;
-}
-function onCommentBoxResizeEnd(ctx, globalCache) {
-  var _globalCache$commentB;
-  if ((_globalCache$commentB = globalCache.commentBox) === null || _globalCache$commentB === void 0 ? void 0 : _globalCache$commentB.resizingId) {
-    var _globalCache$commentB2 = globalCache.commentBox,
-      resizingId = _globalCache$commentB2.resizingId,
-      _globalCache$commentB3 = _globalCache$commentB2.commentRC,
-      r = _globalCache$commentB3.r,
-      c = _globalCache$commentB3.c;
-    globalCache.commentBox.resizingId = undefined;
-    var position = getCommentBoxPosition(resizingId);
-    if (position) {
-      var top = position.top,
-        left = position.left,
-        width = position.width,
-        height = position.height;
-      var flowdata = getFlowdata(ctx);
-      var cell = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r][c];
-      if (!flowdata || !(cell === null || cell === void 0 ? void 0 : cell.ps)) return;
-      cell.ps.left = left / ctx.zoomRatio;
-      cell.ps.top = top / ctx.zoomRatio;
-      cell.ps.width = width / ctx.zoomRatio;
-      cell.ps.height = height / ctx.zoomRatio;
-      setEditingComment(ctx, flowdata, r, c);
-      if (ctx.hooks.afterUpdateComment) {
-        var _ctx$hooks$afterUpdat5, _ctx$hooks10;
-        (_ctx$hooks$afterUpdat5 = (_ctx$hooks10 = ctx.hooks).afterUpdateComment) === null || _ctx$hooks$afterUpdat5 === void 0 ? void 0 : _ctx$hooks$afterUpdat5.call(_ctx$hooks10, r, c, _objectSpread2({}, cell.ps), true);
-      }
-    }
-  }
-}
-function onCommentBoxMoveStart(ctx, globalCache, e, _ref4, movingId) {
-  var r = _ref4.r,
-    c = _ref4.c,
-    rc = _ref4.rc;
-  var position = getCommentBoxPosition(movingId);
-  if (position) {
-    var top = position.top,
-      left = position.left;
-    ___default['default'].set(globalCache, "commentBox", {
-      cursorMoveStartPosition: {
-        x: e.pageX,
-        y: e.pageY
-      },
-      movingId: movingId,
-      commentRC: {
-        r: r,
-        c: c,
-        rc: rc
-      },
-      boxInitialPosition: {
-        left: left,
-        top: top
-      }
-    });
-  }
-}
-function onCommentBoxMove(ctx, globalCache, e) {
-  var commentBox = globalCache === null || globalCache === void 0 ? void 0 : globalCache.commentBox;
-  if (commentBox === null || commentBox === void 0 ? void 0 : commentBox.movingId) {
-    var box = document.getElementById(commentBox.movingId);
-    var _commentBox$cursorMov2 = commentBox.cursorMoveStartPosition,
-      startX = _commentBox$cursorMov2.x,
-      startY = _commentBox$cursorMov2.y;
-    var _commentBox$boxInitia2 = commentBox.boxInitialPosition,
-      top = _commentBox$boxInitia2.top,
-      left = _commentBox$boxInitia2.left;
-    left += e.pageX - startX;
-    top += e.pageY - startY;
-    if (top < 0) top = 0;
-    if (left < 0) left = 0;
-    box.style.left = "".concat(left, "px");
-    box.style.top = "".concat(top, "px");
-    return true;
-  }
-  return false;
-}
-function onCommentBoxMoveEnd(ctx, globalCache) {
-  var _globalCache$commentB4;
-  if ((_globalCache$commentB4 = globalCache.commentBox) === null || _globalCache$commentB4 === void 0 ? void 0 : _globalCache$commentB4.movingId) {
-    var _globalCache$commentB5 = globalCache.commentBox,
-      movingId = _globalCache$commentB5.movingId,
-      _globalCache$commentB6 = _globalCache$commentB5.commentRC,
-      r = _globalCache$commentB6.r,
-      c = _globalCache$commentB6.c;
-    globalCache.commentBox.movingId = undefined;
-    var position = getCommentBoxPosition(movingId);
-    if (position) {
-      var top = position.top,
-        left = position.left;
-      var flowdata = getFlowdata(ctx);
-      var cell = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r][c];
-      if (!flowdata || !(cell === null || cell === void 0 ? void 0 : cell.ps)) return;
-      cell.ps.left = left / ctx.zoomRatio;
-      cell.ps.top = top / ctx.zoomRatio;
-      setEditingComment(ctx, flowdata, r, c);
-      if (ctx.hooks.afterUpdateComment) {
-        var _ctx$hooks$afterUpdat6, _ctx$hooks11;
-        (_ctx$hooks$afterUpdat6 = (_ctx$hooks11 = ctx.hooks).afterUpdateComment) === null || _ctx$hooks$afterUpdat6 === void 0 ? void 0 : _ctx$hooks$afterUpdat6.call(_ctx$hooks11, r, c, _objectSpread2({}, cell.ps), true);
-      }
-    }
-  }
-}
-
-var imageProps = {
-  defaultWidth: 144,
-  defaultHeight: 84,
-  currentObj: null,
-  currentWinW: null,
-  currentWinH: null,
-  resize: null,
-  resizeXY: null,
-  move: false,
-  moveXY: null,
-  cursorStartPosition: null
-};
-function generateRandomId(prefix) {
-  if (prefix == null) {
-    prefix = "img";
-  }
-  var userAgent = window.navigator.userAgent.replace(/[^a-zA-Z0-9]/g, "").split("");
-  var mid = "";
-  for (var i = 0; i < 12; i += 1) {
-    mid += userAgent[Math.round(Math.random() * (userAgent.length - 1))];
-  }
-  var time = new Date().getTime();
-  return "".concat(prefix, "_").concat(mid, "_").concat(time);
-}
-function showImgChooser() {
-  var chooser = document.getElementById("leankylin-img-upload");
-  if (chooser) chooser.click();
-}
-function saveImage(ctx) {
-  var index = getSheetIndex(ctx, ctx.currentSheetId);
-  if (index == null) return;
-  var file = ctx.luckysheetfile[index];
-  file.images = ctx.insertedImgs;
-}
-function removeActiveImage(ctx) {
-  ctx.insertedImgs = ___default['default'].filter(ctx.insertedImgs, function (image) {
-    return image.id !== ctx.activeImg;
-  });
-  ctx.activeImg = undefined;
-  saveImage(ctx);
-}
-function insertImage(ctx, image) {
-  try {
-    var _ctx$luckysheet_selec;
-    var last = (_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec[ctx.luckysheet_select_save.length - 1];
-    var rowIndex = last === null || last === void 0 ? void 0 : last.row_focus;
-    var colIndex = last === null || last === void 0 ? void 0 : last.column_focus;
-    if (!last) {
-      rowIndex = 0;
-      colIndex = 0;
-    } else {
-      if (rowIndex == null) {
-        var _last$row = _slicedToArray(last.row, 1);
-        rowIndex = _last$row[0];
-      }
-      if (colIndex == null) {
-        var _last$column = _slicedToArray(last.column, 1);
-        colIndex = _last$column[0];
-      }
-    }
-    var flowdata = getFlowdata(ctx);
-    var left = colIndex === 0 ? 0 : ctx.visibledatacolumn[colIndex - 1];
-    var top = rowIndex === 0 ? 0 : ctx.visibledatarow[rowIndex - 1];
-    if (flowdata) {
-      var margeset = mergeBorder(ctx, flowdata, rowIndex, colIndex);
-      if (margeset) {
-        var _margeset$row = _slicedToArray(margeset.row, 1);
-        top = _margeset$row[0];
-        var _margeset$column = _slicedToArray(margeset.column, 1);
-        left = _margeset$column[0];
-      }
-    }
-    var width = image.width;
-    var height = image.height;
-    var img = {
-      id: generateRandomId("img"),
-      src: image.src,
-      left: left,
-      top: top,
-      width: width * 0.5,
-      height: height * 0.5,
-      originWidth: width,
-      originHeight: height
-    };
-    ctx.insertedImgs = (ctx.insertedImgs || []).concat(img);
-    saveImage(ctx);
-  } catch (err) {
-    console.info(err);
-  }
+    width: width,
+    height: height,
+    size: size,
+    value: value,
+    autoFocus: false
+  };
 }
-function getImagePosition() {
-  var box = document.getElementById("luckysheet-modal-dialog-activeImage");
+function getCommentBoxPosition(commentId) {
+  var box = document.getElementById(commentId);
   if (!box) return undefined;
   var _box$getBoundingClien = box.getBoundingClientRect(),
     width = _box$getBoundingClien.width,
@@ -49648,97 +49669,46 @@ function getImagePosition() {
     height: height
   };
 }
-function cancelActiveImgItem(ctx, globalCache) {
-  ctx.activeImg = undefined;
-  globalCache.image = undefined;
-}
-function onImageMoveStart(ctx, globalCache, e) {
-  var position = getImagePosition();
-  if (position) {
-    var top = position.top,
-      left = position.left;
-    ___default['default'].set(globalCache, "image", {
-      cursorMoveStartPosition: {
-        x: e.pageX,
-        y: e.pageY
-      },
-      imgInitialPosition: {
-        left: left,
-        top: top
-      }
-    });
-  }
-}
-function onImageMove(ctx, globalCache, e) {
-  if (ctx.allowEdit === false) return false;
-  var image = globalCache === null || globalCache === void 0 ? void 0 : globalCache.image;
-  var img = document.getElementById("luckysheet-modal-dialog-activeImage");
-  if (img && image && !image.resizingSide) {
-    var _image$cursorMoveStar = image.cursorMoveStartPosition,
-      startX = _image$cursorMoveStar.x,
-      startY = _image$cursorMoveStar.y;
-    var _image$imgInitialPosi = image.imgInitialPosition,
-      top = _image$imgInitialPosi.top,
-      left = _image$imgInitialPosi.left;
-    left += e.pageX - startX;
-    top += e.pageY - startY;
-    if (top < 0) top = 0;
-    img.style.left = "".concat(left, "px");
-    img.style.top = "".concat(top, "px");
-    return true;
-  }
-  return false;
-}
-function onImageMoveEnd(ctx, globalCache) {
-  var _globalCache$image;
-  var position = getImagePosition();
-  if (!((_globalCache$image = globalCache.image) === null || _globalCache$image === void 0 ? void 0 : _globalCache$image.resizingSide)) {
-    globalCache.image = undefined;
-    if (position) {
-      var img = ___default['default'].find(ctx.insertedImgs, function (v) {
-        return v.id === ctx.activeImg;
-      });
-      if (img) {
-        img.left = position.left / ctx.zoomRatio;
-        img.top = position.top / ctx.zoomRatio;
-        saveImage(ctx);
-      }
-    }
-  }
-}
-function onImageResizeStart(globalCache, e, resizingSide) {
-  var position = getImagePosition();
+function onCommentBoxResizeStart(ctx, globalCache, e, _ref3, resizingId, resizingSide) {
+  var r = _ref3.r,
+    c = _ref3.c,
+    rc = _ref3.rc;
+  var position = getCommentBoxPosition(resizingId);
   if (position) {
-    ___default['default'].set(globalCache, "image", {
+    ___default['default'].set(globalCache, "commentBox", {
       cursorMoveStartPosition: {
         x: e.pageX,
         y: e.pageY
       },
+      resizingId: resizingId,
       resizingSide: resizingSide,
-      imgInitialPosition: position
+      commentRC: {
+        r: r,
+        c: c,
+        rc: rc
+      },
+      boxInitialPosition: position
     });
   }
 }
-function onImageResize(ctx, globalCache, e) {
+function onCommentBoxResize(ctx, globalCache, e) {
   if (ctx.allowEdit === false) return false;
-  var image = globalCache === null || globalCache === void 0 ? void 0 : globalCache.image;
-  if (image === null || image === void 0 ? void 0 : image.resizingSide) {
-    var imgContainer = document.getElementById("luckysheet-modal-dialog-activeImage");
-    var img = imgContainer === null || imgContainer === void 0 ? void 0 : imgContainer.querySelector(".luckysheet-modal-dialog-content");
-    if (img == null) return false;
-    var _image$cursorMoveStar2 = image.cursorMoveStartPosition,
-      startX = _image$cursorMoveStar2.x,
-      startY = _image$cursorMoveStar2.y;
-    var _image$imgInitialPosi2 = image.imgInitialPosition,
-      top = _image$imgInitialPosi2.top,
-      left = _image$imgInitialPosi2.left,
-      width = _image$imgInitialPosi2.width,
-      height = _image$imgInitialPosi2.height;
+  var commentBox = globalCache === null || globalCache === void 0 ? void 0 : globalCache.commentBox;
+  if ((commentBox === null || commentBox === void 0 ? void 0 : commentBox.resizingId) && commentBox.resizingSide) {
+    var box = document.getElementById(commentBox.resizingId);
+    var _commentBox$cursorMov = commentBox.cursorMoveStartPosition,
+      startX = _commentBox$cursorMov.x,
+      startY = _commentBox$cursorMov.y;
+    var _commentBox$boxInitia = commentBox.boxInitialPosition,
+      top = _commentBox$boxInitia.top,
+      left = _commentBox$boxInitia.left,
+      width = _commentBox$boxInitia.width,
+      height = _commentBox$boxInitia.height;
     var dx = e.pageX - startX;
     var dy = e.pageY - startY;
     var minHeight = 60 * ctx.zoomRatio;
     var minWidth = 1.5 * 60 * ctx.zoomRatio;
-    if (["lm", "lt", "lb"].includes(image.resizingSide)) {
+    if (["lm", "lt", "lb"].includes(commentBox.resizingSide)) {
       if (width - dx < minWidth) {
         left += width - minWidth;
         width = minWidth;
@@ -49747,13 +49717,12 @@ function onImageResize(ctx, globalCache, e) {
         width -= dx;
       }
       if (left < 0) left = 0;
-      img.style.left = "".concat(left, "px");
-      imgContainer.style.left = "".concat(left, "px");
+      box.style.left = "".concat(left, "px");
     }
-    if (["rm", "rt", "rb"].includes(image.resizingSide)) {
+    if (["rm", "rt", "rb"].includes(commentBox.resizingSide)) {
       width = width + dx < minWidth ? minWidth : width + dx;
     }
-    if (["mt", "lt", "rt"].includes(image.resizingSide)) {
+    if (["mt", "lt", "rt"].includes(commentBox.resizingSide)) {
       if (height - dy < minHeight) {
         top += height - minHeight;
         height = minHeight;
@@ -49762,36 +49731,115 @@ function onImageResize(ctx, globalCache, e) {
         height -= dy;
       }
       if (top < 0) top = 0;
-      img.style.top = "".concat(top, "px");
-      imgContainer.style.top = "".concat(top, "px");
+      box.style.top = "".concat(top, "px");
     }
-    if (["mb", "lb", "rb"].includes(image.resizingSide)) {
+    if (["mb", "lb", "rb"].includes(commentBox.resizingSide)) {
       height = height + dy < minHeight ? minHeight : height + dy;
     }
-    img.style.width = "".concat(width, "px");
-    imgContainer.style.width = "".concat(width, "px");
-    img.style.height = "".concat(height, "px");
-    imgContainer.style.height = "".concat(height, "px");
-    img.style.backgroundSize = "".concat(width, "px ").concat(height, "px");
+    box.style.width = "".concat(width, "px");
+    box.style.height = "".concat(height, "px");
     return true;
   }
   return false;
 }
-function onImageResizeEnd(ctx, globalCache) {
-  var _globalCache$image2;
-  if ((_globalCache$image2 = globalCache.image) === null || _globalCache$image2 === void 0 ? void 0 : _globalCache$image2.resizingSide) {
-    globalCache.image = undefined;
-    var position = getImagePosition();
+function onCommentBoxResizeEnd(ctx, globalCache) {
+  var _globalCache$commentB;
+  if ((_globalCache$commentB = globalCache.commentBox) === null || _globalCache$commentB === void 0 ? void 0 : _globalCache$commentB.resizingId) {
+    var _globalCache$commentB2 = globalCache.commentBox,
+      resizingId = _globalCache$commentB2.resizingId,
+      _globalCache$commentB3 = _globalCache$commentB2.commentRC,
+      r = _globalCache$commentB3.r,
+      c = _globalCache$commentB3.c;
+    globalCache.commentBox.resizingId = undefined;
+    var position = getCommentBoxPosition(resizingId);
     if (position) {
-      var img = ___default['default'].find(ctx.insertedImgs, function (v) {
-        return v.id === ctx.activeImg;
-      });
-      if (img) {
-        img.left = position.left / ctx.zoomRatio;
-        img.top = position.top / ctx.zoomRatio;
-        img.width = position.width / ctx.zoomRatio;
-        img.height = position.height / ctx.zoomRatio;
-        saveImage(ctx);
+      var top = position.top,
+        left = position.left,
+        width = position.width,
+        height = position.height;
+      var flowdata = getFlowdata(ctx);
+      var cell = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r][c];
+      if (!flowdata || !(cell === null || cell === void 0 ? void 0 : cell.ps)) return;
+      cell.ps.left = left / ctx.zoomRatio;
+      cell.ps.top = top / ctx.zoomRatio;
+      cell.ps.width = width / ctx.zoomRatio;
+      cell.ps.height = height / ctx.zoomRatio;
+      setEditingComment(ctx, flowdata, r, c);
+      if (ctx.hooks.afterUpdateComment) {
+        var _ctx$hooks$afterUpdat5, _ctx$hooks10;
+        (_ctx$hooks$afterUpdat5 = (_ctx$hooks10 = ctx.hooks).afterUpdateComment) === null || _ctx$hooks$afterUpdat5 === void 0 ? void 0 : _ctx$hooks$afterUpdat5.call(_ctx$hooks10, r, c, _objectSpread2({}, cell.ps), true);
+      }
+    }
+  }
+}
+function onCommentBoxMoveStart(ctx, globalCache, e, _ref4, movingId) {
+  var r = _ref4.r,
+    c = _ref4.c,
+    rc = _ref4.rc;
+  var position = getCommentBoxPosition(movingId);
+  if (position) {
+    var top = position.top,
+      left = position.left;
+    ___default['default'].set(globalCache, "commentBox", {
+      cursorMoveStartPosition: {
+        x: e.pageX,
+        y: e.pageY
+      },
+      movingId: movingId,
+      commentRC: {
+        r: r,
+        c: c,
+        rc: rc
+      },
+      boxInitialPosition: {
+        left: left,
+        top: top
+      }
+    });
+  }
+}
+function onCommentBoxMove(ctx, globalCache, e) {
+  var commentBox = globalCache === null || globalCache === void 0 ? void 0 : globalCache.commentBox;
+  if (commentBox === null || commentBox === void 0 ? void 0 : commentBox.movingId) {
+    var box = document.getElementById(commentBox.movingId);
+    var _commentBox$cursorMov2 = commentBox.cursorMoveStartPosition,
+      startX = _commentBox$cursorMov2.x,
+      startY = _commentBox$cursorMov2.y;
+    var _commentBox$boxInitia2 = commentBox.boxInitialPosition,
+      top = _commentBox$boxInitia2.top,
+      left = _commentBox$boxInitia2.left;
+    left += e.pageX - startX;
+    top += e.pageY - startY;
+    if (top < 0) top = 0;
+    if (left < 0) left = 0;
+    box.style.left = "".concat(left, "px");
+    box.style.top = "".concat(top, "px");
+    return true;
+  }
+  return false;
+}
+function onCommentBoxMoveEnd(ctx, globalCache) {
+  var _globalCache$commentB4;
+  if ((_globalCache$commentB4 = globalCache.commentBox) === null || _globalCache$commentB4 === void 0 ? void 0 : _globalCache$commentB4.movingId) {
+    var _globalCache$commentB5 = globalCache.commentBox,
+      movingId = _globalCache$commentB5.movingId,
+      _globalCache$commentB6 = _globalCache$commentB5.commentRC,
+      r = _globalCache$commentB6.r,
+      c = _globalCache$commentB6.c;
+    globalCache.commentBox.movingId = undefined;
+    var position = getCommentBoxPosition(movingId);
+    if (position) {
+      var top = position.top,
+        left = position.left;
+      var flowdata = getFlowdata(ctx);
+      var cell = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r][c];
+      if (!flowdata || !(cell === null || cell === void 0 ? void 0 : cell.ps)) return;
+      cell.ps.left = left / ctx.zoomRatio;
+      cell.ps.top = top / ctx.zoomRatio;
+      setEditingComment(ctx, flowdata, r, c);
+      if (ctx.hooks.afterUpdateComment) {
+        var _ctx$hooks$afterUpdat6, _ctx$hooks11;
+        (_ctx$hooks$afterUpdat6 = (_ctx$hooks11 = ctx.hooks).afterUpdateComment) === null || _ctx$hooks$afterUpdat6 === void 0 ? void 0 : _ctx$hooks$afterUpdat6.call(_ctx$hooks11, r, c, _objectSpread2({}, cell.ps), true);
       }
     }
   }
@@ -56506,13 +56554,9 @@ function handleCopy(ctx) {
   ctx.luckysheet_paste_iscut = false;
 }
 
-function handleGlobalEnter(ctx, cellInput, e, canvas) {
-  if ((e.altKey || e.metaKey) && ctx.luckysheetCellUpdate.length > 0) {
-    var _ctx$luckysheet_selec;
-    var last = (_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec[ctx.luckysheet_select_save.length - 1];
-    if (last && !___default['default'].isNil(last.row_focus) && !___default['default'].isNil(last.column_focus)) ;
-    e.preventDefault();
-  } else if (ctx.luckysheetCellUpdate.length > 0) {
+function handleGlobalEnter(ctx, cellInput, e, canvas, refs) {
+  var _ctx$active_f;
+  function setValue() {
     var lastCellUpdate = ___default['default'].clone(ctx.luckysheetCellUpdate);
     updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
     ctx.luckysheet_select_save = [{
@@ -56523,6 +56567,18 @@ function handleGlobalEnter(ctx, cellInput, e, canvas) {
     }];
     moveHighlightCell(ctx, "down", 1, "rangeOfSelect");
     e.preventDefault();
+  }
+  if ((e.altKey || e.metaKey) && ctx.luckysheetCellUpdate.length > 0) {
+    var _ctx$luckysheet_selec;
+    var last = (_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec[ctx.luckysheet_select_save.length - 1];
+    if (last && !___default['default'].isNil(last.row_focus) && !___default['default'].isNil(last.column_focus)) ;
+    e.preventDefault();
+  } else if (ctx.luckysheetCellUpdate.length > 0) {
+    setValue();
+  } else if ((_ctx$active_f = ctx.active_f) === null || _ctx$active_f === void 0 ? void 0 : _ctx$active_f.sheetId) {
+    var _ctx$active_f2;
+    setNextSheet(ctx, (_ctx$active_f2 = ctx.active_f) === null || _ctx$active_f2 === void 0 ? void 0 : _ctx$active_f2.sheetId, refs);
+    setValue();
   } else {
     var _ctx$luckysheet_selec2, _ctx$luckysheet_selec3;
     if (((_ctx$luckysheet_selec2 = (_ctx$luckysheet_selec3 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec3 === void 0 ? void 0 : _ctx$luckysheet_selec3.length) !== null && _ctx$luckysheet_selec2 !== void 0 ? _ctx$luckysheet_selec2 : 0) > 0) {
@@ -56668,7 +56724,7 @@ function handleArrowKey(ctx, e) {
       break;
   }
 }
-function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
+function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas, refs) {
   ctx.luckysheet_select_status = false;
   var kcode = e.keyCode;
   var kstr = e.key;
@@ -56684,7 +56740,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
   }
   if (kstr === "Enter") {
     if (!allowEdit) return;
-    handleGlobalEnter(ctx, cellInput, e, canvas);
+    handleGlobalEnter(ctx, cellInput, e, canvas, refs);
   } else if (kstr === "Tab") {
     if (ctx.luckysheetCellUpdate.length > 0) {
       return;
@@ -57573,7 +57629,7 @@ function handleContextMenu(ctx, settings, e, workbookContainer, container, area)
   }
 }
 function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, container, fxInput) {
-  var _ctx$rangeDialog;
+  var _ctx$rangeDialog, _ctx$rangeDialog2;
   var rect = container.getBoundingClientRect();
   if (ctx.luckysheet_scroll_status && !ctx.luckysheet_cols_change_size && !ctx.luckysheet_rows_change_size) {
     var left = ctx.scrollLeft;
@@ -57601,7 +57657,8 @@ function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, container
       scrollX.scrollLeft = sleft;
     }
   }
-  if ((_ctx$rangeDialog = ctx.rangeDialog) === null || _ctx$rangeDialog === void 0 ? void 0 : _ctx$rangeDialog.singleSelect) {
+  console.log('ctx.rangeDialog?.singleSelect', (_ctx$rangeDialog = ctx.rangeDialog) === null || _ctx$rangeDialog === void 0 ? void 0 : _ctx$rangeDialog.singleSelect);
+  if ((_ctx$rangeDialog2 = ctx.rangeDialog) === null || _ctx$rangeDialog2 === void 0 ? void 0 : _ctx$rangeDialog2.singleSelect) {
     return;
   }
   if (ctx.luckysheet_select_status) {
@@ -60592,6 +60649,7 @@ exports.setCellValue = setCellValue;
 exports.setConditionRules = setConditionRules;
 exports.setDropcownValue = setDropcownValue;
 exports.setEditingComment = setEditingComment;
+exports.setNextSheet = setNextSheet;
 exports.showComments = showComments;
 exports.showDropCellSelection = showDropCellSelection;
 exports.showHideAllComments = showHideAllComments;