@fileverse-dev/fortune-core 1.0.81 → 1.0.83

package/es/events/keyboard.js

@@ -3,8 +3,8 @@ import { hideCRCount, removeActiveImage } from "..";
 import { getFlowdata } from "../context";
 import { updateCell, cancelNormalSelected } from "../modules/cell";
 import { handleFormulaInput } from "../modules/formula";
-import { copy, deleteSelectedCellText, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
-import { cancelPaintModel, handleBold } from "../modules/toolbar";
+import { copy, deleteSelectedCellText, deleteSelectedCellFormat, textFormat, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
+import { cancelPaintModel, handleBold, handleItalic, handleUnderline } from "../modules/toolbar";
 import { hasPartMC } from "../modules/validation";
 import { getNowDateTime, getSheetIndex, isAllowEdit } from "../utils";
 import { handleCopy } from "./copy";
@@ -119,6 +119,7 @@ function handleControlPlusArrowKey(ctx, e, shiftPressed) {
 }
 export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo, handleRedo) {
   var _a, _b, _c, _d;
+  console.log(e.key, e.code);
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   if (e.shiftKey) {
@@ -146,6 +147,12 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
     handleControlPlusArrowKey(ctx, e, false);
   } else if (e.code === "KeyB") {
     handleBold(ctx, cellInput);
+  } else if (e.code === "KeyI") {
+    handleItalic(ctx, cellInput);
+  } else if (e.code === "KeyU") {
+    handleUnderline(ctx, cellInput);
+  } else if (e.code === "Backslash") {
+    deleteSelectedCellFormat(ctx);
   } else if (e.code === "KeyC") {
     handleCopy(ctx);
     e.stopPropagation();
@@ -250,6 +257,19 @@ export function handleArrowKey(ctx, e) {
 }
 export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
   var _a;
+  if (e.shiftKey && e.code === "Space") {
+    e.stopImmediatePropagation();
+    e.stopPropagation();
+    e.preventDefault();
+    return;
+  }
+  if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyE") {
+    textFormat(ctx, "center");
+  } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyL") {
+    textFormat(ctx, "left");
+  } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
+    textFormat(ctx, "right");
+  }
   ctx.luckysheet_select_status = false;
   var kcode = e.keyCode;
   var kstr = e.key;

package/es/modules/formula.js

@@ -1198,9 +1198,9 @@ export function setCaretPosition(ctx, textDom, children, pos) {
     var el = textDom;
     var range = document.createRange();
     var sel = window.getSelection();
-    var mainSpan = document.querySelector('.luckysheet-formula-text-string');
-    var textContent = ((_b = (_a = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.firstChild) === null || _a === void 0 ? void 0 : _a.nodeValue) === null || _b === void 0 ? void 0 : _b.trim()) || '';
-    var innerSpan = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.querySelector('.fortune-formula-functionrange-cell');
+    var mainSpan = document.querySelector(".luckysheet-formula-text-string");
+    var textContent = ((_b = (_a = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.firstChild) === null || _a === void 0 ? void 0 : _a.nodeValue) === null || _b === void 0 ? void 0 : _b.trim()) || "";
+    var innerSpan = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.querySelector(".fortune-formula-functionrange-cell");
     if (innerSpan && mainSpan) {
       textContent += innerSpan.textContent;
       el.innerHTML = textContent;

package/es/modules/selection.d.ts

@@ -24,6 +24,8 @@ export declare function moveHighlightRange(ctx: Context, postion: "down" | "righ
 export declare function rangeValueToHtml(ctx: Context, sheetId: string, ranges?: Range): string | null;
 export declare function copy(ctx: Context): void;
 export declare function deleteSelectedCellText(ctx: Context): string;
+export declare function deleteSelectedCellFormat(ctx: Context): string;
+export declare function textFormat(ctx: Context, type: "left" | "center" | "right"): string;
 export declare function selectIsOverlap(ctx: Context, range?: any): boolean;
 export declare function selectAll(ctx: Context): void;
 export declare function fixRowStyleOverflowInFreeze(ctx: Context, r1: number, r2: number, freeze: Freezen | undefined): {

package/es/modules/selection.js

@@ -1538,6 +1538,103 @@ export function deleteSelectedCellText(ctx) {
   }
   return "success";
 }
+export function deleteSelectedCellFormat(ctx) {
+  var allowEdit = isAllowEdit(ctx);
+  if (allowEdit === false) {
+    return "allowEdit";
+  }
+  var selection = ctx.luckysheet_select_save;
+  if (selection && !_.isEmpty(selection)) {
+    var d = getFlowdata(ctx);
+    if (!d) return "dataNullError";
+    var has_PartMC = false;
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      if (hasPartMC(ctx, ctx.config, r1, r2, c1, c2)) {
+        has_PartMC = true;
+        break;
+      }
+    }
+    if (has_PartMC) {
+      return "partMC";
+    }
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      for (var r = r1; r <= r2; r += 1) {
+        for (var c = c1; c <= c2; c += 1) {
+          if (_.isPlainObject(d[r][c])) {
+            var cell = d[r][c];
+            if (cell.ct) {
+              delete cell.ct;
+              delete cell.ff;
+              delete cell.fs;
+              delete cell.bl;
+              delete cell.fc;
+              delete cell.bg;
+              delete cell.tb;
+            }
+          }
+        }
+      }
+    }
+  }
+  return "success";
+}
+export function textFormat(ctx, type) {
+  var allowEdit = isAllowEdit(ctx);
+  if (allowEdit === false) {
+    return "allowEdit";
+  }
+  var selection = ctx.luckysheet_select_save;
+  if (selection && !_.isEmpty(selection)) {
+    var d = getFlowdata(ctx);
+    if (!d) return "dataNullError";
+    var has_PartMC = false;
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      if (hasPartMC(ctx, ctx.config, r1, r2, c1, c2)) {
+        has_PartMC = true;
+        break;
+      }
+    }
+    if (has_PartMC) {
+      return "partMC";
+    }
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      for (var r = r1; r <= r2; r += 1) {
+        for (var c = c1; c <= c2; c += 1) {
+          if (_.isPlainObject(d[r][c])) {
+            var cell = d[r][c];
+            if (type === "left") {
+              cell.tb = "1";
+              cell.ht = 1;
+            } else if (type === "center") {
+              cell.tb = "1";
+              cell.ht = 0;
+            } else if (type === "right") {
+              cell.tb = "1";
+              cell.ht = 2;
+            }
+          }
+        }
+      }
+    }
+  }
+  return "success";
+}
 export function selectIsOverlap(ctx, range) {
   return false;
 }

