Modify - Decimal, Percentage, Currency (#358)

* Modify - Decimal

* decimal not default number remains auto

* manage digit limit beyong 15, even for formula output

* add conversion after 15 to scientific for decimal and formula

* percentage and currency

* minor changes

* minor changes

* Hyperlink warning (#359)

* hyperlink warning for formula cell

* hyperlink warning for formula cell

* minor changes

Author: mritunjayz

package-lock.json

@@ -2,7 +2,7 @@
   "name": "@fileverse-dev/dsheet",
   "private": false,
   "description": "DSheet",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "exports": {
@@ -91,4 +91,4 @@
     "typescript": "^5.2.2",
     "vite": "^5.0.0"
   }
-}
+}

package.json

@@ -21,7 +21,7 @@ export const SERVICES_API_KEY: ServicesApiKeyType = RawServicesApiKey;
 export const DEFAULT_SHEET_DATA = [
   {
     id: '0',
-    name: 'Sheet2',
+    name: 'Sheet1',
     celldata: [],
     config: {},
     order: 0,

src/editor/constants/shared-constants.ts

@@ -949,6 +949,9 @@ export async function handleGlobalKeyDown(
   }
   if ((e.metaKey || e.ctrlKey) && e.code === "KeyK") {
     handleLink(ctx, cellInput, cache);
+    e.preventDefault();
+    e.stopPropagation();
+    return;
   }
   if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "Semicolon") {
     fillDate(ctx);
@@ -1306,6 +1309,15 @@ export async function handleGlobalKeyDown(
             cellAt?.f != null && String(cellAt.f).trim() !== ""
               ? String(cellAt.f).replace(/[\r\n]/g, "")
               : null;
+          const isPercentFormattedCell =
+            !!cellAt &&
+            typeof (cellAt as any)?.ct?.fa === "string" &&
+            String((cellAt as any).ct.fa).includes("%");
+          const isEmptyPercentFormattedCell =
+            isPercentFormattedCell &&
+            _.isNil((cellAt as any).v) &&
+            _.isNil((cellAt as any).m) &&
+            _.isNil((cellAt as any).f);
 
           if (existingFormula != null) {
             suppressFormulaRangeSelectionForInitialEdit(ctx);
@@ -1323,8 +1335,11 @@ export async function handleGlobalKeyDown(
           cellInput.focus();
           const initial = getTypeOverInitialContent(e);
           if (initial !== undefined) {
-            cellInput.textContent = initial;
-            if (fxInput) fxInput.textContent = initial;
+            const seededText = isPercentFormattedCell
+              ? `${initial}%`
+              : initial;
+            cellInput.textContent = seededText;
+            if (fxInput) fxInput.textContent = seededText;
             handleFormulaInput(ctx, fxInput, cellInput, kcode);
             e.preventDefault();
           } else {
@@ -1337,6 +1352,22 @@ export async function handleGlobalKeyDown(
           // Only adjust the in-cell editor: moveToEnd() calls focus() and would steal
           // focus to the formula bar if applied to fxInput.
           queueMicrotask(() => {
+            if (initial !== undefined && isPercentFormattedCell) {
+              const textNode = cellInput.firstChild;
+              const caretOffset = Math.max(
+                0,
+                (cellInput.textContent || "").length - 1
+              );
+              const sel = window.getSelection();
+              if (textNode && sel) {
+                const range = document.createRange();
+                range.setStart(textNode, Math.min(caretOffset, textNode.textContent?.length || 0));
+                range.collapse(true);
+                sel.removeAllRanges();
+                sel.addRange(range);
+                return;
+              }
+            }
             moveToEnd(cellInput);
           });
 

src/sheet-engine/core/events/keyboard.ts

@@ -394,6 +394,12 @@ const handleFormulaOnPaste = (ctx: Context, d: any) => {
 };
 
 function pasteHandler(ctx: Context, data: any, borderInfo?: any) {
+  const normalizeDecimalStringOnPaste = (input: string): string => {
+    const trimmed = input.trim();
+    if (!/^[+-]?\d+\.\d+$/.test(trimmed)) return input;
+    return trimmed.replace(/(\.\d*?[1-9])0+$/, "$1").replace(/\.0+$/, "");
+  };
+
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
@@ -729,26 +735,31 @@ function pasteHandler(ctx: Context, data: any, borderInfo?: any) {
         const url = getUrlFromText(normalizedValueStr);
         const isUrl = url !== null;
 
+        const normalizedNumericValueStr =
+          !isUrl && !isMultilineValue && isRealNum(value)
+            ? normalizeDecimalStringOnPaste(normalizedValueStr)
+            : normalizedValueStr;
+
         if (!isUrl && !isMultilineValue && isRealNum(value)) {
           // 如果单元格设置了纯文本格式，那么就不要转成数值类型了，防止数值过大自动转成科学计数法
           if (originCell && originCell.ct && originCell.ct.fa === "@") {
-            value = String(value);
+            value = normalizedNumericValueStr;
           } else if (!/^0x?[a-fA-F0-9]+$/.test(value)) {
-            value = parseFloat(value);
+            value = parseFloat(normalizedNumericValueStr);
           }
         }
 
         if (originCell) {
           if (!isUrl && isMultilineValue) {
             applyMultilineTextToCell(originCell, normalizedValueStr);
           } else if (!isUrl) {
-            const generated = genarate(originalValueStr);
+            const generated = genarate(normalizedNumericValueStr);
             if (generated) {
               const [genM, genCt, genV] = generated;
               if (genCt?.t === "d") {
                 // Pasted value is a date — always update ct so toolbar shows "Date"
                 originCell.v = genV;
-                originCell.m = genM ?? originalValueStr;
+                originCell.m = genM ?? normalizedNumericValueStr;
                 originCell.ct = genCt;
               } else {
                 // Not a date: preserve destination format, just update value
@@ -831,9 +842,9 @@ function pasteHandler(ctx: Context, data: any, borderInfo?: any) {
               cell.m = value;
               cell.ct = { fa: "@", t: "s" };
             } else {
-              const [m, ct, v] = genarate(originalValueStr) ?? [];
-              cell.v = v ?? originalValueStr;
-              cell.m = m != null ? String(m) : originalValueStr;
+              const [m, ct, v] = genarate(normalizedNumericValueStr) ?? [];
+              cell.v = v ?? normalizedNumericValueStr;
+              cell.m = m != null ? String(m) : normalizedNumericValueStr;
               if (ct?.t === "n") {
                 cell.ct = { fa: "General", t: "g" };
               } else {

src/sheet-engine/core/events/paste.ts

@@ -79,6 +79,8 @@ export {
   update,
   is_date,
   valueShowEs,
+  isTypedCurrencyDisplayFormat,
+  isCurrencyLikeNumberFormat,
   // formula
   FormulaCache,
   groupValuesRefresh,
@@ -125,6 +127,7 @@ export {
   selectTitlesRange,
   normalizeSelection,
   syncPrimaryCellActiveFromSelection,
+  selectionIsExactlyOneMergeBlock,
   setPrimaryCellActive,
   advancePrimaryCellInLastMultiSelection,
   snapSheetSelectionFocusToCellPreserveMultiRange,
@@ -152,12 +155,14 @@ export {
   handleTextBackground,
   handleBorder,
   handleMerge,
+  mergeSelectionHasValues,
   handleSort,
   handleFreeze,
   handleTextSize,
   handleSum,
   handleLink,
   captureLinkEditorOpenSnapshot,
+  isHyperlinkCreationBlocked,
   toolbarItemClickHandler,
   toolbarItemSelectedFunc,
   handleScreenShot,