@fileverse-dev/fortune-core 1.2.81 → 1.2.83-a
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.
|
@@ -270,7 +270,6 @@ export function setConditionRules(ctx, protection, generalDialog, conditionforma
|
|
|
270
270
|
};
|
|
271
271
|
var index = getSheetIndex(ctx, ctx.currentSheetId);
|
|
272
272
|
var ruleArr = (_b = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _b !== void 0 ? _b : [];
|
|
273
|
-
console.log(rule, ruleArr, editKey, edit);
|
|
274
273
|
if (edit) {
|
|
275
274
|
ruleArr.splice(Number(editKey), 1, rule);
|
|
276
275
|
} else {
|
|
@@ -1014,7 +1013,6 @@ export function getComputeMap(ctx) {
|
|
|
1014
1013
|
var data = ctx.luckysheetfile[index].data;
|
|
1015
1014
|
if (_.isNil(data)) return null;
|
|
1016
1015
|
var editKey = (_c = ctx.luckysheetfile[index].conditionRules) === null || _c === void 0 ? void 0 : _c.editKey;
|
|
1017
|
-
console.log("before", editKey, ruleArr);
|
|
1018
1016
|
if (ctx.luckysheet_select_save && ((_d = ctx.luckysheetfile[index].conditionRules) === null || _d === void 0 ? void 0 : _d.rulesValue) !== "") {
|
|
1019
1017
|
if (editKey !== null && editKey !== undefined) {
|
|
1020
1018
|
ruleArr.splice(Number(editKey), 1);
|
|
@@ -1035,7 +1033,6 @@ export function getComputeMap(ctx) {
|
|
|
1035
1033
|
conditionValue: [(_m = ctx.luckysheetfile[index].conditionRules) === null || _m === void 0 ? void 0 : _m.rulesValue]
|
|
1036
1034
|
});
|
|
1037
1035
|
}
|
|
1038
|
-
console.log("after", editKey, ruleArr);
|
|
1039
1036
|
var computeMap = compute(ctx, ruleArr, data);
|
|
1040
1037
|
return computeMap;
|
|
1041
1038
|
}
|
package/es/modules/formula.js
CHANGED
|
@@ -698,6 +698,12 @@ function replaceDotsInFunctionName(str) {
|
|
|
698
698
|
return "=".concat(fixedFnName).concat(str.substring(openParenIndex));
|
|
699
699
|
}
|
|
700
700
|
export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc) {
|
|
701
|
+
console.log("execfunction:", {
|
|
702
|
+
txt: txt,
|
|
703
|
+
r: r,
|
|
704
|
+
c: c,
|
|
705
|
+
id: id
|
|
706
|
+
});
|
|
701
707
|
var originalTxt = txt;
|
|
702
708
|
if (txt.toUpperCase().includes("NETWORKDAYS.INTL") || txt.toUpperCase().includes("WORKDAY.INTL")) {
|
|
703
709
|
txt = replaceDotsInFunctionName(txt);
|
|
@@ -815,6 +821,7 @@ export function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isFo
|
|
|
815
821
|
if (isForce === void 0) {
|
|
816
822
|
isForce = false;
|
|
817
823
|
}
|
|
824
|
+
console.log("execFunctionGroup", origin_r, origin_c, value, id, data);
|
|
818
825
|
if (_.isNil(data)) {
|
|
819
826
|
data = getFlowdata(ctx);
|
|
820
827
|
}
|
|
@@ -285,7 +285,6 @@ function setConditionRules(ctx, protection, generalDialog, conditionformat, rule
|
|
|
285
285
|
};
|
|
286
286
|
var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
|
|
287
287
|
var ruleArr = (_b = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _b !== void 0 ? _b : [];
|
|
288
|
-
console.log(rule, ruleArr, editKey, edit);
|
|
289
288
|
if (edit) {
|
|
290
289
|
ruleArr.splice(Number(editKey), 1, rule);
|
|
291
290
|
} else {
|
|
@@ -1029,7 +1028,6 @@ function getComputeMap(ctx) {
|
|
|
1029
1028
|
var data = ctx.luckysheetfile[index].data;
|
|
1030
1029
|
if (_lodash.default.isNil(data)) return null;
|
|
1031
1030
|
var editKey = (_c = ctx.luckysheetfile[index].conditionRules) === null || _c === void 0 ? void 0 : _c.editKey;
|
|
1032
|
-
console.log("before", editKey, ruleArr);
|
|
1033
1031
|
if (ctx.luckysheet_select_save && ((_d = ctx.luckysheetfile[index].conditionRules) === null || _d === void 0 ? void 0 : _d.rulesValue) !== "") {
|
|
1034
1032
|
if (editKey !== null && editKey !== undefined) {
|
|
1035
1033
|
ruleArr.splice(Number(editKey), 1);
|
|
@@ -1050,7 +1048,6 @@ function getComputeMap(ctx) {
|
|
|
1050
1048
|
conditionValue: [(_m = ctx.luckysheetfile[index].conditionRules) === null || _m === void 0 ? void 0 : _m.rulesValue]
|
|
1051
1049
|
});
|
|
1052
1050
|
}
|
|
1053
|
-
console.log("after", editKey, ruleArr);
|
|
1054
1051
|
var computeMap = compute(ctx, ruleArr, data);
|
|
1055
1052
|
return computeMap;
|
|
1056
1053
|
}
|
package/lib/modules/formula.js
CHANGED
|
@@ -728,6 +728,12 @@ function replaceDotsInFunctionName(str) {
|
|
|
728
728
|
return "=".concat(fixedFnName).concat(str.substring(openParenIndex));
|
|
729
729
|
}
|
|
730
730
|
function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc) {
|
|
731
|
+
console.log("execfunction:", {
|
|
732
|
+
txt: txt,
|
|
733
|
+
r: r,
|
|
734
|
+
c: c,
|
|
735
|
+
id: id
|
|
736
|
+
});
|
|
731
737
|
var originalTxt = txt;
|
|
732
738
|
if (txt.toUpperCase().includes("NETWORKDAYS.INTL") || txt.toUpperCase().includes("WORKDAY.INTL")) {
|
|
733
739
|
txt = replaceDotsInFunctionName(txt);
|
|
@@ -845,6 +851,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce) {
|
|
|
845
851
|
if (isForce === void 0) {
|
|
846
852
|
isForce = false;
|
|
847
853
|
}
|
|
854
|
+
console.log("execFunctionGroup", origin_r, origin_c, value, id, data);
|
|
848
855
|
if (_lodash.default.isNil(data)) {
|
|
849
856
|
data = (0, _context.getFlowdata)(ctx);
|
|
850
857
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fileverse-dev/fortune-core",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.83-a",
|
|
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.
|
|
18
|
+
"@fileverse-dev/formula-parser": "0.2.91-a",
|
|
19
19
|
"dayjs": "^1.11.0",
|
|
20
20
|
"immer": "^9.0.12",
|
|
21
21
|
"lodash": "^4.17.21",
|