@fileverse-dev/fortune-core 1.1.25 → 1.1.26

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.
@@ -1899,7 +1899,7 @@ export function fixColumnStyleOverflowInFreeze(ctx, c1, c2, freeze) {
1899
1899
  return ret;
1900
1900
  }
1901
1901
  export function calcSelectionInfo(ctx, lang) {
1902
- var _a, _b, _c;
1902
+ var _a, _b, _c, _d, _e, _f, _g;
1903
1903
  var selection = ctx.luckysheet_select_save;
1904
1904
  var numberC = 0;
1905
1905
  var count = 0;
@@ -1913,8 +1913,12 @@ export function calcSelectionInfo(ctx, lang) {
1913
1913
  if (r >= data.length || c >= data[0].length) break;
1914
1914
  var ct = (_b = (_a = data[r][c]) === null || _a === void 0 ? void 0 : _a.ct) === null || _b === void 0 ? void 0 : _b.t;
1915
1915
  var value = (_c = data[r][c]) === null || _c === void 0 ? void 0 : _c.m;
1916
- if (ct === "n" || ct === "g" && parseFloat(value).toString() !== "NaN") {
1917
- var valueNumber = parseFloat(value);
1916
+ if ((_f = (_e = (_d = data[r][c]) === null || _d === void 0 ? void 0 : _d.ct) === null || _e === void 0 ? void 0 : _e.fa) === null || _f === void 0 ? void 0 : _f.includes("#,##0")) {
1917
+ value = (_g = data[r][c]) === null || _g === void 0 ? void 0 : _g.v;
1918
+ }
1919
+ if (ct === "n" || ct === "g" && parseFloat(value).toString() !== "NaN" || ct === "s" && parseFloat(value).toString() !== "NaN") {
1920
+ var removeComma = value.replace(/,/g, '');
1921
+ var valueNumber = parseFloat(removeComma);
1918
1922
  count += 1;
1919
1923
  sum += valueNumber;
1920
1924
  max = Math.max(valueNumber, max);
@@ -1926,7 +1930,7 @@ export function calcSelectionInfo(ctx, lang) {
1926
1930
  }
1927
1931
  }
1928
1932
  }
1929
- var formatString = lang && !["zh", "zh_tw"].includes(lang) ? "0.00" : "w0.00";
1933
+ var formatString = lang && !["zh", "zh_tw"].includes(lang) ? "0.00" : "0.00";
1930
1934
  var average = SSF.format(formatString, sum / numberC);
1931
1935
  sum = SSF.format(formatString, sum);
1932
1936
  max = SSF.format(formatString, max);
@@ -1934,7 +1934,7 @@ function fixColumnStyleOverflowInFreeze(ctx, c1, c2, freeze) {
1934
1934
  return ret;
1935
1935
  }
1936
1936
  function calcSelectionInfo(ctx, lang) {
1937
- var _a, _b, _c;
1937
+ var _a, _b, _c, _d, _e, _f, _g;
1938
1938
  var selection = ctx.luckysheet_select_save;
1939
1939
  var numberC = 0;
1940
1940
  var count = 0;
@@ -1948,8 +1948,12 @@ function calcSelectionInfo(ctx, lang) {
1948
1948
  if (r >= data.length || c >= data[0].length) break;
1949
1949
  var ct = (_b = (_a = data[r][c]) === null || _a === void 0 ? void 0 : _a.ct) === null || _b === void 0 ? void 0 : _b.t;
1950
1950
  var value = (_c = data[r][c]) === null || _c === void 0 ? void 0 : _c.m;
1951
- if (ct === "n" || ct === "g" && parseFloat(value).toString() !== "NaN") {
1952
- var valueNumber = parseFloat(value);
1951
+ if ((_f = (_e = (_d = data[r][c]) === null || _d === void 0 ? void 0 : _d.ct) === null || _e === void 0 ? void 0 : _e.fa) === null || _f === void 0 ? void 0 : _f.includes("#,##0")) {
1952
+ value = (_g = data[r][c]) === null || _g === void 0 ? void 0 : _g.v;
1953
+ }
1954
+ if (ct === "n" || ct === "g" && parseFloat(value).toString() !== "NaN" || ct === "s" && parseFloat(value).toString() !== "NaN") {
1955
+ var removeComma = value.replace(/,/g, '');
1956
+ var valueNumber = parseFloat(removeComma);
1953
1957
  count += 1;
1954
1958
  sum += valueNumber;
1955
1959
  max = Math.max(valueNumber, max);
@@ -1961,7 +1965,7 @@ function calcSelectionInfo(ctx, lang) {
1961
1965
  }
1962
1966
  }
1963
1967
  }
1964
- var formatString = lang && !["zh", "zh_tw"].includes(lang) ? "0.00" : "w0.00";
1968
+ var formatString = lang && !["zh", "zh_tw"].includes(lang) ? "0.00" : "0.00";
1965
1969
  var average = _ssf.default.format(formatString, sum / numberC);
1966
1970
  sum = _ssf.default.format(formatString, sum);
1967
1971
  max = _ssf.default.format(formatString, max);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fileverse-dev/fortune-core",
3
- "version": "1.1.25",
3
+ "version": "1.1.26",
4
4
  "main": "lib/index.js",
5
5
  "module": "es/index.js",
6
6
  "typings": "lib/index.d.ts",