@fileverse-dev/fortune-core 1.0.69 → 1.0.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/events/paste.js +12 -3
  2. package/lib/events/paste.js +12 -3
  3. package/package.json +2 -2
package/es/events/paste.js CHANGED
@@ -855,7 +855,7 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
855
855
  var value = null;
856
856
  if ((_f = copyData[h - mth]) === null || _f === void 0 ? void 0 : _f[c - mtc]) {
857
857
  value = _.cloneDeep(copyData[h - mth][c - mtc]);
858
- if ((value === null || value === void 0 ? void 0 : value.v) && (value === null || value === void 0 ? void 0 : value.isDataBlockFormula)) {
858
+ if ((value === null || value === void 0 ? void 0 : value.v) && (value === null || value === void 0 ? void 0 : value.isDataBlockFormula) && arr.length === 1) {
859
859
  value.m = "Loading...";
860
860
  }
861
861
  }
@@ -875,6 +875,7 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
875
875
  }
876
876
  var funcV = execfunction(ctx, func, h, c, undefined, undefined, true);
877
877
  var afterUpdateCell = ctx.hooks.afterUpdateCell;
878
+ console.log("fortune about to call afterUpdateCell");
878
879
  if (afterUpdateCell && arr.length === 1) {
879
880
  afterUpdateCell(h, c, null, __assign(__assign({}, value), {
880
881
  v: funcV[1],
@@ -977,9 +978,17 @@ function handleFormulaStringPaste(ctx, formulaStr) {
977
978
  d[r][c].m = isDataBlockRespose ? "Loading..." : val.toString();
978
979
  d[r][c].v = val;
979
980
  d[r][c].f = formulaStr;
981
+ var cellTemp = {
982
+ m: "",
983
+ v: "",
984
+ f: ""
985
+ };
986
+ cellTemp.m = isDataBlockRespose ? "Loading..." : val.toString();
987
+ cellTemp.v = val;
988
+ cellTemp.f = formulaStr;
980
989
  var afterUpdateCell = ctx.hooks.afterUpdateCell;
981
990
  if (afterUpdateCell && isDataBlockRespose) {
982
- afterUpdateCell(r, c, null, d[r][c]);
991
+ afterUpdateCell(r, c, null, cellTemp);
983
992
  }
984
993
  }
985
994
  export function handlePaste(ctx, e) {
@@ -1374,7 +1383,7 @@ export function handlePasteByClick(ctx, clipboardData, triggerType) {
1374
1383
  }
1375
1384
  } else if (data.indexOf("fortune-copy-action-image") > -1) {} else if (triggerType !== "btn") {
1376
1385
  var isExcelFormula = clipboardData.startsWith("=");
1377
- if (isExcelFormula && false) {
1386
+ if (isExcelFormula) {
1378
1387
  handleFormulaStringPaste(ctx, clipboardData);
1379
1388
  } else {
1380
1389
  pasteHandler(ctx, clipboardData);
package/lib/events/paste.js CHANGED
@@ -863,7 +863,7 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
863
863
  var value = null;
864
864
  if ((_f = copyData[h - mth]) === null || _f === void 0 ? void 0 : _f[c - mtc]) {
865
865
  value = _lodash.default.cloneDeep(copyData[h - mth][c - mtc]);
866
- if ((value === null || value === void 0 ? void 0 : value.v) && (value === null || value === void 0 ? void 0 : value.isDataBlockFormula)) {
866
+ if ((value === null || value === void 0 ? void 0 : value.v) && (value === null || value === void 0 ? void 0 : value.isDataBlockFormula) && arr.length === 1) {
867
867
  value.m = "Loading...";
868
868
  }
869
869
  }
@@ -883,6 +883,7 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
883
883
  }
884
884
  var funcV = (0, _formula.execfunction)(ctx, func, h, c, undefined, undefined, true);
885
885
  var afterUpdateCell = ctx.hooks.afterUpdateCell;
886
+ console.log("fortune about to call afterUpdateCell");
886
887
  if (afterUpdateCell && arr.length === 1) {
887
888
  afterUpdateCell(h, c, null, __assign(__assign({}, value), {
888
889
  v: funcV[1],
@@ -985,9 +986,17 @@ function handleFormulaStringPaste(ctx, formulaStr) {
985
986
  d[r][c].m = isDataBlockRespose ? "Loading..." : val.toString();
986
987
  d[r][c].v = val;
987
988
  d[r][c].f = formulaStr;
989
+ var cellTemp = {
990
+ m: "",
991
+ v: "",
992
+ f: ""
993
+ };
994
+ cellTemp.m = isDataBlockRespose ? "Loading..." : val.toString();
995
+ cellTemp.v = val;
996
+ cellTemp.f = formulaStr;
988
997
  var afterUpdateCell = ctx.hooks.afterUpdateCell;
989
998
  if (afterUpdateCell && isDataBlockRespose) {
990
- afterUpdateCell(r, c, null, d[r][c]);
999
+ afterUpdateCell(r, c, null, cellTemp);
991
1000
  }
992
1001
  }
993
1002
  function handlePaste(ctx, e) {
@@ -1382,7 +1391,7 @@ function handlePasteByClick(ctx, clipboardData, triggerType) {
1382
1391
  }
1383
1392
  } else if (data.indexOf("fortune-copy-action-image") > -1) {} else if (triggerType !== "btn") {
1384
1393
  var isExcelFormula = clipboardData.startsWith("=");
1385
- if (isExcelFormula && false) {
1394
+ if (isExcelFormula) {
1386
1395
  handleFormulaStringPaste(ctx, clipboardData);
1387
1396
  } else {
1388
1397
  pasteHandler(ctx, clipboardData);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fileverse-dev/fortune-core",
3
- "version": "1.0.69",
3
+ "version": "1.0.70",
4
4
  "main": "lib/index.js",
5
5
  "module": "es/index.js",
6
6
  "typings": "lib/index.d.ts",
@@ -15,7 +15,7 @@
15
15
  "dev": "father-build --watch"
16
16
  },
17
17
  "dependencies": {
18
- "@fileverse-dev/formula-parser": "0.2.46",
18
+ "@fileverse-dev/formula-parser": "0.2.47",
19
19
  "dayjs": "^1.11.0",
20
20
  "immer": "^9.0.12",
21
21
  "lodash": "^4.17.21",