@fileverse-dev/fortune-core 1.1.4 → 1.1.5-live-query-2
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.
- package/es/api/common.d.ts +1 -0
- package/es/modules/ConditionFormat.js +27 -27
- package/es/types.d.ts +13 -0
- package/lib/api/common.d.ts +1 -0
- package/lib/modules/ConditionFormat.js +27 -27
- package/lib/types.d.ts +13 -0
- package/package.json +1 -1
package/es/api/common.d.ts
CHANGED
|
@@ -23,20 +23,20 @@ function compareGreaterThan(cellValue, conditionValue, symbol) {
|
|
|
23
23
|
var cellStr = String(cellValue);
|
|
24
24
|
var conditionStr = String(conditionValue);
|
|
25
25
|
if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
|
|
26
|
-
if (symbol ===
|
|
26
|
+
if (symbol === ">=") {
|
|
27
27
|
return cellStr.localeCompare(conditionStr) >= 0;
|
|
28
28
|
}
|
|
29
29
|
return cellStr.localeCompare(conditionStr) > 0;
|
|
30
30
|
}
|
|
31
31
|
var cellNum = Number(cellValue);
|
|
32
32
|
var conditionNum = Number(conditionValue);
|
|
33
|
-
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol ===
|
|
33
|
+
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === ">=") {
|
|
34
34
|
return cellNum >= conditionNum;
|
|
35
35
|
}
|
|
36
|
-
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol ===
|
|
36
|
+
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === ">") {
|
|
37
37
|
return cellNum > conditionNum;
|
|
38
38
|
}
|
|
39
|
-
if (symbol ===
|
|
39
|
+
if (symbol === ">=") {
|
|
40
40
|
return cellStr.localeCompare(conditionStr) >= 0;
|
|
41
41
|
}
|
|
42
42
|
return cellStr.localeCompare(conditionStr) > 0;
|
|
@@ -45,20 +45,20 @@ function compareLessThan(cellValue, conditionValue, symbol) {
|
|
|
45
45
|
var cellStr = String(cellValue);
|
|
46
46
|
var conditionStr = String(conditionValue);
|
|
47
47
|
if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
|
|
48
|
-
if (symbol ===
|
|
48
|
+
if (symbol === "<=") {
|
|
49
49
|
return cellStr.localeCompare(conditionStr) <= 0;
|
|
50
50
|
}
|
|
51
51
|
return cellStr.localeCompare(conditionStr) < 0;
|
|
52
52
|
}
|
|
53
53
|
var cellNum = Number(cellValue);
|
|
54
54
|
var conditionNum = Number(conditionValue);
|
|
55
|
-
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol ===
|
|
55
|
+
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === "<=") {
|
|
56
56
|
return cellNum <= conditionNum;
|
|
57
57
|
}
|
|
58
58
|
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum)) {
|
|
59
59
|
return cellNum < conditionNum;
|
|
60
60
|
}
|
|
61
|
-
if (symbol ===
|
|
61
|
+
if (symbol === "<=") {
|
|
62
62
|
return cellStr.localeCompare(conditionStr) <= 0;
|
|
63
63
|
}
|
|
64
64
|
return cellStr.localeCompare(conditionStr) < 0;
|
|
@@ -67,7 +67,8 @@ function compareBetween(cellValue, value1, value2) {
|
|
|
67
67
|
var cellStr = String(cellValue);
|
|
68
68
|
var val1Str = String(value1);
|
|
69
69
|
var val2Str = String(value2);
|
|
70
|
-
var smallerValue
|
|
70
|
+
var smallerValue;
|
|
71
|
+
var biggerValue;
|
|
71
72
|
if (hasAlphabeticChars(value1) || hasAlphabeticChars(value2) || hasAlphabeticChars(cellValue)) {
|
|
72
73
|
if (val1Str.localeCompare(val2Str) > 0) {
|
|
73
74
|
biggerValue = val1Str;
|
|
@@ -77,24 +78,23 @@ function compareBetween(cellValue, value1, value2) {
|
|
|
77
78
|
smallerValue = val1Str;
|
|
78
79
|
}
|
|
79
80
|
return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
|
|
81
|
+
}
|
|
82
|
+
var cellNum = Number(cellValue);
|
|
83
|
+
var val1Num = Number(value1);
|
|
84
|
+
var val2Num = Number(value2);
|
|
85
|
+
if (!Number.isNaN(cellNum) && !Number.isNaN(val1Num) && !Number.isNaN(val2Num)) {
|
|
86
|
+
var smallerNum = Math.min(val1Num, val2Num);
|
|
87
|
+
var biggerNum = Math.max(val1Num, val2Num);
|
|
88
|
+
return cellNum >= smallerNum && cellNum <= biggerNum;
|
|
89
|
+
}
|
|
90
|
+
if (val1Str.localeCompare(val2Str) > 0) {
|
|
91
|
+
biggerValue = val1Str;
|
|
92
|
+
smallerValue = val2Str;
|
|
80
93
|
} else {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
var val2Num = Number(value2);
|
|
84
|
-
if (!Number.isNaN(cellNum) && !Number.isNaN(val1Num) && !Number.isNaN(val2Num)) {
|
|
85
|
-
var smallerNum = Math.min(val1Num, val2Num);
|
|
86
|
-
var biggerNum = Math.max(val1Num, val2Num);
|
|
87
|
-
return cellNum >= smallerNum && cellNum <= biggerNum;
|
|
88
|
-
}
|
|
89
|
-
if (val1Str.localeCompare(val2Str) > 0) {
|
|
90
|
-
biggerValue = val1Str;
|
|
91
|
-
smallerValue = val2Str;
|
|
92
|
-
} else {
|
|
93
|
-
biggerValue = val2Str;
|
|
94
|
-
smallerValue = val1Str;
|
|
95
|
-
}
|
|
96
|
-
return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
|
|
94
|
+
biggerValue = val2Str;
|
|
95
|
+
smallerValue = val1Str;
|
|
97
96
|
}
|
|
97
|
+
return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
|
|
98
98
|
}
|
|
99
99
|
export function getHistoryRules(fileH) {
|
|
100
100
|
var historyRules = [];
|
|
@@ -558,7 +558,7 @@ export function compute(ctx, ruleArr, d) {
|
|
|
558
558
|
if (_.isNil(cell) || _.isNil(cell.v) || isRealNull(cell.v)) {
|
|
559
559
|
continue;
|
|
560
560
|
}
|
|
561
|
-
if (conditionName === "greaterThan" && compareGreaterThan(cell.v, conditionValue0,
|
|
561
|
+
if (conditionName === "greaterThan" && compareGreaterThan(cell.v, conditionValue0, ">")) {
|
|
562
562
|
if ("".concat(r, "_").concat(c) in computeMap) {
|
|
563
563
|
computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
|
|
564
564
|
computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
|
|
@@ -568,7 +568,7 @@ export function compute(ctx, ruleArr, d) {
|
|
|
568
568
|
cellColor: cellColor_1
|
|
569
569
|
};
|
|
570
570
|
}
|
|
571
|
-
} else if (conditionName === "greaterThanOrEqual" && compareGreaterThan(cell.v, conditionValue0,
|
|
571
|
+
} else if (conditionName === "greaterThanOrEqual" && compareGreaterThan(cell.v, conditionValue0, ">=")) {
|
|
572
572
|
if ("".concat(r, "_").concat(c) in computeMap) {
|
|
573
573
|
computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
|
|
574
574
|
computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
|
|
@@ -588,7 +588,7 @@ export function compute(ctx, ruleArr, d) {
|
|
|
588
588
|
cellColor: cellColor_1
|
|
589
589
|
};
|
|
590
590
|
}
|
|
591
|
-
} else if (conditionName === "lessThanOrEqual" && compareLessThan(cell.v, conditionValue0,
|
|
591
|
+
} else if (conditionName === "lessThanOrEqual" && compareLessThan(cell.v, conditionValue0, "<=")) {
|
|
592
592
|
if ("".concat(r, "_").concat(c) in computeMap) {
|
|
593
593
|
computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
|
|
594
594
|
computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
|
package/es/types.d.ts
CHANGED
|
@@ -144,6 +144,18 @@ export type ConditionRulesProps = {
|
|
|
144
144
|
repeatValue: string;
|
|
145
145
|
projectValue: string;
|
|
146
146
|
};
|
|
147
|
+
export type LiveQueryData = {
|
|
148
|
+
data: {
|
|
149
|
+
row: number;
|
|
150
|
+
column: number;
|
|
151
|
+
function: string;
|
|
152
|
+
value: any;
|
|
153
|
+
id: string;
|
|
154
|
+
name: string;
|
|
155
|
+
subSheetId: string;
|
|
156
|
+
};
|
|
157
|
+
cellData: Cell;
|
|
158
|
+
};
|
|
147
159
|
export type Sheet = {
|
|
148
160
|
name: string;
|
|
149
161
|
config?: SheetConfig;
|
|
@@ -205,6 +217,7 @@ export type Sheet = {
|
|
|
205
217
|
column_focus: number;
|
|
206
218
|
};
|
|
207
219
|
};
|
|
220
|
+
liveQueryList?: Record<string, LiveQueryData>;
|
|
208
221
|
};
|
|
209
222
|
export type CommentBox = {
|
|
210
223
|
r: number;
|
package/lib/api/common.d.ts
CHANGED
|
@@ -38,20 +38,20 @@ function compareGreaterThan(cellValue, conditionValue, symbol) {
|
|
|
38
38
|
var cellStr = String(cellValue);
|
|
39
39
|
var conditionStr = String(conditionValue);
|
|
40
40
|
if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
|
|
41
|
-
if (symbol ===
|
|
41
|
+
if (symbol === ">=") {
|
|
42
42
|
return cellStr.localeCompare(conditionStr) >= 0;
|
|
43
43
|
}
|
|
44
44
|
return cellStr.localeCompare(conditionStr) > 0;
|
|
45
45
|
}
|
|
46
46
|
var cellNum = Number(cellValue);
|
|
47
47
|
var conditionNum = Number(conditionValue);
|
|
48
|
-
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol ===
|
|
48
|
+
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === ">=") {
|
|
49
49
|
return cellNum >= conditionNum;
|
|
50
50
|
}
|
|
51
|
-
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol ===
|
|
51
|
+
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === ">") {
|
|
52
52
|
return cellNum > conditionNum;
|
|
53
53
|
}
|
|
54
|
-
if (symbol ===
|
|
54
|
+
if (symbol === ">=") {
|
|
55
55
|
return cellStr.localeCompare(conditionStr) >= 0;
|
|
56
56
|
}
|
|
57
57
|
return cellStr.localeCompare(conditionStr) > 0;
|
|
@@ -60,20 +60,20 @@ function compareLessThan(cellValue, conditionValue, symbol) {
|
|
|
60
60
|
var cellStr = String(cellValue);
|
|
61
61
|
var conditionStr = String(conditionValue);
|
|
62
62
|
if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
|
|
63
|
-
if (symbol ===
|
|
63
|
+
if (symbol === "<=") {
|
|
64
64
|
return cellStr.localeCompare(conditionStr) <= 0;
|
|
65
65
|
}
|
|
66
66
|
return cellStr.localeCompare(conditionStr) < 0;
|
|
67
67
|
}
|
|
68
68
|
var cellNum = Number(cellValue);
|
|
69
69
|
var conditionNum = Number(conditionValue);
|
|
70
|
-
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol ===
|
|
70
|
+
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === "<=") {
|
|
71
71
|
return cellNum <= conditionNum;
|
|
72
72
|
}
|
|
73
73
|
if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum)) {
|
|
74
74
|
return cellNum < conditionNum;
|
|
75
75
|
}
|
|
76
|
-
if (symbol ===
|
|
76
|
+
if (symbol === "<=") {
|
|
77
77
|
return cellStr.localeCompare(conditionStr) <= 0;
|
|
78
78
|
}
|
|
79
79
|
return cellStr.localeCompare(conditionStr) < 0;
|
|
@@ -82,7 +82,8 @@ function compareBetween(cellValue, value1, value2) {
|
|
|
82
82
|
var cellStr = String(cellValue);
|
|
83
83
|
var val1Str = String(value1);
|
|
84
84
|
var val2Str = String(value2);
|
|
85
|
-
var smallerValue
|
|
85
|
+
var smallerValue;
|
|
86
|
+
var biggerValue;
|
|
86
87
|
if (hasAlphabeticChars(value1) || hasAlphabeticChars(value2) || hasAlphabeticChars(cellValue)) {
|
|
87
88
|
if (val1Str.localeCompare(val2Str) > 0) {
|
|
88
89
|
biggerValue = val1Str;
|
|
@@ -92,24 +93,23 @@ function compareBetween(cellValue, value1, value2) {
|
|
|
92
93
|
smallerValue = val1Str;
|
|
93
94
|
}
|
|
94
95
|
return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
|
|
96
|
+
}
|
|
97
|
+
var cellNum = Number(cellValue);
|
|
98
|
+
var val1Num = Number(value1);
|
|
99
|
+
var val2Num = Number(value2);
|
|
100
|
+
if (!Number.isNaN(cellNum) && !Number.isNaN(val1Num) && !Number.isNaN(val2Num)) {
|
|
101
|
+
var smallerNum = Math.min(val1Num, val2Num);
|
|
102
|
+
var biggerNum = Math.max(val1Num, val2Num);
|
|
103
|
+
return cellNum >= smallerNum && cellNum <= biggerNum;
|
|
104
|
+
}
|
|
105
|
+
if (val1Str.localeCompare(val2Str) > 0) {
|
|
106
|
+
biggerValue = val1Str;
|
|
107
|
+
smallerValue = val2Str;
|
|
95
108
|
} else {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
var val2Num = Number(value2);
|
|
99
|
-
if (!Number.isNaN(cellNum) && !Number.isNaN(val1Num) && !Number.isNaN(val2Num)) {
|
|
100
|
-
var smallerNum = Math.min(val1Num, val2Num);
|
|
101
|
-
var biggerNum = Math.max(val1Num, val2Num);
|
|
102
|
-
return cellNum >= smallerNum && cellNum <= biggerNum;
|
|
103
|
-
}
|
|
104
|
-
if (val1Str.localeCompare(val2Str) > 0) {
|
|
105
|
-
biggerValue = val1Str;
|
|
106
|
-
smallerValue = val2Str;
|
|
107
|
-
} else {
|
|
108
|
-
biggerValue = val2Str;
|
|
109
|
-
smallerValue = val1Str;
|
|
110
|
-
}
|
|
111
|
-
return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
|
|
109
|
+
biggerValue = val2Str;
|
|
110
|
+
smallerValue = val1Str;
|
|
112
111
|
}
|
|
112
|
+
return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
|
|
113
113
|
}
|
|
114
114
|
function getHistoryRules(fileH) {
|
|
115
115
|
var historyRules = [];
|
|
@@ -573,7 +573,7 @@ function compute(ctx, ruleArr, d) {
|
|
|
573
573
|
if (_lodash.default.isNil(cell) || _lodash.default.isNil(cell.v) || (0, _validation.isRealNull)(cell.v)) {
|
|
574
574
|
continue;
|
|
575
575
|
}
|
|
576
|
-
if (conditionName === "greaterThan" && compareGreaterThan(cell.v, conditionValue0,
|
|
576
|
+
if (conditionName === "greaterThan" && compareGreaterThan(cell.v, conditionValue0, ">")) {
|
|
577
577
|
if ("".concat(r, "_").concat(c) in computeMap) {
|
|
578
578
|
computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
|
|
579
579
|
computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
|
|
@@ -583,7 +583,7 @@ function compute(ctx, ruleArr, d) {
|
|
|
583
583
|
cellColor: cellColor_1
|
|
584
584
|
};
|
|
585
585
|
}
|
|
586
|
-
} else if (conditionName === "greaterThanOrEqual" && compareGreaterThan(cell.v, conditionValue0,
|
|
586
|
+
} else if (conditionName === "greaterThanOrEqual" && compareGreaterThan(cell.v, conditionValue0, ">=")) {
|
|
587
587
|
if ("".concat(r, "_").concat(c) in computeMap) {
|
|
588
588
|
computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
|
|
589
589
|
computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
|
|
@@ -603,7 +603,7 @@ function compute(ctx, ruleArr, d) {
|
|
|
603
603
|
cellColor: cellColor_1
|
|
604
604
|
};
|
|
605
605
|
}
|
|
606
|
-
} else if (conditionName === "lessThanOrEqual" && compareLessThan(cell.v, conditionValue0,
|
|
606
|
+
} else if (conditionName === "lessThanOrEqual" && compareLessThan(cell.v, conditionValue0, "<=")) {
|
|
607
607
|
if ("".concat(r, "_").concat(c) in computeMap) {
|
|
608
608
|
computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
|
|
609
609
|
computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
|
package/lib/types.d.ts
CHANGED
|
@@ -144,6 +144,18 @@ export type ConditionRulesProps = {
|
|
|
144
144
|
repeatValue: string;
|
|
145
145
|
projectValue: string;
|
|
146
146
|
};
|
|
147
|
+
export type LiveQueryData = {
|
|
148
|
+
data: {
|
|
149
|
+
row: number;
|
|
150
|
+
column: number;
|
|
151
|
+
function: string;
|
|
152
|
+
value: any;
|
|
153
|
+
id: string;
|
|
154
|
+
name: string;
|
|
155
|
+
subSheetId: string;
|
|
156
|
+
};
|
|
157
|
+
cellData: Cell;
|
|
158
|
+
};
|
|
147
159
|
export type Sheet = {
|
|
148
160
|
name: string;
|
|
149
161
|
config?: SheetConfig;
|
|
@@ -205,6 +217,7 @@ export type Sheet = {
|
|
|
205
217
|
column_focus: number;
|
|
206
218
|
};
|
|
207
219
|
};
|
|
220
|
+
liveQueryList?: Record<string, LiveQueryData>;
|
|
208
221
|
};
|
|
209
222
|
export type CommentBox = {
|
|
210
223
|
r: number;
|