@easyquery/ui 7.4.1-rc04 → 7.4.2-rc01

package/dist/easyquery.ui.cjs.js

@@ -6030,7 +6030,6 @@ class SimpleConditionRenderer extends ConditionRenderer {
             .data('condrow', '')
             .addChildElement(this.renderCheckbox())
             .addChildElement(this.renderConjunction());
-        let mayAppear = autoAppear;
         const minLength = operator == model.nullOperator
             ? Math.min(arrLength, this.condition.expressions.length + 1)
             : arrLength;
@@ -6043,7 +6042,7 @@ class SimpleConditionRenderer extends ConditionRenderer {
                 }
             }
             else if (item.type === 'expression') {
-                const toAppear = mayAppear && (item.index > 0);
+                const toAppear = autoAppear && (item.index == 1);
                 const exprRenderer = this.panel.getExpressionRenderer(this.condition.expressions[item.index]);
                 if (exprRenderer) {
                     const el = exprRenderer.render(toAppear);
@@ -6052,7 +6051,6 @@ class SimpleConditionRenderer extends ConditionRenderer {
                         exprRenderer.adjustWidth();
                     }, 100);
                 }
-                mayAppear = mayAppear && !toAppear;
             }
             else if (item.type === 'text') {
                 builder.addChildElement(new TextRenderer(this.panel, item.text).render());
@@ -7094,7 +7092,6 @@ class CustomListExpressionRenderer extends ListExpressionRenderer {
     constructor() {
         super(...arguments);
         this.isLoading = false;
-        this.onClickTemp = null;
     }
     renderEditor() {
         if (this.isLoading)
@@ -7141,12 +7138,26 @@ class CustomListExpressionRenderer extends ListExpressionRenderer {
             }
         }
         else if (listRequestHandler) {
-            listRequestHandler({
+            let eParams = this.valueEditor.extraParams ? Object.assign({}, this.valueEditor.extraParams) : {};
+            let requestData = {
                 listName: listName,
                 editorId: this.valueEditor.id,
-                editorParams: this.valueEditor.extraParams,
+                editorParams: eParams,
                 value: this.getValue()
-            }, (list) => {
+            };
+            if (this.valueEditor.dependsOnAttr) {
+                const query = this.panel.getQuery();
+                if (query) {
+                    const rootCond = query.getRootCondition ? query.getRootCondition() : query.root;
+                    if (rootCond) {
+                        const pValue = query.getOneValueForAttr(this.valueEditor.dependsOnAttr);
+                        if (pValue) {
+                            requestData.parentValue = pValue;
+                        }
+                    }
+                }
+            }
+            listRequestHandler(requestData, (list) => {
                 this.menuItemsList = list;
                 if (onComplete) {
                     onComplete();
@@ -7158,7 +7169,6 @@ class CustomListExpressionRenderer extends ListExpressionRenderer {
 class SqlListExpressionRenderer extends CustomListExpressionRenderer {
     fillMenuItemsList(onComplete) {
         const context = this.panel.getContext();
-        this.valueEditor;
         const listRequestHandler = context.getListRequestHandler();
         if (listRequestHandler) {
             let requestData = {
@@ -7167,7 +7177,6 @@ class SqlListExpressionRenderer extends CustomListExpressionRenderer {
                 editorParams: this.valueEditor.extraParams,
                 value: this.getValue()
             };
-            //requestData.sql = editor.sql;
             listRequestHandler(requestData, (list) => {
                 this.menuItemsList = list;
                 if (onComplete) {
@@ -7901,6 +7910,51 @@ class QueryPanel extends core.Widget {
                     else {
                         modifyCondition(conds, autoEdit);
                     }
+                    const checkAndClearDependents = (masterCond, masterAttrId) => {
+                        const model = this.getContext().getModel();
+                        const query = this.getQuery();
+                        const rootCond = query.getRootCondition();
+                        const processCond = (c) => {
+                            if (c.isGroup()) {
+                                c.getConditions().forEach(processCond);
+                            }
+                            else if (c !== masterCond && c.expressions.length > 0) {
+                                const attrExpr = c.expressions[0];
+                                if (attrExpr.tag === core.ExprTag.EntityAttribute) {
+                                    const operator = model.getOperatorById(c.getOperatorId());
+                                    const attribute = model.getAttributeByIdSafe(attrExpr.value);
+                                    if (c.expressions.length > 1 && operator) {
+                                        const operand = model.getOperand(attribute, operator, 1);
+                                        let editor = operand.editor;
+                                        if (editor && editor.dependsOnAttr === masterAttrId) {
+                                            for (let i = 1; i < c.expressions.length; i++) {
+                                                // Only clear if it's not already empty to prevent infinite loops
+                                                if (!c.expressions[i].isEmpty()) {
+                                                    c.expressions[i].setContent('', '');
+                                                }
+                                                modifyCondition(c, false);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        };
+                        if (rootCond) {
+                            processCond(rootCond);
+                        }
+                    };
+                    if (!Array.isArray(conds)) {
+                        const masterCond = conds;
+                        const operatorId = masterCond.getOperatorId();
+                        if ((edata.condPart & core.ConditionPart.Value) === core.ConditionPart.Value
+                            && (operatorId == "Equal" || operatorId == "IsInList")) {
+                            const baseExpr = masterCond.expressions[0];
+                            if (baseExpr.tag == core.ExprTag.EntityAttribute) {
+                                const attrId = baseExpr.value;
+                                checkAndClearDependents(masterCond, attrId);
+                            }
+                        }
+                    }
                     break;
                 }
                 case core.QueryChangeAction.Add: {

package/dist/easyquery.ui.esm.js

@@ -6028,7 +6028,6 @@ class SimpleConditionRenderer extends ConditionRenderer {
             .data('condrow', '')
             .addChildElement(this.renderCheckbox())
             .addChildElement(this.renderConjunction());
-        let mayAppear = autoAppear;
         const minLength = operator == model.nullOperator
             ? Math.min(arrLength, this.condition.expressions.length + 1)
             : arrLength;
@@ -6041,7 +6040,7 @@ class SimpleConditionRenderer extends ConditionRenderer {
                 }
             }
             else if (item.type === 'expression') {
-                const toAppear = mayAppear && (item.index > 0);
+                const toAppear = autoAppear && (item.index == 1);
                 const exprRenderer = this.panel.getExpressionRenderer(this.condition.expressions[item.index]);
                 if (exprRenderer) {
                     const el = exprRenderer.render(toAppear);
@@ -6050,7 +6049,6 @@ class SimpleConditionRenderer extends ConditionRenderer {
                         exprRenderer.adjustWidth();
                     }, 100);
                 }
-                mayAppear = mayAppear && !toAppear;
             }
             else if (item.type === 'text') {
                 builder.addChildElement(new TextRenderer(this.panel, item.text).render());
@@ -7092,7 +7090,6 @@ class CustomListExpressionRenderer extends ListExpressionRenderer {
     constructor() {
         super(...arguments);
         this.isLoading = false;
-        this.onClickTemp = null;
     }
     renderEditor() {
         if (this.isLoading)
@@ -7139,12 +7136,26 @@ class CustomListExpressionRenderer extends ListExpressionRenderer {
             }
         }
         else if (listRequestHandler) {
-            listRequestHandler({
+            let eParams = this.valueEditor.extraParams ? Object.assign({}, this.valueEditor.extraParams) : {};
+            let requestData = {
                 listName: listName,
                 editorId: this.valueEditor.id,
-                editorParams: this.valueEditor.extraParams,
+                editorParams: eParams,
                 value: this.getValue()
-            }, (list) => {
+            };
+            if (this.valueEditor.dependsOnAttr) {
+                const query = this.panel.getQuery();
+                if (query) {
+                    const rootCond = query.getRootCondition ? query.getRootCondition() : query.root;
+                    if (rootCond) {
+                        const pValue = query.getOneValueForAttr(this.valueEditor.dependsOnAttr);
+                        if (pValue) {
+                            requestData.parentValue = pValue;
+                        }
+                    }
+                }
+            }
+            listRequestHandler(requestData, (list) => {
                 this.menuItemsList = list;
                 if (onComplete) {
                     onComplete();
@@ -7156,7 +7167,6 @@ class CustomListExpressionRenderer extends ListExpressionRenderer {
 class SqlListExpressionRenderer extends CustomListExpressionRenderer {
     fillMenuItemsList(onComplete) {
         const context = this.panel.getContext();
-        this.valueEditor;
         const listRequestHandler = context.getListRequestHandler();
         if (listRequestHandler) {
             let requestData = {
@@ -7165,7 +7175,6 @@ class SqlListExpressionRenderer extends CustomListExpressionRenderer {
                 editorParams: this.valueEditor.extraParams,
                 value: this.getValue()
             };
-            //requestData.sql = editor.sql;
             listRequestHandler(requestData, (list) => {
                 this.menuItemsList = list;
                 if (onComplete) {
@@ -7899,6 +7908,51 @@ class QueryPanel extends Widget {
                     else {
                         modifyCondition(conds, autoEdit);
                     }
+                    const checkAndClearDependents = (masterCond, masterAttrId) => {
+                        const model = this.getContext().getModel();
+                        const query = this.getQuery();
+                        const rootCond = query.getRootCondition();
+                        const processCond = (c) => {
+                            if (c.isGroup()) {
+                                c.getConditions().forEach(processCond);
+                            }
+                            else if (c !== masterCond && c.expressions.length > 0) {
+                                const attrExpr = c.expressions[0];
+                                if (attrExpr.tag === ExprTag.EntityAttribute) {
+                                    const operator = model.getOperatorById(c.getOperatorId());
+                                    const attribute = model.getAttributeByIdSafe(attrExpr.value);
+                                    if (c.expressions.length > 1 && operator) {
+                                        const operand = model.getOperand(attribute, operator, 1);
+                                        let editor = operand.editor;
+                                        if (editor && editor.dependsOnAttr === masterAttrId) {
+                                            for (let i = 1; i < c.expressions.length; i++) {
+                                                // Only clear if it's not already empty to prevent infinite loops
+                                                if (!c.expressions[i].isEmpty()) {
+                                                    c.expressions[i].setContent('', '');
+                                                }
+                                                modifyCondition(c, false);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        };
+                        if (rootCond) {
+                            processCond(rootCond);
+                        }
+                    };
+                    if (!Array.isArray(conds)) {
+                        const masterCond = conds;
+                        const operatorId = masterCond.getOperatorId();
+                        if ((edata.condPart & ConditionPart.Value) === ConditionPart.Value
+                            && (operatorId == "Equal" || operatorId == "IsInList")) {
+                            const baseExpr = masterCond.expressions[0];
+                            if (baseExpr.tag == ExprTag.EntityAttribute) {
+                                const attrId = baseExpr.value;
+                                checkAndClearDependents(masterCond, attrId);
+                            }
+                        }
+                    }
                     break;
                 }
                 case QueryChangeAction.Add: {

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: any;
+    protected dialogTitle: string;
     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: any;
+    protected dialogTitle: string;
     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: any;
+    protected dialogTitle: string;
     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: any;
+    protected dialogTitle: string;
     protected options: any;
     protected canDisplayFlag: boolean;
     constructor(container: FacetContainer, options?: any);

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

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

package/dist/types/widgets/renderers/querypanel/list_expression_renderer.d.ts

@@ -24,7 +24,6 @@ export declare class ListExpressionRenderer extends ExpressionRenderer {
 export declare class CustomListExpressionRenderer extends ListExpressionRenderer {
     loaderElement: HTMLElement | null;
     private isLoading;
-    private onClickTemp;
     protected renderEditor(): void;
     protected showLoader(): void;
     protected hideLoader(): void;

package/package.json

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