@easyquery/ui 7.4.1-rc02 → 7.4.1-rc04

package/dist/easyquery.ui.cjs.js

@@ -2822,7 +2822,6 @@ class AttrColumnRendererCP extends ColumnRendererCP {
                 .title(attrCaption)
                 .text(attrCaption) //TO DO:add localization
                 .on('click', (ev) => {
-                console.log("columns expression click");
                 ev.stopPropagation();
                 this.activate();
                 this.panel.showEntitiesMenu({
@@ -3505,7 +3504,6 @@ class ColumnsPanel extends core.Widget {
                     .attr('href', 'javascript:void(0)')
                     .text(core$1.i18n.getText('CmdClickToAddColumn'))
                     .on('click', (e) => {
-                    console.log("Add new column");
                     e.preventDefault();
                     this.showEntitiesMenu({
                         anchor: e.target,
@@ -7391,6 +7389,9 @@ class DateTimeExpressionRenderer extends ExpressionRenderer {
             showTimePicker: this.expression.dataType !== core$1.DataType.Date,
             oneClickDateSelection: this.panel.options.oneClickDateSelection,
             showDateTimeInput: this.panel.options.showDateTimeInput,
+            minDate: this.panel.options.minDate,
+            maxDate: this.panel.options.maxDate,
+            defaultDate: this.panel.options.defaultDate,
             onApply: (dateTime) => {
                 const value = this.convertToInternalFormat(dateTime);
                 this.setValue(value);
@@ -7412,17 +7413,20 @@ class DateTimeExpressionRenderer extends ExpressionRenderer {
             : new ui.DefaultDateTimePicker(pickerOptions);
         const model = this.expression.getModel();
         const value = this.expression.value;
-        let dateTime = new Date();
+        let dt;
         if (this.expression.dataType != core$1.DataType.Time && model.isDateMacro(value)) {
-            dateTime = model.getDateMacroValue(value);
+            dt = model.getDateMacroValue(value);
         }
         else if (this.expression.dataType == core$1.DataType.Time && model.isTimeMacro(value)) {
-            dateTime = model.getTimeMacroValue(value);
+            dt = model.getTimeMacroValue(value);
         }
         else {
-            dateTime = this.convertFromInternalFormat(value, new Date());
+            const defaultDate = this.panel.options.defaultDate
+                ? ui.dateLikeToDate(this.panel.options.defaultDate)
+                : new Date();
+            dt = this.convertFromInternalFormat(value, defaultDate);
         }
-        this.dtp.setDateTime(dateTime);
+        this.dtp.setDateTime(dt);
         this.dtp.show(this.element);
     }
     closeEditor() {
@@ -7451,6 +7455,8 @@ class DateTimeExpressionRenderer extends ExpressionRenderer {
             && ((this.panel.options.editableParts & exports.QPEditablePart.Value) === exports.QPEditablePart.Value);
     }
     convertFromInternalFormat(dateTimeStr, defautValue) {
+        if (!dateTimeStr)
+            return defautValue || new Date();
         try {
             return core$1.utils.strToDateTime(dateTimeStr, this.internalDateFormat + ' ' + this.internalTimeFormat);
         }
@@ -7838,6 +7844,7 @@ class QueryPanel extends core.Widget {
         this.slot.innerHTML = '';
     }
     getEntitiesMenu() {
+        this.checkEntitiesMenu();
         return this.entitiesMenu;
     }
     getConditionMenu() {
@@ -8024,7 +8031,7 @@ class QueryPanel extends core.Widget {
     }
     render() {
         try {
-            this.entitiesMenu = this.createEntitiesMenu();
+            this.checkEntitiesMenu();
             this.createConditionMenus();
             this.createLinkTypeMenu();
             this.rootContainer = ui.domel('div', this.slot)
@@ -8184,9 +8191,14 @@ class QueryPanel extends core.Widget {
         core$1.utils.assign(options, this.options.menuOptions);
         return new PopupMenu(options);
     }
+    checkEntitiesMenu() {
+        if (!this.entitiesMenu) {
+            this.entitiesMenu = this.createEntitiesMenu();
+        }
+    }
     showEntitiesMenu(options) {
+        this.checkEntitiesMenu();
         this.entitiesMenu.showMenu(Object.assign({}, this.options.menuOptions, options));
-        // this.entitiesMenu.showMenu(options);
     }
     createConditionMenus() {
         //ConditionMenu
@@ -8484,7 +8496,6 @@ class FilterBar extends core.Widget {
             .text(core$1.i18n.getText('StrNoFilterClickToAdd'))
             .hide()
             .on('click', () => {
-            console.log("condition filter click");
             this.queryPanel.showEntitiesMenu({
                 anchor: this.headerLinkElement,
                 selectedIds: null,
@@ -8565,8 +8576,8 @@ class FilterBar extends core.Widget {
         }
     }
     textResize() {
-        this.headerTextBlock.style.width = (this.slot.clientWidth - this.headerIconElement.offsetWidth
-            - (ui.domel(this.headerArrowBlock).isVisible() ? this.headerArrowBlock.offsetWidth : 0)) + "px";
+        // this.headerTextBlock.style.width = (this.slot.clientWidth - this.headerIconElement.offsetWidth 
+        // - (domel(this.headerArrowBlock).isVisible() ? this.headerArrowBlock.offsetWidth : 0)) + "px";
     }
     destroyCore() {
         if (this.queryPanel)
@@ -13236,6 +13247,14 @@ class AdvancedSearchView extends View {
             }
         });
     }
+    applyQueryNamePattern(input) {
+        const allowedPattern = /[a-zA-Z0-9\s_\[\]()\@\$\#\&\-\.]/;
+        input.addEventListener('keydown', (e) => {
+            if (e.key.length === 1 && !allowedPattern.test(e.key) && !['Backspace', 'Delete', 'ArrowLeft', 'ArrowRight', 'Tab', 'Enter'].includes(e.key)) {
+                e.preventDefault();
+            }
+        });
+    }
     // ------------------ Dialog wrappers ---------------------
     showNewQueryDialog(callback) {
         const ds = this.context.getServices().getService('DialogService');
@@ -13250,6 +13269,7 @@ class AdvancedSearchView extends View {
             arrangeParents: false,
             beforeOpen: () => {
                 const input = document.getElementById(`kdlg-dialog-form-input`);
+                this.applyQueryNamePattern(input);
                 if (defVal) {
                     input.value = defVal;
                 }
@@ -13308,6 +13328,7 @@ class AdvancedSearchView extends View {
             arrangeParents: false,
             beforeOpen: () => {
                 const input = document.getElementById(`kdlg-dialog-form-input`);
+                this.applyQueryNamePattern(input);
                 input.value = newQueryName;
                 const content = document.getElementById('kdlg-dialog-form-content');
                 content.innerHTML = core$1.i18n.getText('SaveQueryContent');
@@ -13352,6 +13373,10 @@ class AdvancedSearchView extends View {
         const dlg = ds.open({
             title: core$1.i18n.getText('SaveQueryToFileDlgTitle'),
             body: body,
+            beforeOpen: () => {
+                const fileNameInput = body.querySelector('#kdlgFileNameInput');
+                this.applyQueryNamePattern(fileNameInput);
+            },
             onSubmit: () => {
                 const fileNameInput = body.querySelector('#kdlgFileNameInput');
                 const fileName = fileNameInput ? fileNameInput.value : "Query";
@@ -13836,6 +13861,14 @@ class ReportView extends View {
         this.reportListSlot = document.getElementById('ReportList');
         this.resultCountSlot = this.resolveElement(resultCountSpan);
     }
+    applyReportNamePattern(input) {
+        const allowedPattern = /[a-zA-Z0-9\s_\[\]()\@\$\#\&\-\.]/;
+        input.addEventListener('keydown', (e) => {
+            if (e.key.length === 1 && !allowedPattern.test(e.key) && !['Backspace', 'Delete', 'ArrowLeft', 'ArrowRight', 'Tab', 'Enter'].includes(e.key)) {
+                e.preventDefault();
+            }
+        });
+    }
     /**
     * Creates a new report.
     */
@@ -13851,6 +13884,7 @@ class ReportView extends View {
             arrangeParents: false,
             beforeOpen: () => {
                 const nameInput = document.getElementById(`kdlg-dialog-form-input`);
+                this.applyReportNamePattern(nameInput);
                 nameInput.value = core$1.i18n.getText('NewReportDefName');
                 const nameLabel = document.getElementById('kdlg-dialog-form-name-label');
                 nameLabel.innerHTML = core$1.i18n.getText('SaveReportDlgLabel');
@@ -13948,6 +13982,7 @@ class ReportView extends View {
             arrangeParents: false,
             beforeOpen: () => {
                 const input = document.getElementById(`kdlg-dialog-form-input`);
+                this.applyReportNamePattern(input);
                 input.value = query.getName();
                 const content = document.getElementById('kdlg-dialog-form-name-label');
                 content.innerHTML = core$1.i18n.getText('SaveReportDlgLabel');

package/dist/easyquery.ui.esm.js

@@ -1,6 +1,6 @@
 import { utils, i18n, DataType, EasyDataTable, AggregationSettings } from '@easydata/core';
 import { Widget, WidgetGroup, QueryChangePart, QueryChangeAction, ExprTag, SortDirection, i18n as i18n$1, equtils, eqconsts, ConditionPart, DataKind, Query, Expression, CondTag, EqEditorTag, EqValueEditor, EqServiceProvider, createEqContext } from '@easyquery/core';
-import { browserUtils, eqDragManager, getElementAbsolutePos, getScrollPos, getWinSize, getViewportSize, domel, DropEffect, createBrowserEvent, DomElementBuilder, DefaultDateTimePicker, slideDown, slideUp, EasyGrid, addCssClass, hideElement, showElement, isVisible, toggleVisibility, addElement, DefaultDialogService } from '@easydata/ui';
+import { browserUtils, eqDragManager, getElementAbsolutePos, getScrollPos, getWinSize, getViewportSize, domel, DropEffect, createBrowserEvent, DomElementBuilder, DefaultDateTimePicker, dateLikeToDate, slideDown, slideUp, EasyGrid, addCssClass, hideElement, showElement, isVisible, toggleVisibility, addElement, DefaultDialogService } from '@easydata/ui';
 
 function findHighestZIndex(elem) {
     let highest = 0;
@@ -2820,7 +2820,6 @@ class AttrColumnRendererCP extends ColumnRendererCP {
                 .title(attrCaption)
                 .text(attrCaption) //TO DO:add localization
                 .on('click', (ev) => {
-                console.log("columns expression click");
                 ev.stopPropagation();
                 this.activate();
                 this.panel.showEntitiesMenu({
@@ -3503,7 +3502,6 @@ class ColumnsPanel extends Widget {
                     .attr('href', 'javascript:void(0)')
                     .text(i18n.getText('CmdClickToAddColumn'))
                     .on('click', (e) => {
-                    console.log("Add new column");
                     e.preventDefault();
                     this.showEntitiesMenu({
                         anchor: e.target,
@@ -7389,6 +7387,9 @@ class DateTimeExpressionRenderer extends ExpressionRenderer {
             showTimePicker: this.expression.dataType !== DataType.Date,
             oneClickDateSelection: this.panel.options.oneClickDateSelection,
             showDateTimeInput: this.panel.options.showDateTimeInput,
+            minDate: this.panel.options.minDate,
+            maxDate: this.panel.options.maxDate,
+            defaultDate: this.panel.options.defaultDate,
             onApply: (dateTime) => {
                 const value = this.convertToInternalFormat(dateTime);
                 this.setValue(value);
@@ -7410,17 +7411,20 @@ class DateTimeExpressionRenderer extends ExpressionRenderer {
             : new DefaultDateTimePicker(pickerOptions);
         const model = this.expression.getModel();
         const value = this.expression.value;
-        let dateTime = new Date();
+        let dt;
         if (this.expression.dataType != DataType.Time && model.isDateMacro(value)) {
-            dateTime = model.getDateMacroValue(value);
+            dt = model.getDateMacroValue(value);
         }
         else if (this.expression.dataType == DataType.Time && model.isTimeMacro(value)) {
-            dateTime = model.getTimeMacroValue(value);
+            dt = model.getTimeMacroValue(value);
         }
         else {
-            dateTime = this.convertFromInternalFormat(value, new Date());
+            const defaultDate = this.panel.options.defaultDate
+                ? dateLikeToDate(this.panel.options.defaultDate)
+                : new Date();
+            dt = this.convertFromInternalFormat(value, defaultDate);
         }
-        this.dtp.setDateTime(dateTime);
+        this.dtp.setDateTime(dt);
         this.dtp.show(this.element);
     }
     closeEditor() {
@@ -7449,6 +7453,8 @@ class DateTimeExpressionRenderer extends ExpressionRenderer {
             && ((this.panel.options.editableParts & QPEditablePart.Value) === QPEditablePart.Value);
     }
     convertFromInternalFormat(dateTimeStr, defautValue) {
+        if (!dateTimeStr)
+            return defautValue || new Date();
         try {
             return utils.strToDateTime(dateTimeStr, this.internalDateFormat + ' ' + this.internalTimeFormat);
         }
@@ -7836,6 +7842,7 @@ class QueryPanel extends Widget {
         this.slot.innerHTML = '';
     }
     getEntitiesMenu() {
+        this.checkEntitiesMenu();
         return this.entitiesMenu;
     }
     getConditionMenu() {
@@ -8022,7 +8029,7 @@ class QueryPanel extends Widget {
     }
     render() {
         try {
-            this.entitiesMenu = this.createEntitiesMenu();
+            this.checkEntitiesMenu();
             this.createConditionMenus();
             this.createLinkTypeMenu();
             this.rootContainer = domel('div', this.slot)
@@ -8182,9 +8189,14 @@ class QueryPanel extends Widget {
         utils.assign(options, this.options.menuOptions);
         return new PopupMenu(options);
     }
+    checkEntitiesMenu() {
+        if (!this.entitiesMenu) {
+            this.entitiesMenu = this.createEntitiesMenu();
+        }
+    }
     showEntitiesMenu(options) {
+        this.checkEntitiesMenu();
         this.entitiesMenu.showMenu(Object.assign({}, this.options.menuOptions, options));
-        // this.entitiesMenu.showMenu(options);
     }
     createConditionMenus() {
         //ConditionMenu
@@ -8482,7 +8494,6 @@ class FilterBar extends Widget {
             .text(i18n.getText('StrNoFilterClickToAdd'))
             .hide()
             .on('click', () => {
-            console.log("condition filter click");
             this.queryPanel.showEntitiesMenu({
                 anchor: this.headerLinkElement,
                 selectedIds: null,
@@ -8563,8 +8574,8 @@ class FilterBar extends Widget {
         }
     }
     textResize() {
-        this.headerTextBlock.style.width = (this.slot.clientWidth - this.headerIconElement.offsetWidth
-            - (domel(this.headerArrowBlock).isVisible() ? this.headerArrowBlock.offsetWidth : 0)) + "px";
+        // this.headerTextBlock.style.width = (this.slot.clientWidth - this.headerIconElement.offsetWidth 
+        // - (domel(this.headerArrowBlock).isVisible() ? this.headerArrowBlock.offsetWidth : 0)) + "px";
     }
     destroyCore() {
         if (this.queryPanel)
@@ -13234,6 +13245,14 @@ class AdvancedSearchView extends View {
             }
         });
     }
+    applyQueryNamePattern(input) {
+        const allowedPattern = /[a-zA-Z0-9\s_\[\]()\@\$\#\&\-\.]/;
+        input.addEventListener('keydown', (e) => {
+            if (e.key.length === 1 && !allowedPattern.test(e.key) && !['Backspace', 'Delete', 'ArrowLeft', 'ArrowRight', 'Tab', 'Enter'].includes(e.key)) {
+                e.preventDefault();
+            }
+        });
+    }
     // ------------------ Dialog wrappers ---------------------
     showNewQueryDialog(callback) {
         const ds = this.context.getServices().getService('DialogService');
@@ -13248,6 +13267,7 @@ class AdvancedSearchView extends View {
             arrangeParents: false,
             beforeOpen: () => {
                 const input = document.getElementById(`kdlg-dialog-form-input`);
+                this.applyQueryNamePattern(input);
                 if (defVal) {
                     input.value = defVal;
                 }
@@ -13306,6 +13326,7 @@ class AdvancedSearchView extends View {
             arrangeParents: false,
             beforeOpen: () => {
                 const input = document.getElementById(`kdlg-dialog-form-input`);
+                this.applyQueryNamePattern(input);
                 input.value = newQueryName;
                 const content = document.getElementById('kdlg-dialog-form-content');
                 content.innerHTML = i18n.getText('SaveQueryContent');
@@ -13350,6 +13371,10 @@ class AdvancedSearchView extends View {
         const dlg = ds.open({
             title: i18n.getText('SaveQueryToFileDlgTitle'),
             body: body,
+            beforeOpen: () => {
+                const fileNameInput = body.querySelector('#kdlgFileNameInput');
+                this.applyQueryNamePattern(fileNameInput);
+            },
             onSubmit: () => {
                 const fileNameInput = body.querySelector('#kdlgFileNameInput');
                 const fileName = fileNameInput ? fileNameInput.value : "Query";
@@ -13834,6 +13859,14 @@ class ReportView extends View {
         this.reportListSlot = document.getElementById('ReportList');
         this.resultCountSlot = this.resolveElement(resultCountSpan);
     }
+    applyReportNamePattern(input) {
+        const allowedPattern = /[a-zA-Z0-9\s_\[\]()\@\$\#\&\-\.]/;
+        input.addEventListener('keydown', (e) => {
+            if (e.key.length === 1 && !allowedPattern.test(e.key) && !['Backspace', 'Delete', 'ArrowLeft', 'ArrowRight', 'Tab', 'Enter'].includes(e.key)) {
+                e.preventDefault();
+            }
+        });
+    }
     /**
     * Creates a new report.
     */
@@ -13849,6 +13882,7 @@ class ReportView extends View {
             arrangeParents: false,
             beforeOpen: () => {
                 const nameInput = document.getElementById(`kdlg-dialog-form-input`);
+                this.applyReportNamePattern(nameInput);
                 nameInput.value = i18n.getText('NewReportDefName');
                 const nameLabel = document.getElementById('kdlg-dialog-form-name-label');
                 nameLabel.innerHTML = i18n.getText('SaveReportDlgLabel');
@@ -13946,6 +13980,7 @@ class ReportView extends View {
             arrangeParents: false,
             beforeOpen: () => {
                 const input = document.getElementById(`kdlg-dialog-form-input`);
+                this.applyReportNamePattern(input);
                 input.value = query.getName();
                 const content = document.getElementById('kdlg-dialog-form-name-label');
                 content.innerHTML = i18n.getText('SaveReportDlgLabel');

package/dist/types/facets/chart_facet.d.ts

@@ -6,7 +6,7 @@ export declare class ChartFacet extends ResultFacet {
     protected chart: ChartWidget;
     title: string;
     protected settings: any;
-    protected dialogTitle: string;
+    protected dialogTitle: any;
     init(slot: HTMLElement): void;
     destroy(): void;
     getType(): FacetType;

package/dist/types/facets/datatable_facet.d.ts

@@ -4,7 +4,7 @@ import { FacetType } from '../types/facet_type';
 export declare class DataTableFacet extends ResultFacet {
     protected grid: Widget;
     title: string;
-    protected dialogTitle: string;
+    protected dialogTitle: any;
     init(slot: HTMLElement): void;
     getSettings(): any;
     protected reinitGrid(): void;

package/dist/types/facets/pivot_table_facet.d.ts

@@ -21,7 +21,7 @@ interface CrossTabOptions {
 export declare class PivotTableFacet extends ResultFacet {
     protected grid: EasyGrid;
     title: string;
-    protected dialogTitle: string;
+    protected dialogTitle: any;
     protected pivotTable: EasyDataTable;
     protected settings: CrossTabOptions;
     init(slot: HTMLElement): void;

package/dist/types/facets/result_facet.d.ts

@@ -10,7 +10,7 @@ export declare abstract class ResultFacet {
     private displayMessageDiv;
     title: string;
     protected cssPrefix: string;
-    protected dialogTitle: string;
+    protected dialogTitle: any;
     protected options: any;
     protected canDisplayFlag: boolean;
     constructor(container: FacetContainer, options?: any);

package/dist/types/views/adv_search_view.d.ts

@@ -72,6 +72,7 @@ export declare class AdvancedSearchView extends View {
     checkIfQueryModified(callback: any): void;
     protected removeCurrentQuery(): void;
     private _querySaveTemplate;
+    private applyQueryNamePattern;
     protected showNewQueryDialog(callback: (result: string) => Promise<DlgCallbackResult>): void;
     protected showQueryClearDialog(callback: (result: boolean) => void): void;
     protected showQueryChangedDialog(callback: (result: boolean) => void): void;

package/dist/types/views/report_view.d.ts

@@ -47,6 +47,7 @@ export declare class ReportView extends View {
     protected initDone(): void;
     protected createWidgets(options?: ReportViewOptions): void;
     private _reportSaveTemplate;
+    private applyReportNamePattern;
     /**
     * Creates a new report.
     */

package/dist/types/widgets/columns_panel.d.ts

@@ -51,11 +51,11 @@ export declare class ColumnsPanel extends Widget {
     private createEntitiesMenu;
     getSortMenuList(): {
         id: string;
-        text: string;
+        text: any;
     }[];
     getMoveMenuList(): {
         id: string;
-        text: string;
+        text: any;
     }[];
     private createSortMenu;
     private createMoveMenu;

package/dist/types/widgets/query_panel.d.ts

@@ -63,6 +63,7 @@ export declare class QueryPanel extends Widget {
     getOperatorRenderer(condition: Condition, text: string, slot?: HTMLDivElement): BaseElementRenderer | null;
     getAddRowRenderer(slot?: HTMLDivElement): BaseElementRenderer | null;
     private createEntitiesMenu;
+    protected checkEntitiesMenu(): void;
     showEntitiesMenu(options: PopupMenuOptions): void;
     private createConditionMenus;
     private createLinkTypeMenu;

package/dist/types/widgets/widget_options.d.ts

@@ -1,6 +1,6 @@
 import { Query, Condition, Expression, Widget, EqValueEditor } from '@easyquery/core';
 import { EasyDataTable } from '@easydata/core';
-import { DateTimePicker, DateTimePickerOptions } from '@easydata/ui';
+import { DateTimePicker, DateTimePickerOptions, DateLike } from '@easydata/ui';
 import { ConditionRenderer } from './renderers/querypanel/condition_renderer';
 import { ExpressionRenderer } from './renderers/querypanel/expression_renderer';
 import { BaseElementRenderer } from './renderers/base_element_renderer';
@@ -382,6 +382,9 @@ export interface QueryPanelOptions {
     dateTimePickerResolver?: (options: DateTimePickerOptions) => DateTimePicker;
     /** Gets or sets the edit mode option: Full, FixedList or ReadOnly */
     editMode?: ConditionsEditMode;
+    minDate?: DateLike;
+    maxDate?: DateLike;
+    defaultDate?: DateLike;
 }
 /**
  * Grid options type.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@easyquery/ui",
-    "version": "7.4.1-rc02",
+    "version": "7.4.1-rc04",
     "description": "EasyQuery.JS Community UI widgets",
     "types": "./dist/types/public_api.d.ts",
     "main": "./dist/easyquery.ui.cjs.js",
@@ -30,7 +30,7 @@
     "bugs": "https://korzh.com/support",
     "license": "LGPL-3.0",
     "peerDependencies": {
-        "@easyquery/core": "^7.4.1-rc02"
+        "@easyquery/core": "^7.4.1-rc04"
     },
     "files": [
         "dist",