@fileverse-dev/fortune-core 1.0.21 → 1.0.22

package/es/events/paste.js

@@ -112,8 +112,9 @@ function postPasteCut(ctx, source, target, RowlChange) {
 function pasteHandler(ctx, data, borderInfo) {
   var _a;
   var _b, _c, _d, _e, _f, _g;
+  console.log("pasteHandler", ctx.isFlvReadOnly);
   var allowEdit = isAllowEdit(ctx);
-  if (!allowEdit) return;
+  if (!allowEdit || ctx.isFlvReadOnly) return;
   if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) !== 1) {
     return;
   }

package/es/modules/sort.js

@@ -1,6 +1,5 @@
 import numeral from "numeral";
 import _ from "lodash";
-import { execfunction, functionCopy, update } from ".";
 import { diff, getFlowdata, isdatetime, isRealNull, isRealNum } from "..";
 import { jfrefreshgrid } from "./refresh";
 export function orderbydata(isAsc, index, data) {
@@ -59,25 +58,10 @@ export function orderbydata(isAsc, index, data) {
   };
 }
 export function sortDataRange(ctx, sheetData, dataRange, index, isAsc, str, edr, stc, edc) {
-  var _a;
-  var _b = orderbydata(isAsc, index, dataRange),
-    sortedData = _b.sortedData,
-    rowOffsets = _b.rowOffsets;
+  var sortedData = orderbydata(isAsc, index, dataRange).sortedData;
   for (var r = str; r <= edr; r += 1) {
     for (var c = stc; c <= edc; c += 1) {
       var cell = sortedData[r - str][c - stc];
-      if (cell === null || cell === void 0 ? void 0 : cell.f) {
-        var moveOffset = rowOffsets[r - str];
-        var func = cell === null || cell === void 0 ? void 0 : cell.f;
-        if (moveOffset > 0) {
-          func = "=".concat(functionCopy(ctx, func, "down", moveOffset));
-        } else if (moveOffset < 0) {
-          func = "=".concat(functionCopy(ctx, func, "up", -moveOffset));
-        }
-        var funcV = execfunction(ctx, func, r, c, undefined, undefined, true);
-        cell.v = funcV[1], cell.f = funcV[2];
-        cell.m = update(((_a = cell.ct) === null || _a === void 0 ? void 0 : _a.fa) || "General", cell.v);
-      }
       sheetData[r][c] = cell;
     }
   }

package/lib/events/paste.js

@@ -120,8 +120,9 @@ function postPasteCut(ctx, source, target, RowlChange) {
 function pasteHandler(ctx, data, borderInfo) {
   var _a;
   var _b, _c, _d, _e, _f, _g;
+  console.log("pasteHandler", ctx.isFlvReadOnly);
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
-  if (!allowEdit) return;
+  if (!allowEdit || ctx.isFlvReadOnly) return;
   if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) !== 1) {
     return;
   }

package/lib/modules/sort.js

@@ -8,8 +8,7 @@ exports.sortDataRange = sortDataRange;
 exports.sortSelection = sortSelection;
 var _numeral = _interopRequireDefault(require("numeral"));
 var _lodash = _interopRequireDefault(require("lodash"));
-var _2 = require(".");
-var _3 = require("..");
+var _2 = require("..");
 var _refresh = require("./refresh");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function orderbydata(isAsc, index, data) {
@@ -25,28 +24,28 @@ function orderbydata(isAsc, index, data) {
     if (y[index] != null) {
       y1 = y[index].v;
     }
-    if ((0, _3.isRealNull)(x1)) {
+    if ((0, _2.isRealNull)(x1)) {
       return isAsc ? 1 : -1;
     }
-    if ((0, _3.isRealNull)(y1)) {
+    if ((0, _2.isRealNull)(y1)) {
       return isAsc ? -1 : 1;
     }
-    if ((0, _3.isdatetime)(x1) && (0, _3.isdatetime)(y1)) {
-      return (0, _3.diff)(x1, y1);
+    if ((0, _2.isdatetime)(x1) && (0, _2.isdatetime)(y1)) {
+      return (0, _2.diff)(x1, y1);
     }
-    if ((0, _3.isRealNum)(x1) && (0, _3.isRealNum)(y1)) {
+    if ((0, _2.isRealNum)(x1) && (0, _2.isRealNum)(y1)) {
       var y1Value = (0, _numeral.default)(y1).value();
       var x1Value = (0, _numeral.default)(x1).value();
       if (y1Value == null || x1Value == null) return null;
       return x1Value - y1Value;
     }
-    if (!(0, _3.isRealNum)(x1) && !(0, _3.isRealNum)(y1)) {
+    if (!(0, _2.isRealNum)(x1) && !(0, _2.isRealNum)(y1)) {
       return x1.localeCompare(y1, "zh");
     }
-    if (!(0, _3.isRealNum)(x1)) {
+    if (!(0, _2.isRealNum)(x1)) {
       return 1;
     }
-    if (!(0, _3.isRealNum)(y1)) {
+    if (!(0, _2.isRealNum)(y1)) {
       return -1;
     }
     return 0;
@@ -68,25 +67,10 @@ function orderbydata(isAsc, index, data) {
   };
 }
 function sortDataRange(ctx, sheetData, dataRange, index, isAsc, str, edr, stc, edc) {
-  var _a;
-  var _b = orderbydata(isAsc, index, dataRange),
-    sortedData = _b.sortedData,
-    rowOffsets = _b.rowOffsets;
+  var sortedData = orderbydata(isAsc, index, dataRange).sortedData;
   for (var r = str; r <= edr; r += 1) {
     for (var c = stc; c <= edc; c += 1) {
       var cell = sortedData[r - str][c - stc];
-      if (cell === null || cell === void 0 ? void 0 : cell.f) {
-        var moveOffset = rowOffsets[r - str];
-        var func = cell === null || cell === void 0 ? void 0 : cell.f;
-        if (moveOffset > 0) {
-          func = "=".concat((0, _2.functionCopy)(ctx, func, "down", moveOffset));
-        } else if (moveOffset < 0) {
-          func = "=".concat((0, _2.functionCopy)(ctx, func, "up", -moveOffset));
-        }
-        var funcV = (0, _2.execfunction)(ctx, func, r, c, undefined, undefined, true);
-        cell.v = funcV[1], cell.f = funcV[2];
-        cell.m = (0, _2.update)(((_a = cell.ct) === null || _a === void 0 ? void 0 : _a.fa) || "General", cell.v);
-      }
       sheetData[r][c] = cell;
     }
   }
@@ -108,7 +92,7 @@ function sortSelection(ctx, isAsc, colIndex) {
   if (isAsc == null) {
     isAsc = true;
   }
-  var flowdata = (0, _3.getFlowdata)(ctx);
+  var flowdata = (0, _2.getFlowdata)(ctx);
   var d = flowdata;
   if (d == null) return;
   var r1 = ctx.luckysheet_select_save[0].row[0];
@@ -121,7 +105,7 @@ function sortSelection(ctx, isAsc, colIndex) {
     if (d[r] != null && d[r][c1] != null) {
       var cell = d[r][c1];
       if (cell == null) return;
-      if (cell.mc != null || (0, _3.isRealNull)(cell.v)) {
+      if (cell.mc != null || (0, _2.isRealNull)(cell.v)) {
         continue;
       }
       if (str == null && /[\u4e00-\u9fa5]+/g.test("".concat(cell.v))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
@@ -15,7 +15,7 @@
     "dev": "father-build --watch"
   },
   "dependencies": {
-    "@fileverse-dev/formula-parser": "0.2.17",
+    "@fileverse-dev/formula-parser": "0.2.18",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",