@fileverse-dev/fortune-core 1.0.21 → 1.0.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/events/paste.js +2 -1
  2. package/es/modules/sort.js +1 -17
  3. package/lib/events/paste.js +2 -1
  4. package/lib/modules/sort.js +12 -28
  5. package/package.json +2 -2
package/es/events/paste.js CHANGED
@@ -112,8 +112,9 @@ function postPasteCut(ctx, source, target, RowlChange) {
112
112
  function pasteHandler(ctx, data, borderInfo) {
113
113
  var _a;
114
114
  var _b, _c, _d, _e, _f, _g;
115
+ console.log("pasteHandler", ctx.isFlvReadOnly);
115
116
  var allowEdit = isAllowEdit(ctx);
116
- if (!allowEdit) return;
117
+ if (!allowEdit || ctx.isFlvReadOnly) return;
117
118
  if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) !== 1) {
118
119
  return;
119
120
  }
package/es/modules/sort.js CHANGED
@@ -1,6 +1,5 @@
1
1
  import numeral from "numeral";
2
2
  import _ from "lodash";
3
- import { execfunction, functionCopy, update } from ".";
4
3
  import { diff, getFlowdata, isdatetime, isRealNull, isRealNum } from "..";
5
4
  import { jfrefreshgrid } from "./refresh";
6
5
  export function orderbydata(isAsc, index, data) {
@@ -59,25 +58,10 @@ export function orderbydata(isAsc, index, data) {
59
58
  };
60
59
  }