package/lib/events/keyboard.js

@@ -129,6 +129,7 @@ function handleControlPlusArrowKey(ctx, e, shiftPressed) {
 }
 function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo, handleRedo) {
   var _a, _b, _c, _d;
+  console.log(e.key, e.code);
   var flowdata = (0, _context.getFlowdata)(ctx);
   if (!flowdata) return;
   if (e.shiftKey) {
@@ -156,6 +157,12 @@ function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo,
     handleControlPlusArrowKey(ctx, e, false);
   } else if (e.code === "KeyB") {
     (0, _toolbar.handleBold)(ctx, cellInput);
+  } else if (e.code === "KeyI") {
+    (0, _toolbar.handleItalic)(ctx, cellInput);
+  } else if (e.code === "KeyU") {
+    (0, _toolbar.handleUnderline)(ctx, cellInput);
+  } else if (e.code === "Backslash") {
+    (0, _selection.deleteSelectedCellFormat)(ctx);
   } else if (e.code === "KeyC") {
     (0, _copy.handleCopy)(ctx);
     e.stopPropagation();
@@ -260,6 +267,19 @@ function handleArrowKey(ctx, e) {
 }
 function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
   var _a;
+  if (e.shiftKey && e.code === "Space") {
+    e.stopImmediatePropagation();
+    e.stopPropagation();
+    e.preventDefault();
+    return;
+  }
+  if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyE") {
+    (0, _selection.textFormat)(ctx, "center");
+  } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyL") {
+    (0, _selection.textFormat)(ctx, "left");
+  } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
+    (0, _selection.textFormat)(ctx, "right");
+  }
   ctx.luckysheet_select_status = false;
   var kcode = e.keyCode;
   var kstr = e.key;

package/lib/modules/formula.js

