@fileverse-dev/fortune-core 1.0.65 → 1.0.66

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/modules/cell.js +4 -3
  2. package/lib/modules/cell.js +4 -3
  3. package/package.json +2 -2
package/es/modules/cell.js CHANGED
@@ -609,14 +609,14 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
609
609
  } else {
610
610
  delFunctionGroup(ctx, r, c);
611
611
  curv = _.cloneDeep(((_e = d === null || d === void 0 ? void 0 : d[r]) === null || _e === void 0 ? void 0 : _e[c]) || {});
612
- curv.v = value;
612
+ curv.v = value.toString();
613
613
  delete curv.f;
614
614
  delete curv.spl;
615
615
  var decemialCount_1 = ((_f = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _f === void 0 ? void 0 : _f.toString().includes(".")) ? (_g = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _g === void 0 ? void 0 : _g.toString().split(" ")[0].split(".")[1].length : 0;
616
616
  var coin_1 = (_h = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _h === void 0 ? void 0 : _h.toString().split(" ")[1];
617
617
  if (_typeof(curv) === "object" && (curv === null || curv === void 0 ? void 0 : curv.baseValue)) {
618
618
  curv.m = "".concat((parseFloat(value) / (oldValue === null || oldValue === void 0 ? void 0 : oldValue.baseCurrencyPrice)).toFixed(decemialCount_1), " ").concat(coin_1);
619
- curv.baseValue = value.toString();
619
+ curv.baseValue = value;
620
620
  }
621
621
  execFunctionGroup(ctx, r, c, curv);
622
622
  isRunExecFunction = false;
@@ -680,7 +680,8 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
680
680
  var coin = (_l = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _l === void 0 ? void 0 : _l.toString().split(" ")[1];
681
681
  if (_typeof(value) === "object" && value.baseValue && !(value === null || value === void 0 ? void 0 : value.m)) {
682
682
  value.m = "".concat((parseFloat(value === null || value === void 0 ? void 0 : value.v) / (oldValue === null || oldValue === void 0 ? void 0 : oldValue.baseCurrencyPrice)).toFixed(decemialCount), " ").concat(coin);
683
- value.baseValue = value === null || value === void 0 ? void 0 : value.v.toString();
683
+ value.baseValue = Number(value === null || value === void 0 ? void 0 : value.v);
684
+ value.v = value === null || value === void 0 ? void 0 : value.v.toString();
684
685
  }
685
686
  setCellValue(ctx, r, c, d, value);
686
687
  cancelNormalSelected(ctx);
package/lib/modules/cell.js CHANGED
@@ -639,14 +639,14 @@ function updateCell(ctx, r, c, $input, value, canvas) {
639
639
  } else {
640
640
  (0, _formula.delFunctionGroup)(ctx, r, c);
641
641
  curv = _lodash.default.cloneDeep(((_e = d === null || d === void 0 ? void 0 : d[r]) === null || _e === void 0 ? void 0 : _e[c]) || {});
642
- curv.v = value;
642
+ curv.v = value.toString();
643
643
  delete curv.f;
644
644
  delete curv.spl;
645
645
  var decemialCount_1 = ((_f = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _f === void 0 ? void 0 : _f.toString().includes(".")) ? (_g = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _g === void 0 ? void 0 : _g.toString().split(" ")[0].split(".")[1].length : 0;
646
646
  var coin_1 = (_h = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _h === void 0 ? void 0 : _h.toString().split(" ")[1];
647
647
  if (_typeof(curv) === "object" && (curv === null || curv === void 0 ? void 0 : curv.baseValue)) {
648
648
  curv.m = "".concat((parseFloat(value) / (oldValue === null || oldValue === void 0 ? void 0 : oldValue.baseCurrencyPrice)).toFixed(decemialCount_1), " ").concat(coin_1);
649
- curv.baseValue = value.toString();
649
+ curv.baseValue = value;
650
650
  }
651
651
  (0, _formula.execFunctionGroup)(ctx, r, c, curv);
652
652
  isRunExecFunction = false;
@@ -710,7 +710,8 @@ function updateCell(ctx, r, c, $input, value, canvas) {
710
710
  var coin = (_l = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _l === void 0 ? void 0 : _l.toString().split(" ")[1];
711
711
  if (_typeof(value) === "object" && value.baseValue && !(value === null || value === void 0 ? void 0 : value.m)) {
712
712
  value.m = "".concat((parseFloat(value === null || value === void 0 ? void 0 : value.v) / (oldValue === null || oldValue === void 0 ? void 0 : oldValue.baseCurrencyPrice)).toFixed(decemialCount), " ").concat(coin);
713
- value.baseValue = value === null || value === void 0 ? void 0 : value.v.toString();
713
+ value.baseValue = Number(value === null || value === void 0 ? void 0 : value.v);
714
+ value.v = value === null || value === void 0 ? void 0 : value.v.toString();
714
715
  }
715
716
  setCellValue(ctx, r, c, d, value);
716
717
  cancelNormalSelected(ctx);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fileverse-dev/fortune-core",
3
- "version": "1.0.65",
3
+ "version": "1.0.66",
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.42",
18
+ "@fileverse-dev/formula-parser": "0.2.43",
19
19
  "dayjs": "^1.11.0",
20
20
  "immer": "^9.0.12",
21
21
  "lodash": "^4.17.21",