@easyquery/ui 7.1.2-rc01 → 7.1.2-rc07

package/dist/browser/eq.core.css

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Community 7.1.2-rc01 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.1.2-rc07 (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.2-rc01 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.1.2-rc07 (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.2-rc01 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.1.2-rc07 (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.2-rc01 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.1.2-rc07 (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

@@ -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();
                     }); });
@@ -9055,13 +9055,13 @@ var column_renderer_ColumnRendererCP = /** @class */ (function () {
         var funcs = this.panel.getContext().getModel().getAggrFunctions();
         var funcAllowed = true;
         var item = null;
-        var attribute = this.getAttribute();
+        var colDataType = this.column.getDataType();
         var funcCaption;
         for (var _i = 0, funcs_1 = funcs; _i < funcs_1.length; _i++) {
             var func = funcs_1[_i];
             if (!func)
                 continue;
-            var toInclude = func.getAppliedTypesOrDefault().indexOf(attribute.dataType) >= 0;
+            var toInclude = func.getAppliedTypesOrDefault().indexOf(colDataType) >= 0;
             if (this.column.expr.func === func.id && !toInclude) {
                 funcAllowed = false;
             }
@@ -9382,7 +9382,8 @@ var simple_column_renderer_SimpleColumnRendererCP = /** @class */ (function (_su
                 _this.panel.showEntitiesMenu({
                     anchor: ev.target,
                     selectedIds: null,
-                    itemSelectedCallback: _this.baseExpressionItemSelectedCallback.bind(_this)
+                    itemSelectedCallback: _this.baseExpressionItemSelectedCallback.bind(_this),
+                    itemFilterCallback: function (item) { return item.id !== '__AddAll__'; }
                 });
                 return false;
             })
@@ -9710,10 +9711,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 +9739,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 +9807,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 +9881,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));
 
@@ -9885,7 +9951,6 @@ var columns_panel_ColumnsPanel = /** @class */ (function (_super) {
             buttons: null,
             alwaysShowButtons: false,
             accentActiveColumn: true,
-            menuSearchBoxAfter: 30,
             allowDragDrop: true,
             menuOptions: {
                 showSearchBoxAfter: 30,
@@ -9898,7 +9963,8 @@ var columns_panel_ColumnsPanel = /** @class */ (function (_super) {
             sortEntities: false,
             columnRenderedCallback: null,
             customExpressionText: 0,
-            allowHiddenColumns: false
+            allowHiddenColumns: false,
+            showAddAllForEntity: false
         };
         _this.landingSlot = Object(lib_public_api["i" /* domel */])('div')
             .addClass(_this.cssPrefix + "-col-landing-slot")
@@ -10017,8 +10083,13 @@ var columns_panel_ColumnsPanel = /** @class */ (function (_super) {
                         anchor: e.target,
                         selectedIds: null,
                         itemSelectedCallback: function (data, items) {
-                            var attrid = data.id;
-                            _this.addNewColumn(attrid);
+                            if (data.id === '__AddAll__' && data.extra && Array.isArray(data.extra.ids)) {
+                                data.extra.ids.forEach(function (attrId) { return _this.addNewColumn(attrId); });
+                            }
+                            else {
+                                var attrid = data.id;
+                                _this.addNewColumn(attrid);
+                            }
                             return false;
                         }
                     });
@@ -10391,6 +10462,24 @@ var columns_panel_ColumnsPanel = /** @class */ (function (_super) {
         var query = this.getQuery();
         return query.isEx() && this.options.allowCustomExpressions;
     };
+    ColumnsPanel.prototype.addAllColumnsToEntitiesList = function (list) {
+        var _this = this;
+        var attrIds = list.filter(function (item) { return !item.isEntity; }).map(function (item) { return item.id; });
+        if (attrIds.length > 0) {
+            list.unshift({
+                id: '__AddAll__',
+                text: public_api["g" /* i18n */].getText('AddAllForEntityText'),
+                extra: {
+                    ids: attrIds
+                }
+            });
+        }
+        list.forEach(function (item) {
+            if (item.items) {
+                _this.addAllColumnsToEntitiesList(item.items);
+            }
+        });
+    };
     ColumnsPanel.prototype.createEntitiesMenu = function () {
         var model = this.getContext().getModel();
         if (!model || model.isEmpty())
@@ -10400,6 +10489,10 @@ var columns_panel_ColumnsPanel = /** @class */ (function (_super) {
             menuId += '-EntitiesMenu';
         }
         var entitiesList = model.getEntitiesTree({ addUIC: false, addUIR: true, addUIS: false, attrPlacement: this.options.attrPlacement, sortEntities: this.options.sortEntities });
+        // add [Add all columns] items
+        if (this.options.showAddAllForEntity) {
+            this.addAllColumnsToEntitiesList(entitiesList);
+        }
         var options = {
             id: menuId,
             items: entitiesList,
@@ -10598,7 +10691,6 @@ var column_renderer_ColumnRendererCB = /** @class */ (function () {
         builder
             .addClass(this.getClassesToAdd())
             .addClass(browser_utils["a" /* browserUtils */].getMobileCssClass())
-            //        .addChildElement(this.renderExpressionBlock())
             .addChildElement(this.renderCaptionBlock())
             .addChildElement(this.renderSortingImage());
         if (!browser_utils["a" /* browserUtils */].isMobileMode()) {
@@ -10632,7 +10724,6 @@ var column_renderer_ColumnRendererCB = /** @class */ (function () {
     ColumnRendererCB.prototype.renderButtonsBlock = function () {
         return Object(lib_public_api["i" /* domel */])('div', this.element)
             .addClass(utils["b" /* eqCssPrefix */] + "-column-buttonsBlock", this.cssPrefix + "-buttonsBlock")
-            //.addClass(browserUtils.getMobileCssClass())
             .addChildElement(this.renderSortingButton())
             .addChildElement(this.renderColumnTypeButton())
             .addChildElement(this.renderColumnFormatButton())
@@ -11018,13 +11109,13 @@ var column_renderer_ColumnRendererCB = /** @class */ (function () {
         var funcs = this.bar.getContext().getModel().getAggrFunctions();
         var funcAllowed = true;
         var item = null;
-        var attribute = this.getAttribute();
+        var colDataType = this.column.getDataType();
         var funcCaption;
         for (var _i = 0, funcs_1 = funcs; _i < funcs_1.length; _i++) {
             var func = funcs_1[_i];
             if (!func)
                 continue;
-            var toInclude = func.getAppliedTypesOrDefault().indexOf(attribute.dataType) >= 0;
+            var toInclude = func.getAppliedTypesOrDefault().indexOf(colDataType) >= 0;
             if (this.column.expr.func === func.id && !toInclude) {
                 funcAllowed = false;
             }
@@ -11277,7 +11368,6 @@ var columns_bar_ColumnsBar = /** @class */ (function (_super) {
             titleElementFormat: null,
             alwaysShowButtons: false,
             accentActiveColumn: true,
-            menuSearchBoxAfter: 30,
             allowDragDrop: true,
             menuOptions: {
                 showSearchBoxAfter: 30,
@@ -14319,12 +14409,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;
@@ -14939,7 +15031,9 @@ var query_panel_QueryPanel = /** @class */ (function (_super) {
             });
         }
         if (this.options.dateFormatDisplay) {
-            // TO DO: process option
+            public_api["g" /* i18n */].updateLocaleSettings({
+                shortDateFormat: this.options.dateFormatDisplay
+            });
         }
         if (typeof this.options.editableParts === "undefined") {
             this.options.editableParts = QPEditablePart.All;
@@ -19057,7 +19151,6 @@ var export_widget_ExportWidget = /** @class */ (function (_super) {
 
 
 
-
 var aggr_settings_renderer_AggrSettingsRenderer = /** @class */ (function () {
     function AggrSettingsRenderer(options) {
         this.selectState = {
@@ -19107,8 +19200,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 +19507,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({
@@ -19583,6 +19674,12 @@ var aggr_settings_dialog_AggrSettingsDialog = /** @class */ (function () {
         if (this.query.enableAggregation) {
             this.renderer.render();
         }
+        else {
+            var btn = this.body ? this.body.closest('.kdlg-modal').querySelector('footer .kfrm-button.is-info') : null;
+            if (btn) {
+                btn.disabled = false;
+            }
+        }
     };
     return AggrSettingsDialog;
 }());
@@ -20602,8 +20699,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 +20828,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,12 +21445,14 @@ 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) {
-            if (!this.classList.contains(self.disabledClass)) {
-                var format = this.getAttribute("data-format");
-                self.getContext().exportResult({ format: format });
+        _this.context.useStoredQueryOnFetch = true;
+        _this.exportButtonClickHandler = function (srcElement, e) {
+            if (!srcElement.classList.contains(_this.disabledClass)) {
+                var format = srcElement.getAttribute("data-format");
+                _this.context.exportResult({ format: format });
             }
         };
         _this.clearReportButtonClickHandler = _this.clearReportButtonClick.bind(_this);
@@ -21365,18 +21467,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 +21500,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 +21518,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) {
@@ -22151,6 +22253,7 @@ function addEasyQueryUITexts() {
         SortHeaderSorting: 'Sorting',
         StrAddColumns: 'Add columns',
         CustomExpression: 'Custom Expression',
+        AddAllForEntityText: '[Add all attributes]',
         CmdMoveToStart: 'Move to start',
         CmdMoveRight: 'Move right',
         CmdMoveLeft: 'Move left',