@fileverse-dev/fortune-core 1.2.89 → 1.2.90-ydoc-1

package/es/api/cell.js

@@ -55,6 +55,7 @@ export function setCellValue(ctx, row, column, value, cellInput, options) {
   if (options === void 0) {
     options = {};
   }
+  var afterUpdateCellCalledInInternal = false;
   if (!_.isNumber(row) || !_.isNumber(column)) {
     throw new Error("row or column cannot be null or undefined");
   }

package/es/events/keyboard.js

@@ -423,12 +423,12 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
       isFxInput = (_b = (_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.contains("fortune-fx-input");
       ignoredKeys = new Set(isFxInput ? ["Enter", "Tab", "ArrowLeft", "ArrowRight"] : ["Enter", "Tab", "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"]);
       restCod = !ignoredKeys.has(kstr);
-      if (ctx.luckysheetCellUpdate.length > 0 && restCod && (window.CompositData === "" || window.CompositData === undefined)) {
+      if (ctx.luckysheetCellUpdate.length > 0 && restCod) {
         return [2];
       }
       if (kstr === "Enter") {
         if (!allowEdit) return [2];
-        if (window.CompositData === "" || window.CompositData === undefined) handleGlobalEnter(ctx, cellInput, e, canvas);
+        handleGlobalEnter(ctx, cellInput, e, canvas);
       } else if (kstr === "Tab") {
         if (ctx.luckysheetCellUpdate.length > 0) {
           updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);

package/es/modules/cell.js

@@ -110,7 +110,8 @@ export function getCellValue(r, c, data, attr) {
   return retv;
 }
 export function setCellValue(ctx, r, c, d, v) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+  console.log("setCellValue", r, c, v);
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_.isNil(d)) {
     d = getFlowdata(ctx);
@@ -350,6 +351,11 @@ export function setCellValue(ctx, r, c, d, v) {
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
+  if (ctx.hooks.afterUpdateCell) {
+    var newCell = _.isPlainObject(cell) ? __assign({}, cell) : cell;
+    console.log("newCell ======== newCell", newCell, _.isPlainObject(cell));
+    (_o = (_m = ctx.hooks).afterUpdateCell) === null || _o === void 0 ? void 0 : _o.call(_m, r, c, null, newCell);
+  }
 }
 export function getRealCellValue(r, c, data, attr) {
   var value = getCellValue(r, c, data, "m");
@@ -799,13 +805,6 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
     if (isValueArray) {
       if (spillSortResult(ctx, r, c, value, d)) {
         cancelNormalSelected(ctx);
-        if (ctx.hooks.afterUpdateCell) {
-          var newValue_1 = _.cloneDeep(d[r][c]);
-          setTimeout(function () {
-            var _a, _b;
-            return (_b = (_a = ctx.hooks).afterUpdateCell) === null || _b === void 0 ? void 0 : _b.call(_a, r, c, null, newValue_1);
-          });
-        }
         ctx.formulaCache.execFunctionGlobalData = null;
         return;
       }
@@ -853,13 +852,6 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
       }
     }
   }
-  if (ctx.hooks.afterUpdateCell) {
-    var newValue_2 = _.cloneDeep(flowdata[r][c]);
-    var afterUpdateCell_1 = ctx.hooks.afterUpdateCell;
-    setTimeout(function () {
-      afterUpdateCell_1 === null || afterUpdateCell_1 === void 0 ? void 0 : afterUpdateCell_1(r, c, oldValue, newValue_2);
-    });
-  }
   ctx.formulaCache.execFunctionGlobalData = null;
 }
 export function getOrigincell(ctx, r, c, i) {

package/lib/api/cell.js

@@ -66,6 +66,7 @@ function setCellValue(ctx, row, column, value, cellInput, options) {
   if (options === void 0) {
     options = {};
   }
+  var afterUpdateCellCalledInInternal = false;
   if (!_lodash.default.isNumber(row) || !_lodash.default.isNumber(column)) {
     throw new Error("row or column cannot be null or undefined");
   }

package/lib/events/keyboard.js

@@ -433,12 +433,12 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
       isFxInput = (_b = (_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.contains("fortune-fx-input");
       ignoredKeys = new Set(isFxInput ? ["Enter", "Tab", "ArrowLeft", "ArrowRight"] : ["Enter", "Tab", "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"]);
       restCod = !ignoredKeys.has(kstr);
-      if (ctx.luckysheetCellUpdate.length > 0 && restCod && (window.CompositData === "" || window.CompositData === undefined)) {
+      if (ctx.luckysheetCellUpdate.length > 0 && restCod) {
         return [2];
       }
       if (kstr === "Enter") {
         if (!allowEdit) return [2];
-        if (window.CompositData === "" || window.CompositData === undefined) handleGlobalEnter(ctx, cellInput, e, canvas);
+        handleGlobalEnter(ctx, cellInput, e, canvas);
       } else if (kstr === "Tab") {
         if (ctx.luckysheetCellUpdate.length > 0) {
           (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);

package/lib/modules/cell.js

@@ -143,7 +143,8 @@ function getCellValue(r, c, data, attr) {
   return retv;
 }
 function setCellValue(ctx, r, c, d, v) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+  console.log("setCellValue", r, c, v);
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_lodash.default.isNil(d)) {
     d = (0, _context.getFlowdata)(ctx);
@@ -383,6 +384,11 @@ function setCellValue(ctx, r, c, d, v) {
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
+  if (ctx.hooks.afterUpdateCell) {
+    var newCell = _lodash.default.isPlainObject(cell) ? __assign({}, cell) : cell;
+    console.log("newCell ======== newCell", newCell, _lodash.default.isPlainObject(cell));
+    (_o = (_m = ctx.hooks).afterUpdateCell) === null || _o === void 0 ? void 0 : _o.call(_m, r, c, null, newCell);
+  }
 }
 function getRealCellValue(r, c, data, attr) {
   var value = getCellValue(r, c, data, "m");
@@ -832,13 +838,6 @@ function updateCell(ctx, r, c, $input, value, canvas) {
     if (isValueArray) {
       if ((0, _sort.spillSortResult)(ctx, r, c, value, d)) {
         cancelNormalSelected(ctx);
-        if (ctx.hooks.afterUpdateCell) {
-          var newValue_1 = _lodash.default.cloneDeep(d[r][c]);
-          setTimeout(function () {
-            var _a, _b;
-            return (_b = (_a = ctx.hooks).afterUpdateCell) === null || _b === void 0 ? void 0 : _b.call(_a, r, c, null, newValue_1);
-          });
-        }
         ctx.formulaCache.execFunctionGlobalData = null;
         return;
       }
@@ -886,13 +885,6 @@ function updateCell(ctx, r, c, $input, value, canvas) {
       }
     }
   }
-  if (ctx.hooks.afterUpdateCell) {
-    var newValue_2 = _lodash.default.cloneDeep(flowdata[r][c]);
-    var afterUpdateCell_1 = ctx.hooks.afterUpdateCell;
-    setTimeout(function () {
-      afterUpdateCell_1 === null || afterUpdateCell_1 === void 0 ? void 0 : afterUpdateCell_1(r, c, oldValue, newValue_2);
-    });
-  }
   ctx.formulaCache.execFunctionGlobalData = null;
 }
 function getOrigincell(ctx, r, c, i) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.2.89",
+  "version": "1.2.90-ydoc-1",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",