@ai-table/state 0.0.10 → 0.0.12
Sign up to get free protection for your applications and to get access to all the features.
- package/esm2022/types/view.mjs +1 -1
- package/esm2022/utils/build.mjs +6 -11
- package/esm2022/utils/field/date.mjs +19 -1
- package/esm2022/utils/field/field.mjs +32 -1
- package/esm2022/utils/field/number.mjs +19 -1
- package/esm2022/utils/field/rate.mjs +19 -1
- package/esm2022/utils/field/select.mjs +23 -1
- package/esm2022/utils/field/text.mjs +7 -1
- package/esm2022/utils/sort-records.mjs +34 -0
- package/esm2022/utils/view.mjs +8 -1
- package/fesm2022/ai-table-state.mjs +153 -9
- package/fesm2022/ai-table-state.mjs.map +1 -1
- package/package.json +1 -1
- package/types/view.d.ts +7 -3
- package/types/view.d.ts.map +1 -1
- package/utils/build.d.ts +2 -2
- package/utils/build.d.ts.map +1 -1
- package/utils/field/date.d.ts +3 -0
- package/utils/field/date.d.ts.map +1 -1
- package/utils/field/field.d.ts +5 -1
- package/utils/field/field.d.ts.map +1 -1
- package/utils/field/number.d.ts +3 -0
- package/utils/field/number.d.ts.map +1 -1
- package/utils/field/rate.d.ts +3 -0
- package/utils/field/rate.d.ts.map +1 -1
- package/utils/field/select.d.ts +6 -1
- package/utils/field/select.d.ts.map +1 -1
- package/utils/field/text.d.ts +2 -0
- package/utils/field/text.d.ts.map +1 -1
- package/utils/sort-records.d.ts +5 -0
- package/utils/sort-records.d.ts.map +1 -0
- package/utils/view.d.ts +2 -1
- package/utils/view.d.ts.map +1 -1
package/esm2022/types/view.mjs
CHANGED
@@ -39,4 +39,4 @@ export var PositionActionName;
|
|
39
39
|
PositionActionName["AddRecordPosition"] = "add_record_position";
|
40
40
|
PositionActionName["RemoveRecordPosition"] = "remove_record_position";
|
41
41
|
})(PositionActionName || (PositionActionName = {}));
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmlldy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3BhY2thZ2VzL3N0YXRlL3NyYy90eXBlcy92aWV3LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE1BQU0sT0FBTyxTQUFTO0NBRXJCO0FBY0QsTUFBTSxDQUFOLElBQVksU0FJWDtBQUpELFdBQVksU0FBUztJQUNqQiwrQ0FBVyxDQUFBO0lBQ1gsbURBQWEsQ0FBQTtJQUNiLHNEQUFlLENBQUE7QUFDbkIsQ0FBQyxFQUpXLFNBQVMsS0FBVCxTQUFTLFFBSXBCO0FBRUQsTUFBTSxDQUFOLElBQVksb0JBR1g7QUFIRCxXQUFZLG9CQUFvQjtJQUM1QixtQ0FBVyxDQUFBO0lBQ1gsaUNBQVMsQ0FBQTtBQUNiLENBQUMsRUFIVyxvQkFBb0IsS0FBcEIsb0JBQW9CLFFBRy9CO0FBRUQsTUFBTSxDQUFOLElBQVksc0JBZVg7QUFmRCxXQUFZLHNCQUFzQjtJQUM5QixtQ0FBUyxDQUFBO0lBQ1QscUNBQVcsQ0FBQTtJQUNYLHFDQUFXLENBQUE7SUFDWCxtQ0FBUyxDQUFBO0lBQ1QsbUNBQVMsQ0FBQTtJQUNULG1DQUFTLENBQUE7SUFDVCw2Q0FBbUIsQ0FBQTtJQUNuQixtQ0FBUyxDQUFBO0lBQ1QscUNBQVcsQ0FBQTtJQUNYLDZDQUFtQixDQUFBO0lBQ25CLDZDQUFtQixDQUFBO0lBQ25CLHlDQUFlLENBQUE7SUFDZiwyQ0FBaUIsQ0FBQTtJQUNqQixvREFBMEIsQ0FBQTtBQUM5QixDQUFDLEVBZlcsc0JBQXNCLEtBQXRCLHNCQUFzQixRQWVqQztBQXlDRCxNQUFNLENBQU4sSUFBWSxjQUlYO0FBSkQsV0FBWSxjQUFjO0lBQ3RCLHNDQUFvQixDQUFBO0lBQ3BCLHNDQUFvQixDQUFBO0lBQ3BCLDRDQUEwQixDQUFBO0FBQzlCLENBQUMsRUFKVyxjQUFjLEtBQWQsY0FBYyxRQUl6QjtBQUVELE1BQU0sQ0FBTixJQUFZLGtCQUdYO0FBSEQsV0FBWSxrQkFBa0I7SUFDMUIsK0RBQXlDLENBQUE7SUFDekMscUVBQStDLENBQUE7QUFDbkQsQ0FBQyxFQUhXLGtCQUFrQixLQUFsQixrQkFBa0IsUUFHN0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBSVJlY29yZElkUGF0aCwgQUlUYWJsZSwgQUlUYWJsZUFjdGlvbiwgQUlUYWJsZUZpZWxkLCBBSVRhYmxlUmVjb3JkIH0gZnJvbSAnQGFpLXRhYmxlL2dyaWQnO1xuaW1wb3J0IHsgU2lnbmFsLCBXcml0YWJsZVNpZ25hbCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgSWQgfSBmcm9tICduZ3gtdGV0aHlzL3R5cGVzJztcblxuZXhwb3J0IGNsYXNzIFBvc2l0aW9ucyB7XG4gICAgW3ZpZXdfaWQ6IHN0cmluZ106IG51bWJlcjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBBSVRhYmxlVmlld1JlY29yZCBleHRlbmRzIEFJVGFibGVSZWNvcmQge1xuICAgIHBvc2l0aW9uczogUG9zaXRpb25zO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEFJVGFibGVWaWV3RmllbGQgZXh0ZW5kcyBBSVRhYmxlRmllbGQge1xuICAgIHBvc2l0aW9uczogUG9zaXRpb25zO1xufVxuXG5leHBvcnQgdHlwZSBBSVRhYmxlVmlld1JlY29yZHMgPSBBSVRhYmxlVmlld1JlY29yZFtdO1xuXG5leHBvcnQgdHlwZSBBSVRhYmxlVmlld0ZpZWxkcyA9IEFJVGFibGVWaWV3RmllbGRbXTtcblxuZXhwb3J0IGVudW0gRGlyZWN0aW9uIHtcbiAgICBkZWZhdWx0ID0gMCxcbiAgICBhc2NlbmRpbmcgPSAxLFxuICAgIGRlc2NlbmRpbmcgPSAtMVxufVxuXG5leHBvcnQgZW51bSBBSVRhYmxlRmlsdGVyTG9naWNhbCB7XG4gICAgYW5kID0gJ2FuZCcsXG4gICAgb3IgPSAnb3InXG59XG5cbmV4cG9ydCBlbnVtIEFJVGFibGVGaWx0ZXJPcGVyYXRpb24ge1xuICAgIGVxID0gJ2VxJyxcbiAgICBndGUgPSAnZ3RlJyxcbiAgICBsdGUgPSAnbHRlJyxcbiAgICBndCA9ICdndCcsXG4gICAgbHQgPSAnbHQnLFxuICAgIGluID0gJ2luJyxcbiAgICBjb250YWluID0gJ2NvbnRhaW4nLFxuICAgIG5lID0gJ25lJyxcbiAgICBuaW4gPSAnbmluJyxcbiAgICBiZXR3ZWVuID0gJ2JldHdlZW4nLFxuICAgIGJlc2lkZXMgPSAnYmVzaWRlcycsXG4gICAgZW1wdHkgPSAnZW1wdHknLFxuICAgIGV4aXN0cyA9ICdleGlzdHMnLFxuICAgIG5vdENvbnRhaW4gPSAnbm90X2NvbnRhaW4nXG59XG5cbmV4cG9ydCB0eXBlIFZpZXdTZXR0aW5ncyA9IEFJVGFibGVGaWx0ZXJDb25kaXRpb25zICYgQUlUYWJsZVNvcnRPcHRpb25zXG5cbmV4cG9ydCBpbnRlcmZhY2UgQUlUYWJsZVZpZXcge1xuICAgIF9pZDogc3RyaW5nO1xuICAgIG5hbWU6IHN0cmluZztcbiAgICBlbW9qaV9pY29uPzogc3RyaW5nO1xuICAgIHNldHRpbmdzPzogVmlld1NldHRpbmdzO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEFJVGFibGVGaWx0ZXJDb25kaXRpb248VFZhbHVlID0gdW5rbm93bj4ge1xuICAgIGZpZWxkX2lkOiBJZDtcbiAgICBvcGVyYXRpb246IEFJVGFibGVGaWx0ZXJPcGVyYXRpb247XG4gICAgdmFsdWU6IFRWYWx1ZTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBBSVRhYmxlRmlsdGVyQ29uZGl0aW9uczxUVmFsdWUgPSB1bmtub3duPiB7XG4gICAgY29uZGl0aW9uX2xvZ2ljYWw/OiBBSVRhYmxlRmlsdGVyTG9naWNhbDtcbiAgICBjb25kaXRpb25zPzogQUlUYWJsZUZpbHRlckNvbmRpdGlvbjxUVmFsdWU+W107XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQUlUYWJsZVNvcnRPcHRpb25zIHtcbiAgICBpc19rZWVwX3NvcnQ/OiBib29sZWFuO1xuICAgIHNvcnRzPzoge1xuICAgICAgICBzb3J0X2J5OiBJZDtcbiAgICAgICAgZGlyZWN0aW9uOiBEaXJlY3Rpb247XG4gICAgfVtdO1xufVxuXG5leHBvcnQgdHlwZSBBSVRhYmxlVmlld3MgPSBBSVRhYmxlVmlld1tdO1xuXG5leHBvcnQgdHlwZSBBSVZpZXdJZFBhdGggPSBbc3RyaW5nXTtcblxuZXhwb3J0IGludGVyZmFjZSBBSVZpZXdUYWJsZSBleHRlbmRzIEFJVGFibGUge1xuICAgIHZpZXdzOiBXcml0YWJsZVNpZ25hbDxBSVRhYmxlVmlld1tdPjtcbiAgICBhY3RpdmVWaWV3SWQ6IFdyaXRhYmxlU2lnbmFsPHN0cmluZz47XG4gICAgdmlld3NNYXA6IFNpZ25hbDx7IFtrZXk6IHN0cmluZ106IEFJVGFibGVWaWV3IH0+O1xuICAgIGFwcGx5OiAoYWN0aW9uOiBBSVRhYmxlU2hhcmVkQWN0aW9uKSA9PiB2b2lkO1xufVxuXG5leHBvcnQgZW51bSBWaWV3QWN0aW9uTmFtZSB7XG4gICAgU2V0VmlldyA9ICdzZXRfdmlldycsXG4gICAgQWRkVmlldyA9ICdhZGRfdmlldycsXG4gICAgUmVtb3ZlVmlldyA9ICdyZW1vdmVfdmlldydcbn1cblxuZXhwb3J0IGVudW0gUG9zaXRpb25BY3Rpb25OYW1lIHtcbiAgICBBZGRSZWNvcmRQb3NpdGlvbiA9ICdhZGRfcmVjb3JkX3Bvc2l0aW9uJyxcbiAgICBSZW1vdmVSZWNvcmRQb3NpdGlvbiA9ICdyZW1vdmVfcmVjb3JkX3Bvc2l0aW9uJ1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFNldFZpZXdBY3Rpb24ge1xuICAgIHR5cGU6IFZpZXdBY3Rpb25OYW1lLlNldFZpZXc7XG4gICAgcHJvcGVydGllczogUGFydGlhbDxBSVRhYmxlVmlldz47XG4gICAgbmV3UHJvcGVydGllczogUGFydGlhbDxBSVRhYmxlVmlldz47XG4gICAgcGF0aDogQUlWaWV3SWRQYXRoO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEFkZFZpZXdBY3Rpb24ge1xuICAgIHR5cGU6IFZpZXdBY3Rpb25OYW1lLkFkZFZpZXc7XG4gICAgdmlldzogQUlUYWJsZVZpZXc7XG4gICAgcGF0aDogW251bWJlcl07XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUmVtb3ZlVmlld0FjdGlvbiB7XG4gICAgdHlwZTogVmlld0FjdGlvbk5hbWUuUmVtb3ZlVmlldztcbiAgICBwYXRoOiBBSVZpZXdJZFBhdGg7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQWRkUmVjb3JkUG9zaXRpb25BY3Rpb24ge1xuICAgIHR5cGU6IFBvc2l0aW9uQWN0aW9uTmFtZS5BZGRSZWNvcmRQb3NpdGlvbjtcbiAgICBwb3NpdGlvbjogUG9zaXRpb25zO1xuICAgIHBhdGg6IEFJUmVjb3JkSWRQYXRoO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJlbW92ZVJlY29yZFBvc2l0aW9uQWN0aW9uIHtcbiAgICB0eXBlOiBQb3NpdGlvbkFjdGlvbk5hbWUuUmVtb3ZlUmVjb3JkUG9zaXRpb247XG4gICAgcGF0aDogW3N0cmluZywgc3RyaW5nXTtcbn1cblxuZXhwb3J0IHR5cGUgQUlUYWJsZVZpZXdBY3Rpb24gPSBTZXRWaWV3QWN0aW9uIHwgQWRkVmlld0FjdGlvbiB8IFJlbW92ZVZpZXdBY3Rpb247XG5cbmV4cG9ydCB0eXBlIEFJVGFibGVQb3NpdGlvbkFjdGlvbiA9IEFkZFJlY29yZFBvc2l0aW9uQWN0aW9uIHwgUmVtb3ZlUmVjb3JkUG9zaXRpb25BY3Rpb247XG5cbmV4cG9ydCB0eXBlIEFJVGFibGVTaGFyZWRBY3Rpb24gPSBBSVRhYmxlVmlld0FjdGlvbiB8IEFJVGFibGVBY3Rpb24gfCBBSVRhYmxlUG9zaXRpb25BY3Rpb247XG4iXX0=
|
package/esm2022/utils/build.mjs
CHANGED
@@ -1,16 +1,11 @@
|
|
1
1
|
import { getFilteredRecords } from './filter-records';
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
return [...data].sort((a, b) => a.positions[activeViewId] - b.positions[activeViewId]);
|
6
|
-
}
|
7
|
-
return data;
|
8
|
-
}
|
9
|
-
export function buildRecordsByView(records, fields, activeView) {
|
2
|
+
import { getSortRecords } from './sort-records';
|
3
|
+
import { sortByViewPosition } from './view';
|
4
|
+
export function buildRecordsByView(aiTable, records, fields, activeView) {
|
10
5
|
const filteredRecords = getFilteredRecords(records, fields, activeView);
|
11
|
-
return
|
6
|
+
return getSortRecords(aiTable, filteredRecords, activeView);
|
12
7
|
}
|
13
8
|
export function buildFieldsByView(fields, activeView) {
|
14
|
-
return
|
9
|
+
return sortByViewPosition(fields, activeView);
|
15
10
|
}
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wYWNrYWdlcy9zdGF0ZS9zcmMvdXRpbHMvYnVpbGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFdEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUU1QyxNQUFNLFVBQVUsa0JBQWtCLENBQUMsT0FBZ0IsRUFBRSxPQUEyQixFQUFFLE1BQXlCLEVBQUUsVUFBdUI7SUFDaEksTUFBTSxlQUFlLEdBQUcsa0JBQWtCLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLENBQUMsQ0FBQztJQUN4RSxPQUFPLGNBQWMsQ0FBQyxPQUFPLEVBQUUsZUFBZSxFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQ2hFLENBQUM7QUFFRCxNQUFNLFVBQVUsaUJBQWlCLENBQUMsTUFBeUIsRUFBRSxVQUF1QjtJQUNoRixPQUFPLGtCQUFrQixDQUFDLE1BQTJCLEVBQUUsVUFBVSxDQUFDLENBQUM7QUFDdkUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFJVGFibGVWaWV3LCBBSVRhYmxlVmlld0ZpZWxkcywgQUlUYWJsZVZpZXdSZWNvcmRzIH0gZnJvbSAnLi4vdHlwZXMnO1xuaW1wb3J0IHsgZ2V0RmlsdGVyZWRSZWNvcmRzIH0gZnJvbSAnLi9maWx0ZXItcmVjb3Jkcyc7XG5pbXBvcnQgeyBBSVRhYmxlIH0gZnJvbSAnQGFpLXRhYmxlL2dyaWQnO1xuaW1wb3J0IHsgZ2V0U29ydFJlY29yZHMgfSBmcm9tICcuL3NvcnQtcmVjb3Jkcyc7XG5pbXBvcnQgeyBzb3J0QnlWaWV3UG9zaXRpb24gfSBmcm9tICcuL3ZpZXcnO1xuXG5leHBvcnQgZnVuY3Rpb24gYnVpbGRSZWNvcmRzQnlWaWV3KGFpVGFibGU6IEFJVGFibGUsIHJlY29yZHM6IEFJVGFibGVWaWV3UmVjb3JkcywgZmllbGRzOiBBSVRhYmxlVmlld0ZpZWxkcywgYWN0aXZlVmlldzogQUlUYWJsZVZpZXcpIHtcbiAgICBjb25zdCBmaWx0ZXJlZFJlY29yZHMgPSBnZXRGaWx0ZXJlZFJlY29yZHMocmVjb3JkcywgZmllbGRzLCBhY3RpdmVWaWV3KTtcbiAgICByZXR1cm4gZ2V0U29ydFJlY29yZHMoYWlUYWJsZSwgZmlsdGVyZWRSZWNvcmRzLCBhY3RpdmVWaWV3KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkRmllbGRzQnlWaWV3KGZpZWxkczogQUlUYWJsZVZpZXdGaWVsZHMsIGFjdGl2ZVZpZXc6IEFJVGFibGVWaWV3KSB7XG4gICAgcmV0dXJuIHNvcnRCeVZpZXdQb3NpdGlvbihmaWVsZHMgYXMgQUlUYWJsZVZpZXdGaWVsZHMsIGFjdGl2ZVZpZXcpO1xufVxuIl19
|
@@ -52,5 +52,23 @@ export class DateField extends Field {
|
|
52
52
|
];
|
53
53
|
}
|
54
54
|
}
|
55
|
+
cellValueToString(_cellValue) {
|
56
|
+
return null;
|
57
|
+
}
|
58
|
+
static _compare(cellValue1, cellValue2) {
|
59
|
+
if (isEmpty(cellValue1?.timestamp) && isEmpty(cellValue2?.timestamp)) {
|
60
|
+
return 0;
|
61
|
+
}
|
62
|
+
if (isEmpty(cellValue1?.timestamp)) {
|
63
|
+
return -1;
|
64
|
+
}
|
65
|
+
if (isEmpty(cellValue2?.timestamp)) {
|
66
|
+
return 1;
|
67
|
+
}
|
68
|
+
return cellValue1.timestamp === cellValue2.timestamp ? 0 : cellValue1.timestamp > cellValue2.timestamp ? 1 : -1;
|
69
|
+
}
|
70
|
+
compare(cellValue1, cellValue2) {
|
71
|
+
return DateField._compare(cellValue1, cellValue2);
|
72
|
+
}
|
55
73
|
}
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
74
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"date.js","sourceRoot":"","sources":["../../../../../packages/state/src/utils/field/date.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAA0B,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,OAAO,SAAU,SAAQ,KAAK;IACvB,YAAY,CAAC,SAAyC,EAAE,SAAyB;QACtF,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACzD,QAAQ,SAAS,CAAC,SAAS,EAAE,CAAC;YAC1B,KAAK,sBAAsB,CAAC,KAAK;gBAC7B,OAAO,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,SAAS,KAAK,CAAC,CAAC;YACrE,KAAK,sBAAsB,CAAC,MAAM;gBAC9B,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,SAAS,KAAK,CAAC,CAAC;YACtE,KAAK,sBAAsB,CAAC,EAAE;gBAC1B,OAAO,IAAI,IAAI,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC;YACtE,KAAK,sBAAsB,CAAC,EAAE;gBAC1B,OAAO,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC;YACvC,KAAK,sBAAsB,CAAC,EAAE;gBAC1B,OAAO,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC;YACtC,KAAK,sBAAsB,CAAC,OAAO;gBAC/B,OAAO,IAAI,IAAI,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC;YACtE;gBACI,OAAO,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACxD,CAAC;IACL,CAAC;IAED,YAAY,CAAC,KAAiC;QAC1C,QAAQ,KAAK,EAAE,CAAC;YACZ,KAAK,OAAO;gBACR,OAAO,CAAC,IAAI,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,EAAE,IAAI,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;YACpH,KAAK,cAAc;gBACf,OAAO;oBACH,IAAI,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE;oBAC7D,IAAI,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE;iBAC9D,CAAC;YACN,KAAK,WAAW;gBACZ,OAAO;oBACH,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE;oBAC/D,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE;iBAChE,CAAC;YACN,KAAK,eAAe;gBAChB,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC,YAAY,EAAE,CAAC,WAAW,EAAE,EAAE,IAAI,QAAQ,EAAE,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;YACpG;gBACI,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACjB,OAAO;wBACH,IAAI,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAW,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE;wBACzE,IAAI,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE;qBAC1E,CAAC;gBACN,CAAC;gBACD,OAAO;oBACH,IAAI,QAAQ,CAAC,YAAY,CAAC,KAAe,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE;oBACtE,IAAI,QAAQ,CAAC,YAAY,CAAC,KAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE;iBACvE,CAAC;QACV,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,UAA0B;QACxC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,UAA0B,EAAE,UAA0B;QAClE,IAAI,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC;YACnE,OAAO,CAAC,CAAC;QACb,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,CAAC,CAAC;QACd,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,CAAC;QACb,CAAC;QAED,OAAO,UAAU,CAAC,SAAS,KAAK,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpH,CAAC;IAEQ,OAAO,CAAC,UAA0B,EAAE,UAA0B;QACnE,OAAO,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACtD,CAAC;CACJ","sourcesContent":["import { Field } from './field';\nimport { DateFieldValue } from '@ai-table/grid';\nimport { fromUnixTime, subDays } from 'date-fns';\nimport { isArray, TinyDate } from 'ngx-tethys/util';\nimport { AITableFilterCondition, AITableFilterOperation } from '../../types'\nimport { isEmpty } from '../common';\n\nexport class DateField extends Field {\n    override isMeetFilter(condition: AITableFilterCondition<string>, cellValue: DateFieldValue) {\n        const [left, right] = this.getTimeRange(condition.value);\n        switch (condition.operation) {\n            case AITableFilterOperation.empty:\n                return isEmpty(cellValue.timestamp) || cellValue.timestamp === 0;\n            case AITableFilterOperation.exists:\n                return !isEmpty(cellValue.timestamp) && cellValue.timestamp !== 0;\n            case AITableFilterOperation.eq:\n                return left <= cellValue.timestamp && cellValue.timestamp < right;\n            case AITableFilterOperation.gt:\n                return cellValue.timestamp > right;\n            case AITableFilterOperation.lt:\n                return cellValue.timestamp < left;\n            case AITableFilterOperation.between:\n                return left <= cellValue.timestamp && cellValue.timestamp < right;\n            default:\n                return super.isMeetFilter(condition, cellValue);\n        }\n    }\n\n    getTimeRange(value: string | number | number[]) {\n        switch (value) {\n            case 'today':\n                return [new TinyDate(new Date()).startOfDay().getUnixTime(), new TinyDate(new Date()).endOfDay().getUnixTime()];\n            case 'current_week':\n                return [\n                    new TinyDate().startOfWeek({ weekStartsOn: 1 }).getUnixTime(),\n                    new TinyDate().endOfWeek({ weekStartsOn: 1 }).getUnixTime()\n                ];\n            case 'yesterday':\n                return [\n                    new TinyDate(subDays(new Date(), 1)).startOfDay().getUnixTime(),\n                    new TinyDate(subDays(new Date(), 1)).endOfDay().getUnixTime()\n                ];\n            case 'current_month':\n                return [new TinyDate().startOfMonth().getUnixTime(), new TinyDate().endOfMonth().getUnixTime()];\n            default:\n                if (isArray(value)) {\n                    return [\n                        new TinyDate(fromUnixTime(value[0] as number)).startOfDay().getUnixTime(),\n                        new TinyDate(fromUnixTime(value[1] as number)).endOfDay().getUnixTime()\n                    ];\n                }\n                return [\n                    new TinyDate(fromUnixTime(value as number)).startOfDay().getUnixTime(),\n                    new TinyDate(fromUnixTime(value as number)).endOfDay().getUnixTime()\n                ];\n        }\n    }\n\n    cellValueToString(_cellValue: DateFieldValue): string | null {\n        return null;\n    }\n\n    static _compare(cellValue1: DateFieldValue, cellValue2: DateFieldValue): number {\n        if (isEmpty(cellValue1?.timestamp) && isEmpty(cellValue2?.timestamp)) {\n            return 0;\n        }\n        if (isEmpty(cellValue1?.timestamp)) {\n            return -1;\n        }\n        if (isEmpty(cellValue2?.timestamp)) {\n            return 1;\n        }\n\n        return cellValue1.timestamp === cellValue2.timestamp ? 0 : cellValue1.timestamp > cellValue2.timestamp ? 1 : -1;\n    }\n\n    override compare(cellValue1: DateFieldValue, cellValue2: DateFieldValue): number {\n        return DateField._compare(cellValue1, cellValue2);\n    }\n}\n"]}
|
@@ -1,5 +1,7 @@
|
|
1
1
|
import { AITableFilterOperation } from '../../types';
|
2
2
|
import { isEmpty } from '../common';
|
3
|
+
import { isEqual } from 'lodash';
|
4
|
+
export const zhIntlCollator = typeof Intl !== 'undefined' ? new Intl.Collator('zh-CN') : undefined;
|
3
5
|
export class Field {
|
4
6
|
stringInclude(str, searchStr) {
|
5
7
|
return str.toLowerCase().includes(searchStr.trim().toLowerCase());
|
@@ -28,5 +30,34 @@ export class Field {
|
|
28
30
|
}
|
29
31
|
}
|
30
32
|
}
|
33
|
+
eq(cv1, cv2) {
|
34
|
+
return isEqual(cv1, cv2);
|
35
|
+
}
|
36
|
+
compare(cellValue1, cellValue2, field) {
|
37
|
+
if (this.eq(cellValue1, cellValue2)) {
|
38
|
+
return 0;
|
39
|
+
}
|
40
|
+
if (cellValue1 == null) {
|
41
|
+
return -1;
|
42
|
+
}
|
43
|
+
if (cellValue2 == null) {
|
44
|
+
return 1;
|
45
|
+
}
|
46
|
+
let str1 = this.cellValueToString(cellValue1, field);
|
47
|
+
let str2 = this.cellValueToString(cellValue2, field);
|
48
|
+
if (str1 === str2) {
|
49
|
+
return 0;
|
50
|
+
}
|
51
|
+
if (str1 == null) {
|
52
|
+
return -1;
|
53
|
+
}
|
54
|
+
if (str2 == null) {
|
55
|
+
return 1;
|
56
|
+
}
|
57
|
+
str1 = str1.trim();
|
58
|
+
str2 = str2.trim();
|
59
|
+
// test pinyin sort
|
60
|
+
return str1 === str2 ? 0 : zhIntlCollator ? zhIntlCollator.compare(str1, str2) : str1.localeCompare(str2, 'zh-CN') > 0 ? 1 : -1;
|
61
|
+
}
|
31
62
|
}
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmllbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9zdGF0ZS9zcmMvdXRpbHMvZmllbGQvZmllbGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUEwQixzQkFBc0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3RSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFFakMsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLE9BQU8sSUFBSSxLQUFLLFdBQVcsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7QUFFbkcsTUFBTSxPQUFnQixLQUFLO0lBQ2IsYUFBYSxDQUFDLEdBQVcsRUFBRSxTQUFpQjtRQUNsRCxPQUFPLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7SUFDdEUsQ0FBQztJQUlELFlBQVksQ0FBQyxTQUFpQyxFQUFFLFNBQXFCO1FBQ2pFLFFBQVEsU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQzFCLEtBQUssc0JBQXNCLENBQUMsS0FBSyxDQUFDO1lBQ2xDLEtBQUssc0JBQXNCLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDakMsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7WUFDN0QsQ0FBQztZQUNELE9BQU8sQ0FBQyxDQUFDLENBQUM7Z0JBQ04sT0FBTyxJQUFJLENBQUM7WUFDaEIsQ0FBQztRQUNMLENBQUM7SUFDTCxDQUFDO0lBRUQsWUFBWSxDQUFDLFNBQXVFLEVBQUUsU0FBcUI7UUFDdkcsUUFBUSxTQUFTLEVBQUUsQ0FBQztZQUNoQixLQUFLLHNCQUFzQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ2hDLE9BQU8sT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQzlCLENBQUM7WUFDRCxLQUFLLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2pDLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDL0IsQ0FBQztZQUNELE9BQU8sQ0FBQyxDQUFDLENBQUM7Z0JBQ04sTUFBTSxJQUFJLEtBQUssQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO1lBQ25ELENBQUM7UUFDTCxDQUFDO0lBQ0wsQ0FBQztJQUVELEVBQUUsQ0FBQyxHQUFlLEVBQUUsR0FBZTtRQUMvQixPQUFPLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUVELE9BQU8sQ0FBQyxVQUFzQixFQUFFLFVBQXNCLEVBQUUsS0FBbUI7UUFDdkUsSUFBSSxJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsRUFBRSxDQUFDO1lBQ2xDLE9BQU8sQ0FBQyxDQUFDO1FBQ2IsQ0FBQztRQUNELElBQUksVUFBVSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3JCLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDZCxDQUFDO1FBQ0QsSUFBSSxVQUFVLElBQUksSUFBSSxFQUFFLENBQUM7WUFDckIsT0FBTyxDQUFDLENBQUM7UUFDYixDQUFDO1FBRUQsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNyRCxJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUMsVUFBVSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRXJELElBQUksSUFBSSxLQUFLLElBQUksRUFBRSxDQUFDO1lBQ2hCLE9BQU8sQ0FBQyxDQUFDO1FBQ2IsQ0FBQztRQUNELElBQUksSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ2YsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNkLENBQUM7UUFDRCxJQUFJLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUNmLE9BQU8sQ0FBQyxDQUFDO1FBQ2IsQ0FBQztRQUVELElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDbkIsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUVuQixtQkFBbUI7UUFDbkIsT0FBTyxJQUFJLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwSSxDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBSVRhYmxlRmllbGQsIEZpZWxkVmFsdWUgfSBmcm9tICdAYWktdGFibGUvZ3JpZCc7XG5pbXBvcnQgeyBBSVRhYmxlRmlsdGVyQ29uZGl0aW9uLCBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uIH0gZnJvbSAnLi4vLi4vdHlwZXMnO1xuaW1wb3J0IHsgaXNFbXB0eSB9IGZyb20gJy4uL2NvbW1vbic7XG5pbXBvcnQgeyBpc0VxdWFsIH0gZnJvbSAnbG9kYXNoJztcblxuZXhwb3J0IGNvbnN0IHpoSW50bENvbGxhdG9yID0gdHlwZW9mIEludGwgIT09ICd1bmRlZmluZWQnID8gbmV3IEludGwuQ29sbGF0b3IoJ3poLUNOJykgOiB1bmRlZmluZWQ7XG5cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBGaWVsZCB7XG4gICAgcHJvdGVjdGVkIHN0cmluZ0luY2x1ZGUoc3RyOiBzdHJpbmcsIHNlYXJjaFN0cjogc3RyaW5nKSB7XG4gICAgICAgIHJldHVybiBzdHIudG9Mb3dlckNhc2UoKS5pbmNsdWRlcyhzZWFyY2hTdHIudHJpbSgpLnRvTG93ZXJDYXNlKCkpO1xuICAgIH1cblxuICAgIGFic3RyYWN0IGNlbGxWYWx1ZVRvU3RyaW5nKGNlbGxWYWx1ZTogRmllbGRWYWx1ZSwgZmllbGQ6IEFJVGFibGVGaWVsZCk6IHN0cmluZyB8IG51bGw7XG5cbiAgICBpc01lZXRGaWx0ZXIoY29uZGl0aW9uOiBBSVRhYmxlRmlsdGVyQ29uZGl0aW9uLCBjZWxsVmFsdWU6IEZpZWxkVmFsdWUpIHtcbiAgICAgICAgc3dpdGNoIChjb25kaXRpb24ub3BlcmF0aW9uKSB7XG4gICAgICAgICAgICBjYXNlIEFJVGFibGVGaWx0ZXJPcGVyYXRpb24uZW1wdHk6XG4gICAgICAgICAgICBjYXNlIEFJVGFibGVGaWx0ZXJPcGVyYXRpb24uZXhpc3RzOiB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuaXNFbXB0eU9yTm90KGNvbmRpdGlvbi5vcGVyYXRpb24sIGNlbGxWYWx1ZSk7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBkZWZhdWx0OiB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBpc0VtcHR5T3JOb3Qob3BlcmF0aW9uOiBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uLmVtcHR5IHwgQUlUYWJsZUZpbHRlck9wZXJhdGlvbi5leGlzdHMsIGNlbGxWYWx1ZTogRmllbGRWYWx1ZSkge1xuICAgICAgICBzd2l0Y2ggKG9wZXJhdGlvbikge1xuICAgICAgICAgICAgY2FzZSBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uLmVtcHR5OiB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIGlzRW1wdHkoY2VsbFZhbHVlKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIGNhc2UgQUlUYWJsZUZpbHRlck9wZXJhdGlvbi5leGlzdHM6IHtcbiAgICAgICAgICAgICAgICByZXR1cm4gIWlzRW1wdHkoY2VsbFZhbHVlKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIGRlZmF1bHQ6IHtcbiAgICAgICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ2NvbXBhcmUgb3BlcmF0b3IgdHlwZSBlcnJvcicpO1xuICAgICAgICAgICAgfVxuICAgICAgICB9XG4gICAgfVxuXG4gICAgZXEoY3YxOiBGaWVsZFZhbHVlLCBjdjI6IEZpZWxkVmFsdWUpOiBib29sZWFuIHtcbiAgICAgICAgcmV0dXJuIGlzRXF1YWwoY3YxLCBjdjIpO1xuICAgIH1cblxuICAgIGNvbXBhcmUoY2VsbFZhbHVlMTogRmllbGRWYWx1ZSwgY2VsbFZhbHVlMjogRmllbGRWYWx1ZSwgZmllbGQ6IEFJVGFibGVGaWVsZCk6IG51bWJlciB7XG4gICAgICAgIGlmICh0aGlzLmVxKGNlbGxWYWx1ZTEsIGNlbGxWYWx1ZTIpKSB7XG4gICAgICAgICAgICByZXR1cm4gMDtcbiAgICAgICAgfVxuICAgICAgICBpZiAoY2VsbFZhbHVlMSA9PSBudWxsKSB7XG4gICAgICAgICAgICByZXR1cm4gLTE7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKGNlbGxWYWx1ZTIgPT0gbnVsbCkge1xuICAgICAgICAgICAgcmV0dXJuIDE7XG4gICAgICAgIH1cblxuICAgICAgICBsZXQgc3RyMSA9IHRoaXMuY2VsbFZhbHVlVG9TdHJpbmcoY2VsbFZhbHVlMSwgZmllbGQpO1xuICAgICAgICBsZXQgc3RyMiA9IHRoaXMuY2VsbFZhbHVlVG9TdHJpbmcoY2VsbFZhbHVlMiwgZmllbGQpO1xuXG4gICAgICAgIGlmIChzdHIxID09PSBzdHIyKSB7XG4gICAgICAgICAgICByZXR1cm4gMDtcbiAgICAgICAgfVxuICAgICAgICBpZiAoc3RyMSA9PSBudWxsKSB7XG4gICAgICAgICAgICByZXR1cm4gLTE7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKHN0cjIgPT0gbnVsbCkge1xuICAgICAgICAgICAgcmV0dXJuIDE7XG4gICAgICAgIH1cblxuICAgICAgICBzdHIxID0gc3RyMS50cmltKCk7XG4gICAgICAgIHN0cjIgPSBzdHIyLnRyaW0oKTtcblxuICAgICAgICAvLyB0ZXN0IHBpbnlpbiBzb3J0XG4gICAgICAgIHJldHVybiBzdHIxID09PSBzdHIyID8gMCA6IHpoSW50bENvbGxhdG9yID8gemhJbnRsQ29sbGF0b3IuY29tcGFyZShzdHIxLCBzdHIyKSA6IHN0cjEubG9jYWxlQ29tcGFyZShzdHIyLCAnemgtQ04nKSA+IDAgPyAxIDogLTE7XG4gICAgfVxufVxuIl19
|
@@ -24,5 +24,23 @@ export class NumberField extends Field {
|
|
24
24
|
return super.isMeetFilter(condition, cellValue);
|
25
25
|
}
|
26
26
|
}
|
27
|
+
cellValueToString(_cellValue) {
|
28
|
+
return null;
|
29
|
+
}
|
30
|
+
static _compare(cellValue1, cellValue2) {
|
31
|
+
if (isEmpty(cellValue1) && isEmpty(cellValue2)) {
|
32
|
+
return 0;
|
33
|
+
}
|
34
|
+
if (isEmpty(cellValue1)) {
|
35
|
+
return -1;
|
36
|
+
}
|
37
|
+
if (isEmpty(cellValue2)) {
|
38
|
+
return 1;
|
39
|
+
}
|
40
|
+
return cellValue1 === cellValue2 ? 0 : cellValue1 > cellValue2 ? 1 : -1;
|
41
|
+
}
|
42
|
+
compare(cellValue1, cellValue2) {
|
43
|
+
return NumberField._compare(cellValue1, cellValue2);
|
44
|
+
}
|
27
45
|
}
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVtYmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvc3RhdGUvc3JjL3V0aWxzL2ZpZWxkL251bWJlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTBCLHNCQUFzQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQzdFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFFaEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUVwQyxNQUFNLE9BQU8sV0FBWSxTQUFRLEtBQUs7SUFDekIsWUFBWSxDQUFDLFNBQXlDLEVBQUUsU0FBcUI7UUFDbEYsUUFBUSxTQUFTLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDMUIsS0FBSyxzQkFBc0IsQ0FBQyxLQUFLO2dCQUM3QixPQUFPLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUM5QixLQUFLLHNCQUFzQixDQUFDLE1BQU07Z0JBQzlCLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDL0IsS0FBSyxzQkFBc0IsQ0FBQyxFQUFFO2dCQUMxQixPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLElBQUksU0FBUyxJQUFJLElBQUksSUFBSSxTQUFTLEtBQUssRUFBRSxJQUFJLFNBQVMsQ0FBQyxLQUFLLEtBQUssU0FBUyxDQUFDO1lBQ3BILEtBQUssc0JBQXNCLENBQUMsR0FBRztnQkFDM0IsT0FBTyxTQUFTLElBQUksSUFBSSxJQUFJLFNBQVMsS0FBSyxFQUFFLElBQUksU0FBUyxJQUFJLFNBQVMsQ0FBQyxLQUFLLENBQUM7WUFDakYsS0FBSyxzQkFBc0IsQ0FBQyxHQUFHO2dCQUMzQixPQUFPLFNBQVMsSUFBSSxJQUFJLElBQUksU0FBUyxLQUFLLEVBQUUsSUFBSSxTQUFTLElBQUksU0FBUyxDQUFDLEtBQUssQ0FBQztZQUNqRixLQUFLLHNCQUFzQixDQUFDLEVBQUU7Z0JBQzFCLE9BQU8sU0FBUyxJQUFJLElBQUksSUFBSSxTQUFTLEtBQUssRUFBRSxJQUFJLFNBQVMsR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDO1lBQ2hGLEtBQUssc0JBQXNCLENBQUMsRUFBRTtnQkFDMUIsT0FBTyxTQUFTLElBQUksSUFBSSxJQUFJLFNBQVMsS0FBSyxFQUFFLElBQUksU0FBUyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUM7WUFDaEYsS0FBSyxzQkFBc0IsQ0FBQyxFQUFFO2dCQUMxQixPQUFPLFNBQVMsSUFBSSxJQUFJLElBQUksU0FBUyxJQUFJLEVBQUUsSUFBSSxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsSUFBSSxTQUFTLEtBQUssU0FBUyxDQUFDLEtBQUssQ0FBQztZQUNsSDtnQkFDSSxPQUFPLEtBQUssQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3hELENBQUM7SUFDTCxDQUFDO0lBRUQsaUJBQWlCLENBQUMsVUFBc0I7UUFDcEMsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUVELE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBa0IsRUFBRSxVQUFrQjtRQUNsRCxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztZQUM3QyxPQUFPLENBQUMsQ0FBQztRQUNiLENBQUM7UUFDRCxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1lBQ3RCLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDZCxDQUFDO1FBQ0QsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztZQUN0QixPQUFPLENBQUMsQ0FBQztRQUNiLENBQUM7UUFDRCxPQUFPLFVBQVUsS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1RSxDQUFDO0lBRVEsT0FBTyxDQUFDLFVBQWtCLEVBQUUsVUFBa0I7UUFDbkQsT0FBTyxXQUFXLENBQUMsUUFBUSxDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUN4RCxDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBSVRhYmxlRmlsdGVyQ29uZGl0aW9uLCBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uIH0gZnJvbSAnLi4vLi4vdHlwZXMnO1xuaW1wb3J0IHsgRmllbGQgfSBmcm9tICcuL2ZpZWxkJztcbmltcG9ydCB7IEZpZWxkVmFsdWUgfSBmcm9tICdAYWktdGFibGUvZ3JpZCc7XG5pbXBvcnQgeyBpc0VtcHR5IH0gZnJvbSAnLi4vY29tbW9uJztcblxuZXhwb3J0IGNsYXNzIE51bWJlckZpZWxkIGV4dGVuZHMgRmllbGQge1xuICAgIG92ZXJyaWRlIGlzTWVldEZpbHRlcihjb25kaXRpb246IEFJVGFibGVGaWx0ZXJDb25kaXRpb248bnVtYmVyPiwgY2VsbFZhbHVlOiBGaWVsZFZhbHVlKSB7XG4gICAgICAgIHN3aXRjaCAoY29uZGl0aW9uLm9wZXJhdGlvbikge1xuICAgICAgICAgICAgY2FzZSBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uLmVtcHR5OlxuICAgICAgICAgICAgICAgIHJldHVybiBpc0VtcHR5KGNlbGxWYWx1ZSk7XG4gICAgICAgICAgICBjYXNlIEFJVGFibGVGaWx0ZXJPcGVyYXRpb24uZXhpc3RzOlxuICAgICAgICAgICAgICAgIHJldHVybiAhaXNFbXB0eShjZWxsVmFsdWUpO1xuICAgICAgICAgICAgY2FzZSBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uLmVxOlxuICAgICAgICAgICAgICAgIHJldHVybiAhTnVtYmVyLmlzTmFOKGNvbmRpdGlvbi52YWx1ZSkgJiYgY2VsbFZhbHVlICE9IG51bGwgJiYgY2VsbFZhbHVlICE9PSAnJyAmJiBjb25kaXRpb24udmFsdWUgPT09IGNlbGxWYWx1ZTtcbiAgICAgICAgICAgIGNhc2UgQUlUYWJsZUZpbHRlck9wZXJhdGlvbi5ndGU6XG4gICAgICAgICAgICAgICAgcmV0dXJuIGNlbGxWYWx1ZSAhPSBudWxsICYmIGNlbGxWYWx1ZSAhPT0gJycgJiYgY2VsbFZhbHVlID49IGNvbmRpdGlvbi52YWx1ZTtcbiAgICAgICAgICAgIGNhc2UgQUlUYWJsZUZpbHRlck9wZXJhdGlvbi5sdGU6XG4gICAgICAgICAgICAgICAgcmV0dXJuIGNlbGxWYWx1ZSAhPSBudWxsICYmIGNlbGxWYWx1ZSAhPT0gJycgJiYgY2VsbFZhbHVlIDw9IGNvbmRpdGlvbi52YWx1ZTtcbiAgICAgICAgICAgIGNhc2UgQUlUYWJsZUZpbHRlck9wZXJhdGlvbi5ndDpcbiAgICAgICAgICAgICAgICByZXR1cm4gY2VsbFZhbHVlICE9IG51bGwgJiYgY2VsbFZhbHVlICE9PSAnJyAmJiBjZWxsVmFsdWUgPiBjb25kaXRpb24udmFsdWU7XG4gICAgICAgICAgICBjYXNlIEFJVGFibGVGaWx0ZXJPcGVyYXRpb24ubHQ6XG4gICAgICAgICAgICAgICAgcmV0dXJuIGNlbGxWYWx1ZSAhPSBudWxsICYmIGNlbGxWYWx1ZSAhPT0gJycgJiYgY2VsbFZhbHVlIDwgY29uZGl0aW9uLnZhbHVlO1xuICAgICAgICAgICAgY2FzZSBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uLm5lOlxuICAgICAgICAgICAgICAgIHJldHVybiBjZWxsVmFsdWUgPT0gbnVsbCB8fCBjZWxsVmFsdWUgPT0gJycgfHwgTnVtYmVyLmlzTmFOKGNvbmRpdGlvbi52YWx1ZSkgfHwgY2VsbFZhbHVlICE9PSBjb25kaXRpb24udmFsdWU7XG4gICAgICAgICAgICBkZWZhdWx0OlxuICAgICAgICAgICAgICAgIHJldHVybiBzdXBlci5pc01lZXRGaWx0ZXIoY29uZGl0aW9uLCBjZWxsVmFsdWUpO1xuICAgICAgICB9XG4gICAgfVxuXG4gICAgY2VsbFZhbHVlVG9TdHJpbmcoX2NlbGxWYWx1ZTogRmllbGRWYWx1ZSk6IHN0cmluZyB8IG51bGwge1xuICAgICAgICByZXR1cm4gbnVsbDtcbiAgICB9XG5cbiAgICBzdGF0aWMgX2NvbXBhcmUoY2VsbFZhbHVlMTogbnVtYmVyLCBjZWxsVmFsdWUyOiBudW1iZXIpOiBudW1iZXIge1xuICAgICAgICBpZiAoaXNFbXB0eShjZWxsVmFsdWUxKSAmJiBpc0VtcHR5KGNlbGxWYWx1ZTIpKSB7XG4gICAgICAgICAgICByZXR1cm4gMDtcbiAgICAgICAgfVxuICAgICAgICBpZiAoaXNFbXB0eShjZWxsVmFsdWUxKSkge1xuICAgICAgICAgICAgcmV0dXJuIC0xO1xuICAgICAgICB9XG4gICAgICAgIGlmIChpc0VtcHR5KGNlbGxWYWx1ZTIpKSB7XG4gICAgICAgICAgICByZXR1cm4gMTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gY2VsbFZhbHVlMSA9PT0gY2VsbFZhbHVlMiA/IDAgOiBjZWxsVmFsdWUxID4gY2VsbFZhbHVlMiA/IDEgOiAtMTtcbiAgICB9XG5cbiAgICBvdmVycmlkZSBjb21wYXJlKGNlbGxWYWx1ZTE6IG51bWJlciwgY2VsbFZhbHVlMjogbnVtYmVyKTogbnVtYmVyIHtcbiAgICAgICAgcmV0dXJuIE51bWJlckZpZWxkLl9jb21wYXJlKGNlbGxWYWx1ZTEsIGNlbGxWYWx1ZTIpO1xuICAgIH1cbn1cbiJdfQ==
|
@@ -16,5 +16,23 @@ export class RateField extends Field {
|
|
16
16
|
return super.isMeetFilter(condition, cellValue);
|
17
17
|
}
|
18
18
|
}
|
19
|
+
cellValueToString(_cellValue) {
|
20
|
+
return null;
|
21
|
+
}
|
22
|
+
static _compare(cellValue1, cellValue2) {
|
23
|
+
if (isEmpty(cellValue1) && isEmpty(cellValue2)) {
|
24
|
+
return 0;
|
25
|
+
}
|
26
|
+
if (isEmpty(cellValue1)) {
|
27
|
+
return -1;
|
28
|
+
}
|
29
|
+
if (isEmpty(cellValue2)) {
|
30
|
+
return 1;
|
31
|
+
}
|
32
|
+
return cellValue1 === cellValue2 ? 0 : cellValue1 > cellValue2 ? 1 : -1;
|
33
|
+
}
|
34
|
+
compare(cellValue1, cellValue2) {
|
35
|
+
return RateField._compare(cellValue1, cellValue2);
|
36
|
+
}
|
19
37
|
}
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3N0YXRlL3NyYy91dGlscy9maWVsZC9yYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDcEMsT0FBTyxFQUEwQixzQkFBc0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3RSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBR2hDLE1BQU0sT0FBTyxTQUFVLFNBQVEsS0FBSztJQUN2QixZQUFZLENBQUMsU0FBMkMsRUFBRSxTQUFrQztRQUNqRyxRQUFRLFNBQVMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUMxQixLQUFLLHNCQUFzQixDQUFDLEtBQUs7Z0JBQzdCLE9BQU8sT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQzlCLEtBQUssc0JBQXNCLENBQUMsTUFBTTtnQkFDOUIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUMvQixLQUFLLHNCQUFzQixDQUFDLEVBQUU7Z0JBQzFCLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksU0FBUyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDakYsS0FBSyxzQkFBc0IsQ0FBQyxHQUFHO2dCQUMzQixPQUFPLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1lBQ2pGO2dCQUNJLE9BQU8sS0FBSyxDQUFDLFlBQVksQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDeEQsQ0FBQztJQUNMLENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxVQUEwQjtRQUN4QyxPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFrQixFQUFFLFVBQWtCO1FBQ2xELElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1lBQzdDLE9BQU8sQ0FBQyxDQUFDO1FBQ2IsQ0FBQztRQUNELElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7WUFDdEIsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNkLENBQUM7UUFDRCxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1lBQ3RCLE9BQU8sQ0FBQyxDQUFDO1FBQ2IsQ0FBQztRQUNELE9BQU8sVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVFLENBQUM7SUFFUSxPQUFPLENBQUMsVUFBa0IsRUFBRSxVQUFrQjtRQUNuRCxPQUFPLFNBQVMsQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ3RELENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGlzRW1wdHkgfSBmcm9tICcuLi9jb21tb24nO1xuaW1wb3J0IHsgQUlUYWJsZUZpbHRlckNvbmRpdGlvbiwgQUlUYWJsZUZpbHRlck9wZXJhdGlvbiB9IGZyb20gJy4uLy4uL3R5cGVzJztcbmltcG9ydCB7IEZpZWxkIH0gZnJvbSAnLi9maWVsZCc7XG5pbXBvcnQgeyBSYXRlRmllbGRWYWx1ZSB9IGZyb20gJ0BhaS10YWJsZS9ncmlkJztcblxuZXhwb3J0IGNsYXNzIFJhdGVGaWVsZCBleHRlbmRzIEZpZWxkIHtcbiAgICBvdmVycmlkZSBpc01lZXRGaWx0ZXIoY29uZGl0aW9uOiBBSVRhYmxlRmlsdGVyQ29uZGl0aW9uPHN0cmluZ1tdPiwgY2VsbFZhbHVlOiBSYXRlRmllbGRWYWx1ZSB8IHN0cmluZykge1xuICAgICAgICBzd2l0Y2ggKGNvbmRpdGlvbi5vcGVyYXRpb24pIHtcbiAgICAgICAgICAgIGNhc2UgQUlUYWJsZUZpbHRlck9wZXJhdGlvbi5lbXB0eTpcbiAgICAgICAgICAgICAgICByZXR1cm4gaXNFbXB0eShjZWxsVmFsdWUpO1xuICAgICAgICAgICAgY2FzZSBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uLmV4aXN0czpcbiAgICAgICAgICAgICAgICByZXR1cm4gIWlzRW1wdHkoY2VsbFZhbHVlKTtcbiAgICAgICAgICAgIGNhc2UgQUlUYWJsZUZpbHRlck9wZXJhdGlvbi5pbjpcbiAgICAgICAgICAgICAgICByZXR1cm4gIWlzRW1wdHkoY2VsbFZhbHVlKSAmJiBjb25kaXRpb24udmFsdWUuaW5jbHVkZXMoY2VsbFZhbHVlLnRvU3RyaW5nKCkpO1xuICAgICAgICAgICAgY2FzZSBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uLm5pbjpcbiAgICAgICAgICAgICAgICByZXR1cm4gaXNFbXB0eShjZWxsVmFsdWUpIHx8ICFjb25kaXRpb24udmFsdWUuaW5jbHVkZXMoY2VsbFZhbHVlLnRvU3RyaW5nKCkpO1xuICAgICAgICAgICAgZGVmYXVsdDpcbiAgICAgICAgICAgICAgICByZXR1cm4gc3VwZXIuaXNNZWV0RmlsdGVyKGNvbmRpdGlvbiwgY2VsbFZhbHVlKTtcbiAgICAgICAgfVxuICAgIH1cblxuICAgIGNlbGxWYWx1ZVRvU3RyaW5nKF9jZWxsVmFsdWU6IFJhdGVGaWVsZFZhbHVlKTogc3RyaW5nIHwgbnVsbCB7XG4gICAgICAgIHJldHVybiBudWxsO1xuICAgIH1cblxuICAgIHN0YXRpYyBfY29tcGFyZShjZWxsVmFsdWUxOiBudW1iZXIsIGNlbGxWYWx1ZTI6IG51bWJlcik6IG51bWJlciB7XG4gICAgICAgIGlmIChpc0VtcHR5KGNlbGxWYWx1ZTEpICYmIGlzRW1wdHkoY2VsbFZhbHVlMikpIHtcbiAgICAgICAgICAgIHJldHVybiAwO1xuICAgICAgICB9XG4gICAgICAgIGlmIChpc0VtcHR5KGNlbGxWYWx1ZTEpKSB7XG4gICAgICAgICAgICByZXR1cm4gLTE7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKGlzRW1wdHkoY2VsbFZhbHVlMikpIHtcbiAgICAgICAgICAgIHJldHVybiAxO1xuICAgICAgICB9XG4gICAgICAgIHJldHVybiBjZWxsVmFsdWUxID09PSBjZWxsVmFsdWUyID8gMCA6IGNlbGxWYWx1ZTEgPiBjZWxsVmFsdWUyID8gMSA6IC0xO1xuICAgIH1cblxuICAgIG92ZXJyaWRlIGNvbXBhcmUoY2VsbFZhbHVlMTogbnVtYmVyLCBjZWxsVmFsdWUyOiBudW1iZXIpOiBudW1iZXIge1xuICAgICAgICByZXR1cm4gUmF0ZUZpZWxkLl9jb21wYXJlKGNlbGxWYWx1ZTEsIGNlbGxWYWx1ZTIpO1xuICAgIH1cbn1cbiJdfQ==
|
@@ -16,6 +16,28 @@ export class SelectField extends Field {
|
|
16
16
|
return super.isMeetFilter(condition, cellValue);
|
17
17
|
}
|
18
18
|
}
|
19
|
+
cellValueToString(cellValue, field) {
|
20
|
+
return this.arrayValueToString(this.cellValueToArray(cellValue, field));
|
21
|
+
}
|
22
|
+
cellValueToArray(cellValue, field) {
|
23
|
+
if (!cellValue) {
|
24
|
+
return null;
|
25
|
+
}
|
26
|
+
const result = [];
|
27
|
+
for (let i = 0, l = cellValue.length; i < l; i++) {
|
28
|
+
const option = this.findOptionById(field, cellValue[i]);
|
29
|
+
if (option) {
|
30
|
+
result.push(option.text);
|
31
|
+
}
|
32
|
+
}
|
33
|
+
return result;
|
34
|
+
}
|
35
|
+
findOptionById(field, id) {
|
36
|
+
return field.settings.options.find(option => option._id === id) || null;
|
37
|
+
}
|
38
|
+
arrayValueToString(cellValues) {
|
39
|
+
return cellValues && cellValues.length ? cellValues.join(', ') : null;
|
40
|
+
}
|
19
41
|
}
|
20
42
|
function hasIntersect(array1, array2) {
|
21
43
|
if (!Array.isArray(array1) || !Array.isArray(array2)) {
|
@@ -30,4 +52,4 @@ function hasIntersect(array1, array2) {
|
|
30
52
|
}
|
31
53
|
return false;
|
32
54
|
}
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VsZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvc3RhdGUvc3JjL3V0aWxzL2ZpZWxkL3NlbGVjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3BDLE9BQU8sRUFBMEIsc0JBQXNCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDN0UsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUloQyxNQUFNLE9BQU8sV0FBWSxTQUFRLEtBQUs7SUFDekIsWUFBWSxDQUFDLFNBQXlDLEVBQUUsU0FBMkI7UUFDeEYsUUFBUSxTQUFTLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDMUIsS0FBSyxzQkFBc0IsQ0FBQyxLQUFLO2dCQUM3QixPQUFPLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUM5QixLQUFLLHNCQUFzQixDQUFDLE1BQU07Z0JBQzlCLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDL0IsS0FBSyxzQkFBc0IsQ0FBQyxFQUFFO2dCQUMxQixPQUFPLEtBQUssQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxJQUFJLFlBQVksQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3RGLEtBQUssc0JBQXNCLENBQUMsR0FBRztnQkFDM0IsT0FBTyxLQUFLLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3ZGO2dCQUNJLE9BQU8sS0FBSyxDQUFDLFlBQVksQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDeEQsQ0FBQztJQUNMLENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxTQUEyQixFQUFFLEtBQW1CO1FBQzlELE9BQU8sSUFBSSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUM1RSxDQUFDO0lBRUQsZ0JBQWdCLENBQUMsU0FBMkIsRUFBRSxLQUFtQjtRQUM3RCxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDYixPQUFPLElBQUksQ0FBQztRQUNoQixDQUFDO1FBQ0QsTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFDO1FBQzVCLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUMvQyxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN4RCxJQUFJLE1BQU0sRUFBRSxDQUFDO2dCQUNULE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzdCLENBQUM7UUFDTCxDQUFDO1FBQ0QsT0FBTyxNQUFNLENBQUM7SUFDbEIsQ0FBQztJQUVELGNBQWMsQ0FBQyxLQUFtQixFQUFFLEVBQU07UUFDdEMsT0FBUSxLQUFLLENBQUMsUUFBMkIsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxFQUFFLENBQUMsSUFBSSxJQUFJLENBQUM7SUFDaEcsQ0FBQztJQUVELGtCQUFrQixDQUFDLFVBQTJCO1FBQzFDLE9BQU8sVUFBVSxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztJQUMxRSxDQUFDO0NBQ0o7QUFFRCxTQUFTLFlBQVksQ0FBNEIsTUFBVyxFQUFFLE1BQVc7SUFDckUsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7UUFDbkQsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUNELE1BQU0sSUFBSSxHQUFHLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzdCLE1BQU0sSUFBSSxHQUFHLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzdCLEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7UUFDckIsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDaEIsT0FBTyxJQUFJLENBQUM7UUFDaEIsQ0FBQztJQUNMLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNqQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaXNFbXB0eSB9IGZyb20gJy4uL2NvbW1vbic7XG5pbXBvcnQgeyBBSVRhYmxlRmlsdGVyQ29uZGl0aW9uLCBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uIH0gZnJvbSAnLi4vLi4vdHlwZXMnO1xuaW1wb3J0IHsgRmllbGQgfSBmcm9tICcuL2ZpZWxkJztcbmltcG9ydCB7IEFJVGFibGVGaWVsZCwgQUlUYWJsZVNlbGVjdE9wdGlvbiwgU2VsZWN0RmllbGRWYWx1ZSwgU2VsZWN0U2V0dGluZ3MgfSBmcm9tICdAYWktdGFibGUvZ3JpZCc7XG5pbXBvcnQgeyBJZCB9IGZyb20gJ25neC10ZXRoeXMvdHlwZXMnO1xuXG5leHBvcnQgY2xhc3MgU2VsZWN0RmllbGQgZXh0ZW5kcyBGaWVsZCB7XG4gICAgb3ZlcnJpZGUgaXNNZWV0RmlsdGVyKGNvbmRpdGlvbjogQUlUYWJsZUZpbHRlckNvbmRpdGlvbjxzdHJpbmc+LCBjZWxsVmFsdWU6IFNlbGVjdEZpZWxkVmFsdWUpIHtcbiAgICAgICAgc3dpdGNoIChjb25kaXRpb24ub3BlcmF0aW9uKSB7XG4gICAgICAgICAgICBjYXNlIEFJVGFibGVGaWx0ZXJPcGVyYXRpb24uZW1wdHk6XG4gICAgICAgICAgICAgICAgcmV0dXJuIGlzRW1wdHkoY2VsbFZhbHVlKTtcbiAgICAgICAgICAgIGNhc2UgQUlUYWJsZUZpbHRlck9wZXJhdGlvbi5leGlzdHM6XG4gICAgICAgICAgICAgICAgcmV0dXJuICFpc0VtcHR5KGNlbGxWYWx1ZSk7XG4gICAgICAgICAgICBjYXNlIEFJVGFibGVGaWx0ZXJPcGVyYXRpb24uaW46XG4gICAgICAgICAgICAgICAgcmV0dXJuIEFycmF5LmlzQXJyYXkoY29uZGl0aW9uLnZhbHVlKSAmJiBoYXNJbnRlcnNlY3QoY2VsbFZhbHVlLCBjb25kaXRpb24udmFsdWUpO1xuICAgICAgICAgICAgY2FzZSBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uLm5pbjpcbiAgICAgICAgICAgICAgICByZXR1cm4gQXJyYXkuaXNBcnJheShjb25kaXRpb24udmFsdWUpICYmICFoYXNJbnRlcnNlY3QoY2VsbFZhbHVlLCBjb25kaXRpb24udmFsdWUpO1xuICAgICAgICAgICAgZGVmYXVsdDpcbiAgICAgICAgICAgICAgICByZXR1cm4gc3VwZXIuaXNNZWV0RmlsdGVyKGNvbmRpdGlvbiwgY2VsbFZhbHVlKTtcbiAgICAgICAgfVxuICAgIH1cblxuICAgIGNlbGxWYWx1ZVRvU3RyaW5nKGNlbGxWYWx1ZTogU2VsZWN0RmllbGRWYWx1ZSwgZmllbGQ6IEFJVGFibGVGaWVsZCk6IHN0cmluZyB8IG51bGwge1xuICAgICAgICByZXR1cm4gdGhpcy5hcnJheVZhbHVlVG9TdHJpbmcodGhpcy5jZWxsVmFsdWVUb0FycmF5KGNlbGxWYWx1ZSwgZmllbGQpKTtcbiAgICB9XG5cbiAgICBjZWxsVmFsdWVUb0FycmF5KGNlbGxWYWx1ZTogU2VsZWN0RmllbGRWYWx1ZSwgZmllbGQ6IEFJVGFibGVGaWVsZCk6IHN0cmluZ1tdIHwgbnVsbCB7XG4gICAgICAgIGlmICghY2VsbFZhbHVlKSB7XG4gICAgICAgICAgICByZXR1cm4gbnVsbDtcbiAgICAgICAgfVxuICAgICAgICBjb25zdCByZXN1bHQ6IHN0cmluZ1tdID0gW107XG4gICAgICAgIGZvciAobGV0IGkgPSAwLCBsID0gY2VsbFZhbHVlLmxlbmd0aDsgaSA8IGw7IGkrKykge1xuICAgICAgICAgICAgY29uc3Qgb3B0aW9uID0gdGhpcy5maW5kT3B0aW9uQnlJZChmaWVsZCwgY2VsbFZhbHVlW2ldKTtcbiAgICAgICAgICAgIGlmIChvcHRpb24pIHtcbiAgICAgICAgICAgICAgICByZXN1bHQucHVzaChvcHRpb24udGV4dCk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIHJlc3VsdDtcbiAgICB9XG5cbiAgICBmaW5kT3B0aW9uQnlJZChmaWVsZDogQUlUYWJsZUZpZWxkLCBpZDogSWQpOiBBSVRhYmxlU2VsZWN0T3B0aW9uIHwgbnVsbCB7XG4gICAgICAgIHJldHVybiAoZmllbGQuc2V0dGluZ3MgYXMgU2VsZWN0U2V0dGluZ3MpLm9wdGlvbnMuZmluZChvcHRpb24gPT4gb3B0aW9uLl9pZCA9PT0gaWQpIHx8IG51bGw7XG4gICAgfVxuXG4gICAgYXJyYXlWYWx1ZVRvU3RyaW5nKGNlbGxWYWx1ZXM6IHN0cmluZ1tdIHwgbnVsbCk6IHN0cmluZyB8IG51bGwge1xuICAgICAgICByZXR1cm4gY2VsbFZhbHVlcyAmJiBjZWxsVmFsdWVzLmxlbmd0aCA/IGNlbGxWYWx1ZXMuam9pbignLCAnKSA6IG51bGw7XG4gICAgfVxufVxuXG5mdW5jdGlvbiBoYXNJbnRlcnNlY3Q8VCBleHRlbmRzIG51bWJlciB8IHN0cmluZz4oYXJyYXkxOiBUW10sIGFycmF5MjogVFtdKSB7XG4gICAgaWYgKCFBcnJheS5pc0FycmF5KGFycmF5MSkgfHwgIUFycmF5LmlzQXJyYXkoYXJyYXkyKSkge1xuICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuICAgIGNvbnN0IHNldDEgPSBuZXcgU2V0KGFycmF5MSk7XG4gICAgY29uc3Qgc2V0MiA9IG5ldyBTZXQoYXJyYXkyKTtcbiAgICBmb3IgKGNvbnN0IGVsZSBvZiBzZXQxKSB7XG4gICAgICAgIGlmIChzZXQyLmhhcyhlbGUpKSB7XG4gICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgfVxuICAgIH1cbiAgICByZXR1cm4gZmFsc2U7XG59XG4iXX0=
|
@@ -17,5 +17,11 @@ export class TextField extends Field {
|
|
17
17
|
static stringInclude(str, searchStr) {
|
18
18
|
return str.toLowerCase().includes(searchStr.trim().toLowerCase());
|
19
19
|
}
|
20
|
+
eq(cv1, cv2) {
|
21
|
+
return this.cellValueToString(cv1) === this.cellValueToString(cv2);
|
22
|
+
}
|
23
|
+
cellValueToString(cellValue) {
|
24
|
+
return cellValue;
|
25
|
+
}
|
20
26
|
}
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3N0YXRlL3NyYy91dGlscy9maWVsZC90ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDcEMsT0FBTyxFQUEwQixzQkFBc0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3RSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBR2hDLE1BQU0sT0FBTyxTQUFVLFNBQVEsS0FBSztJQUN2QixZQUFZLENBQUMsU0FBeUMsRUFBRSxTQUFxQjtRQUNsRixRQUFRLFNBQVMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUMxQixLQUFLLHNCQUFzQixDQUFDLEtBQUs7Z0JBQzdCLE9BQU8sT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQzlCLEtBQUssc0JBQXNCLENBQUMsTUFBTTtnQkFDOUIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUMvQixLQUFLLHNCQUFzQixDQUFDLE9BQU87Z0JBQy9CLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksSUFBSSxDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2pGO2dCQUNJLE9BQU8sS0FBSyxDQUFDLFlBQVksQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDeEQsQ0FBQztJQUNMLENBQUM7SUFFRCxNQUFNLENBQUMsYUFBYSxDQUFDLEdBQVcsRUFBRSxTQUFpQjtRQUMvQyxPQUFPLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7SUFDdEUsQ0FBQztJQUVRLEVBQUUsQ0FBQyxHQUFrQixFQUFFLEdBQWtCO1FBQzlDLE9BQU8sSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxLQUFLLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN2RSxDQUFDO0lBRUQsaUJBQWlCLENBQUMsU0FBd0I7UUFDdEMsT0FBTyxTQUFTLENBQUM7SUFDckIsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaXNFbXB0eSB9IGZyb20gJy4uL2NvbW1vbic7XG5pbXBvcnQgeyBBSVRhYmxlRmlsdGVyQ29uZGl0aW9uLCBBSVRhYmxlRmlsdGVyT3BlcmF0aW9uIH0gZnJvbSAnLi4vLi4vdHlwZXMnO1xuaW1wb3J0IHsgRmllbGQgfSBmcm9tICcuL2ZpZWxkJztcbmltcG9ydCB7IEZpZWxkVmFsdWUgfSBmcm9tICdAYWktdGFibGUvZ3JpZCc7XG5cbmV4cG9ydCBjbGFzcyBUZXh0RmllbGQgZXh0ZW5kcyBGaWVsZCB7XG4gICAgb3ZlcnJpZGUgaXNNZWV0RmlsdGVyKGNvbmRpdGlvbjogQUlUYWJsZUZpbHRlckNvbmRpdGlvbjxzdHJpbmc+LCBjZWxsVmFsdWU6IEZpZWxkVmFsdWUpIHtcbiAgICAgICAgc3dpdGNoIChjb25kaXRpb24ub3BlcmF0aW9uKSB7XG4gICAgICAgICAgICBjYXNlIEFJVGFibGVGaWx0ZXJPcGVyYXRpb24uZW1wdHk6XG4gICAgICAgICAgICAgICAgcmV0dXJuIGlzRW1wdHkoY2VsbFZhbHVlKTtcbiAgICAgICAgICAgIGNhc2UgQUlUYWJsZUZpbHRlck9wZXJhdGlvbi5leGlzdHM6XG4gICAgICAgICAgICAgICAgcmV0dXJuICFpc0VtcHR5KGNlbGxWYWx1ZSk7XG4gICAgICAgICAgICBjYXNlIEFJVGFibGVGaWx0ZXJPcGVyYXRpb24uY29udGFpbjpcbiAgICAgICAgICAgICAgICByZXR1cm4gIWlzRW1wdHkoY2VsbFZhbHVlKSAmJiB0aGlzLnN0cmluZ0luY2x1ZGUoY2VsbFZhbHVlLCBjb25kaXRpb24udmFsdWUpO1xuICAgICAgICAgICAgZGVmYXVsdDpcbiAgICAgICAgICAgICAgICByZXR1cm4gc3VwZXIuaXNNZWV0RmlsdGVyKGNvbmRpdGlvbiwgY2VsbFZhbHVlKTtcbiAgICAgICAgfVxuICAgIH1cblxuICAgIHN0YXRpYyBzdHJpbmdJbmNsdWRlKHN0cjogc3RyaW5nLCBzZWFyY2hTdHI6IHN0cmluZykge1xuICAgICAgICByZXR1cm4gc3RyLnRvTG93ZXJDYXNlKCkuaW5jbHVkZXMoc2VhcmNoU3RyLnRyaW0oKS50b0xvd2VyQ2FzZSgpKTtcbiAgICB9XG5cbiAgICBvdmVycmlkZSBlcShjdjE6IHN0cmluZyB8IG51bGwsIGN2Mjogc3RyaW5nIHwgbnVsbCk6IGJvb2xlYW4ge1xuICAgICAgICByZXR1cm4gdGhpcy5jZWxsVmFsdWVUb1N0cmluZyhjdjEpID09PSB0aGlzLmNlbGxWYWx1ZVRvU3RyaW5nKGN2Mik7XG4gICAgfVxuXG4gICAgY2VsbFZhbHVlVG9TdHJpbmcoY2VsbFZhbHVlOiBzdHJpbmcgfCBudWxsKTogc3RyaW5nIHwgbnVsbCB7XG4gICAgICAgIHJldHVybiBjZWxsVmFsdWU7XG4gICAgfVxufVxuIl19
|
@@ -0,0 +1,34 @@
|
|
1
|
+
import { AITableQueries } from '@ai-table/grid';
|
2
|
+
import { ViewOperationMap } from './field';
|
3
|
+
import { sortByViewPosition } from './view';
|
4
|
+
export function getSortRecords(aiTable, records, activeView) {
|
5
|
+
if (!activeView?.settings || !activeView.settings.sorts?.length) {
|
6
|
+
return records;
|
7
|
+
}
|
8
|
+
const { is_keep_sort, sorts } = activeView.settings;
|
9
|
+
if (is_keep_sort && sorts?.length) {
|
10
|
+
return sortRecordsBySortInfo(aiTable, records, activeView);
|
11
|
+
}
|
12
|
+
return sortByViewPosition(records, activeView);
|
13
|
+
}
|
14
|
+
export function sortRecordsBySortInfo(aiTable, records, activeView) {
|
15
|
+
const shallowRows = [...records];
|
16
|
+
if (activeView.settings?.sorts?.length) {
|
17
|
+
shallowRows.sort((prev, current) => {
|
18
|
+
return activeView.settings.sorts.reduce((acc, rule) => {
|
19
|
+
const field = aiTable.fieldsMap()[rule.sort_by];
|
20
|
+
if (!field || acc !== 0) {
|
21
|
+
return acc;
|
22
|
+
}
|
23
|
+
const fieldMethod = ViewOperationMap[field.type];
|
24
|
+
const cellValue1 = AITableQueries.getFieldValue(aiTable, [prev._id, field._id]);
|
25
|
+
const cellValue2 = AITableQueries.getFieldValue(aiTable, [current._id, field._id]);
|
26
|
+
const res = fieldMethod.compare(cellValue1, cellValue2, field);
|
27
|
+
return res * rule.direction;
|
28
|
+
}, 0);
|
29
|
+
});
|
30
|
+
return shallowRows;
|
31
|
+
}
|
32
|
+
return shallowRows;
|
33
|
+
}
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ydC1yZWNvcmRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcGFja2FnZXMvc3RhdGUvc3JjL3V0aWxzL3NvcnQtcmVjb3Jkcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQVcsY0FBYyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDekQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sU0FBUyxDQUFDO0FBRTNDLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUU1QyxNQUFNLFVBQVUsY0FBYyxDQUFDLE9BQWdCLEVBQUUsT0FBMkIsRUFBRSxVQUF1QjtJQUNqRyxJQUFJLENBQUMsVUFBVSxFQUFFLFFBQVEsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxDQUFDO1FBQzlELE9BQU8sT0FBTyxDQUFDO0lBQ25CLENBQUM7SUFDRCxNQUFNLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBRSxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUM7SUFDcEQsSUFBSSxZQUFZLElBQUksS0FBSyxFQUFFLE1BQU0sRUFBRSxDQUFDO1FBQ2hDLE9BQU8scUJBQXFCLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxVQUFVLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBQ0QsT0FBTyxrQkFBa0IsQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7QUFDbkQsQ0FBQztBQUVELE1BQU0sVUFBVSxxQkFBcUIsQ0FBQyxPQUFnQixFQUFFLE9BQTJCLEVBQUUsVUFBdUI7SUFDeEcsTUFBTSxXQUFXLEdBQUcsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDO0lBQ2pDLElBQUksVUFBVSxDQUFDLFFBQVEsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLENBQUM7UUFDckMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUMvQixPQUFPLFVBQVUsQ0FBQyxRQUFTLENBQUMsS0FBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRTtnQkFDcEQsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDaEQsSUFBSSxDQUFDLEtBQUssSUFBSSxHQUFHLEtBQUssQ0FBQyxFQUFFLENBQUM7b0JBQ3RCLE9BQU8sR0FBRyxDQUFDO2dCQUNmLENBQUM7Z0JBQ0QsTUFBTSxXQUFXLEdBQUcsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO2dCQUVqRCxNQUFNLFVBQVUsR0FBRyxjQUFjLENBQUMsYUFBYSxDQUFDLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ2hGLE1BQU0sVUFBVSxHQUFHLGNBQWMsQ0FBQyxhQUFhLENBQUMsT0FBTyxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDbkYsTUFBTSxHQUFHLEdBQUcsV0FBVyxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsVUFBVSxFQUFFLEtBQUssQ0FBQyxDQUFDO2dCQUMvRCxPQUFPLEdBQUcsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDO1lBQ2hDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUNWLENBQUMsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxXQUFXLENBQUM7SUFDdkIsQ0FBQztJQUNELE9BQU8sV0FBVyxDQUFDO0FBQ3ZCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBSVRhYmxlLCBBSVRhYmxlUXVlcmllcyB9IGZyb20gJ0BhaS10YWJsZS9ncmlkJztcbmltcG9ydCB7IFZpZXdPcGVyYXRpb25NYXAgfSBmcm9tICcuL2ZpZWxkJztcbmltcG9ydCB7IEFJVGFibGVWaWV3LCBBSVRhYmxlVmlld1JlY29yZHMgfSBmcm9tICcuLi90eXBlcyc7XG5pbXBvcnQgeyBzb3J0QnlWaWV3UG9zaXRpb24gfSBmcm9tICcuL3ZpZXcnO1xuXG5leHBvcnQgZnVuY3Rpb24gZ2V0U29ydFJlY29yZHMoYWlUYWJsZTogQUlUYWJsZSwgcmVjb3JkczogQUlUYWJsZVZpZXdSZWNvcmRzLCBhY3RpdmVWaWV3OiBBSVRhYmxlVmlldykge1xuICAgIGlmICghYWN0aXZlVmlldz8uc2V0dGluZ3MgfHwgIWFjdGl2ZVZpZXcuc2V0dGluZ3Muc29ydHM/Lmxlbmd0aCkge1xuICAgICAgICByZXR1cm4gcmVjb3JkcztcbiAgICB9XG4gICAgY29uc3QgeyBpc19rZWVwX3NvcnQsIHNvcnRzIH0gPSBhY3RpdmVWaWV3LnNldHRpbmdzO1xuICAgIGlmIChpc19rZWVwX3NvcnQgJiYgc29ydHM/Lmxlbmd0aCkge1xuICAgICAgICByZXR1cm4gc29ydFJlY29yZHNCeVNvcnRJbmZvKGFpVGFibGUsIHJlY29yZHMsIGFjdGl2ZVZpZXcpO1xuICAgIH1cbiAgICByZXR1cm4gc29ydEJ5Vmlld1Bvc2l0aW9uKHJlY29yZHMsIGFjdGl2ZVZpZXcpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gc29ydFJlY29yZHNCeVNvcnRJbmZvKGFpVGFibGU6IEFJVGFibGUsIHJlY29yZHM6IEFJVGFibGVWaWV3UmVjb3JkcywgYWN0aXZlVmlldzogQUlUYWJsZVZpZXcpIHtcbiAgICBjb25zdCBzaGFsbG93Um93cyA9IFsuLi5yZWNvcmRzXTtcbiAgICBpZiAoYWN0aXZlVmlldy5zZXR0aW5ncz8uc29ydHM/Lmxlbmd0aCkge1xuICAgICAgICBzaGFsbG93Um93cy5zb3J0KChwcmV2LCBjdXJyZW50KSA9PiB7XG4gICAgICAgICAgICByZXR1cm4gYWN0aXZlVmlldy5zZXR0aW5ncyEuc29ydHMhLnJlZHVjZSgoYWNjLCBydWxlKSA9PiB7XG4gICAgICAgICAgICAgICAgY29uc3QgZmllbGQgPSBhaVRhYmxlLmZpZWxkc01hcCgpW3J1bGUuc29ydF9ieV07XG4gICAgICAgICAgICAgICAgaWYgKCFmaWVsZCB8fCBhY2MgIT09IDApIHtcbiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGFjYztcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgICAgY29uc3QgZmllbGRNZXRob2QgPSBWaWV3T3BlcmF0aW9uTWFwW2ZpZWxkLnR5cGVdO1xuXG4gICAgICAgICAgICAgICAgY29uc3QgY2VsbFZhbHVlMSA9IEFJVGFibGVRdWVyaWVzLmdldEZpZWxkVmFsdWUoYWlUYWJsZSwgW3ByZXYuX2lkLCBmaWVsZC5faWRdKTtcbiAgICAgICAgICAgICAgICBjb25zdCBjZWxsVmFsdWUyID0gQUlUYWJsZVF1ZXJpZXMuZ2V0RmllbGRWYWx1ZShhaVRhYmxlLCBbY3VycmVudC5faWQsIGZpZWxkLl9pZF0pO1xuICAgICAgICAgICAgICAgIGNvbnN0IHJlcyA9IGZpZWxkTWV0aG9kLmNvbXBhcmUoY2VsbFZhbHVlMSwgY2VsbFZhbHVlMiwgZmllbGQpO1xuICAgICAgICAgICAgICAgIHJldHVybiByZXMgKiBydWxlLmRpcmVjdGlvbjtcbiAgICAgICAgICAgIH0sIDApO1xuICAgICAgICB9KTtcbiAgICAgICAgcmV0dXJuIHNoYWxsb3dSb3dzO1xuICAgIH1cbiAgICByZXR1cm4gc2hhbGxvd1Jvd3M7XG59XG4iXX0=
|
package/esm2022/utils/view.mjs
CHANGED
@@ -66,4 +66,11 @@ export function removeView(aiTable, records, fields, activeViewId) {
|
|
66
66
|
});
|
67
67
|
ViewActions.removeView(aiTable, [activeViewId]);
|
68
68
|
}
|
69
|
-
|
69
|
+
export function sortByViewPosition(data, activeView) {
|
70
|
+
const hasPositions = data.every((item) => item.positions && item.positions);
|
71
|
+
if (hasPositions) {
|
72
|
+
return [...data].sort((a, b) => a.positions[activeView._id] - b.positions[activeView._id]);
|
73
|
+
}
|
74
|
+
return data;
|
75
|
+
}
|
76
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../packages/state/src/utils/view.ts"],"names":[],"mappings":"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","sourcesContent":["import { idCreator, Actions } from '@ai-table/grid';\nimport { AITableView, AITableViewField, AITableViewFields, AITableViewRecords, AIViewTable, Positions } from '../types';\nimport { PositionActions, ViewActions } from '../view/action';\n\nexport function createDefaultPositions(\n    views: AITableView[],\n    activeId: string,\n    data: AITableViewRecords | AITableViewFields,\n    index: number\n) {\n    const positions: Positions = {};\n    const position = getPosition(data, activeId, index);\n    const maxPosition = data[data.length - 1].positions[activeId];\n    views.forEach((element) => {\n        positions[element._id] = element._id === activeId ? position : maxPosition + 1;\n    });\n    return positions;\n}\n\nexport function getPosition(data: AITableViewRecords | AITableViewFields, activeViewId: string, index: number) {\n    let position = data.length - 1;\n    if (index !== 0 && index !== data.length) {\n        const previousViewPosition = data[index - 1].positions[activeViewId];\n        const nextViewPosition = data[index].positions[activeViewId!];\n        position = (previousViewPosition + nextViewPosition) / 2;\n    } else {\n        position = index;\n    }\n    return position;\n}\n\nexport function addView(aiTable: AIViewTable, type: 'add' | 'copy') {\n    let index = aiTable.views().length;\n    const newId = idCreator();\n    let newView: AITableView = {\n        _id: newId,\n        name: '表格视图 ' + index\n    };\n    let originViewId = aiTable.views()[aiTable.views().length - 1]._id;\n    if (type === 'copy') {\n        originViewId = aiTable.activeViewId();\n        const copyView = aiTable.views().find((item) => item._id === aiTable.activeViewId())!;\n        newView = {\n            ...copyView,\n            _id: newId,\n            name: copyView.name + '-副本'\n        };\n        index = aiTable.views().indexOf(copyView) + 1;\n    }\n    ViewActions.addView(aiTable, newView, [index]);\n    (aiTable.records() as AITableViewRecords).forEach((record) => {\n        PositionActions.addRecordPosition(aiTable, { [newId]: record.positions[originViewId] }, [record._id]);\n    });\n    (aiTable.fields() as AITableViewFields).forEach((field) => {\n        Actions.setField<AITableViewField>(\n            aiTable,\n            {\n                positions: {\n                    ...field.positions,\n                    [newId]: field.positions[originViewId]\n                }\n            },\n            [field._id]\n        );\n    });\n    return newView;\n}\n\nexport function removeView(aiTable: AIViewTable, records: AITableViewRecords, fields: AITableViewFields, activeViewId: string) {\n    records.forEach((record) => {\n        PositionActions.removeRecordPosition(aiTable, [activeViewId, record._id]);\n    });\n    fields.forEach((field) => {\n        const positions = { ...field.positions };\n        delete positions[activeViewId];\n        Actions.setField<AITableViewField>(\n            aiTable,\n            {\n                positions\n            },\n            [field._id]\n        );\n    });\n    ViewActions.removeView(aiTable, [activeViewId]);\n}\n\nexport function sortByViewPosition(data: AITableViewRecords | AITableViewFields, activeView: AITableView) {\n    const hasPositions = data.every((item) => item.positions && item.positions);\n    if (hasPositions) {\n        return [...data].sort((a, b) => a.positions[activeView._id] - b.positions[activeView._id]);\n    }\n    return data;\n}"]}
|