@easyquery/ui 7.2.5-rc02 → 7.2.5

package/dist/easyquery.ui.esm.js

@@ -187,9 +187,9 @@ class EntitiesPanel extends Widget {
         this.rootEntityBlock = document.createElement('div');
         if (model != null && !model.isEmpty()) {
             let entTree = model.getEntitiesTree({
-                addUIC: this.options.showAttributes.useInConditions,
+                addUIC: this.options.showAttributes.useInConditions && !this.options.syncWithColumns,
                 addUIR: this.options.showAttributes.useInResult,
-                addUIS: this.options.showAttributes.useInSorting,
+                addUIS: this.options.showAttributes.useInSorting && !this.options.syncWithColumns,
                 attrPlacement: this.options.attrPlacement,
                 sortEntities: this.options.sortEntities,
                 includeRootData: true
@@ -288,7 +288,7 @@ class EntitiesPanel extends Widget {
                                         const attr = model.getAttributeById(attrId);
                                         const column = query.addColumn({
                                             attribute: attr
-                                        });
+                                        }, true);
                                         query.fireColumnsChangedEvent(QueryChangeAction.Add, column);
                                     }
                                     else {
@@ -320,7 +320,7 @@ class EntitiesPanel extends Widget {
                     attrNode.innerHTML = "";
                     attrNode.appendChild(attrLabel);
                     attrNode.setAttribute('data-id', item.id);
-                    if (this.options.draggableAttributes) {
+                    if (this.options.draggableAttributes && !this.options.syncWithColumns) {
                         eqDragManager.registerDraggableItem({
                             element: attrNode,
                             scope: "entityAttr",
@@ -391,7 +391,7 @@ class EntitiesPanel extends Widget {
                 }
                 if (element.checked) {
                     for (const attrId of attrList) {
-                        query.addColumn({ attributeId: attrId });
+                        query.addColumn({ attributeId: attrId }, true);
                     }
                 }
                 else {
@@ -5617,7 +5617,7 @@ class SortingBar extends Widget {
             attributeId: attrId,
             justsorted: true,
             sorting: SortDirection.Ascending
-        });
+        }, true);
         query.fireChangedEvent({
             part: QueryChangePart.SortingColumns,
             action: QueryChangeAction.Add,
@@ -8756,7 +8756,7 @@ class EasyGridWidget extends Grid {
         const query = this.getContext().getQuery();
         const col = query.addColumn({
             attributeId: attrId
-        });
+        }, true);
         query.fireChangedEvent({
             part: QueryChangePart.Columns,
             action: QueryChangeAction.Add,
@@ -8886,10 +8886,7 @@ class ManageDrillDownWidget extends Widget {
                 utils.moveArrayItem(attr.operators, opIdx, 0);
             }
         }, null);
-        this.ddQuery = new Query(model, null, {
-            parent: query,
-            context: this.context
-        });
+        this.ddQuery = query.createSubQuery();
         const dds = this.context.getQuery().getDrillDowns();
         if (dds.length) {
             const dd = dds[0];
@@ -8974,63 +8971,6 @@ var FacetType;
     FacetType["PivotTable"] = "PIVOT_TABLE";
 })(FacetType || (FacetType = {}));
 
-class ExportDialog {
-    constructor(context) {
-        this.context = context;
-        this.promise = null;
-    }
-    show(defFormat = null) {
-        if (!this.promise) {
-            const formats = this.context.getExportFormats();
-            if (formats.length == 0)
-                throw Error("No exporter has been registered.");
-            defFormat = defFormat || formats[0];
-            this.promise = new Promise((resolve, reject) => {
-                const ds = this.context.getServices().getService('DialogService');
-                const body = domel('div')
-                    .addClass('kdlg-form-section')
-                    .addChild('div', b => b
-                    .addClass('kfrm-form')
-                    .addChild('div', b => b
-                    .addClass('kfrm-fields col-a-1 label-align-right')
-                    .addChild('label', b => b
-                    .addClass('kdlg-form-label', 'kflex-20')
-                    .attr('for', 'export_format')
-                    .addText(i18n$1.getText('ExportDlgFmtLabel')))
-                    .addChild('div', b => b
-                    .addClass('kfrm-select')
-                    .addChild('select', b => {
-                    b
-                        .attr('name', 'export_format')
-                        .id('exportFormat');
-                    for (const format of this.context.getExportFormats()) {
-                        b.addOption({
-                            value: format,
-                            title: i18n$1.getText(format) || format,
-                            selected: defFormat == format
-                        });
-                    }
-                }))))
-                    .toDOM();
-                ds.open({
-                    title: i18n$1.getText('ExportDlgTitle'),
-                    body: body,
-                    onSubmit: () => {
-                        const format = body.querySelector('#exportFormat').value;
-                        this.context.exportResult({
-                            format: format,
-                            success: resolve,
-                            error: reject
-                        });
-                        return true;
-                    }
-                });
-            });
-        }
-        return this.promise.finally(() => this.promise = null);
-    }
-}
-
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10864,6 +10804,63 @@ class FacetContainer extends Widget {
     }
 }
 
+class ExportDialog {
+    constructor(context) {
+        this.context = context;
+        this.promise = null;
+    }
+    show(defFormat = null) {
+        if (!this.promise) {
+            const formats = this.context.getExportFormats();
+            if (formats.length == 0)
+                throw Error("No exporter has been registered.");
+            defFormat = defFormat || formats[0];
+            this.promise = new Promise((resolve, reject) => {
+                const ds = this.context.getServices().getService('DialogService');
+                const body = domel('div')
+                    .addClass('kdlg-form-section')
+                    .addChild('div', b => b
+                    .addClass('kfrm-form')
+                    .addChild('div', b => b
+                    .addClass('kfrm-fields col-a-1 label-align-right')
+                    .addChild('label', b => b
+                    .addClass('kdlg-form-label', 'kflex-20')
+                    .attr('for', 'export_format')
+                    .addText(i18n$1.getText('ExportDlgFmtLabel')))
+                    .addChild('div', b => b
+                    .addClass('kfrm-select')
+                    .addChild('select', b => {
+                    b
+                        .attr('name', 'export_format')
+                        .id('exportFormat');
+                    for (const format of this.context.getExportFormats()) {
+                        b.addOption({
+                            value: format,
+                            title: i18n$1.getText(format) || format,
+                            selected: defFormat == format
+                        });
+                    }
+                }))))
+                    .toDOM();
+                ds.open({
+                    title: i18n$1.getText('ExportDlgTitle'),
+                    body: body,
+                    onSubmit: () => {
+                        const format = body.querySelector('#exportFormat').value;
+                        this.context.exportResult({
+                            format: format,
+                            success: resolve,
+                            error: reject
+                        });
+                        return true;
+                    }
+                });
+            });
+        }
+        return this.promise.finally(() => this.promise = null);
+    }
+}
+
 class ResultFacetsPanel extends FacetContainer {
     constructor(slot) {
         super(slot);
@@ -11735,7 +11732,8 @@ class AggrSettingsRenderer {
         const funcs = this.query.getModel().getAggrFunctions();
         const items = [];
         for (const func of funcs) {
-            if (!func)
+            //add all functions except those we don't process
+            if (!func || func.id == 'MIN' || func.id == 'MAX' || func.id == 'CNTDST')
                 continue;
             this.funcMap[func.id] = func;
             const funcCaption = model
@@ -14378,4 +14376,4 @@ if (!Array.prototype.findIndex) {
     };
 }
 
-export { AddRowRenderer, AdvancedSearchView, AggrFuncColumnRendererCB, AggrFuncColumnRendererCP, AggrSettingsDialog, AggrSettingsRenderer, AggregationBar, AttrColumnRendererCB, AttrColumnRendererCP, AttributeExpressionRenderer, BaseElementRenderer, ChartFacet, ChartJsWidget, ChartType, ChartWidget, ColumnAction, ColumnRendererCB, ColumnRendererCP, ColumnsBar, ColumnsPanel, ConditionAction, ConditionGroupRenderer, ConditionGroupRowRenderer, ConditionRenderer, ConstColumnRendererCP, CustomListExpressionRenderer, CustomSqlColumnRendererCP, DataFilterView, DataTableFacet, DateTimeExpressionRenderer, DomDropDownElementBuilder, DropDownRenderer, EasyGridWidget, EntitiesPanel, EqHtmlGrid, ExportDialog, ExportWidget, ExpressionRenderer, FacetType, FilterBar, GoogleChartWidget, Grid, HtmlContentWidget, HtmlDataFilterView, InputExpressionRenderer, ListExpressionRenderer, ManageDrillDownWidget, OperatorRenderer, PivotTableFacet, PopupMenu, ProcessWidget, QPEditablePart, QueryPanel, ReportView, ResultFacet, ResultFacetsPanel, SimpleConditionRenderer, SortingBar, SqlListExpressionRenderer, StatementPanel, SubQueryExpressionRenderer, TextRenderer, View, browserUtils, dropdown };
+export { AddRowRenderer, AdvancedSearchView, AggrFuncColumnRendererCB, AggrFuncColumnRendererCP, AggrSettingsDialog, AggrSettingsRenderer, AggregationBar, AttrColumnRendererCB, AttrColumnRendererCP, AttributeExpressionRenderer, BaseElementRenderer, ChartFacet, ChartJsWidget, ChartType, ChartWidget, ColumnAction, ColumnRendererCB, ColumnRendererCP, ColumnsBar, ColumnsPanel, ConditionAction, ConditionGroupRenderer, ConditionGroupRowRenderer, ConditionRenderer, ConstColumnRendererCP, CustomListExpressionRenderer, CustomSqlColumnRendererCP, DataFilterView, DataTableFacet, DateTimeExpressionRenderer, DomDropDownElementBuilder, DropDownRenderer, EasyGridWidget, EntitiesPanel, EqHtmlGrid, ExportDialog, ExportWidget, ExpressionRenderer, FacetContainer, FacetType, FilterBar, GoogleChartWidget, Grid, HtmlContentWidget, HtmlDataFilterView, InputExpressionRenderer, ListExpressionRenderer, ManageDrillDownWidget, OperatorRenderer, PivotTableFacet, PopupMenu, ProcessWidget, QPEditablePart, QueryPanel, ReportView, ResultFacet, ResultFacetsPanel, SimpleConditionRenderer, SortingBar, SqlListExpressionRenderer, StatementPanel, SubQueryExpressionRenderer, TextRenderer, View, browserUtils, dropdown };

package/dist/types/public_api.d.ts

@@ -12,6 +12,7 @@ export * from './widgets/statement_panel';
 export * from './widgets/widget_options';
 export * from './widgets/process_widget';
 export * from './widgets/manage_drilldown_widget';
+export * from './widgets/facet_container';
 export * from './widgets/result_facets_panel';
 export * from './widgets/export_widget';
 export * from './widgets/aggregation_bar';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@easyquery/ui",
-    "version": "7.2.5-rc02",
+    "version": "7.2.5",
     "description": "EasyQuery.JS Community UI widgets",
     "types": "./dist/types/public_api.d.ts",
     "main": "./dist/easyquery.ui.cjs.js",
@@ -9,8 +9,7 @@
         "clear": "shx rm -rf dist/* docs/* lib/*",
         "build": "npm run clear && rollup -c",
         "watch": "npm run clear && rollup -c -w",
-        "docs": "typedoc src/public_api.ts --out ./docs",
-        "test": "jest"
+        "docs": "typedoc src/public_api.ts --out ./docs"
     },
     "author": "Korzh.com",
     "homepage": "https://korzh.com/easyquery/javascript",
@@ -31,7 +30,7 @@
     "peerDependencies": {
         "@easydata/core": "^1.4.21",
         "@easydata/ui": "^1.4.21",
-        "@easyquery/core": "^7.2.5-rc02"
+        "@easyquery/core": "^7.2.5"
     },
     "files": [
         "dist",