@fileverse-dev/fortune-core 1.0.82 → 1.0.84

package/es/events/keyboard.js

@@ -3,9 +3,10 @@ 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 { copy, deleteSelectedCellText, deleteSelectedCellFormat, textFormat, fillDate, fillTime, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
 import { cancelPaintModel, handleBold, handleItalic, handleUnderline } from "../modules/toolbar";
 import { hasPartMC } from "../modules/validation";
+import { handleLink } from "../modules/toolbar";
 import { getNowDateTime, getSheetIndex, isAllowEdit } from "../utils";
 import { handleCopy } from "./copy";
 import { jfrefreshgrid } from "../modules/refresh";
@@ -127,7 +128,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;
@@ -151,7 +152,7 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
     handleItalic(ctx, cellInput);
   } else if (e.code === "KeyU") {
     handleUnderline(ctx, cellInput);
-  } else if (e.code === 'Backslash') {
+  } else if (e.code === "Backslash") {
     deleteSelectedCellFormat(ctx);
   } else if (e.code === "KeyC") {
     handleCopy(ctx);
@@ -257,18 +258,28 @@ export function handleArrowKey(ctx, e) {
 }
 export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
   var _a;
-  if (e.shiftKey && e.code === 'Space') {
+  console.log(e.code);
+  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');
+    textFormat(ctx, "center");
   } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyL") {
-    textFormat(ctx, 'left');
+    textFormat(ctx, "left");
   } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
-    textFormat(ctx, 'right');
+    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;
@@ -345,7 +356,6 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
       }
     }
   }
-  console.log('kkkk');
   if (cellInput !== document.activeElement) {
     cellInput === null || cellInput === void 0 ? void 0 : cellInput.focus();
   }

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

@@ -25,7 +25,9 @@ export declare function rangeValueToHtml(ctx: Context, sheetId: string, ranges?:
 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 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

@@ -1561,7 +1561,6 @@ export function deleteSelectedCellFormat(ctx) {
     if (has_PartMC) {
       return "partMC";
     }
-    var hyperlinkMap = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].hyperlink;
     for (var s = 0; s < selection.length; s += 1) {
       var r1 = selection[s].row[0];
       var r2 = selection[s].row[1];
@@ -1610,7 +1609,6 @@ export function textFormat(ctx, type) {
     if (has_PartMC) {
       return "partMC";
     }
-    var hyperlinkMap = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].hyperlink;
     for (var s = 0; s < selection.length; s += 1) {
       var r1 = selection[s].row[0];
       var r2 = selection[s].row[1];
@@ -1620,14 +1618,14 @@ export function textFormat(ctx, type) {
         for (var c = c1; c <= c2; c += 1) {
           if (_.isPlainObject(d[r][c])) {
             var cell = d[r][c];
-            if (type === 'left') {
-              cell.tb = "2";
+            if (type === "left") {
+              cell.tb = "1";
               cell.ht = 1;
             } else if (type === "center") {
-              cell.tb = "2";
+              cell.tb = "1";
               cell.ht = 0;
-            } else if (type === 'right') {
-              cell.tb = "2";
+            } else if (type === "right") {
+              cell.tb = "1";
               cell.ht = 2;
             }
           }
@@ -1637,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/lib/events/keyboard.js

@@ -137,7 +137,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;
@@ -161,7 +161,7 @@ function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo,
     (0, _toolbar.handleItalic)(ctx, cellInput);
   } else if (e.code === "KeyU") {
     (0, _toolbar.handleUnderline)(ctx, cellInput);
-  } else if (e.code === 'Backslash') {
+  } else if (e.code === "Backslash") {
     (0, _selection.deleteSelectedCellFormat)(ctx);
   } else if (e.code === "KeyC") {
     (0, _copy.handleCopy)(ctx);
@@ -267,18 +267,28 @@ function handleArrowKey(ctx, e) {
 }
 function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
   var _a;
-  if (e.shiftKey && e.code === 'Space') {
+  console.log(e.code);
+  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');
+    (0, _selection.textFormat)(ctx, "center");
   } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyL") {
-    (0, _selection.textFormat)(ctx, 'left');
+    (0, _selection.textFormat)(ctx, "left");
   } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
-    (0, _selection.textFormat)(ctx, 'right');
+    (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;
@@ -355,7 +365,6 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
       }
     }
   }
-  console.log('kkkk');
   if (cellInput !== document.activeElement) {
     cellInput === null || cellInput === void 0 ? void 0 : cellInput.focus();
   }

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

@@ -25,7 +25,9 @@ export declare function rangeValueToHtml(ctx: Context, sheetId: string, ranges?:
 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 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;
@@ -1592,7 +1594,6 @@ function deleteSelectedCellFormat(ctx) {
     if (has_PartMC) {
       return "partMC";
     }
-    var hyperlinkMap = ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)].hyperlink;
     for (var s = 0; s < selection.length; s += 1) {
       var r1 = selection[s].row[0];
       var r2 = selection[s].row[1];
@@ -1641,7 +1642,6 @@ function textFormat(ctx, type) {
     if (has_PartMC) {
       return "partMC";
     }
-    var hyperlinkMap = ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)].hyperlink;
     for (var s = 0; s < selection.length; s += 1) {
       var r1 = selection[s].row[0];
       var r2 = selection[s].row[1];
@@ -1651,14 +1651,14 @@ function textFormat(ctx, type) {
         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 = "2";
+            if (type === "left") {
+              cell.tb = "1";
               cell.ht = 1;
             } else if (type === "center") {
-              cell.tb = "2";
+              cell.tb = "1";
               cell.ht = 0;
-            } else if (type === 'right') {
-              cell.tb = "2";
+            } else if (type === "right") {
+              cell.tb = "1";
               cell.ht = 2;
             }
           }
@@ -1668,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/package.json

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