@fileverse-dev/fortune-core 1.3.1-paint-1 → 1.3.2-format-1

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 + 14;
+      var textMetrics = measureText.width + 18;
       var oneLineTextHeight = measureText.actualBoundingBoxDescent + measureText.actualBoundingBoxAscent;
       var horizonAlignPos = pos_x + space_width;
       if (horizonAlign === 0) {

package/es/events/mouse.js

@@ -733,7 +733,6 @@ export function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, co
     return;
   }
   if (ctx.luckysheet_select_status) {
-    console.log("ctx.scrollLeft", ctx.scrollLeft);
     var mouseX = e.pageX - rect.left - window.scrollX;
     var mouseY = e.pageY - rect.top - window.scrollY;
     var _x = mouseX - ctx.rowHeaderWidth + ctx.scrollLeft;

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, _h, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_.isNil(d)) {
     d = getFlowdata(ctx);
@@ -276,10 +276,7 @@ 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(",") || 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;
-          }
+        if (commaPresent && !fa.includes(",")) {
           fa = getNumberFormat(String(vupdate), commaPresent);
         }
         vupdate = parseFloat(vupdate);
@@ -289,6 +286,9 @@ export function setCellValue(ctx, r, c, d, v) {
             t: "n"
           });
         }
+        if (!cell.ht) {
+          cell.ht = 2;
+        }
       }
       var mask = update(fa, vupdate);
       if (mask === vupdate) {

package/es/modules/selection.js

@@ -181,7 +181,6 @@ export function selectTitlesRange(map) {
 }
 export function pasteHandlerOfPaintModel(ctx, copyRange) {
   var _a;
-  console.log("pasteHandlerOfPaintModel", ctx, copyRange);
   var cfg = ctx.config;
   if (cfg.merge == null) {
     cfg.merge = {};

package/es/modules/toolbar.js

@@ -33,21 +33,36 @@ 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);
         }
-        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) {
+        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)) {
@@ -727,7 +742,6 @@ export function handleVerticalAlign(ctx, cellInput, value) {
   setAttr(ctx, cellInput, "vt", value);
 }
 export function handleFormatPainter(ctx) {
-  console.log("handleFormatPainter", ctx);
   var allowEdit = isAllowEdit(ctx);
   if (!allowEdit) return;
   if (ctx.luckysheet_select_save == null || ctx.luckysheet_select_save.length === 0) {

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 + 14;
+      var textMetrics = measureText.width + 18;
       var oneLineTextHeight = measureText.actualBoundingBoxDescent + measureText.actualBoundingBoxAscent;
       var horizonAlignPos = pos_x + space_width;
       if (horizonAlign === 0) {

package/lib/events/mouse.js

@@ -753,7 +753,6 @@ function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, container
     return;
   }
   if (ctx.luckysheet_select_status) {
-    console.log("ctx.scrollLeft", ctx.scrollLeft);
     var mouseX = e.pageX - rect.left - window.scrollX;
     var mouseY = e.pageY - rect.top - window.scrollY;
     var _x = mouseX - ctx.rowHeaderWidth + ctx.scrollLeft;

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, _h, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_lodash.default.isNil(d)) {
     d = (0, _context.getFlowdata)(ctx);
@@ -309,10 +309,7 @@ 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(",") || 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;
-          }
+        if (commaPresent && !fa.includes(",")) {
           fa = (0, _utils.getNumberFormat)(String(vupdate), commaPresent);
         }
         vupdate = parseFloat(vupdate);
@@ -322,6 +319,9 @@ function setCellValue(ctx, r, c, d, v) {
             t: "n"
           });
         }
+        if (!cell.ht) {
+          cell.ht = 2;
+        }
       }
       var mask = (0, _format.update)(fa, vupdate);
       if (mask === vupdate) {

package/lib/modules/selection.js

@@ -216,7 +216,6 @@ function selectTitlesRange(map) {
 }
 function pasteHandlerOfPaintModel(ctx, copyRange) {
   var _a;
-  console.log("pasteHandlerOfPaintModel", ctx, copyRange);
   var cfg = ctx.config;
   if (cfg.merge == null) {
     cfg.merge = {};

package/lib/modules/toolbar.js

@@ -66,21 +66,36 @@ 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);
         }
-        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) {
+        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)) {
@@ -760,7 +775,6 @@ function handleVerticalAlign(ctx, cellInput, value) {
   setAttr(ctx, cellInput, "vt", value);
 }
 function handleFormatPainter(ctx) {
-  console.log("handleFormatPainter", ctx);
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit) return;
   if (ctx.luckysheet_select_save == null || ctx.luckysheet_select_save.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.1-paint-1",
+  "version": "1.3.2-format-1",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",