61
60
  export function sortDataRange(ctx, sheetData, dataRange, index, isAsc, str, edr, stc, edc) {
62
- var _a;
63
- var _b = orderbydata(isAsc, index, dataRange),
64
- sortedData = _b.sortedData,
65
- rowOffsets = _b.rowOffsets;
61
+ var sortedData = orderbydata(isAsc, index, dataRange).sortedData;
66
62
  for (var r = str; r <= edr; r += 1) {
67
63
  for (var c = stc; c <= edc; c += 1) {
68
64
  var cell = sortedData[r - str][c - stc];
69
- if (cell === null || cell === void 0 ? void 0 : cell.f) {
70
- var moveOffset = rowOffsets[r - str];
71
- var func = cell === null || cell === void 0 ? void 0 : cell.f;
72
- if (moveOffset > 0) {
73
- func = "=".concat(functionCopy(ctx, func, "down", moveOffset));
74
- } else if (moveOffset < 0) {
75
- func = "=".concat(functionCopy(ctx, func, "up", -moveOffset));
76
- }
77
- var funcV = execfunction(ctx, func, r, c, undefined, undefined, true);
78
- cell.v = funcV[1], cell.f = funcV[2];
79
- cell.m = update(((_a = cell.ct) === null || _a === void 0 ? void 0 : _a.fa) || "General", cell.v);
80
- }
81
65
  sheetData[r][c] = cell;
82
66
  }
83
67
  }
package/lib/events/paste.js CHANGED
@@ -120,8 +120,9 @@ function postPasteCut(ctx, source, target, RowlChange) {
120
120
  function pasteHandler(ctx, data, borderInfo) {
121
121
  var _a;
122
122
  var _b, _c, _d, _e, _f, _g;
123
+ console.log("pasteHandler", ctx.isFlvReadOnly);
123
124
  var allowEdit = (0, _utils.isAllowEdit)(ctx);
124
- if (!allowEdit) return;
125
+ if (!allowEdit || ctx.isFlvReadOnly) return;
125
126
  if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) !== 1) {
126
127
  return;
127
128
  }
package/lib/modules/sort.js CHANGED
@@ -8,8 +8,7 @@ exports.sortDataRange = sortDataRange;
8
8
  exports.sortSelection = sortSelection;
9
9
  var _numeral = _interopRequireDefault(require("numeral"));
10
10
  var _lodash = _interopRequireDefault(require("lodash"));
11
- var _2 = require(".");
12
- var _3 = require("..");
11
+ var _2 = require("..");
13
12
  var _refresh = require("./refresh");
14
13
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
15
14
  function orderbydata(isAsc, index, data) {
@@ -25,28 +24,28 @@ function orderbydata(isAsc, index, data) {
25
24
  if (y[index] != null) {
26
25
  y1 = y[index].v;
27
26
  }
28
- if ((0, _3.isRealNull)(x1)) {
27
+ if ((0, _2.isRealNull)(x1)) {
29
28
  return isAsc ? 1 : -1;
30
29
  }
31
- if ((0, _3.isRealNull)(y1)) {
30
+ if ((0, _2.isRealNull)(y1)) {
32
31
  return isAsc ? -1 : 1;
33
32
  }
34
- if ((0, _3.isdatetime)(x1) && (0, _3.isdatetime)(y1)) {
35
- return (0, _3.diff)(x1, y1);
33
+ if ((0, _2.isdatetime)(x1) && (0, _2.isdatetime)(y1)) {
34
+ return (0, _2.diff)(x1, y1);
36
35
  }
37
- if ((0, _3.isRealNum)(x1) && (0, _3.isRealNum)(y1)) {
36
+ if ((0, _2.isRealNum)(x1) && (0, _2.isRealNum)(y1)) {
38
37
  var y1Value = (0, _numeral.default)(y1).value();
39
38
  var x1Value = (0, _numeral.default)(x1).value();
40
39
  if (y1Value == null || x1Value == null) return null;
41
40
  return x1Value - y1Value;
42
41
  }
43
- if (!(0, _3.isRealNum)(x1) && !(0, _3.isRealNum)(y1)) {
42
+ if (!(0, _2.isRealNum)(x1) && !(0, _2.isRealNum)(y1)) {
44
43
  return x1.localeCompare(y1, "zh");
45
44
  }
46
- if (!(0, _3.isRealNum)(x1)) {
45
+ if (!(0, _2.isRealNum)(x1)) {
47
46
  return 1;
48
47
  }
49
- if (!(0, _3.isRealNum)(y1)) {
48
+ if (!(0, _2.isRealNum)(y1)) {
50
49
  return -1;
51
50
  }
52
51
  return 0;
@@ -68,25 +67,10 @@ function orderbydata(isAsc, index, data) {
68
67
  };
69
68
  }
70
69
  function sortDataRange(ctx, sheetData, dataRange, index, isAsc, str, edr, stc, edc) {
71
- var _a;
72
- var _b = orderbydata(isAsc, index, dataRange),
73
- sortedData = _b.sortedData,
74
- rowOffsets = _b.rowOffsets;
70
+ var sortedData = orderbydata(isAsc, index, dataRange).sortedData;
75
71
  for (var r = str; r <= edr; r += 1) {
76
72
  for (var c = stc; c <= edc; c += 1) {
77
73
  var cell = sortedData[r - str][c - stc];
78
- if (cell === null || cell === void 0 ? void 0 : cell.f) {
79
- var moveOffset = rowOffsets[r - str];
80
- var func = cell === null || cell === void 0 ? void 0 : cell.f;
81
- if (moveOffset > 0) {
82
- func = "=".concat((0, _2.functionCopy)(ctx, func, "down", moveOffset));
83
- } else if (moveOffset < 0) {
84
- func = "=".concat((0, _2.functionCopy)(ctx, func, "up", -moveOffset));
85
- }
86
- var funcV = (0, _2.execfunction)(ctx, func, r, c, undefined, undefined, true);
87
- cell.v = funcV[1], cell.f = funcV[2];
88
- cell.m = (0, _2.update)(((_a = cell.ct) === null || _a === void 0 ? void 0 : _a.fa) || "General", cell.v);
89
- }
90
74
  sheetData[r][c] = cell;
91
75
  }
92
76
  }
@@ -108,7 +92,7 @@ function sortSelection(ctx, isAsc, colIndex) {
108
92
  if (isAsc == null) {
109
93
  isAsc = true;
110
94
  }
111
- var flowdata = (0, _3.getFlowdata)(ctx);
95
+ var flowdata = (0, _2.getFlowdata)(ctx);
112
96
  var d = flowdata;
113
97
  if (d == null) return;
114
98
  var r1 = ctx.luckysheet_select_save[0].row[0];
@@ -121,7 +105,7 @@ function sortSelection(ctx, isAsc, colIndex) {
121
105
  if (d[r] != null && d[r][c1] != null) {
122
106
  var cell = d[r][c1];
123
107
  if (cell == null) return;
124
- if (cell.mc != null || (0, _3.isRealNull)(cell.v)) {
108
+ if (cell.mc != null || (0, _2.isRealNull)(cell.v)) {
125
109
  continue;
126
110
  }
127
111
  if (str == null && /[\u4e00-\u9fa5]+/g.test("".concat(cell.v))) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fileverse-dev/fortune-core",
3
- "version": "1.0.21",
3
+ "version": "1.0.22",
4
4
  "main": "lib/index.js",
5
5
  "module": "es/index.js",
6
6
  "typings": "lib/index.d.ts",
@@ -15,7 +15,7 @@
15
15
  "dev": "father-build --watch"
16
16
  },
17
17
  "dependencies": {
18
- "@fileverse-dev/formula-parser": "0.2.17",
18
+ "@fileverse-dev/formula-parser": "0.2.18",
19
19
  "dayjs": "^1.11.0",
20
20
  "immer": "^9.0.12",
21
21
  "lodash": "^4.17.21",