@fileverse-dev/fortune-core 1.0.83 → 1.0.85

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, deleteSelectedCellFormat, textFormat, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
-import { cancelPaintModel, handleBold, handleItalic, handleUnderline } from "../modules/toolbar";
+import { copy, deleteSelectedCellText, deleteSelectedCellFormat, textFormat, fillDate, fillTime, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
+import { cancelPaintModel, handleBold, handleItalic, handleUnderline, handleLink } from "../modules/toolbar";
 import { hasPartMC } from "../modules/validation";
 import { getNowDateTime, getSheetIndex, isAllowEdit } from "../utils";
 import { handleCopy } from "./copy";
@@ -119,7 +119,6 @@ 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) {
@@ -127,7 +126,7 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
     ctx.luckysheet_shiftkeydown = true;
     if (["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"].includes(e.key)) {
       handleControlPlusArrowKey(ctx, e, true);
-    } else if (_.includes([";", '"', ":", "'"], e.key)) {
+    } else if (_.includes(['"', ":", "'"], e.key)) {
       var last = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b[ctx.luckysheet_select_save.length - 1];
       if (!last) return;
       var row_index = last.row_focus;
@@ -270,6 +269,15 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
   } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
     textFormat(ctx, "right");
   }
+  if ((e.metaKey || e.ctrlKey) && e.code === "KeyK") {
+    handleLink(ctx);
+  }
+  if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "Semicolon") {
+    fillDate(ctx);
+  }
+  if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.code === "Semicolon") {
+    fillTime(ctx);
+  }
   ctx.luckysheet_select_status = false;
   var kcode = e.keyCode;
   var kstr = e.key;

package/es/modules/selection.d.ts

@@ -26,6 +26,8 @@ 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 fillDate(ctx: Context): string;
+export declare function fillTime(ctx: Context): 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

@@ -1635,6 +1635,88 @@ export function textFormat(ctx, type) {
   }
   return "success";
 }
+export function fillDate(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) {
+          var today = new Date();
+          var formattedDate = "".concat(String(today.getDate()).padStart(2, "0"), "/").concat(String(today.getMonth() + 1).padStart(2, "0"), "/").concat(today.getFullYear());
+          d[r][c] = {
+            v: formattedDate
+          };
+        }
+      }
+    }
+  }
+  return "success";
+}
+export function fillTime(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) {
+          var now = new Date();
+          var formattedTime = "".concat(String(now.getHours()).padStart(2, "0"), ":").concat(String(now.getMinutes()).padStart(2, "0"), ":").concat(String(now.getSeconds()).padStart(2, "0"));
+          d[r][c] = {
+            v: formattedTime
+          };
+        }
+      }
+    }
+  }
+  return "success";
+}
 export function selectIsOverlap(ctx, range) {
   return false;
 }

package/es/modules/zoom.js

@@ -2,7 +2,7 @@ var ZOOM_STEP = 0.1;
 export var MAX_ZOOM_RATIO = 4;
 export var MIN_ZOOM_RATIO = 0.1;
 export function handleKeydownForZoom(ev, currentZoom) {
-  if (!ev.ctrlKey) {
+  if (!ev.ctrlKey || ev.altKey) {
     return currentZoom;
   }
   var handled = false;

package/lib/events/keyboard.js

@@ -129,7 +129,6 @@ 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) {
@@ -137,7 +136,7 @@ function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo,
     ctx.luckysheet_shiftkeydown = true;
     if (["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"].includes(e.key)) {
       handleControlPlusArrowKey(ctx, e, true);
-    } else if (_lodash.default.includes([";", '"', ":", "'"], e.key)) {
+    } else if (_lodash.default.includes(['"', ":", "'"], e.key)) {
       var last = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b[ctx.luckysheet_select_save.length - 1];
       if (!last) return;
       var row_index = last.row_focus;
@@ -280,6 +279,15 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
   } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
     (0, _selection.textFormat)(ctx, "right");
   }
+  if ((e.metaKey || e.ctrlKey) && e.code === "KeyK") {
+    (0, _toolbar.handleLink)(ctx);
+  }
+  if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "Semicolon") {
+    (0, _selection.fillDate)(ctx);
+  }
+  if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.code === "Semicolon") {
+    (0, _selection.fillTime)(ctx);
+  }
   ctx.luckysheet_select_status = false;
   var kcode = e.keyCode;
   var kstr = e.key;

package/lib/modules/selection.d.ts

@@ -26,6 +26,8 @@ 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 fillDate(ctx: Context): string;
+export declare function fillTime(ctx: Context): 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

@@ -8,6 +8,8 @@ exports.colHasMerged = colHasMerged;
 exports.copy = copy;
 exports.deleteSelectedCellFormat = deleteSelectedCellFormat;
 exports.deleteSelectedCellText = deleteSelectedCellText;
+exports.fillDate = fillDate;
+exports.fillTime = fillTime;
 exports.fixColumnStyleOverflowInFreeze = fixColumnStyleOverflowInFreeze;
 exports.fixRowStyleOverflowInFreeze = fixRowStyleOverflowInFreeze;
 exports.getColMerge = getColMerge;
@@ -1666,6 +1668,88 @@ function textFormat(ctx, type) {
   }
   return "success";
 }
+function fillDate(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) {
+          var today = new Date();
+          var formattedDate = "".concat(String(today.getDate()).padStart(2, "0"), "/").concat(String(today.getMonth() + 1).padStart(2, "0"), "/").concat(today.getFullYear());
+          d[r][c] = {
+            v: formattedDate
+          };
+        }
+      }
+    }
+  }
+  return "success";
+}
+function fillTime(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) {
+          var now = new Date();
+          var formattedTime = "".concat(String(now.getHours()).padStart(2, "0"), ":").concat(String(now.getMinutes()).padStart(2, "0"), ":").concat(String(now.getSeconds()).padStart(2, "0"));
+          d[r][c] = {
+            v: formattedTime
+          };
+        }
+      }
+    }
+  }
+  return "success";
+}
 function selectIsOverlap(ctx, range) {
   return false;
 }

package/lib/modules/zoom.js

@@ -9,7 +9,7 @@ var ZOOM_STEP = 0.1;
 var MAX_ZOOM_RATIO = exports.MAX_ZOOM_RATIO = 4;
 var MIN_ZOOM_RATIO = exports.MIN_ZOOM_RATIO = 0.1;
 function handleKeydownForZoom(ev, currentZoom) {
-  if (!ev.ctrlKey) {
+  if (!ev.ctrlKey || ev.altKey) {
     return currentZoom;
   }
   var handled = false;

package/package.json

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