@fileverse-dev/fortune-core 1.2.21 → 1.2.22-cell-ref-adjustment-1

package/es/events/paste.d.ts

@@ -1,4 +1,7 @@
 import { Context } from "../context";
+export declare function columnLabelIndex(label: string): number;
+export declare function indexToColumnLabel(index: number): string;
+export declare function adjustFormulaForPaste(formula: string, srcCol: number, srcRow: number, destCol: number, destRow: number): string;
 export declare function parseAsLinkIfUrl(txtdata: string, ctx: Context): void;
 export declare function handlePaste(ctx: Context, e: ClipboardEvent): void;
 export declare function handlePasteByClick(ctx: Context, clipboardData: string, triggerType?: string): void;

package/es/events/paste.js

@@ -12,7 +12,7 @@ var __assign = this && this.__assign || function () {
 import _ from "lodash";
 import { handlePastedTable } from "../paste-table-helpers";
 import { getFlowdata } from "../context";
-import { execfunction, functionCopy } from "../modules/formula";
+import { execfunction } from "../modules/formula";
 import { getdatabyselection } from "../modules/cell";
 import { genarate, update } from "../modules/format";
 import { normalizeSelection, selectionCache } from "../modules/selection";
@@ -24,6 +24,36 @@ import { jfrefreshgrid } from "../modules/refresh";
 import { CFSplitRange, sanitizeDuneUrl, saveHyperlink } from "../modules";
 import clipboard from "../modules/clipboard";
 import { calculateRangeCellSize, updateSheetCellSizes } from "../paste-helpers/calculate-range-cell-size";
+export function columnLabelIndex(label) {
+  var index = 0;
+  var A = "A".charCodeAt(0);
+  for (var i = 0; i < label.length; i++) {
+    var charCode = label.charCodeAt(i) - A + 1;
+    index = index * 26 + charCode;
+  }
+  return index - 1;
+}
+export function indexToColumnLabel(index) {
+  var label = "";
+  while (index >= 0) {
+    var remainder = index % 26;
+    label = String.fromCharCode(65 + remainder) + label;
+    index = Math.floor(index / 26) - 1;
+  }
+  return label;
+}
+export function adjustFormulaForPaste(formula, srcCol, srcRow, destCol, destRow) {
+  var colOffset = destCol - srcCol;
+  var rowOffset = destRow - srcRow;
+  return formula.replace(/(\$?)([A-Z]+)(\$?)(\d+)/g, function (__, absCol, colLetters, absRow, rowNum) {
+    var colIndex = columnLabelIndex(colLetters);
+    var rowIndex = parseInt(rowNum, 10);
+    if (!absCol) colIndex += colOffset;
+    if (!absRow) rowIndex += rowOffset;
+    var newCol = indexToColumnLabel(colIndex);
+    return "".concat(absCol ? "$" : "").concat(newCol).concat(absRow ? "$" : "").concat(rowIndex);
+  });
+}
 function postPasteCut(ctx, source, target, RowlChange) {
   var execF_rc = {};
   ctx.formulaCache.execFunctionExist = [];
@@ -792,8 +822,6 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
       mtc = minc + (tc - 1) * copyc;
       maxrowCache = minh + th * copyh;
       maxcellCahe = minc + tc * copyc;
-      var offsetRow = mth - c_r1;
-      var offsetCol = mtc - c_c1;
       var offsetMC = {};
       for (var h = mth; h < maxrowCache; h += 1) {
         if (hiddenRows === null || hiddenRows === void 0 ? void 0 : hiddenRows.has(h.toString())) continue;
@@ -868,20 +896,9 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
             }
           }
           if (!_.isNil(value) && !_.isNil(value.f)) {
-            var func = value.f;
-            if (offsetRow > 0) {
-              func = "=".concat(functionCopy(ctx, func, "down", offsetRow));
-            }
-            if (offsetRow < 0) {
-              func = "=".concat(functionCopy(ctx, func, "up", Math.abs(offsetRow)));
-            }
-            if (offsetCol > 0) {
-              func = "=".concat(functionCopy(ctx, func, "right", offsetCol));
-            }
-            if (offsetCol < 0) {
-              func = "=".concat(functionCopy(ctx, func, "left", Math.abs(offsetCol)));
-            }
-            var funcV = execfunction(ctx, func, h, c, undefined, undefined, true);
+            var adjustedFormula = adjustFormulaForPaste(value.f.startsWith("=") ? value.f : "=".concat(value.f), c_c1, c_r1, c, h);
+            var funcV = execfunction(ctx, adjustedFormula, h, c, undefined, undefined, true);
+            value.f = adjustedFormula;
             var afterUpdateCell = ctx.hooks.afterUpdateCell;
             if (afterUpdateCell) {
               afterUpdateCell(h, c, null, __assign(__assign({}, value), {

package/es/locale/en.js

@@ -9808,7 +9808,7 @@ export default {
     cellRange: "Cell range",
     selectCellRange: "Select a data range",
     selectCellRange2: "Please select a range of cells",
-    verificationCondition: "Verification condition",
+    verificationCondition: "Validation condition",
     allowMultiSelect: "Allow multiple selection",
     dropdown: "Dropdown list",
     checkbox: "Checkbox",
@@ -9845,7 +9845,7 @@ export default {
     remote: "Automatic remote acquisition option",
     prohibitInput: "Prohibit input when input data is invalid",
     hintShow: "Show prompt when the cell is selected",
-    deleteVerification: "Delete verification",
+    deleteVerification: "Delete validation",
     tooltipInfo1: "The drop-down list option cannot be empty",
     tooltipInfo2: "Checkbox content cannot be empty",
     tooltipInfo3: "The value entered is not a numeric type",

package/lib/events/paste.d.ts

@@ -1,4 +1,7 @@
 import { Context } from "../context";
+export declare function columnLabelIndex(label: string): number;
+export declare function indexToColumnLabel(index: number): string;
+export declare function adjustFormulaForPaste(formula: string, srcCol: number, srcRow: number, destCol: number, destRow: number): string;
 export declare function parseAsLinkIfUrl(txtdata: string, ctx: Context): void;
 export declare function handlePaste(ctx: Context, e: ClipboardEvent): void;
 export declare function handlePasteByClick(ctx: Context, clipboardData: string, triggerType?: string): void;

package/lib/events/paste.js

@@ -3,8 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.adjustFormulaForPaste = adjustFormulaForPaste;
+exports.columnLabelIndex = columnLabelIndex;
 exports.handlePaste = handlePaste;
 exports.handlePasteByClick = handlePasteByClick;
+exports.indexToColumnLabel = indexToColumnLabel;
 exports.parseAsLinkIfUrl = parseAsLinkIfUrl;
 var _lodash = _interopRequireDefault(require("lodash"));
 var _pasteTableHelpers = require("../paste-table-helpers");
@@ -33,6 +36,36 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+function columnLabelIndex(label) {
+  var index = 0;
+  var A = "A".charCodeAt(0);
+  for (var i = 0; i < label.length; i++) {
+    var charCode = label.charCodeAt(i) - A + 1;
+    index = index * 26 + charCode;
+  }
+  return index - 1;
+}
+function indexToColumnLabel(index) {
+  var label = "";
+  while (index >= 0) {
+    var remainder = index % 26;
+    label = String.fromCharCode(65 + remainder) + label;
+    index = Math.floor(index / 26) - 1;
+  }
+  return label;
+}
+function adjustFormulaForPaste(formula, srcCol, srcRow, destCol, destRow) {
+  var colOffset = destCol - srcCol;
+  var rowOffset = destRow - srcRow;
+  return formula.replace(/(\$?)([A-Z]+)(\$?)(\d+)/g, function (__, absCol, colLetters, absRow, rowNum) {
+    var colIndex = columnLabelIndex(colLetters);
+    var rowIndex = parseInt(rowNum, 10);
+    if (!absCol) colIndex += colOffset;
+    if (!absRow) rowIndex += rowOffset;
+    var newCol = indexToColumnLabel(colIndex);
+    return "".concat(absCol ? "$" : "").concat(newCol).concat(absRow ? "$" : "").concat(rowIndex);
+  });
+}
 function postPasteCut(ctx, source, target, RowlChange) {
   var execF_rc = {};
   ctx.formulaCache.execFunctionExist = [];
@@ -801,8 +834,6 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
       mtc = minc + (tc - 1) * copyc;
       maxrowCache = minh + th * copyh;
       maxcellCahe = minc + tc * copyc;
-      var offsetRow = mth - c_r1;
-      var offsetCol = mtc - c_c1;
       var offsetMC = {};
       for (var h = mth; h < maxrowCache; h += 1) {
         if (hiddenRows === null || hiddenRows === void 0 ? void 0 : hiddenRows.has(h.toString())) continue;
@@ -877,20 +908,9 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
             }
           }
           if (!_lodash.default.isNil(value) && !_lodash.default.isNil(value.f)) {
-            var func = value.f;
-            if (offsetRow > 0) {
-              func = "=".concat((0, _formula.functionCopy)(ctx, func, "down", offsetRow));
-            }
-            if (offsetRow < 0) {
-              func = "=".concat((0, _formula.functionCopy)(ctx, func, "up", Math.abs(offsetRow)));
-            }
-            if (offsetCol > 0) {
-              func = "=".concat((0, _formula.functionCopy)(ctx, func, "right", offsetCol));
-            }
-            if (offsetCol < 0) {
-              func = "=".concat((0, _formula.functionCopy)(ctx, func, "left", Math.abs(offsetCol)));
-            }
-            var funcV = (0, _formula.execfunction)(ctx, func, h, c, undefined, undefined, true);
+            var adjustedFormula = adjustFormulaForPaste(value.f.startsWith("=") ? value.f : "=".concat(value.f), c_c1, c_r1, c, h);
+            var funcV = (0, _formula.execfunction)(ctx, adjustedFormula, h, c, undefined, undefined, true);
+            value.f = adjustedFormula;
             var afterUpdateCell = ctx.hooks.afterUpdateCell;
             if (afterUpdateCell) {
               afterUpdateCell(h, c, null, __assign(__assign({}, value), {

package/lib/locale/en.js

@@ -9814,7 +9814,7 @@ var _default = exports.default = {
     cellRange: "Cell range",
     selectCellRange: "Select a data range",
     selectCellRange2: "Please select a range of cells",
-    verificationCondition: "Verification condition",
+    verificationCondition: "Validation condition",
     allowMultiSelect: "Allow multiple selection",
     dropdown: "Dropdown list",
     checkbox: "Checkbox",
@@ -9851,7 +9851,7 @@ var _default = exports.default = {
     remote: "Automatic remote acquisition option",
     prohibitInput: "Prohibit input when input data is invalid",
     hintShow: "Show prompt when the cell is selected",
-    deleteVerification: "Delete verification",
+    deleteVerification: "Delete validation",
     tooltipInfo1: "The drop-down list option cannot be empty",
     tooltipInfo2: "Checkbox content cannot be empty",
     tooltipInfo3: "The value entered is not a numeric type",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.2.21",
+  "version": "1.2.22-cell-ref-adjustment-1",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",