@fileverse-dev/fortune-core 1.3.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.d.ts

@@ -12,6 +12,7 @@ export declare function fixPositionOnFrozenCells(freeze: Freezen | undefined, x:
 export declare function handleCellAreaMouseDown(ctx: Context, globalCache: GlobalCache, e: MouseEvent, cellInput: HTMLDivElement, container: HTMLDivElement, fxInput?: HTMLDivElement | null, canvas?: CanvasRenderingContext2D): void;
 export declare function handleCellAreaDoubleClick(ctx: Context, globalCache: GlobalCache, settings: Settings, e: MouseEvent, container: HTMLElement): void;
 export declare function handleContextMenu(ctx: Context, settings: Settings, e: MouseEvent, workbookContainer: HTMLDivElement, container: HTMLDivElement, area: "cell" | "rowHeader" | "columnHeader"): void;
+export declare function mouseRender(ctx: Context, globalCache: GlobalCache, e: MouseEvent, cellInput: HTMLDivElement, scrollX: HTMLDivElement, scrollY: HTMLDivElement, container: HTMLDivElement, fxInput?: HTMLDivElement | null): void;
 export declare function handleOverlayMouseMove(ctx: Context, globalCache: GlobalCache, e: MouseEvent, cellInput: HTMLDivElement, scrollX: HTMLDivElement, scrollY: HTMLDivElement, container: HTMLDivElement, fxInput?: HTMLDivElement | null): void;
 export declare function handleOverlayMouseUp(ctx: Context, globalCache: GlobalCache, settings: Settings, e: MouseEvent, scrollbarX: HTMLDivElement, scrollbarY: HTMLDivElement, container: HTMLDivElement, cellInput: HTMLDivElement | null, fxInput: HTMLDivElement | null): void;
 export declare function handleRowHeaderMouseDown(ctx: Context, globalCache: GlobalCache, e: MouseEvent, container: HTMLDivElement, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null): void;

package/es/events/mouse.js

@@ -696,7 +696,7 @@ export function handleContextMenu(ctx, settings, e, workbookContainer, container
     });
   }
 }
