@easyquery/ui 7.4.1-rc01 → 7.4.1-rc03

package/dist/easyquery.ui.cjs.js

@@ -7838,6 +7838,7 @@ class QueryPanel extends core.Widget {
         this.slot.innerHTML = '';
     }
     getEntitiesMenu() {
+        this.checkEntitiesMenu();
         return this.entitiesMenu;
     }
     getConditionMenu() {
@@ -8024,7 +8025,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 +8185,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
@@ -8439,7 +8445,7 @@ class FilterBar extends core.Widget {
         ui.domel(this.headerTextElement)
             .text(text)
             .attr('title', text);
-        if (!query || query.isEmptyConditions()) { //empty query, don't show query panel and arrow, show link in header
+        if (!query || query.isEmptyConditions()) { //empty query, don't show query panel and arrow, show a link in the header
             ui.domel(this.headerTextElement).hide();
             ui.domel(this.headerLinkElement).show();
             if (!ui.domel(this.qpBlock).isVisible()) {
@@ -8465,6 +8471,7 @@ class FilterBar extends core.Widget {
         this.textResize();
     }
     render() {
+        this.slot.innerHTML = '';
         ui.domel(this.slot)
             .addClass(`${this.cssPrefix}-container`)
             .addClass(getMobileCssClass())
@@ -8483,7 +8490,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,
@@ -8543,14 +8549,13 @@ class FilterBar extends core.Widget {
         });
         this.updateHeader();
         this.queryPanel.refresh();
-        setTimeout(() => this.textResize(), 500);
     }
     refreshCore() {
         this.clear();
         this.render();
     }
     clear() {
-        this.slot.innerHTML = "";
+        this.slot.innerHTML = '';
     }
     applyFilter() {
         if (this.options.applyFilterCallback) {
@@ -8565,8 +8570,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)
@@ -8577,7 +8582,12 @@ class FilterBar extends core.Widget {
     attachQueryObserver() {
         const query = this.getContext().getQuery();
         this.queryEventCallbackId = query.addChangedCallback(event => {
-            this.render();
+            if (this.headerElement) {
+                this.updateHeader();
+            }
+            else {
+                this.render();
+            }
         });
     }
     detachQueryObserver() {

package/dist/easyquery.ui.esm.js

@@ -7836,6 +7836,7 @@ class QueryPanel extends Widget {
         this.slot.innerHTML = '';
     }
     getEntitiesMenu() {
+        this.checkEntitiesMenu();
         return this.entitiesMenu;
     }
     getConditionMenu() {
@@ -8022,7 +8023,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 +8183,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
@@ -8437,7 +8443,7 @@ class FilterBar extends Widget {
         domel(this.headerTextElement)
             .text(text)
             .attr('title', text);
-        if (!query || query.isEmptyConditions()) { //empty query, don't show query panel and arrow, show link in header
+        if (!query || query.isEmptyConditions()) { //empty query, don't show query panel and arrow, show a link in the header
             domel(this.headerTextElement).hide();
             domel(this.headerLinkElement).show();
             if (!domel(this.qpBlock).isVisible()) {
@@ -8463,6 +8469,7 @@ class FilterBar extends Widget {
         this.textResize();
     }
     render() {
+        this.slot.innerHTML = '';
         domel(this.slot)
             .addClass(`${this.cssPrefix}-container`)
             .addClass(getMobileCssClass())
@@ -8481,7 +8488,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,
@@ -8541,14 +8547,13 @@ class FilterBar extends Widget {
         });
         this.updateHeader();
         this.queryPanel.refresh();
-        setTimeout(() => this.textResize(), 500);
     }
     refreshCore() {
         this.clear();
         this.render();
     }
     clear() {
-        this.slot.innerHTML = "";
+        this.slot.innerHTML = '';
     }
     applyFilter() {
         if (this.options.applyFilterCallback) {
@@ -8563,8 +8568,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)
@@ -8575,7 +8580,12 @@ class FilterBar extends Widget {
     attachQueryObserver() {
         const query = this.getContext().getQuery();
         this.queryEventCallbackId = query.addChangedCallback(event => {
-            this.render();
+            if (this.headerElement) {
+                this.updateHeader();
+            }
+            else {
+                this.render();
+            }
         });
     }
     detachQueryObserver() {

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@easyquery/ui",
-    "version": "7.4.1-rc01",
+    "version": "7.4.1-rc03",
     "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-rc01"
+        "@easyquery/core": "^7.4.1-rc03"
     },
     "files": [
         "dist",