@easyquery/ui 7.1.2-rc01 → 7.1.2-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/browser/eq.community.js +2891 -2807
- package/dist/browser/eq.community.js.map +1 -1
- package/dist/browser/eq.community.min.js +2 -2
- package/dist/browser/eq.community.min.js.map +1 -1
- package/dist/browser/eq.core.css +1 -1
- package/dist/browser/eq.core.min.css +1 -1
- package/dist/browser/eq.view.css +1 -1
- package/dist/browser/eq.view.min.css +1 -1
- package/dist/bundles/easyquery.ui.js +97 -28
- package/dist/bundles/easyquery.ui.js.map +1 -1
- package/dist/bundles/easyquery.ui.min.js +1 -1
- package/dist/bundles/easyquery.ui.min.js.map +1 -1
- package/dist/lib/dialog/aggr_settings_dialog.js.map +1 -1
- package/dist/lib/views/adv_search_view.d.ts +1 -0
- package/dist/lib/views/adv_search_view.js +5 -2
- package/dist/lib/views/adv_search_view.js.map +1 -1
- package/dist/lib/views/report_view.d.ts +2 -0
- package/dist/lib/views/report_view.js +14 -12
- package/dist/lib/views/report_view.js.map +1 -1
- package/dist/lib/views/view.js.map +1 -1
- package/dist/lib/widgets/renderers/aggr_settings/aggr_settings_renderer.js +2 -5
- package/dist/lib/widgets/renderers/aggr_settings/aggr_settings_renderer.js.map +1 -1
- package/dist/lib/widgets/renderers/columnspanel/customsql_column_renderer.d.ts +3 -0
- package/dist/lib/widgets/renderers/columnspanel/customsql_column_renderer.js +67 -2
- package/dist/lib/widgets/renderers/columnspanel/customsql_column_renderer.js.map +1 -1
- package/dist/lib/widgets/renderers/columnspanel/simple_column_renderer.js.map +1 -1
- package/dist/lib/widgets/renderers/querypanel/datetime_expression_render.js +8 -6
- package/dist/lib/widgets/renderers/querypanel/datetime_expression_render.js.map +1 -1
- package/package.json +4 -4
|
@@ -11,15 +11,18 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
11
11
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
12
12
|
};
|
|
13
13
|
})();
|
|
14
|
-
import { i18n } from '@easydata/core';
|
|
14
|
+
import { i18n, DataType } from '@easydata/core';
|
|
15
15
|
import { ExprTag } from '@easyquery/core';
|
|
16
16
|
import { domel, eqDragManager } from '@easydata/ui';
|
|
17
17
|
import { SimpleColumnRendererCP } from './simple_column_renderer';
|
|
18
18
|
import { browserUtils } from '../../../utils/browser_utils';
|
|
19
|
+
import { PopupMenu } from '../../../utils/popup_menu';
|
|
19
20
|
var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
|
|
20
21
|
__extends(CustomSqlColumnRendererCP, _super);
|
|
21
22
|
function CustomSqlColumnRendererCP() {
|
|
22
|
-
|
|
23
|
+
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
24
|
+
_this.dataTypeMenu = null;
|
|
25
|
+
return _this;
|
|
23
26
|
}
|
|
24
27
|
CustomSqlColumnRendererCP.prototype.getClassesToAdd = function () {
|
|
25
28
|
return this.cssPrefix + "-row " + this.cssPrefix + "-row-column-entattr" + _super.prototype.getClassesToAdd.call(this);
|
|
@@ -41,6 +44,7 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
|
|
|
41
44
|
.addClass(this.cssPrefix + "-expr-block")
|
|
42
45
|
.addClass(browserUtils.getMobileCssClass())
|
|
43
46
|
.toDOM();
|
|
47
|
+
//Attribute element
|
|
44
48
|
var builder = domel('div', exprBlock)
|
|
45
49
|
.addClass(this.cssPrefix + "-colelement", this.cssPrefix + "-attrelement")
|
|
46
50
|
.addClass(browserUtils.getMobileCssClass());
|
|
@@ -108,6 +112,44 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
|
|
|
108
112
|
.title(_this.column.caption);
|
|
109
113
|
});
|
|
110
114
|
}
|
|
115
|
+
// Colon element
|
|
116
|
+
builder = domel('div', exprBlock)
|
|
117
|
+
.addClass(this.cssPrefix + "-colelement")
|
|
118
|
+
.addChild('span', function (b) {
|
|
119
|
+
b.text(':')
|
|
120
|
+
.title(':');
|
|
121
|
+
});
|
|
122
|
+
// DataType element
|
|
123
|
+
builder = domel('div', exprBlock)
|
|
124
|
+
.addClass(this.cssPrefix + "-colelement", this.cssPrefix + "-attrelement")
|
|
125
|
+
.addClass(browserUtils.getMobileCssClass());
|
|
126
|
+
if (this.isEditable()) {
|
|
127
|
+
this.createDataTypeMenu();
|
|
128
|
+
builder
|
|
129
|
+
.addChild('a', function (dataTypeLink) { return dataTypeLink
|
|
130
|
+
.attr('href', 'javascript:void(0)')
|
|
131
|
+
.title(DataType[_this.column.expr.dataType])
|
|
132
|
+
.text(DataType[_this.column.expr.dataType])
|
|
133
|
+
.on('touchstart click', function (ev) {
|
|
134
|
+
ev.stopPropagation();
|
|
135
|
+
_this.dataTypeMenu.showMenu({
|
|
136
|
+
anchor: dataTypeLink.toDOM(),
|
|
137
|
+
selectedIds: null,
|
|
138
|
+
itemSelectedCallback: function (data, items) {
|
|
139
|
+
_this.column.expr.dataType = data.id;
|
|
140
|
+
_this.fireColumnChanged();
|
|
141
|
+
}
|
|
142
|
+
});
|
|
143
|
+
}); });
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
this.column.expr.dataType;
|
|
147
|
+
builder
|
|
148
|
+
.addChild('span', function (b) {
|
|
149
|
+
b.text(DataType[_this.column.expr.dataType])
|
|
150
|
+
.title(DataType[_this.column.expr.dataType]);
|
|
151
|
+
});
|
|
152
|
+
}
|
|
111
153
|
return exprBlock;
|
|
112
154
|
};
|
|
113
155
|
CustomSqlColumnRendererCP.prototype.changeTypeToSimple = function () {
|
|
@@ -144,6 +186,29 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
|
|
|
144
186
|
}]
|
|
145
187
|
}];
|
|
146
188
|
};
|
|
189
|
+
CustomSqlColumnRendererCP.prototype.createDataTypeMenu = function () {
|
|
190
|
+
var items = [];
|
|
191
|
+
for (var typeItem in DataType) {
|
|
192
|
+
if (!isNaN(Number(typeItem))) {
|
|
193
|
+
var item = {
|
|
194
|
+
id: typeItem,
|
|
195
|
+
text: DataType[typeItem]
|
|
196
|
+
};
|
|
197
|
+
items.push(item);
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
var menuId = this.column.id;
|
|
201
|
+
if (menuId) {
|
|
202
|
+
menuId += '-DataTypeMenu';
|
|
203
|
+
}
|
|
204
|
+
var menuOptions = {
|
|
205
|
+
items: items,
|
|
206
|
+
id: menuId,
|
|
207
|
+
searchBoxAlwaysShown: false,
|
|
208
|
+
domWriteItemsId: true
|
|
209
|
+
};
|
|
210
|
+
this.dataTypeMenu = new PopupMenu(menuOptions);
|
|
211
|
+
};
|
|
147
212
|
return CustomSqlColumnRendererCP;
|
|
148
213
|
}(SimpleColumnRendererCP));
|
|
149
214
|
export { CustomSqlColumnRendererCP };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customsql_column_renderer.js","sourceRoot":"","sources":["../../../../../src/widgets/renderers/columnspanel/customsql_column_renderer.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"customsql_column_renderer.js","sourceRoot":"","sources":["../../../../../src/widgets/renderers/columnspanel/customsql_column_renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple_column_renderer.js","sourceRoot":"","sources":["../../../../../src/widgets/renderers/columnspanel/simple_column_renderer.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAW,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAgB,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D;IAA4C,0CAAgB;IAA5D;;
|
|
1
|
+
{"version":3,"file":"simple_column_renderer.js","sourceRoot":"","sources":["../../../../../src/widgets/renderers/columnspanel/simple_column_renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,12 +80,14 @@ var DateTimeExpressionRenderer = /** @class */ (function (_super) {
|
|
|
80
80
|
var defValue = '${{Today}}';
|
|
81
81
|
var value = this.expression.value;
|
|
82
82
|
var model = this.expression.getModel();
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
83
|
+
console.log('DateTimeExpressionRenderer.getLabelText / value', value);
|
|
84
|
+
if (!model) {
|
|
85
|
+
throw new Error('DataModel is not defined for ' + this.expression.value);
|
|
86
|
+
}
|
|
87
|
+
if (model.isDateMacro(value) || model.isTimeMacro(value)) {
|
|
88
|
+
var macroText = value.substring(3, value.length - 2);
|
|
89
|
+
var res = i18n.getText(macroText);
|
|
90
|
+
return res ? res : defValue;
|
|
89
91
|
}
|
|
90
92
|
var result = i18n.dateTimeToStr(this.convertFromInternalFormat(value), this.expression.dataType);
|
|
91
93
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datetime_expression_render.js","sourceRoot":"","sources":["../../../../../src/widgets/renderers/querypanel/datetime_expression_render.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAkB,qBAAqB,EAAyB,MAAM,cAAc,CAAC;AAE5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE;IAAgD,8CAAkB;IAAlE;QAAA,
|
|
1
|
+
{"version":3,"file":"datetime_expression_render.js","sourceRoot":"","sources":["../../../../../src/widgets/renderers/querypanel/datetime_expression_render.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAkB,qBAAqB,EAAyB,MAAM,cAAc,CAAC;AAE5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE;IAAgD,8CAAkB;IAAlE;QAAA,qEA6FC;QA5FW,SAAG,GAAmB,IAAI,CAAC;QAE3B,wBAAkB,GAAG,YAAY,CAAC;QAClC,wBAAkB,GAAG,OAAO,CAAC;;IAyFzC,CAAC;IAvFa,iDAAY,GAAtB;IACA,CAAC;IAES,+CAAU,GAApB;QAAA,iBA6CC;QA5CG,IAAI,IAAI,CAAC,GAAG;YACR,OAAO;QAEX,IAAM,aAAa,GAA0B;YACzC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS;YACvC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,KAAK,QAAQ,CAAC,IAAI;YACxD,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,KAAK,QAAQ,CAAC,IAAI;YAC1D,qBAAqB,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,qBAAqB;YAC/D,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB;YACvD,OAAO,EAAE,UAAC,QAAc;gBACpB,IAAM,KAAK,GAAG,KAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;gBACrD,KAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAErB,KAAI,CAAC,GAAG,GAAG,IAAI,CAAC;gBAChB,UAAU,CAAC,cAAM,OAAA,KAAI,CAAC,YAAY,CAAC,KAAK,EAAE,EAAzB,CAAyB,EAAE,GAAG,CAAC,CAAC;YACrD,CAAC;YACD,QAAQ,EAAE;gBACN,KAAI,CAAC,YAAY,CAAC,SAAS,GAAG,KAAI,CAAC,YAAY,EAAE,CAAC;gBAClD,KAAI,CAAC,GAAG,GAAG,IAAI,CAAC;gBAChB,UAAU,CAAC,cAAM,OAAA,KAAI,CAAC,YAAY,CAAC,KAAK,EAAE,EAAzB,CAAyB,EAAE,GAAG,CAAC,CAAC;YACrD,CAAC;YACD,iBAAiB,EAAE,UAAC,QAAc;gBAC9B,IAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBACrE,KAAI,CAAC,YAAY,CAAC,SAAS,GAAG,KAAK,CAAC;YACxC,CAAC;SACJ,CAAC;QAEF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAsB;YAChD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,aAAa,CAAC;YAC1D,CAAC,CAAC,IAAI,qBAAqB,CAAC,aAAa,CAAC,CAAC;QAE/C,IAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,IAAI,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;YACvE,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;SAC7C;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;YAC9E,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;SAC7C;aAAM;YACH,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;SACpD;QAED,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAES,gDAAW,GAArB;QACI,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;IACpB,CAAC;IAES,iDAAY,GAAtB;QACI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK;YACtB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;QAE/B,IAAM,QAAQ,GAAG,YAAY,CAAC;QAC9B,IAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,IAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,iDAAiD,EAAE,KAAK,CAAC,CAAC;QACtE,IAAI,CAAC,KAAK,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAC5E;QACD,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;YACtD,IAAI,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACrD,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAClC,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;SAC/B;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACnG,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,+CAAU,GAApB;QACI,OAAO,iBAAM,UAAU,WAAE;eAClB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,CAAA;IAC/F,CAAC;IAES,8DAAyB,GAAnC,UAAoC,QAAgB;QAChD,OAAO,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,GAAG,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACtG,CAAC;IAES,4DAAuB,GAAjC,UAAkC,QAAc;QAC5C,OAAO,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,GAAG,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACtG,CAAC;IACL,iCAAC;AAAD,CAAC,AA7FD,CAAgD,kBAAkB,GA6FjE"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@easyquery/ui",
|
|
3
|
-
"version": "7.1.2-
|
|
3
|
+
"version": "7.1.2-rc02",
|
|
4
4
|
"description": "EasyQuery.JS Community UI widgets",
|
|
5
5
|
"types": "./dist/lib/public_api.d.ts",
|
|
6
6
|
"main": "./dist/bundles/easyquery.ui.js",
|
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
"bugs": "https://korzh.com/support",
|
|
31
31
|
"license": "LGPL-3.0",
|
|
32
32
|
"peerDependencies": {
|
|
33
|
-
"@easyquery/core": "^7.1.2-
|
|
34
|
-
"@easydata/core": "^1.3.
|
|
35
|
-
"@easydata/ui": "^1.3.
|
|
33
|
+
"@easyquery/core": "^7.1.2-rc02",
|
|
34
|
+
"@easydata/core": "^1.3.5-rc01",
|
|
35
|
+
"@easydata/ui": "^1.3.5-rc01"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/jasmine": "^3.3.12",
|