-function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, container, fxInput) {
+export function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, container, fxInput) {
   var _a, _b, _c, _d;
   var rect = container.getBoundingClientRect();
   if (ctx.luckysheet_scroll_status && !ctx.luckysheet_cols_change_size && !ctx.luckysheet_rows_change_size) {

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

@@ -180,6 +180,7 @@ export function selectTitlesRange(map) {
   return rangeArr;
 }
 export function pasteHandlerOfPaintModel(ctx, copyRange) {
+  var _a;
   var cfg = ctx.config;
   if (cfg.merge == null) {
     cfg.merge = {};
@@ -369,36 +370,40 @@ export function pasteHandlerOfPaintModel(ctx, copyRange) {
   }
   var currFile = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)];
   currFile.config = cfg;
-  currFile.dataVerification = dataVerification;
-  var cdformat = null;
+  if (dataVerification != null) {
+    currFile.dataVerification = dataVerification;
+  }
   var copyIndex = getSheetIndex(ctx, copySheetIndex);
-  if (!copyIndex) return;
-  var ruleArr = _.cloneDeep(ctx.luckysheetfile[copyIndex].luckysheet_conditionformat_save);
-  if (!_.isNil(ruleArr) && ruleArr.length > 0) {
-    var currentIndex = getSheetIndex(ctx, ctx.currentSheetId);
-    cdformat = _.cloneDeep(ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save);
-    for (var i = 0; i < ruleArr.length; i += 1) {
-      var cdformat_cellrange = ruleArr[i].cellrange;
-      var emptyRange = [];
-      for (var j = 0; j < cdformat_cellrange.length; j += 1) {
-        var range = CFSplitRange(cdformat_cellrange[j], {
-          row: [c_r1, c_r2],
-          column: [c_c1, c_c2]
-        }, {
-          row: [minh, maxh],
-          column: [minc, maxc]
-        }, "operatePart");
-        if (range.length > 0) {
-          emptyRange = emptyRange.concat(range);
+  if (copyIndex != null) {
+    var ruleArr = _.cloneDeep(ctx.luckysheetfile[copyIndex].luckysheet_conditionformat_save);
+    if (!_.isNil(ruleArr) && ruleArr.length > 0) {
+      var currentIndex = getSheetIndex(ctx, ctx.currentSheetId);
+      var existingCf = ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save;
+      var cdformat = (_a = _.cloneDeep(existingCf)) !== null && _a !== void 0 ? _a : [];
+      for (var i = 0; i < ruleArr.length; i += 1) {
+        var cdformat_cellrange = ruleArr[i].cellrange;
+        var emptyRange = [];
+        for (var j = 0; j < cdformat_cellrange.length; j += 1) {
+          var range = CFSplitRange(cdformat_cellrange[j], {
+            row: [c_r1, c_r2],
+            column: [c_c1, c_c2]
+          }, {
+            row: [minh, maxh],
+            column: [minc, maxc]
+          }, "operatePart");
+          if (range.length > 0) {
+            emptyRange = emptyRange.concat(range);
+          }
+        }
+        if (emptyRange.length > 0) {
+          ruleArr[i].cellrange = [{
+            row: [minh, maxh],
+            column: [minc, maxc]
+          }];
+          cdformat.push(ruleArr[i]);
         }
       }
-      if (emptyRange.length > 0) {
-        ruleArr[i].cellrange = [{
-          row: [minh, maxh],
-          column: [minc, maxc]
-        }];
-        cdformat.push(ruleArr[i]);
-      }
+      currFile.luckysheet_conditionformat_save = cdformat;
     }
   }
 }

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)) {

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.d.ts

@@ -12,6 +12,7 @@ export declare function fixPositionOnFrozenCells(freeze: Freezen | undefined, x:
 export declare function handleCellAreaMouseDown(ctx: Context, globalCache: GlobalCache, e: MouseEvent, cellInput: HTMLDivElement, container: HTMLDivElement, fxInput?: HTMLDivElement | null, canvas?: CanvasRenderingContext2D): void;
 export declare function handleCellAreaDoubleClick(ctx: Context, globalCache: GlobalCache, settings: Settings, e: MouseEvent, container: HTMLElement): void;
 export declare function handleContextMenu(ctx: Context, settings: Settings, e: MouseEvent, workbookContainer: HTMLDivElement, container: HTMLDivElement, area: "cell" | "rowHeader" | "columnHeader"): void;
+export declare function mouseRender(ctx: Context, globalCache: GlobalCache, e: MouseEvent, cellInput: HTMLDivElement, scrollX: HTMLDivElement, scrollY: HTMLDivElement, container: HTMLDivElement, fxInput?: HTMLDivElement | null): void;
 export declare function handleOverlayMouseMove(ctx: Context, globalCache: GlobalCache, e: MouseEvent, cellInput: HTMLDivElement, scrollX: HTMLDivElement, scrollY: HTMLDivElement, container: HTMLDivElement, fxInput?: HTMLDivElement | null): void;
 export declare function handleOverlayMouseUp(ctx: Context, globalCache: GlobalCache, settings: Settings, e: MouseEvent, scrollbarX: HTMLDivElement, scrollbarY: HTMLDivElement, container: HTMLDivElement, cellInput: HTMLDivElement | null, fxInput: HTMLDivElement | null): void;
 export declare function handleRowHeaderMouseDown(ctx: Context, globalCache: GlobalCache, e: MouseEvent, container: HTMLDivElement, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null): void;

package/lib/events/mouse.js

@@ -16,6 +16,7 @@ exports.handleOverlayMouseUp = handleOverlayMouseUp;
 exports.handleRowFreezeHandleMouseDown = handleRowFreezeHandleMouseDown;
 exports.handleRowHeaderMouseDown = handleRowHeaderMouseDown;
 exports.handleRowSizeHandleMouseDown = handleRowSizeHandleMouseDown;
+exports.mouseRender = mouseRender;
 var _lodash = _interopRequireDefault(require("lodash"));
 var _context = require("../context");
 var _modules = require("../modules");

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

@@ -215,6 +215,7 @@ function selectTitlesRange(map) {
   return rangeArr;
 }
 function pasteHandlerOfPaintModel(ctx, copyRange) {
+  var _a;
   var cfg = ctx.config;
   if (cfg.merge == null) {
     cfg.merge = {};
@@ -404,36 +405,40 @@ function pasteHandlerOfPaintModel(ctx, copyRange) {
   }
   var currFile = ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)];
   currFile.config = cfg;
-  currFile.dataVerification = dataVerification;
-  var cdformat = null;
+  if (dataVerification != null) {
+    currFile.dataVerification = dataVerification;
+  }
   var copyIndex = (0, _utils.getSheetIndex)(ctx, copySheetIndex);
-  if (!copyIndex) return;
-  var ruleArr = _lodash.default.cloneDeep(ctx.luckysheetfile[copyIndex].luckysheet_conditionformat_save);
-  if (!_lodash.default.isNil(ruleArr) && ruleArr.length > 0) {
-    var currentIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
-    cdformat = _lodash.default.cloneDeep(ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save);
-    for (var i = 0; i < ruleArr.length; i += 1) {
-      var cdformat_cellrange = ruleArr[i].cellrange;
-      var emptyRange = [];
-      for (var j = 0; j < cdformat_cellrange.length; j += 1) {
-        var range = (0, _ConditionFormat.CFSplitRange)(cdformat_cellrange[j], {
-          row: [c_r1, c_r2],
-          column: [c_c1, c_c2]
-        }, {
-          row: [minh, maxh],
-          column: [minc, maxc]
-        }, "operatePart");
-        if (range.length > 0) {
-          emptyRange = emptyRange.concat(range);
+  if (copyIndex != null) {
+    var ruleArr = _lodash.default.cloneDeep(ctx.luckysheetfile[copyIndex].luckysheet_conditionformat_save);
+    if (!_lodash.default.isNil(ruleArr) && ruleArr.length > 0) {
+      var currentIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
+      var existingCf = ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save;
+      var cdformat = (_a = _lodash.default.cloneDeep(existingCf)) !== null && _a !== void 0 ? _a : [];
+      for (var i = 0; i < ruleArr.length; i += 1) {
+        var cdformat_cellrange = ruleArr[i].cellrange;
+        var emptyRange = [];
+        for (var j = 0; j < cdformat_cellrange.length; j += 1) {
+          var range = (0, _ConditionFormat.CFSplitRange)(cdformat_cellrange[j], {
+            row: [c_r1, c_r2],
+            column: [c_c1, c_c2]
+          }, {
+            row: [minh, maxh],
+            column: [minc, maxc]
+          }, "operatePart");
+          if (range.length > 0) {
+            emptyRange = emptyRange.concat(range);
+          }
+        }
+        if (emptyRange.length > 0) {
+          ruleArr[i].cellrange = [{
+            row: [minh, maxh],
+            column: [minc, maxc]
+          }];
+          cdformat.push(ruleArr[i]);
         }
       }
-      if (emptyRange.length > 0) {
-        ruleArr[i].cellrange = [{
-          row: [minh, maxh],
-          column: [minc, maxc]
-        }];
-        cdformat.push(ruleArr[i]);
-      }
+      currFile.luckysheet_conditionformat_save = cdformat;
     }
   }
 }

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)) {

package/package.json

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