@omegagrid/grid-core 0.5.19 → 0.6.0
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/dist/__generated/functions.d.ts.map +1 -1
- package/dist/__generated/functions.js +1 -3
- package/dist/__generated/functions.js.map +1 -1
- package/dist/calculations/autofill.js +15 -22
- package/dist/calculations/autofill.js.map +1 -1
- package/dist/calculations/conditions.js +7 -12
- package/dist/calculations/conditions.js.map +1 -1
- package/dist/calculations/context.d.ts.map +1 -1
- package/dist/calculations/context.js +7 -11
- package/dist/calculations/context.js.map +1 -1
- package/dist/calculations/formula.js +78 -89
- package/dist/calculations/formula.js.map +1 -1
- package/dist/calculations/functions/dates.d.ts.map +1 -1
- package/dist/calculations/functions/dates.js +26 -40
- package/dist/calculations/functions/dates.js.map +1 -1
- package/dist/calculations/functions/index.js +10 -43
- package/dist/calculations/functions/index.js.map +1 -1
- package/dist/calculations/functions/logical.js +13 -25
- package/dist/calculations/functions/logical.js.map +1 -1
- package/dist/calculations/functions/lookup.js +27 -46
- package/dist/calculations/functions/lookup.js.map +1 -1
- package/dist/calculations/functions/math.js +74 -137
- package/dist/calculations/functions/math.js.map +1 -1
- package/dist/calculations/functions/special.js +1 -5
- package/dist/calculations/functions/special.js.map +1 -1
- package/dist/calculations/functions/statistical.js +17 -29
- package/dist/calculations/functions/statistical.js.map +1 -1
- package/dist/calculations/functions/text.js +9 -17
- package/dist/calculations/functions/text.js.map +1 -1
- package/dist/calculations/helpers.js +6 -15
- package/dist/calculations/helpers.js.map +1 -1
- package/dist/calculations/index.js +6 -35
- package/dist/calculations/index.js.map +1 -1
- package/dist/calculations/operators.d.ts.map +1 -1
- package/dist/calculations/operators.js +14 -23
- package/dist/calculations/operators.js.map +1 -1
- package/dist/calculations/tokenization.d.ts +1 -1
- package/dist/calculations/tokenization.d.ts.map +1 -1
- package/dist/calculations/tokenization.js +18 -26
- package/dist/calculations/tokenization.js.map +1 -1
- package/dist/common/index.js +1 -17
- package/dist/common/index.js.map +1 -1
- package/dist/common/range.js +6 -15
- package/dist/common/range.js.map +1 -1
- package/dist/constants.d.ts +13 -12
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +5 -8
- package/dist/constants.js.map +1 -1
- package/dist/index.js +7 -40
- package/dist/index.js.map +1 -1
- package/dist/model/calculationModel.js +9 -13
- package/dist/model/calculationModel.js.map +1 -1
- package/dist/model/cellModel.js +44 -53
- package/dist/model/cellModel.js.map +1 -1
- package/dist/model/columnModel.d.ts +5 -6
- package/dist/model/columnModel.d.ts.map +1 -1
- package/dist/model/columnModel.js +15 -22
- package/dist/model/columnModel.js.map +1 -1
- package/dist/model/commentModel.js +8 -13
- package/dist/model/commentModel.js.map +1 -1
- package/dist/model/conditionalFormats.d.ts +3 -3
- package/dist/model/conditionalFormats.js +22 -27
- package/dist/model/conditionalFormats.js.map +1 -1
- package/dist/model/cssStyle.d.ts.map +1 -1
- package/dist/model/cssStyle.js +38 -53
- package/dist/model/cssStyle.js.map +1 -1
- package/dist/model/dependencies.js +6 -10
- package/dist/model/dependencies.js.map +1 -1
- package/dist/model/elementModel.js +8 -12
- package/dist/model/elementModel.js.map +1 -1
- package/dist/model/filterModel.d.ts.map +1 -1
- package/dist/model/filterModel.js +26 -39
- package/dist/model/filterModel.js.map +1 -1
- package/dist/model/gridModel.d.ts.map +1 -1
- package/dist/model/gridModel.js +70 -84
- package/dist/model/gridModel.js.map +1 -1
- package/dist/model/groupModel.d.ts +1 -1
- package/dist/model/groupModel.js +5 -10
- package/dist/model/groupModel.js.map +1 -1
- package/dist/model/history.js +1 -5
- package/dist/model/history.js.map +1 -1
- package/dist/model/index.js +20 -36
- package/dist/model/index.js.map +1 -1
- package/dist/model/iterableRange.js +5 -10
- package/dist/model/iterableRange.js.map +1 -1
- package/dist/model/namingModel.js +8 -13
- package/dist/model/namingModel.js.map +1 -1
- package/dist/model/options.js +12 -39
- package/dist/model/options.js.map +1 -1
- package/dist/model/rowModel.d.ts +3 -3
- package/dist/model/rowModel.d.ts.map +1 -1
- package/dist/model/rowModel.js +12 -17
- package/dist/model/rowModel.js.map +1 -1
- package/dist/model/selectionModel.js +5 -9
- package/dist/model/selectionModel.js.map +1 -1
- package/dist/model/sortingModel.js +8 -13
- package/dist/model/sortingModel.js.map +1 -1
- package/dist/model/style.js +9 -18
- package/dist/model/style.js.map +1 -1
- package/dist/model/styleModel.js +7 -11
- package/dist/model/styleModel.js.map +1 -1
- package/dist/model/tableTheme.js +6 -11
- package/dist/model/tableTheme.js.map +1 -1
- package/dist/sparklines/index.js +1 -17
- package/dist/sparklines/index.js.map +1 -1
- package/dist/sparklines/sparklines.js +22 -30
- package/dist/sparklines/sparklines.js.map +1 -1
- package/dist/types.js +1 -2
- package/dist/utils.js +4 -9
- package/dist/utils.js.map +1 -1
- package/package.json +4 -4
package/dist/model/history.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.History = void 0;
|
|
4
|
-
class History {
|
|
1
|
+
export class History {
|
|
5
2
|
constructor(model) {
|
|
6
3
|
this.model = model;
|
|
7
4
|
this.stack = [];
|
|
@@ -35,5 +32,4 @@ class History {
|
|
|
35
32
|
return items;
|
|
36
33
|
}
|
|
37
34
|
}
|
|
38
|
-
exports.History = History;
|
|
39
35
|
//# sourceMappingURL=history.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/model/history.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/model/history.ts"],"names":[],"mappings":"AAaA,MAAM,OAAO,OAAO;IAKnB,YAA4B,KAAgB;QAAhB,UAAK,GAAL,KAAK,CAAW;QAHrC,UAAK,GAAkB,EAAE,CAAC;QAC1B,YAAO,GAAkB,EAAE,CAAC;IAEa,CAAC;IAEjD,IAAI,CAAC,IAAiB;QACrB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACjD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,GAAG,CAAC,KAAK,GAAG,CAAC;QACZ,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,MAAM,KAAK,GAAkB,EAAE,CAAC;QAChC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,CAAC,KAAK,GAAG,CAAC;QACb,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,MAAM,KAAK,GAAkB,EAAE,CAAC;QAChC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CAED"}
|
package/dist/model/index.js
CHANGED
|
@@ -1,37 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
__exportStar(require("./calculationModel"), exports);
|
|
22
|
-
__exportStar(require("./conditionalFormats"), exports);
|
|
23
|
-
__exportStar(require("./cssStyle"), exports);
|
|
24
|
-
__exportStar(require("./dependencies"), exports);
|
|
25
|
-
__exportStar(require("./elementModel"), exports);
|
|
26
|
-
__exportStar(require("./filterModel"), exports);
|
|
27
|
-
__exportStar(require("./gridModel"), exports);
|
|
28
|
-
__exportStar(require("./groupModel"), exports);
|
|
29
|
-
__exportStar(require("./history"), exports);
|
|
30
|
-
__exportStar(require("./iterableRange"), exports);
|
|
31
|
-
__exportStar(require("./options"), exports);
|
|
32
|
-
__exportStar(require("./rowModel"), exports);
|
|
33
|
-
__exportStar(require("./namingModel"), exports);
|
|
34
|
-
__exportStar(require("./selectionModel"), exports);
|
|
35
|
-
__exportStar(require("./style"), exports);
|
|
36
|
-
__exportStar(require("./tableTheme"), exports);
|
|
1
|
+
export * from './cellModel';
|
|
2
|
+
export * from './columnModel';
|
|
3
|
+
export * from './sortingModel';
|
|
4
|
+
export * from './commentModel';
|
|
5
|
+
export * from './calculationModel';
|
|
6
|
+
export * from './conditionalFormats';
|
|
7
|
+
export * from './cssStyle';
|
|
8
|
+
export * from './dependencies';
|
|
9
|
+
export * from './elementModel';
|
|
10
|
+
export * from './filterModel';
|
|
11
|
+
export * from './gridModel';
|
|
12
|
+
export * from './groupModel';
|
|
13
|
+
export * from './history';
|
|
14
|
+
export * from './iterableRange';
|
|
15
|
+
export * from './options';
|
|
16
|
+
export * from './rowModel';
|
|
17
|
+
export * from './namingModel';
|
|
18
|
+
export * from './selectionModel';
|
|
19
|
+
export * from './style';
|
|
20
|
+
export * from './tableTheme';
|
|
37
21
|
//# sourceMappingURL=index.js.map
|
package/dist/model/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/model/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.IterableAddressRange = exports.IterableRange = void 0;
|
|
4
|
-
const range_1 = require("../common/range");
|
|
5
|
-
class IterableRange extends range_1.CellRange {
|
|
1
|
+
import { CellRange } from "../common/range";
|
|
2
|
+
export class IterableRange extends CellRange {
|
|
6
3
|
constructor(model, range, initializedOnly = false) {
|
|
7
4
|
super(range.c1, range.r1, range.c2, range.r2);
|
|
8
5
|
this.model = model;
|
|
@@ -43,7 +40,7 @@ class IterableRange extends range_1.CellRange {
|
|
|
43
40
|
this.done = this.c >= this.size.columns - 1 && this.r >= this.size.rows - 1;
|
|
44
41
|
const row = this.model.rows[this.r + this.r1];
|
|
45
42
|
const c = this.c + this.c1;
|
|
46
|
-
const cell = this.initializedOnly && !row.isCellInitialized(c) ? this.nextInitialized() : row
|
|
43
|
+
const cell = this.initializedOnly && !row.isCellInitialized(c) ? this.nextInitialized() : row?.cell(c);
|
|
47
44
|
return cell ? { done: false, value: cell } : { done: true };
|
|
48
45
|
}
|
|
49
46
|
forEach(callback) {
|
|
@@ -53,8 +50,7 @@ class IterableRange extends range_1.CellRange {
|
|
|
53
50
|
}
|
|
54
51
|
}
|
|
55
52
|
}
|
|
56
|
-
|
|
57
|
-
class IterableAddressRange extends range_1.CellRange {
|
|
53
|
+
export class IterableAddressRange extends CellRange {
|
|
58
54
|
constructor(range) {
|
|
59
55
|
super(range.c1, range.r1, range.c2, range.r2);
|
|
60
56
|
this.r = 0;
|
|
@@ -76,8 +72,7 @@ class IterableAddressRange extends range_1.CellRange {
|
|
|
76
72
|
this.r++;
|
|
77
73
|
}
|
|
78
74
|
this.done = this.c == this.size.columns - 1 && this.r == this.size.rows - 1;
|
|
79
|
-
return { done: false, value: new
|
|
75
|
+
return { done: false, value: new CellRange(this.c + this.c1, this.r + this.r1) };
|
|
80
76
|
}
|
|
81
77
|
}
|
|
82
|
-
exports.IterableAddressRange = IterableAddressRange;
|
|
83
78
|
//# sourceMappingURL=iterableRange.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iterableRange.js","sourceRoot":"","sources":["../../src/model/iterableRange.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"iterableRange.js","sourceRoot":"","sources":["../../src/model/iterableRange.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const core_1 = require("@omegagrid/core");
|
|
5
|
-
const common_1 = require("../common");
|
|
6
|
-
class NamingModel {
|
|
1
|
+
import { utils } from "@omegagrid/core";
|
|
2
|
+
import { CellRange } from "../common";
|
|
3
|
+
export class NamingModel {
|
|
7
4
|
constructor(model, sourceData) {
|
|
8
5
|
this.model = model;
|
|
9
6
|
this.names = new Map();
|
|
@@ -12,9 +9,9 @@ class NamingModel {
|
|
|
12
9
|
this.populate(sourceData);
|
|
13
10
|
}
|
|
14
11
|
populate(sourceData) {
|
|
15
|
-
sourceData.forEach(({ name, ref }) => this.set(name,
|
|
16
|
-
?
|
|
17
|
-
:
|
|
12
|
+
sourceData.forEach(({ name, ref }) => this.set(name, utils.isObject(ref)
|
|
13
|
+
? CellRange.fromCoords(ref)
|
|
14
|
+
: CellRange.fromA1(ref)));
|
|
18
15
|
}
|
|
19
16
|
set(name, range) {
|
|
20
17
|
this.names.set(name, range);
|
|
@@ -44,8 +41,7 @@ class NamingModel {
|
|
|
44
41
|
return null;
|
|
45
42
|
}
|
|
46
43
|
getCellByName(name, contextRange) {
|
|
47
|
-
|
|
48
|
-
const namedRange = (_a = this.names.get(name)) !== null && _a !== void 0 ? _a : this.findCellByName(name);
|
|
44
|
+
const namedRange = this.names.get(name) ?? this.findCellByName(name);
|
|
49
45
|
if (!namedRange)
|
|
50
46
|
return null;
|
|
51
47
|
if (namedRange.isColumn)
|
|
@@ -57,7 +53,7 @@ class NamingModel {
|
|
|
57
53
|
}
|
|
58
54
|
getRangeByName(name, trim = true) {
|
|
59
55
|
const range = this.names.get(name);
|
|
60
|
-
return trim ? range
|
|
56
|
+
return trim ? range?.intersect(this.model.gridRange) : range;
|
|
61
57
|
}
|
|
62
58
|
shift(options) {
|
|
63
59
|
this.names.forEach((range, name) => {
|
|
@@ -71,5 +67,4 @@ class NamingModel {
|
|
|
71
67
|
});
|
|
72
68
|
}
|
|
73
69
|
}
|
|
74
|
-
exports.NamingModel = NamingModel;
|
|
75
70
|
//# sourceMappingURL=namingModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namingModel.js","sourceRoot":"","sources":["../../src/model/namingModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"namingModel.js","sourceRoot":"","sources":["../../src/model/namingModel.ts"],"names":[],"mappings":"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"}
|
package/dist/model/options.js
CHANGED
|
@@ -1,59 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.initOptions = void 0;
|
|
27
|
-
const core_1 = require("@omegagrid/core");
|
|
28
|
-
const constants_1 = __importStar(require("../constants"));
|
|
29
|
-
const core_2 = require("@omegagrid/core");
|
|
30
|
-
function initOptions(options, origOptions = null) {
|
|
31
|
-
const opt = core_2.utils.mergeDeep({}, constants_1.default.DEFAULT_OPTIONS, origOptions, (0, core_1.initCommonOptions)(options, origOptions));
|
|
1
|
+
import { numbers, initCommonOptions, dates } from "@omegagrid/core";
|
|
2
|
+
import constants, { DEFAULT_FILTER_OPTIONS, DEFAULT_TREE_OPTIONS } from "../constants";
|
|
3
|
+
import { utils } from "@omegagrid/core";
|
|
4
|
+
export function initOptions(options, origOptions = null) {
|
|
5
|
+
const opt = utils.mergeDeep({}, constants.DEFAULT_OPTIONS, origOptions, initCommonOptions(options, origOptions));
|
|
32
6
|
if (opt.numberFormat) {
|
|
33
|
-
opt.numberFormatter =
|
|
7
|
+
opt.numberFormatter = numbers.getNumberFormatter(opt.locale, opt.numberFormat);
|
|
34
8
|
}
|
|
35
9
|
else if (!opt.numberFormatter) {
|
|
36
|
-
opt.numberFormatter =
|
|
10
|
+
opt.numberFormatter = numbers.getNumberFormatter(opt.locale);
|
|
37
11
|
}
|
|
38
12
|
if (opt.dateFormat) {
|
|
39
|
-
opt.dateFormatter =
|
|
13
|
+
opt.dateFormatter = dates.getDateFormatter(opt.locale, opt.dateFormat);
|
|
40
14
|
}
|
|
41
15
|
else if (!opt.dateFormatter) {
|
|
42
|
-
opt.dateFormatter =
|
|
16
|
+
opt.dateFormatter = dates.getDateFormatter(opt.locale);
|
|
43
17
|
}
|
|
44
18
|
if (opt.columnSorting) {
|
|
45
19
|
opt.sorting = opt.sorting || { enabled: true };
|
|
46
20
|
}
|
|
47
21
|
if (opt.filters === false)
|
|
48
22
|
opt.filters = { enabled: false };
|
|
49
|
-
opt.filters = Object.assign({},
|
|
23
|
+
opt.filters = Object.assign({}, DEFAULT_FILTER_OPTIONS, opt.filters);
|
|
50
24
|
if (opt.rowTree === false)
|
|
51
25
|
opt.rowTree = { enabled: false };
|
|
52
|
-
opt.rowTree = Object.assign({},
|
|
26
|
+
opt.rowTree = Object.assign({}, DEFAULT_TREE_OPTIONS, opt.rowTree);
|
|
53
27
|
if (opt.columnTree === false)
|
|
54
28
|
opt.columnTree = { enabled: false };
|
|
55
|
-
opt.columnTree = Object.assign({},
|
|
29
|
+
opt.columnTree = Object.assign({}, DEFAULT_TREE_OPTIONS, opt.columnTree);
|
|
56
30
|
return opt;
|
|
57
31
|
}
|
|
58
|
-
exports.initOptions = initOptions;
|
|
59
32
|
//# sourceMappingURL=options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/model/options.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/model/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAiB,KAAK,EAAY,MAAM,iBAAiB,CAAC;AAG7F,OAAO,SAAS,EAAE,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAuQxC,MAAM,UAAU,WAAW,CAAC,OAA+B,EAAE,cAA4B,IAAI;IAC5F,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAe,EAAE,EAAE,SAAS,CAAC,eAAe,EAAE,WAAW,EAAE,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;IAE/H,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;QACtB,GAAG,CAAC,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IAChF,CAAC;SAAM,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QACjC,GAAG,CAAC,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;QACpB,GAAG,CAAC,aAAa,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACxE,CAAC;SAAM,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QAC/B,GAAG,CAAC,aAAa,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACvB,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC;IAC9C,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK;QAAE,GAAG,CAAC,OAAO,GAAG,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;IAC1D,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,sBAAsB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAErE,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK;QAAE,GAAG,CAAC,OAAO,GAAG,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;IAC1D,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,oBAAoB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAEnE,IAAI,GAAG,CAAC,UAAU,KAAK,KAAK;QAAE,GAAG,CAAC,UAAU,GAAG,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;IAChE,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,oBAAoB,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IAEzE,OAAO,GAAc,CAAC;AACvB,CAAC"}
|
package/dist/model/rowModel.d.ts
CHANGED
|
@@ -46,9 +46,9 @@ declare const RowModel_base: (new (...input: any[]) => {
|
|
|
46
46
|
collapse(): void;
|
|
47
47
|
toggleCollapse(recursive?: boolean, unhide?: boolean): void;
|
|
48
48
|
clearChildren(): void;
|
|
49
|
-
walk(cb: (m: any) => unknown): void;
|
|
50
|
-
walkVisible(cb: (m: any) => unknown): void;
|
|
51
|
-
walkUp(cb: (m: any) => unknown): void;
|
|
49
|
+
walk(cb: (m: any) => unknown | void): void;
|
|
50
|
+
walkVisible(cb: (m: any) => unknown | void): void;
|
|
51
|
+
walkUp(cb: (m: any) => unknown | void): void;
|
|
52
52
|
_sort(comparer: (a: any, b: any) => number): void;
|
|
53
53
|
sort(comparer: (a: any, b: any) => number): void;
|
|
54
54
|
}) & typeof ElementModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rowModel.d.ts","sourceRoot":"","sources":["../../src/model/rowModel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,IAAI,EAAS,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAU7D,sCAAsC;AACtC,MAAM,MAAM,SAAS,GAAG;IACvB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,2GAA2G;IAC3G,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,CAAC,cAAc,GAAG,aAAa,CAAA
|
|
1
|
+
{"version":3,"file":"rowModel.d.ts","sourceRoot":"","sources":["../../src/model/rowModel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,IAAI,EAAS,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAU7D,sCAAsC;AACtC,MAAM,MAAM,SAAS,GAAG;IACvB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,2GAA2G;IAC3G,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,CAAC,cAAc,GAAG,aAAa,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAuCpC,CAAC;iBAAsC,CAAC;;4BACgC,CAAC,iBAAiB,CAAC;;;;;;;;AAtC9F,qBAAa,QAAS,SAAQ,aAAgC;IAE7D,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IAErB,OAAO,CAAC,WAAW,CAAY;IAE/B,OAAO,CAAC,MAAM,CAAc;IAC5B,IAAI,KAAK,gBAAyB;IAElC,OAAO,CAAC,KAAK,CAA6B;IAC1C,IAAI,IAAI,IACK,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,CADP;IAChC,IAAI,IAAI,CAAC,CAAC,EAAG,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,EAAoB;IAE3D,OAAO,CAAC,OAAO,CAAS;IACxB,IAAI,MAAM,IACQ,MAAM,CAD4C;IACpE,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAA0B;IAElD,OAAO,CAAC,SAAS,CAAS;IAC1B,IAAI,QAAQ,IACQ,MAAM,CADc;IACxC,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,EAA4B;IAEtD,IAAI,OAAO,WAAmC;IAC9C,IAAI,KAAK,cAA+D;IAExE,IAAI,UAAU,YAA6B;IAC3C,IAAI,OAAO,IACI,MAAM,CADiB;IACtC,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,EAGpB;IAED,IAAI,MAAM,cAAuE;IAEjF,iBAAiB,MAAO,MAAM,aAAqB;IAEnD,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,GAAI,SAAS;gBAwBpC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,SAAS;IAMhD,QAAQ,CAAC,MAAM,EAAE,SAAS;IAO1B,aAAa;IAOb,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO;IAKvB,QAAQ;IAKR,IAAI,IAAI,aAA6C;IACrD,IAAI,IAAI,aAA6C;IAErD,IAAI,WAAW,IAAK,QAAQ,CAI3B;IAED,IAAI,WAAW,IAAK,QAAQ,CAI3B;IAED;;;;OAIG;IACH,cAAc,CAAC,CAAC,EAAE,MAAM;IAKxB,WAAW,CAAC,CAAC,EAAE,MAAM;IAKrB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,UAAQ;IAqBjE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,UAAQ;IAqBjE,qBAAqB;CAIrB"}
|
package/dist/model/rowModel.js
CHANGED
|
@@ -1,21 +1,18 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const elementModel_1 = require("./elementModel");
|
|
9
|
-
class RowModel extends core_1.tree.TreeNodeMixin(elementModel_1.ElementModel) {
|
|
2
|
+
import { CellRange, encodeRow } from "../common/range";
|
|
3
|
+
import { CellModel } from "./cellModel";
|
|
4
|
+
import { tree, utils } from "@omegagrid/core";
|
|
5
|
+
import { ElementModel } from "./elementModel";
|
|
6
|
+
export class RowModel extends tree.TreeNodeMixin(ElementModel) {
|
|
10
7
|
get cells() { return this._cells; }
|
|
11
8
|
get data() { return this._data; }
|
|
12
9
|
set data(v) { this._data = v; }
|
|
13
|
-
get height() {
|
|
10
|
+
get height() { return this._height ?? this.model.options.rowHeight; }
|
|
14
11
|
set height(value) { this._height = value; }
|
|
15
12
|
get priority() { return this._priority; }
|
|
16
13
|
set priority(value) { this._priority = value; }
|
|
17
|
-
get address() { return
|
|
18
|
-
get range() { return new
|
|
14
|
+
get address() { return encodeRow(this.index); }
|
|
15
|
+
get range() { return new CellRange(null, this.index, null, this.index); }
|
|
19
16
|
get hasFormula() { return !!this._formula; }
|
|
20
17
|
get formula() { return this._formula; }
|
|
21
18
|
set formula(v) {
|
|
@@ -26,18 +23,18 @@ class RowModel extends core_1.tree.TreeNodeMixin(elementModel_1.ElementModel) {
|
|
|
26
23
|
cell(c, source) {
|
|
27
24
|
if (this.model.options.singleCellModel) {
|
|
28
25
|
if (!this._singleCell)
|
|
29
|
-
this._singleCell = new
|
|
26
|
+
this._singleCell = new CellModel(this.model, { c: c, r: this.index });
|
|
30
27
|
this._singleCell.row = this;
|
|
31
28
|
this._singleCell.column = this.model.columns[c];
|
|
32
29
|
return this._singleCell;
|
|
33
30
|
}
|
|
34
31
|
let cell = this._cells[c];
|
|
35
32
|
if ((source || !cell) && this.model.columns[c]) {
|
|
36
|
-
cell = new
|
|
33
|
+
cell = new CellModel(this.model, source ?? { c: c, r: this.index });
|
|
37
34
|
if (this._data) {
|
|
38
35
|
const dataField = this.model.columns[c].data;
|
|
39
36
|
if (dataField != null) {
|
|
40
|
-
if (
|
|
37
|
+
if (utils.isObject(this._data[dataField]))
|
|
41
38
|
cell.populate(this._data[dataField]);
|
|
42
39
|
else if (!cell.hasValue)
|
|
43
40
|
cell.value = this._data[dataField];
|
|
@@ -57,9 +54,8 @@ class RowModel extends core_1.tree.TreeNodeMixin(elementModel_1.ElementModel) {
|
|
|
57
54
|
this._priority = model.options.rowPriority;
|
|
58
55
|
}
|
|
59
56
|
populate(source) {
|
|
60
|
-
var _a;
|
|
61
57
|
super.populate(source);
|
|
62
|
-
this._height =
|
|
58
|
+
this._height = source.h ?? this.model.options.rowHeight;
|
|
63
59
|
this._data = source.data; // TODO: make clone?
|
|
64
60
|
if (source.priority != null)
|
|
65
61
|
this._priority = source.priority;
|
|
@@ -147,5 +143,4 @@ class RowModel extends core_1.tree.TreeNodeMixin(elementModel_1.ElementModel) {
|
|
|
147
143
|
this.cells.forEach(cell => cell && this.model.calculations.refreshFormula(cell));
|
|
148
144
|
}
|
|
149
145
|
}
|
|
150
|
-
exports.RowModel = RowModel;
|
|
151
146
|
//# sourceMappingURL=rowModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rowModel.js","sourceRoot":"","sources":["../../src/model/rowModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rowModel.js","sourceRoot":"","sources":["../../src/model/rowModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.SelectionModel = void 0;
|
|
4
|
-
const range_1 = require("../common/range");
|
|
5
|
-
class SelectionModel {
|
|
1
|
+
import { CellRange } from "../common/range";
|
|
2
|
+
export class SelectionModel {
|
|
6
3
|
get activeCellCoords() {
|
|
7
4
|
return {
|
|
8
5
|
c: this.range.c1 + this.activeCell.c1,
|
|
@@ -11,8 +8,8 @@ class SelectionModel {
|
|
|
11
8
|
}
|
|
12
9
|
constructor(c1, r1, c2, r2) {
|
|
13
10
|
this.hidden = false;
|
|
14
|
-
this.range = new
|
|
15
|
-
this.activeCell = new
|
|
11
|
+
this.range = new CellRange(c1, r1, c2, r2);
|
|
12
|
+
this.activeCell = new CellRange(0, 0);
|
|
16
13
|
}
|
|
17
14
|
static fromRange(r) {
|
|
18
15
|
return new SelectionModel(r.c1, r.r1, r.c2, r.r2);
|
|
@@ -23,7 +20,7 @@ class SelectionModel {
|
|
|
23
20
|
}
|
|
24
21
|
setRange(range) {
|
|
25
22
|
if (typeof range === 'string')
|
|
26
|
-
range =
|
|
23
|
+
range = CellRange.fromA1(range);
|
|
27
24
|
this.range.setCoords(range.c1, range.r1, range.c2, range.r2);
|
|
28
25
|
this.activeCell.setCoords(0, 0);
|
|
29
26
|
}
|
|
@@ -40,5 +37,4 @@ class SelectionModel {
|
|
|
40
37
|
this.activeCell.move(c, r, columns, rows, true);
|
|
41
38
|
}
|
|
42
39
|
}
|
|
43
|
-
exports.SelectionModel = SelectionModel;
|
|
44
40
|
//# sourceMappingURL=selectionModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selectionModel.js","sourceRoot":"","sources":["../../src/model/selectionModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"selectionModel.js","sourceRoot":"","sources":["../../src/model/selectionModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,OAAO,cAAc;IAO1B,IAAI,gBAAgB;QACnB,OAAO;YACN,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE;YACrC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE;SACrC,CAAA;IACF,CAAC;IAED,YAAY,EAAU,EAAE,EAAU,EAAE,EAAW,EAAE,EAAW;QAT5D,WAAM,GAAG,KAAK,CAAC;QAUd,IAAI,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,CAAY;QAC5B,OAAO,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,SAAS,CAAC,EAAW,EAAE,EAAW,EAAE,EAAW,EAAE,EAAW;QAC3D,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,QAAQ,CAAC,KAAuB;QAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,UAAmB,EAAE,OAAgB;QAC/D,IAAI,CAAC,KAAK,CAAC,SAAS,CACnB,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAClC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAClC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAClC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAClC,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,CAAC,CAAS,EAAE,CAAS,EAAE,UAAmB,EAAE,OAAgB;QACpE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,cAAc,CAAC,CAAS,EAAE,CAAS;QAClC,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;CAED"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.SortingModel = exports.SortOrder = void 0;
|
|
4
|
-
const core_1 = require("@omegagrid/core");
|
|
5
|
-
var SortOrder;
|
|
1
|
+
import { log } from "@omegagrid/core";
|
|
2
|
+
export var SortOrder;
|
|
6
3
|
(function (SortOrder) {
|
|
7
4
|
SortOrder[SortOrder["Asc"] = 1] = "Asc";
|
|
8
5
|
SortOrder[SortOrder["Desc"] = -1] = "Desc";
|
|
9
|
-
})(SortOrder || (
|
|
6
|
+
})(SortOrder || (SortOrder = {}));
|
|
10
7
|
const ascComparers = {
|
|
11
8
|
'g': (a, b) => a.value == b.value ? 0 : (a.value > b.value ? 1 : -1),
|
|
12
9
|
't': (a, b) => (a.value || '').toString().localeCompare((b.value || '').toString()),
|
|
@@ -37,7 +34,7 @@ const origComparer = (a, b) => a.origIndex - b.origIndex;
|
|
|
37
34
|
/**
|
|
38
35
|
* Class for sorting rows by columns sort settings
|
|
39
36
|
*/
|
|
40
|
-
class SortingModel extends EventTarget {
|
|
37
|
+
export class SortingModel extends EventTarget {
|
|
41
38
|
get settings() { return this._settings; }
|
|
42
39
|
set settings(v) {
|
|
43
40
|
this._settings = v;
|
|
@@ -45,7 +42,7 @@ class SortingModel extends EventTarget {
|
|
|
45
42
|
if (this.settings.length > 0) {
|
|
46
43
|
this.settings.forEach((s, i) => this.colMap.set(s.c, i));
|
|
47
44
|
this.applySort();
|
|
48
|
-
|
|
45
|
+
log.getLogger().info(`sorting applied: ${JSON.stringify(this.settings)}`);
|
|
49
46
|
}
|
|
50
47
|
}
|
|
51
48
|
constructor(model, _settings = []) {
|
|
@@ -111,10 +108,9 @@ class SortingModel extends EventTarget {
|
|
|
111
108
|
applySort() {
|
|
112
109
|
const m = this.model;
|
|
113
110
|
const cellComparers = this.settings.map(s => {
|
|
114
|
-
var _a, _b;
|
|
115
111
|
const column = m.columns[s.c];
|
|
116
112
|
if (!column) {
|
|
117
|
-
|
|
113
|
+
log.getLogger().warn(`Column sorting: Column with index ${s.c} not found`);
|
|
118
114
|
return null;
|
|
119
115
|
}
|
|
120
116
|
if (column.comparer)
|
|
@@ -122,8 +118,8 @@ class SortingModel extends EventTarget {
|
|
|
122
118
|
? column.comparer
|
|
123
119
|
: (a, b) => -column.comparer(a, b);
|
|
124
120
|
return s.ord == SortOrder.Asc
|
|
125
|
-
? ascComparers[
|
|
126
|
-
: descComparers[
|
|
121
|
+
? ascComparers[column.type ?? 't']
|
|
122
|
+
: descComparers[column.type ?? 't'];
|
|
127
123
|
}).filter(c => c);
|
|
128
124
|
const len = cellComparers.length;
|
|
129
125
|
let ord, i, c;
|
|
@@ -159,5 +155,4 @@ class SortingModel extends EventTarget {
|
|
|
159
155
|
this.model.rows.forEach((r, i) => r.origIndex = i);
|
|
160
156
|
}
|
|
161
157
|
}
|
|
162
|
-
exports.SortingModel = SortingModel;
|
|
163
158
|
//# sourceMappingURL=sortingModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortingModel.js","sourceRoot":"","sources":["../../src/model/sortingModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sortingModel.js","sourceRoot":"","sources":["../../src/model/sortingModel.ts"],"names":[],"mappings":"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"}
|