@easyquery/ui 7.1.1-rc08 → 7.1.2-rc02

package/dist/browser/eq.core.css

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Community 7.1.1-rc08 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.1.2-rc02 (https://korzh.com/easyquery/javascript)
  * Copyright 2021 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at

package/dist/browser/eq.core.min.css

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Community 7.1.1-rc08 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.1.2-rc02 (https://korzh.com/easyquery/javascript)
  * Copyright 2021 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at

package/dist/browser/eq.view.css

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Community 7.1.1-rc08 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.1.2-rc02 (https://korzh.com/easyquery/javascript)
  * Copyright 2021 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at

package/dist/browser/eq.view.min.css

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Community 7.1.1-rc08 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.1.2-rc02 (https://korzh.com/easyquery/javascript)
  * Copyright 2021 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at

package/dist/bundles/easyquery.ui.js

@@ -2124,7 +2124,7 @@ var AggregationSettings = /** @class */ (function () {
         this.useGrandTotals = false;
         this.useRecordCount = false;
         this.caseSensitiveGroups = false;
-        this.COUNT_FIELD_NAME = '__count';
+        this.COUNT_FIELD_NAME = 'GRPRECCNT';
     }
     AggregationSettings.prototype.addGroup = function (settings) {
         var cols = settings.columns || this.colStore.getColumnIds(settings.from, settings.to);
@@ -6066,7 +6066,7 @@ var default_dialog_service_DefaultDialog = /** @class */ (function () {
                     return;
                 b.addChild('button', function (b) { return b
                     .addClass('kfrm-button', 'is-info')
-                    .addText(public_api["g" /* i18n */].getText('ButtonOK'))
+                    .addText(options.submitButtonText || public_api["g" /* i18n */].getText('ButtonOK'))
                     .on('click', function (e) {
                     _this.submitHandler();
                 })
@@ -6074,7 +6074,7 @@ var default_dialog_service_DefaultDialog = /** @class */ (function () {
                 if (options.cancelable !== false)
                     b.addChild('button', function (builder) { return builder
                         .addClass('kfrm-button')
-                        .addText(public_api["g" /* i18n */].getText('ButtonCancel'))
+                        .addText(options.cancelButtonText || public_api["g" /* i18n */].getText('ButtonCancel'))
                         .on('click', function (e) {
                         _this.cancelHandler();
                     }); });
@@ -9710,10 +9710,13 @@ var customsql_column_renderer_extends = (undefined && undefined.__extends) || (f
 
 
 
+
 var customsql_column_renderer_CustomSqlColumnRendererCP = /** @class */ (function (_super) {
     customsql_column_renderer_extends(CustomSqlColumnRendererCP, _super);
     function CustomSqlColumnRendererCP() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.dataTypeMenu = null;
+        return _this;
     }
     CustomSqlColumnRendererCP.prototype.getClassesToAdd = function () {
         return this.cssPrefix + "-row " + this.cssPrefix + "-row-column-entattr" + _super.prototype.getClassesToAdd.call(this);
@@ -9735,6 +9738,7 @@ var customsql_column_renderer_CustomSqlColumnRendererCP = /** @class */ (functio
             .addClass(this.cssPrefix + "-expr-block")
             .addClass(browser_utils["a" /* browserUtils */].getMobileCssClass())
             .toDOM();
+        //Attribute element
         var builder = Object(lib_public_api["i" /* domel */])('div', exprBlock)
             .addClass(this.cssPrefix + "-colelement", this.cssPrefix + "-attrelement")
             .addClass(browser_utils["a" /* browserUtils */].getMobileCssClass());
@@ -9802,6 +9806,44 @@ var customsql_column_renderer_CustomSqlColumnRendererCP = /** @class */ (functio
                     .title(_this.column.caption);
             });
         }
+        // Colon element
+        builder = Object(lib_public_api["i" /* domel */])('div', exprBlock)
+            .addClass(this.cssPrefix + "-colelement")
+            .addChild('span', function (b) {
+            b.text(':')
+                .title(':');
+        });
+        // DataType element
+        builder = Object(lib_public_api["i" /* domel */])('div', exprBlock)
+            .addClass(this.cssPrefix + "-colelement", this.cssPrefix + "-attrelement")
+            .addClass(browser_utils["a" /* browserUtils */].getMobileCssClass());
+        if (this.isEditable()) {
+            this.createDataTypeMenu();
+            builder
+                .addChild('a', function (dataTypeLink) { return dataTypeLink
+                .attr('href', 'javascript:void(0)')
+                .title(public_api["d" /* DataType */][_this.column.expr.dataType])
+                .text(public_api["d" /* DataType */][_this.column.expr.dataType])
+                .on('touchstart click', function (ev) {
+                ev.stopPropagation();
+                _this.dataTypeMenu.showMenu({
+                    anchor: dataTypeLink.toDOM(),
+                    selectedIds: null,
+                    itemSelectedCallback: function (data, items) {
+                        _this.column.expr.dataType = data.id;
+                        _this.fireColumnChanged();
+                    }
+                });
+            }); });
+        }
+        else {
+            this.column.expr.dataType;
+            builder
+                .addChild('span', function (b) {
+                b.text(public_api["d" /* DataType */][_this.column.expr.dataType])
+                    .title(public_api["d" /* DataType */][_this.column.expr.dataType]);
+            });
+        }
         return exprBlock;
     };
     CustomSqlColumnRendererCP.prototype.changeTypeToSimple = function () {
@@ -9838,6 +9880,29 @@ var customsql_column_renderer_CustomSqlColumnRendererCP = /** @class */ (functio
                     }]
             }];
     };
+    CustomSqlColumnRendererCP.prototype.createDataTypeMenu = function () {
+        var items = [];
+        for (var typeItem in public_api["d" /* DataType */]) {
+            if (!isNaN(Number(typeItem))) {
+                var item = {
+                    id: typeItem,
+                    text: public_api["d" /* DataType */][typeItem]
+                };
+                items.push(item);
+            }
+        }
+        var menuId = this.column.id;
+        if (menuId) {
+            menuId += '-DataTypeMenu';
+        }
+        var menuOptions = {
+            items: items,
+            id: menuId,
+            searchBoxAlwaysShown: false,
+            domWriteItemsId: true
+        };
+        this.dataTypeMenu = new popup_menu_PopupMenu(menuOptions);
+    };
     return CustomSqlColumnRendererCP;
 }(simple_column_renderer_SimpleColumnRendererCP));
 
@@ -14319,12 +14384,14 @@ var datetime_expression_render_DateTimeExpressionRenderer = /** @class */ (funct
         var defValue = '${{Today}}';
         var value = this.expression.value;
         var model = this.expression.getModel();
-        if (model) {
-            if (model.isDateMacro(value) || model.isTimeMacro(value)) {
-                var macroText = value.substring(3, value.length - 2);
-                var res = public_api["g" /* i18n */].getText(macroText);
-                return res ? res : defValue;
-            }
+        console.log('DateTimeExpressionRenderer.getLabelText / value', value);
+        if (!model) {
+            throw new Error('DataModel is not defined for ' + this.expression.value);
+        }
+        if (model.isDateMacro(value) || model.isTimeMacro(value)) {
+            var macroText = value.substring(3, value.length - 2);
+            var res = public_api["g" /* i18n */].getText(macroText);
+            return res ? res : defValue;
         }
         var result = public_api["g" /* i18n */].dateTimeToStr(this.convertFromInternalFormat(value), this.expression.dataType);
         return result;
@@ -19057,7 +19124,6 @@ var export_widget_ExportWidget = /** @class */ (function (_super) {
 
 
 
-
 var aggr_settings_renderer_AggrSettingsRenderer = /** @class */ (function () {
     function AggrSettingsRenderer(options) {
         this.selectState = {
@@ -19107,8 +19173,7 @@ var aggr_settings_renderer_AggrSettingsRenderer = /** @class */ (function () {
         this.state.recordCount = aggrSettings.hasRecordCount();
     };
     AggrSettingsRenderer.prototype.getAvailableColumns = function () {
-        return this.query.getColumns().filter(function (c) { return c.enabled
-            && c.expr.tag == external_easyqueryCore_["ExprTag"].EntityAttribute; });
+        return this.query.getColumns().filter(function (c) { return c.enabled; });
     };
     AggrSettingsRenderer.prototype.renderCore = function () {
         var _this = this;
@@ -19415,11 +19480,10 @@ var aggr_settings_renderer_AggrSettingsRenderer = /** @class */ (function () {
         var model = this.query.getModel();
         var colId = this.selectState.columns[0];
         var col = this.getAvailableColumns().filter(function (c) { return c.id == colId; })[0];
-        var attr = model.getAttributeById(col.expr.value);
         this.functionMenu.showMenu({
             anchor: ev.target,
             itemFilterCallback: function (item) {
-                return _this.funcMap[item.id].appliedTypes.indexOf(attr.dataType) >= 0;
+                return _this.funcMap[item.id].appliedTypes.indexOf(col.expr.dataType) >= 0;
             },
             itemSelectedCallback: function (data) {
                 _this.state.aggregates.push({
@@ -20602,8 +20666,6 @@ var adv_search_view_AdvancedSearchView = /** @class */ (function (_super) {
         if (typeof (this.options.syncQueryOnChange) == 'undefined') {
             this.options.syncQueryOnChange = true;
         }
-        var query = this.context.getQuery();
-        query.addChangedCallback(this.queryChangedHandler);
         // hide any dropdown menu when user clicks somewhere
         window.addEventListener('click', this.outsideClickHandler);
         return this.options;
@@ -20733,6 +20795,11 @@ var adv_search_view_AdvancedSearchView = /** @class */ (function (_super) {
             }
         }
     };
+    AdvancedSearchView.prototype.initDone = function () {
+        _super.prototype.initDone.call(this);
+        var query = this.context.getQuery();
+        query.addChangedCallback(this.queryChangedHandler);
+    };
     /**
     * Sends current query to the backend.
     */
@@ -21345,6 +21412,8 @@ var report_view_ReportView = /** @class */ (function (_super) {
         _this.disabledClass = "eqjs-disabled";
         _this.enableExport = false;
         _this.useReportCache = true;
+        _this.syncReportOnChange = true;
+        _this.fetchDataOnChange = false;
         _this._reportSaveTemplate = "<div id=\"kdlg-dialog-form\" class=\"kfrm-form\">\n            <div class=\"kfrm-fields label-above\">\n                <label for=\"kdlg-dialog-form-input\" id=\"kdlg-dialog-form-content\"></label>\n                <input type=\"text\" name=\"kdlg-dialog-form-input\" id=\"kdlg-dialog-form-input\" />\n                <label for=\"kdlg-dialog-form-textarea\" id=\"kdlg-dialog-form-desc-label\"></label>\n                <textarea type=\"text\" name=\"kdlg-dialog-form-textarea\" id=\"kdlg-dialog-form-textarea\"></textarea>\n            </div>\n        </div>";
         var self = _this;
         _this.exportButtonClickHandler = function (e) {
@@ -21365,18 +21434,23 @@ var report_view_ReportView = /** @class */ (function (_super) {
         return _this;
     }
     ReportView.prototype.initOptions = function (options) {
-        var _this = this;
         options = _super.prototype.initOptions.call(this, options);
-        if (typeof (options.syncReportOnChange) === "undefined") {
-            options.syncReportOnChange = true;
+        if (typeof (options.syncQueryOnChange) !== "undefined") {
+            this.syncReportOnChange = options.syncQueryOnChange;
         }
-        if (typeof (options.syncQueryOnChange) == "undefined") {
-            options.syncQueryOnChange = options.syncReportOnChange;
+        if (typeof (options.syncReportOnChange) !== "undefined") {
+            this.syncReportOnChange = options.syncReportOnChange;
         }
+        options.syncQueryOnChange = this.syncReportOnChange;
         if (typeof (options.useReportCache) !== "undefined") {
             this.useReportCache = options.useReportCache;
         }
         this.defaultReportId = options.defaultReportId;
+        return options;
+    };
+    ReportView.prototype.initDone = function () {
+        var _this = this;
+        _super.prototype.initDone.call(this);
         var query = this.context.getQuery();
         query.addChangedCallback(function (event) {
             var eventData = event.data;
@@ -21393,7 +21467,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
                     }
                 }
             }
-            if (options.syncQueryOnChange) {
+            if (_this.syncReportOnChange) {
                 var needSync = eventData && eventData.changeType != "query.switched" && !eventData.noSync;
                 if (needSync) {
                     _this.syncReport();
@@ -21411,15 +21485,10 @@ var report_view_ReportView = /** @class */ (function (_super) {
                 _this.context.refreshWidgets(external_easyqueryCore_["WidgetGroup"].Result);
             }
             // fetch data on query change
-            if (options.fetchDataOnChange) {
+            if (_this.fetchDataOnChange) {
                 _this.fetchData();
             }
         });
-        return options;
-    };
-    ReportView.prototype.initDone = function () {
-        var _this = this;
-        _super.prototype.initDone.call(this);
         window.setTimeout(function () {
             _this.context.loadQueryList({
                 success: function (data) {