@fileverse-dev/fortune-core 1.3.4-date-format-1 → 1.3.4-viewMode-3

package/es/canvas.js

@@ -1012,7 +1012,7 @@ var Canvas = function () {
       renderCtx.clip();
       renderCtx.scale(this.sheetCtx.zoomRatio, this.sheetCtx.zoomRatio);
       var measureText = getMeasureText(value, renderCtx, this.sheetCtx);
-      var textMetrics = measureText.width + 18;
+      var textMetrics = measureText.width + 14;
       var oneLineTextHeight = measureText.actualBoundingBoxDescent + measureText.actualBoundingBoxAscent;
       var horizonAlignPos = pos_x + space_width;
       if (horizonAlign === 0) {

package/es/modules/cell.js

@@ -110,7 +110,7 @@ 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;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_.isNil(d)) {
     d = getFlowdata(ctx);
@@ -276,7 +276,10 @@ export function setCellValue(ctx, r, c, d, v) {
     } else if (!_.isNil(cell.ct) && !_.isNil(cell.ct.fa) && cell.ct.fa !== "General") {
       var fa = cell.ct.fa;
       if (isRealNum(vupdate)) {
-        if (commaPresent && !fa.includes(",")) {
+        if (commaPresent && !fa.includes(",") || String(vupdate).includes(".") && ((_j = (_h = String(vupdate).split(".")) === null || _h === void 0 ? void 0 : _h[1]) === null || _j === void 0 ? void 0 : _j.length) !== ((_l = (_k = fa.split(".")) === null || _k === void 0 ? void 0 : _k[1]) === null || _l === void 0 ? void 0 : _l.length) || fa.includes(",") !== String(vupdate).includes(",")) {
+          if (fa.includes(",") !== String(vupdate).includes(",")) {
+            commaPresent = true;
+          }
           fa = getNumberFormat(String(vupdate), commaPresent);
         }
         vupdate = parseFloat(vupdate);
@@ -286,9 +289,6 @@ export function setCellValue(ctx, r, c, d, v) {
             t: "n"
           });
         }
-        if (_.isNil(cell.ht)) {
-          cell.ht = 2;
-        }
       }
       var mask = update(fa, vupdate);
       if (mask === vupdate) {
@@ -317,9 +317,7 @@ export function setCellValue(ctx, r, c, d, v) {
         var strValue = String(vupdate);
         var format = getNumberFormat(strValue, commaPresent);
         cell.m = v.m ? v.m : update(format, cell.v);
-        if (_.isNil(cell.ht)) {
-          cell.ht = 2;
-        }
+        cell.ht = (v === null || v === void 0 ? void 0 : v.ht) ? cell.ht : 2;
         cell.ct = {
           fa: format,
           t: "n"

package/es/modules/ssf.js

@@ -1364,7 +1364,7 @@ var make_ssf = function make_ssf(SSF) {
     if (typeof n !== "number" || !Number.isFinite(n)) return null;
     if (!Number.isInteger(n)) return null;
     if (n < 0) return null;
-    var minSec = 100000; // Excel serial numbers max ~73050 for year 2100; avoids collision
+    var minSec = 0; // 1970-01-01
     var maxSec = 4102444800; // ~2100-01-01
     var minMs = minSec * 1000;
     var maxMs = maxSec * 1000;

package/es/modules/toolbar.js

@@ -33,42 +33,21 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
         } else {
           value = cell;
         }
-        var type = "n";
-        if (is_date(foucsStatus) || foucsStatus === 14 || foucsStatus === 15 || foucsStatus === 16 || foucsStatus === 17 || foucsStatus === 18 || foucsStatus === 19 || foucsStatus === 20 || foucsStatus === 21 || foucsStatus === 22 || foucsStatus === 45 || foucsStatus === 46 || foucsStatus === 47) {
-          type = "d";
-        } else if (foucsStatus === "@" || foucsStatus === 49) {
-          type = "s";
-        }
         if (_.isNil(value)) {
-          if (!_.isNil(d[r])) {
-            if (_.isNil(d[r][c])) {
-              d[r][c] = {
-                ct: {
-                  fa: foucsStatus,
-                  t: type
-                }
-              };
-            } else if (_.isPlainObject(d[r][c])) {
-              if (_.isNil(d[r][c].ct)) d[r][c].ct = {};
-              d[r][c].ct.fa = foucsStatus;
-              d[r][c].ct.t = type;
-            }
-          }
           continue;
         }
         if (foucsStatus !== "@" && isRealNum(value)) {
           value = Number(value);
-        } else if (type === "d" && typeof value === "string") {
-          var dateMask = genarate(value);
-          if (dateMask && dateMask[1].t === "d") {
-            var numericSerial = dateMask[2];
-            value = numericSerial;
-          }
         }
-        if (foucsStatus === "General" || foucsStatus === 0) {
+        var mask = update(foucsStatus, value);
+        var type = "n";
+        if (is_date(foucsStatus) || foucsStatus === 14 || foucsStatus === 15 || foucsStatus === 16 || foucsStatus === 17 || foucsStatus === 18 || foucsStatus === 19 || foucsStatus === 20 || foucsStatus === 21 || foucsStatus === 22 || foucsStatus === 45 || foucsStatus === 46 || foucsStatus === 47) {
+          type = "d";
+        } else if (foucsStatus === "@" || foucsStatus === 49) {
+          type = "s";
+        } else if (foucsStatus === "General" || foucsStatus === 0) {
           type = isRealNum(value) ? "n" : "g";
         }
-        var mask = update(foucsStatus, value);
         if (cell && _.isPlainObject(cell)) {
           cell.m = "".concat(mask);
           if (_.isNil(cell.ct)) {
@@ -76,7 +55,7 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
           }
           cell.ct.fa = foucsStatus;
           cell.ct.t = type;
-          cell.v = typeof value === "number" ? value : String(value);
+          cell.v = String(value);
           cell.fc = cell.fc || ((_f = (_e = (_d = cell.ct) === null || _d === void 0 ? void 0 : _d.s) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.fc);
           cell.bl = cell.bl || ((_j = (_h = (_g = cell.ct) === null || _g === void 0 ? void 0 : _g.s) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.bl);
           cell.it = cell.it || ((_m = (_l = (_k = cell.ct) === null || _k === void 0 ? void 0 : _k.s) === null || _l === void 0 ? void 0 : _l[0]) === null || _m === void 0 ? void 0 : _m.it);
@@ -89,7 +68,7 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
               fa: foucsStatus,
               t: type
             },
-            v: typeof value === "number" ? value : value,
+            v: value,
             m: mask
           };
         }

package/lib/canvas.js

@@ -1019,7 +1019,7 @@ var Canvas = exports.Canvas = function () {
       renderCtx.clip();
       renderCtx.scale(this.sheetCtx.zoomRatio, this.sheetCtx.zoomRatio);
       var measureText = (0, _text.getMeasureText)(value, renderCtx, this.sheetCtx);
-      var textMetrics = measureText.width + 18;
+      var textMetrics = measureText.width + 14;
       var oneLineTextHeight = measureText.actualBoundingBoxDescent + measureText.actualBoundingBoxAscent;
       var horizonAlignPos = pos_x + space_width;
       if (horizonAlign === 0) {

package/lib/modules/cell.js

@@ -143,7 +143,7 @@ function getCellValue(r, c, data, attr) {
   return retv;
 }
 function setCellValue(ctx, r, c, d, v) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_lodash.default.isNil(d)) {
     d = (0, _context.getFlowdata)(ctx);
@@ -309,7 +309,10 @@ function setCellValue(ctx, r, c, d, v) {
     } else if (!_lodash.default.isNil(cell.ct) && !_lodash.default.isNil(cell.ct.fa) && cell.ct.fa !== "General") {
       var fa = cell.ct.fa;
       if ((0, _validation.isRealNum)(vupdate)) {
-        if (commaPresent && !fa.includes(",")) {
+        if (commaPresent && !fa.includes(",") || String(vupdate).includes(".") && ((_j = (_h = String(vupdate).split(".")) === null || _h === void 0 ? void 0 : _h[1]) === null || _j === void 0 ? void 0 : _j.length) !== ((_l = (_k = fa.split(".")) === null || _k === void 0 ? void 0 : _k[1]) === null || _l === void 0 ? void 0 : _l.length) || fa.includes(",") !== String(vupdate).includes(",")) {
+          if (fa.includes(",") !== String(vupdate).includes(",")) {
+            commaPresent = true;
+          }
           fa = (0, _utils.getNumberFormat)(String(vupdate), commaPresent);
         }
         vupdate = parseFloat(vupdate);
@@ -319,9 +322,6 @@ function setCellValue(ctx, r, c, d, v) {
             t: "n"
           });
         }
-        if (_lodash.default.isNil(cell.ht)) {
-          cell.ht = 2;
-        }
       }
       var mask = (0, _format.update)(fa, vupdate);
       if (mask === vupdate) {
@@ -350,9 +350,7 @@ function setCellValue(ctx, r, c, d, v) {
         var strValue = String(vupdate);
         var format = (0, _utils.getNumberFormat)(strValue, commaPresent);
         cell.m = v.m ? v.m : (0, _format.update)(format, cell.v);
-        if (_lodash.default.isNil(cell.ht)) {
-          cell.ht = 2;
-        }
+        cell.ht = (v === null || v === void 0 ? void 0 : v.ht) ? cell.ht : 2;
         cell.ct = {
           fa: format,
           t: "n"

package/lib/modules/ssf.js

@@ -1370,7 +1370,7 @@ var make_ssf = function make_ssf(SSF) {
     if (typeof n !== "number" || !Number.isFinite(n)) return null;
     if (!Number.isInteger(n)) return null;
     if (n < 0) return null;
-    var minSec = 100000; // Excel serial numbers max ~73050 for year 2100; avoids collision
+    var minSec = 0; // 1970-01-01
     var maxSec = 4102444800; // ~2100-01-01
     var minMs = minSec * 1000;
     var maxMs = maxSec * 1000;

package/lib/modules/toolbar.js

@@ -66,42 +66,21 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
         } else {
           value = cell;
         }
-        var type = "n";
-        if ((0, _format.is_date)(foucsStatus) || foucsStatus === 14 || foucsStatus === 15 || foucsStatus === 16 || foucsStatus === 17 || foucsStatus === 18 || foucsStatus === 19 || foucsStatus === 20 || foucsStatus === 21 || foucsStatus === 22 || foucsStatus === 45 || foucsStatus === 46 || foucsStatus === 47) {
-          type = "d";
-        } else if (foucsStatus === "@" || foucsStatus === 49) {
-          type = "s";
-        }
         if (_lodash.default.isNil(value)) {
-          if (!_lodash.default.isNil(d[r])) {
-            if (_lodash.default.isNil(d[r][c])) {
-              d[r][c] = {
-                ct: {
-                  fa: foucsStatus,
-                  t: type
-                }
-              };
-            } else if (_lodash.default.isPlainObject(d[r][c])) {
-              if (_lodash.default.isNil(d[r][c].ct)) d[r][c].ct = {};
-              d[r][c].ct.fa = foucsStatus;
-              d[r][c].ct.t = type;
-            }
-          }
           continue;
         }
         if (foucsStatus !== "@" && (0, _validation.isRealNum)(value)) {
           value = Number(value);
-        } else if (type === "d" && typeof value === "string") {
-          var dateMask = (0, _format.genarate)(value);
-          if (dateMask && dateMask[1].t === "d") {
-            var numericSerial = dateMask[2];
-            value = numericSerial;
-          }
         }
-        if (foucsStatus === "General" || foucsStatus === 0) {
+        var mask = (0, _format.update)(foucsStatus, value);
+        var type = "n";
+        if ((0, _format.is_date)(foucsStatus) || foucsStatus === 14 || foucsStatus === 15 || foucsStatus === 16 || foucsStatus === 17 || foucsStatus === 18 || foucsStatus === 19 || foucsStatus === 20 || foucsStatus === 21 || foucsStatus === 22 || foucsStatus === 45 || foucsStatus === 46 || foucsStatus === 47) {
+          type = "d";
+        } else if (foucsStatus === "@" || foucsStatus === 49) {
+          type = "s";
+        } else if (foucsStatus === "General" || foucsStatus === 0) {
           type = (0, _validation.isRealNum)(value) ? "n" : "g";
         }
-        var mask = (0, _format.update)(foucsStatus, value);
         if (cell && _lodash.default.isPlainObject(cell)) {
           cell.m = "".concat(mask);
           if (_lodash.default.isNil(cell.ct)) {
@@ -109,7 +88,7 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
           }
           cell.ct.fa = foucsStatus;
           cell.ct.t = type;
-          cell.v = typeof value === "number" ? value : String(value);
+          cell.v = String(value);
           cell.fc = cell.fc || ((_f = (_e = (_d = cell.ct) === null || _d === void 0 ? void 0 : _d.s) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.fc);
           cell.bl = cell.bl || ((_j = (_h = (_g = cell.ct) === null || _g === void 0 ? void 0 : _g.s) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.bl);
           cell.it = cell.it || ((_m = (_l = (_k = cell.ct) === null || _k === void 0 ? void 0 : _k.s) === null || _l === void 0 ? void 0 : _l[0]) === null || _m === void 0 ? void 0 : _m.it);
@@ -122,7 +101,7 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
               fa: foucsStatus,
               t: type
             },
-            v: typeof value === "number" ? value : value,
+            v: value,
             m: mask
           };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.4-date-format-1",
+  "version": "1.3.4-viewMode-3",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",