@easyquery/enterprise 7.2.4-rc01 → 7.2.4-rc03
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/browser/eq.enterprise.js +198 -25
- package/dist/browser/eq.enterprise.js.map +1 -1
- package/dist/browser/eq.enterprise.min.js +1 -1
- package/dist/browser/eq.enterprise.min.js.map +1 -1
- package/dist/bundles/easyquery.enterprise.js +9 -7
- package/dist/bundles/easyquery.enterprise.js.map +1 -1
- package/dist/bundles/easyquery.enterprise.min.js +1 -1
- package/dist/bundles/easyquery.enterprise.min.js.map +1 -1
- package/dist/lib/extensions.js +1 -1
- package/dist/lib/extensions.js.map +1 -1
- package/dist/lib/query/query_ex.d.ts +2 -2
- package/dist/lib/query/query_ex.js +8 -6
- package/dist/lib/query/query_ex.js.map +1 -1
- package/package.json +2 -2
package/dist/lib/extensions.js
CHANGED
|
@@ -17,7 +17,7 @@ EqContext.prototype.useEnterprise = function (keyOrInitCallback) {
|
|
|
17
17
|
if (lcv.__kt > 1) {
|
|
18
18
|
var services = _this.getServices();
|
|
19
19
|
services.registerDataModelResolver(function (context) { return new DataModelEx(); });
|
|
20
|
-
services.registerQueryResolver(function (context) { return new QueryEx(context.getModel()); });
|
|
20
|
+
services.registerQueryResolver(function (context) { return new QueryEx(context.getModel(), { context: context }); });
|
|
21
21
|
services.registerQueryStorageResolver(function (context) { return new EqServerQueryStorage(context); });
|
|
22
22
|
services.registerAggregatesCalculator(function (context) { return new DataTableAggregatesCalculator(context); });
|
|
23
23
|
if (lcv.__kt === 2) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../src/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AA6BnE,SAAS,CAAC,SAAS,CAAC,qBAAqB,GAAG,UAA0B,QAAiB;IACtF,OAAO,CAAC,IAAI,CAAC,mDAAmD;UAC3D,+GAA+G;UAC/G,8CAA8C,CAAC,CAAC;AACtD,CAAC,CAAA;AAED,SAAS,CAAC,SAAS,CAAC,aAAa,GAAG,UAA0B,iBAAwC;IAAlE,iBA+DnC;IA9DA,IAAM,IAAI,GAAG,UAAC,GAAW,EAAE,SAAkB;QAC5C,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAEZ,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE;YACjB,IAAM,QAAQ,GAAG,KAAI,CAAC,WAAW,EAAE,CAAC;YACpC,QAAQ,CAAC,yBAAyB,CAAC,UAAA,OAAO,IAAI,OAAA,IAAI,WAAW,EAAE,EAAjB,CAAiB,CAAC,CAAC;YACjE,QAAQ,CAAC,qBAAqB,CAAC,UAAA,OAAO,IAAI,OAAA,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../src/extensions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Query, DataModel, CondTag, ConditionGroupDescriptor, Condition, QueryColumn } from '@easyquery/core';
|
|
1
|
+
import { Query, DataModel, CondTag, ConditionGroupDescriptor, Condition, QueryColumn, QueryOptions } from '@easyquery/core';
|
|
2
2
|
export declare class QueryEx extends Query {
|
|
3
|
-
constructor(model: DataModel);
|
|
3
|
+
constructor(model: DataModel, options?: QueryOptions);
|
|
4
4
|
isEx(): boolean;
|
|
5
5
|
createSubQuery(): Query;
|
|
6
6
|
createCondition(tag?: CondTag): Condition;
|
|
@@ -19,14 +19,14 @@ import { QueryColumnEx } from './query_column_ex';
|
|
|
19
19
|
import { lcv } from '../utils/lcv';
|
|
20
20
|
var QueryEx = /** @class */ (function (_super) {
|
|
21
21
|
__extends(QueryEx, _super);
|
|
22
|
-
function QueryEx(model) {
|
|
23
|
-
return _super.call(this, model) || this;
|
|
22
|
+
function QueryEx(model, options) {
|
|
23
|
+
return _super.call(this, model, null, options) || this;
|
|
24
24
|
}
|
|
25
25
|
QueryEx.prototype.isEx = function () {
|
|
26
26
|
return lcv.__kt > 1;
|
|
27
27
|
};
|
|
28
28
|
QueryEx.prototype.createSubQuery = function () {
|
|
29
|
-
return new QueryEx(this.model);
|
|
29
|
+
return new QueryEx(this.model, { context: this.context });
|
|
30
30
|
};
|
|
31
31
|
QueryEx.prototype.createCondition = function (tag) {
|
|
32
32
|
if (tag === void 0) { tag = CondTag.Simple; }
|
|
@@ -56,9 +56,11 @@ var QueryEx = /** @class */ (function (_super) {
|
|
|
56
56
|
if (addChildCondition) {
|
|
57
57
|
var model = this.getModel();
|
|
58
58
|
var attr = model.getFirstUICAttr();
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
if (attr) {
|
|
60
|
+
var op = model.getDefaultOperatorForAttr(attr);
|
|
61
|
+
var cond = this.createSimpleConditionObject(attr, op, "");
|
|
62
|
+
group.addCondition(cond);
|
|
63
|
+
}
|
|
62
64
|
}
|
|
63
65
|
parent.addCondition(group);
|
|
64
66
|
return group;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query_ex.js","sourceRoot":"","sources":["../../../src/query/query_ex.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EACH,KAAK,EACL,OAAO,EACI,QAAQ,EACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAGnC;IAA6B,2BAAK;IAE9B,iBAAY,KAAiB;
|
|
1
|
+
{"version":3,"file":"query_ex.js","sourceRoot":"","sources":["../../../src/query/query_ex.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@easyquery/enterprise",
|
|
3
|
-
"version": "7.2.4-
|
|
3
|
+
"version": "7.2.4-rc03",
|
|
4
4
|
"description": "EasyQuery.JS Enterprise",
|
|
5
5
|
"types": "./dist/lib/public_api.d.ts",
|
|
6
6
|
"main": "./dist/bundles/easyquery.enterprise.js",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
31
31
|
"peerDependencies": {
|
|
32
32
|
"@easydata/core": "^1.4.17",
|
|
33
|
-
"@easyquery/core": "^7.2.4-
|
|
33
|
+
"@easyquery/core": "^7.2.4-rc03"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@olton/typedoc-webpack-plugin": "^0.1.0",
|