@easyquery/core 7.2.4-beta03 → 7.2.4-rc02
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/bundles/easyquery.core.js +245 -63
- package/dist/bundles/easyquery.core.js.map +1 -1
- package/dist/bundles/easyquery.core.min.js +1 -1
- package/dist/bundles/easyquery.core.min.js.map +1 -1
- package/dist/lib/common/eq_services.js +1 -1
- package/dist/lib/common/eq_services.js.map +1 -1
- package/dist/lib/eqs/eqs_exporter.js +3 -1
- package/dist/lib/eqs/eqs_exporter.js.map +1 -1
- package/dist/lib/eqs/eqs_query_file_loader.js +1 -1
- package/dist/lib/eqs/eqs_query_file_loader.js.map +1 -1
- package/dist/lib/export/exporter.d.ts +3 -0
- package/dist/lib/export/exporter.js +6 -1
- package/dist/lib/export/exporter.js.map +1 -1
- package/dist/lib/main/context.d.ts +3 -0
- package/dist/lib/main/context.js +23 -4
- package/dist/lib/main/context.js.map +1 -1
- package/dist/lib/main/context_options.d.ts +2 -0
- package/dist/lib/main/query_storage.js +1 -1
- package/dist/lib/main/query_storage.js.map +1 -1
- package/dist/lib/query/query.d.ts +12 -2
- package/dist/lib/query/query.js +156 -51
- package/dist/lib/query/query.js.map +1 -1
- package/dist/lib/query/query_column.d.ts +6 -2
- package/dist/lib/query/query_column.js +52 -5
- package/dist/lib/query/query_column.js.map +1 -1
- package/package.json +2 -2
|
@@ -25,12 +25,14 @@ var QueryColumn = /** @class */ (function () {
|
|
|
25
25
|
/** The parameters associated with this column */
|
|
26
26
|
this.params = [];
|
|
27
27
|
this._isHidden = false;
|
|
28
|
+
this.query = query;
|
|
28
29
|
this._id = dataUtils.generateId('col');
|
|
29
30
|
this.caption = '';
|
|
30
|
-
this.
|
|
31
|
-
this.
|
|
31
|
+
this._sorting = SortDirection.None;
|
|
32
|
+
this._sortIndex = -1;
|
|
32
33
|
this.expr = new Expression(this);
|
|
33
34
|
this.blockId = '';
|
|
35
|
+
this.justsorted = justsorted;
|
|
34
36
|
}
|
|
35
37
|
Object.defineProperty(QueryColumn.prototype, "id", {
|
|
36
38
|
get: function () {
|
|
@@ -39,6 +41,51 @@ var QueryColumn = /** @class */ (function () {
|
|
|
39
41
|
enumerable: false,
|
|
40
42
|
configurable: true
|
|
41
43
|
});
|
|
44
|
+
Object.defineProperty(QueryColumn.prototype, "sorting", {
|
|
45
|
+
/** Column sorting direction */
|
|
46
|
+
get: function () {
|
|
47
|
+
if (this.query) {
|
|
48
|
+
return this.query.getColumnSorting(this);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
return this._sorting;
|
|
52
|
+
}
|
|
53
|
+
},
|
|
54
|
+
set: function (direction) {
|
|
55
|
+
if (this.query) {
|
|
56
|
+
this.query.setColumnSorting(this, direction);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
this._sorting = direction;
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
enumerable: false,
|
|
63
|
+
configurable: true
|
|
64
|
+
});
|
|
65
|
+
;
|
|
66
|
+
Object.defineProperty(QueryColumn.prototype, "sortIndex", {
|
|
67
|
+
/** The index of the column in the sorting list. */
|
|
68
|
+
get: function () {
|
|
69
|
+
if (this.query) {
|
|
70
|
+
return this.query.getColumnSortIndex(this);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
return this._sortIndex;
|
|
74
|
+
}
|
|
75
|
+
},
|
|
76
|
+
set: function (index) {
|
|
77
|
+
if (this.query) {
|
|
78
|
+
this.query.setColumnSortIndex(this, index);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
this._sortIndex = index;
|
|
82
|
+
}
|
|
83
|
+
},
|
|
84
|
+
enumerable: false,
|
|
85
|
+
configurable: true
|
|
86
|
+
});
|
|
87
|
+
;
|
|
88
|
+
;
|
|
42
89
|
QueryColumn.prototype.getModel = function () {
|
|
43
90
|
return this.query.getModel();
|
|
44
91
|
};
|
|
@@ -93,8 +140,8 @@ var QueryColumn = /** @class */ (function () {
|
|
|
93
140
|
}
|
|
94
141
|
this.caption = colData.cptn;
|
|
95
142
|
if (typeof colData.srt !== 'undefined') {
|
|
96
|
-
this.
|
|
97
|
-
this.
|
|
143
|
+
this._sorting = colData.srt;
|
|
144
|
+
this._sortIndex = (typeof colData.srtidx !== 'undefined')
|
|
98
145
|
? colData.srtidx
|
|
99
146
|
: -1;
|
|
100
147
|
}
|
|
@@ -120,7 +167,7 @@ var QueryColumn = /** @class */ (function () {
|
|
|
120
167
|
if (typeof this.caption !== 'undefined') {
|
|
121
168
|
obj.cptn = this.caption;
|
|
122
169
|
}
|
|
123
|
-
if (
|
|
170
|
+
if (this.sorting != SortDirection.None) {
|
|
124
171
|
obj.srt = this.sorting;
|
|
125
172
|
obj.srtidx = this.sortIndex;
|
|
126
173
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query_column.js","sourceRoot":"","sources":["../../../src/query/query_column.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG9D,OAAO,EAAE,UAAU,EAAoB,MAAM,cAAc,CAAC;AAO5D,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAIpE,oCAAoC;AACpC,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACrB,kBAAkB;IAClB,iDAAQ,CAAA;IACR,uBAAuB;IACvB,2DAAa,CAAA;IACb,wBAAwB;IACxB,6DAAc,CAAA;AAClB,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AAED;;GAEG;AACH;
|
|
1
|
+
{"version":3,"file":"query_column.js","sourceRoot":"","sources":["../../../src/query/query_column.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@easyquery/core",
|
|
3
|
-
"version": "7.2.4-
|
|
3
|
+
"version": "7.2.4-rc02",
|
|
4
4
|
"description": "EasyQuery.JS Community core modules",
|
|
5
5
|
"types": "./dist/lib/public_api.d.ts",
|
|
6
6
|
"main": "./dist/bundles/easyquery.core.js",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"bugs": "https://korzh.com/support",
|
|
32
32
|
"license": "LGPL-3.0",
|
|
33
33
|
"peerDependencies": {
|
|
34
|
-
"@easydata/core": "^1.4.
|
|
34
|
+
"@easydata/core": "^1.4.17"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@olton/typedoc-webpack-plugin": "^0.1.0",
|