@@ -1227,9 +1227,9 @@ function setCaretPosition(ctx, textDom, children, pos) {
     var el = textDom;
     var range = document.createRange();
     var sel = window.getSelection();
-    var mainSpan = document.querySelector('.luckysheet-formula-text-string');
-    var textContent = ((_b = (_a = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.firstChild) === null || _a === void 0 ? void 0 : _a.nodeValue) === null || _b === void 0 ? void 0 : _b.trim()) || '';
-    var innerSpan = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.querySelector('.fortune-formula-functionrange-cell');
+    var mainSpan = document.querySelector(".luckysheet-formula-text-string");
+    var textContent = ((_b = (_a = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.firstChild) === null || _a === void 0 ? void 0 : _a.nodeValue) === null || _b === void 0 ? void 0 : _b.trim()) || "";
+    var innerSpan = mainSpan === null || mainSpan === void 0 ? void 0 : mainSpan.querySelector(".fortune-formula-functionrange-cell");
     if (innerSpan && mainSpan) {
       textContent += innerSpan.textContent;
       el.innerHTML = textContent;

package/lib/modules/selection.d.ts

@@ -24,6 +24,8 @@ export declare function moveHighlightRange(ctx: Context, postion: "down" | "righ
 export declare function rangeValueToHtml(ctx: Context, sheetId: string, ranges?: Range): string | null;
 export declare function copy(ctx: Context): void;
 export declare function deleteSelectedCellText(ctx: Context): string;
+export declare function deleteSelectedCellFormat(ctx: Context): string;
+export declare function textFormat(ctx: Context, type: "left" | "center" | "right"): string;
 export declare function selectIsOverlap(ctx: Context, range?: any): boolean;
 export declare function selectAll(ctx: Context): void;
 export declare function fixRowStyleOverflowInFreeze(ctx: Context, r1: number, r2: number, freeze: Freezen | undefined): {

package/lib/modules/selection.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.calcSelectionInfo = calcSelectionInfo;
 exports.colHasMerged = colHasMerged;
 exports.copy = copy;
+exports.deleteSelectedCellFormat = deleteSelectedCellFormat;
 exports.deleteSelectedCellText = deleteSelectedCellText;
 exports.fixColumnStyleOverflowInFreeze = fixColumnStyleOverflowInFreeze;
 exports.fixRowStyleOverflowInFreeze = fixRowStyleOverflowInFreeze;
@@ -25,6 +26,7 @@ exports.selectTitlesRange = selectTitlesRange;
 exports.selectionCache = void 0;
 exports.selectionCopyShow = selectionCopyShow;
 exports.seletedHighlistByindex = seletedHighlistByindex;
+exports.textFormat = textFormat;
 var _lodash = _interopRequireWildcard(require("lodash"));
 var _context = require("../context");
 var _cell = require("./cell");
@@ -1567,6 +1569,103 @@ function deleteSelectedCellText(ctx) {
   }
   return "success";
 }
+function deleteSelectedCellFormat(ctx) {
+  var allowEdit = (0, _utils.isAllowEdit)(ctx);
+  if (allowEdit === false) {
+    return "allowEdit";
+  }
+  var selection = ctx.luckysheet_select_save;
+  if (selection && !_lodash.default.isEmpty(selection)) {
+    var d = (0, _context.getFlowdata)(ctx);
+    if (!d) return "dataNullError";
+    var has_PartMC = false;
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      if ((0, _validation.hasPartMC)(ctx, ctx.config, r1, r2, c1, c2)) {
+        has_PartMC = true;
+        break;
+      }
+    }
+    if (has_PartMC) {
+      return "partMC";
+    }
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      for (var r = r1; r <= r2; r += 1) {
+        for (var c = c1; c <= c2; c += 1) {
+          if (_lodash.default.isPlainObject(d[r][c])) {
+            var cell = d[r][c];
+            if (cell.ct) {
+              delete cell.ct;
+              delete cell.ff;
+              delete cell.fs;
+              delete cell.bl;
+              delete cell.fc;
+              delete cell.bg;
+              delete cell.tb;
+            }
+          }
+        }
+      }
+    }
+  }
+  return "success";
+}
+function textFormat(ctx, type) {
+  var allowEdit = (0, _utils.isAllowEdit)(ctx);
+  if (allowEdit === false) {
+    return "allowEdit";
+  }
+  var selection = ctx.luckysheet_select_save;
+  if (selection && !_lodash.default.isEmpty(selection)) {
+    var d = (0, _context.getFlowdata)(ctx);
+    if (!d) return "dataNullError";
+    var has_PartMC = false;
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      if ((0, _validation.hasPartMC)(ctx, ctx.config, r1, r2, c1, c2)) {
+        has_PartMC = true;
+        break;
+      }
+    }
+    if (has_PartMC) {
+      return "partMC";
+    }
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      for (var r = r1; r <= r2; r += 1) {
+        for (var c = c1; c <= c2; c += 1) {
+          if (_lodash.default.isPlainObject(d[r][c])) {
+            var cell = d[r][c];
+            if (type === "left") {
+              cell.tb = "1";
+              cell.ht = 1;
+            } else if (type === "center") {
+              cell.tb = "1";
+              cell.ht = 0;
+            } else if (type === "right") {
+              cell.tb = "1";
+              cell.ht = 2;
+            }
+          }
+        }
+      }
+    }
+  }
+  return "success";
+}
 function selectIsOverlap(ctx, range) {
   return false;
 }

package/package.json

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