@easyquery/core 7.2.4-beta03 → 7.2.4-rc02

package/dist/bundles/easyquery.core.js

@@ -3170,6 +3170,7 @@ __webpack_require__.d(__webpack_exports__, {
   DataModel: () => (/* reexport */ DataModel),
   DefaultAggregatesCalculator: () => (/* reexport */ DefaultAggregatesCalculator),
   EasyQueryDataLoader: () => (/* reexport */ EasyQueryDataLoader),
+  EmptyChunk: () => (/* reexport */ EmptyChunk),
   Entity: () => (/* reexport */ Entity),
   EntityAttr: () => (/* reexport */ EntityAttr),
   EqAction: () => (/* reexport */ EqAction),
@@ -3476,6 +3477,14 @@ var eqconsts;
     ];
 })(eqconsts || (eqconsts = {}));
 
+;// CONCATENATED MODULE: ./src/export/exporter.ts
+//possibly move it to the EasyData lib on the next update
+var EmptyChunk = {
+    offset: 0,
+    limit: 0,
+    needTotal: false
+};
+
 ;// CONCATENATED MODULE: ./src/dm/aggr_function.ts
 
 /**
@@ -5062,12 +5071,14 @@ var QueryColumn = /** @class */ (function () {
         /** The parameters associated with this column */
         this.params = [];
         this._isHidden = false;
+        this.query = query;
         this._id = public_api/* utils.generateId */.P6.generateId('col');
         this.caption = '';
-        this.sorting = SortDirection.None;
-        this.sortIndex = -1;
+        this._sorting = SortDirection.None;
+        this._sortIndex = -1;
         this.expr = new Expression(this);
         this.blockId = '';
+        this.justsorted = justsorted;
     }
     Object.defineProperty(QueryColumn.prototype, "id", {
         get: function () {
@@ -5076,6 +5087,51 @@ var QueryColumn = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(QueryColumn.prototype, "sorting", {
+        /** Column sorting direction */
+        get: function () {
+            if (this.query) {
+                return this.query.getColumnSorting(this);
+            }
+            else {
+                return this._sorting;
+            }
+        },
+        set: function (direction) {
+            if (this.query) {
+                this.query.setColumnSorting(this, direction);
+            }
+            else {
+                this._sorting = direction;
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ;
+    Object.defineProperty(QueryColumn.prototype, "sortIndex", {
+        /** The index of the column in the sorting list. */
+        get: function () {
+            if (this.query) {
+                return this.query.getColumnSortIndex(this);
+            }
+            else {
+                return this._sortIndex;
+            }
+        },
+        set: function (index) {
+            if (this.query) {
+                this.query.setColumnSortIndex(this, index);
+            }
+            else {
+                this._sortIndex = index;
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ;
+    ;
     QueryColumn.prototype.getModel = function () {
         return this.query.getModel();
     };
@@ -5130,8 +5186,8 @@ var QueryColumn = /** @class */ (function () {
             }
             this.caption = colData.cptn;
             if (typeof colData.srt !== 'undefined') {
-                this.sorting = colData.srt;
-                this.sortIndex = (typeof colData.srtidx !== 'undefined')
+                this._sorting = colData.srt;
+                this._sortIndex = (typeof colData.srtidx !== 'undefined')
                     ? colData.srtidx
                     : -1;
             }
@@ -5157,7 +5213,7 @@ var QueryColumn = /** @class */ (function () {
         if (typeof this.caption !== 'undefined') {
             obj.cptn = this.caption;
         }
-        if (typeof this.sorting !== 'undefined' && this.sorting != SortDirection.None) {
+        if (this.sorting != SortDirection.None) {
             obj.srt = this.sorting;
             obj.srtidx = this.sortIndex;
         }
@@ -5621,11 +5677,19 @@ var Query = /** @class */ (function () {
         this._enableAggregation = false;
         this.parentQuery = null;
         this.drillDowns = [];
+        this.syncSortOrderWithColumnsOrder = true;
+        if (options) {
+            this.context = options.context;
+            if (this.context) {
+                this.syncSortOrderWithColumnsOrder = this.context.options.syncSortOrderWithColumnsOrder;
+            }
+        }
         this.eventEmitter = new public_api/* EventEmitter */.vp(this);
         this.root = new Condition(this, CondTag.Group);
         this.extraConditions = new Condition(this, CondTag.Group);
         this.columns = new Array();
-        this.justsorted = new Array();
+        //this.justsorted = new Array<QueryColumn>();
+        this.sortedColumns = new Array();
         if (!this.id) {
             this.regenerateId();
         }
@@ -5715,7 +5779,7 @@ var Query = /** @class */ (function () {
         return hasChanged;
     };
     Query.prototype.createSubQuery = function () {
-        return new Query(this.model);
+        return new Query(this.model, null, { context: this.context });
     };
     Query.prototype.useAggregation = function (settingsTuner, silent) {
         if (silent === void 0) { silent = false; }
@@ -5776,6 +5840,7 @@ var Query = /** @class */ (function () {
         });
     };
     Query.prototype.processQueryForAggregation = function (silent) {
+        var _this = this;
         if (silent === void 0) { silent = false; }
         var aggrSettings = this.getAggregationSettings();
         var groups = aggrSettings.getGroups();
@@ -5789,19 +5854,21 @@ var Query = /** @class */ (function () {
                 if (groupColIds.indexOf(col.id) >= 0) {
                     groupedCols.push(col);
                 }
-                else if (col.sorting != SortDirection.None) {
+                else if (this.getColumnSorting(col) != SortDirection.None) {
                     sortedCols.push(col);
                 }
             }
             var sortIndex_1 = 0;
             groupedCols.forEach(function (col) {
-                if (col.sorting == SortDirection.None) {
-                    col.sorting = SortDirection.Ascending;
+                if (_this.getColumnSorting(col) == SortDirection.None) {
+                    _this.setColumnSorting(col, SortDirection.Ascending);
                 }
-                col.sortIndex = sortIndex_1++;
+                _this.setColumnSortIndex(col, sortIndex_1++);
+                //col.sortIndex = sortIndex++;
             });
             sortedCols.forEach(function (col) {
-                col.sortIndex = sortIndex_1++;
+                _this.setColumnSortIndex(col, sortIndex_1++);
+                //     col.sortIndex = sortIndex++;
             });
             if (!silent) {
                 this.fireChangedEvent({
@@ -6032,12 +6099,14 @@ var Query = /** @class */ (function () {
             }
             this.name = data.name;
             this.description = data.desc;
-            this.justsorted = [];
+            //this.justsorted = [];
+            this.sortedColumns = [];
             if (data.justsortcols) {
                 for (var i = 0; i < data.justsortcols.length; i++) {
                     var newCol = this.createColumn(true);
                     newCol.loadFromData(this.model, data.justsortcols[i]);
-                    this.justsorted.push(newCol);
+                    //this.justsorted.push(newCol);
+                    this.addColumnToSorted(newCol);
                 }
             }
             if (data.cols) {
@@ -6045,8 +6114,15 @@ var Query = /** @class */ (function () {
                     var newCol = this.createColumn();
                     newCol.loadFromData(this.model, data.cols[i]);
                     this.columns.push(newCol);
+                    if (newCol._sorting != SortDirection.None) {
+                        this.addColumnToSorted(newCol);
+                    }
                 }
             }
+            this.sortedColumns.sort(function (col1, col2) {
+                return col1._sortIndex - col2._sortIndex;
+            });
+            this.fixupSortingIndices();
             if (data.extraData) {
                 this.extraData = data.extraData;
             }
@@ -6136,6 +6212,7 @@ var Query = /** @class */ (function () {
      */
     Query.prototype.toJSONData = function () {
         var _this = this;
+        this.fixupSortingIndices();
         var obj = {
             modelId: this.model ? this.model.getId() : null,
             modelName: this.model ? this.model.getName() : null
@@ -6150,9 +6227,14 @@ var Query = /** @class */ (function () {
             obj.cols.push(this.columns[i].saveToData());
         }
         obj.justsortcols = [];
-        for (var i = 0; i < this.justsorted.length; i++) {
-            obj.justsortcols.push(this.justsorted[i].saveToData());
-        }
+        // for (let i = 0; i < this.justsorted.length; i++) {
+        //     obj.justsortcols.push(this.justsorted[i].saveToData());
+        // }
+        this.sortedColumns.forEach(function (col) {
+            if (col.isJustSorted()) {
+                obj.justsortcols.push(col.saveToData());
+            }
+        });
         if (this.extraData) {
             obj.extraData = this.extraData;
         }
@@ -6225,7 +6307,8 @@ var Query = /** @class */ (function () {
      */
     Query.prototype.clearColumns = function () {
         this.columns = [];
-        this.justsorted = [];
+        //this.justsorted = [];   
+        this.sortedColumns = [];
     };
     /**
      * Clears all conditions in query.
@@ -6317,31 +6400,34 @@ var Query = /** @class */ (function () {
             cols.pop();
         return cols;
     };
+    Query.prototype.addColumnToSorted = function (col) {
+        var colJson = JSON.stringify(col.expr.saveToData());
+        var isUnique = true;
+        this.sortedColumns.forEach(function (scol) {
+            var qcolJson = JSON.stringify(scol.expr.saveToData());
+            if (qcolJson === colJson) {
+                isUnique = false;
+            }
+        });
+        if (isUnique) {
+            this.sortedColumns.push(col);
+        }
+    };
     /**
      * Get array of columns used only in sorting.
      * @retruns Columns.
      */
     Query.prototype.getJustSortedColumns = function () {
-        return this.justsorted;
+        return this.sortedColumns.filter(function (col) {
+            return col.isJustSorted();
+        });
     };
     /**
      * Gets array of columns used in sorting
      * @retruns Columns
      */
     Query.prototype.getSortedColumns = function () {
-        var sortedCols = new Array();
-        var cols = this.getColumns()
-            .concat(this.getJustSortedColumns());
-        for (var i = 0; i < cols.length; i++) {
-            var col = cols[i];
-            if (col.sortIndex >= 0) {
-                sortedCols.push(col);
-            }
-        }
-        sortedCols.sort(function (col1, col2) {
-            return col1.sortIndex - col2.sortIndex;
-        });
-        return sortedCols;
+        return this.sortedColumns;
     };
     /**
      * Gets Colummn sorting index.
@@ -6349,17 +6435,71 @@ var Query = /** @class */ (function () {
      * @retruns The index.
      */
     Query.prototype.getColumnSortIndex = function (col) {
-        if (col.sorting != SortDirection.None) {
-            if (col.sortIndex < 0) {
-                var cols = this.getColumns()
-                    .concat(this.getJustSortedColumns());
-                return public_api/* utils.indexOfArrayItem */.P6.indexOfArrayItem(cols, col);
+        return this.sortedColumns.indexOf(col);
+    };
+    Query.prototype.setColumnSortIndex = function (col, index) {
+        if (index < 0)
+            return;
+        var colIdx = this.getColumnSortIndex(col);
+        if (colIdx < 0) {
+            this.addColumnToSorted(col);
+            colIdx = this.sortedColumns.length - 1;
+        }
+        public_api/* utils.moveArrayItem */.P6.moveArrayItem(this.sortedColumns, colIdx, index);
+        this.fixupSortingIndices();
+        this.fireColumnsChangedEvent(QueryChangeAction.All);
+    };
+    Query.prototype.getColumnSorting = function (col) {
+        var idx = this.getColumnSortIndex(col);
+        if (idx >= 0) {
+            return col._sorting != SortDirection.None ? col._sorting : SortDirection.Ascending;
+        }
+        else {
+            return SortDirection.None;
+        }
+    };
+    Query.prototype.setColumnSorting = function (col, direction) {
+        var idx = this.getColumnSortIndex(col);
+        col._sorting = direction;
+        if (idx >= 0) {
+            if (direction == SortDirection.None) {
+                public_api/* utils.removeArrayItem */.P6.removeArrayItem(this.sortedColumns, col);
+                this.fixupSortingIndices();
             }
-            else {
-                return col.sortIndex;
+        }
+        else {
+            if (direction != SortDirection.None) {
+                this.addColumnToSorted(col);
+                this.fixupSortingIndices();
             }
         }
-        return -1;
+        this.adjustColumnsSorting();
+        this.fireColumnsChangedEvent(QueryChangeAction.Modify, col, col.isJustSorted());
+    };
+    Query.prototype.fixupSortingIndices = function () {
+        this.sortedColumns.forEach(function (col, index) {
+            col._sortIndex = index;
+        });
+    };
+    Query.prototype.adjustColumnsSorting = function () {
+        var _this = this;
+        if (!this.syncSortOrderWithColumnsOrder) {
+            return;
+        }
+        if (this.getJustSortedColumns().length > 0) {
+            return;
+        }
+        var idx = 0;
+        this.columns.forEach(function (col) {
+            if (col.sorting != SortDirection.None) {
+                var colIdx = _this.getColumnSortIndex(col);
+                if (colIdx >= 0) {
+                    public_api/* utils.moveArrayItem */.P6.moveArrayItem(_this.sortedColumns, colIdx, idx);
+                    idx++;
+                }
+            }
+        });
+        this.fixupSortingIndices();
     };
     Query.prototype.createColumn = function (justsorted) {
         if (justsorted === void 0) { justsorted = false; }
@@ -6384,9 +6524,9 @@ var Query = /** @class */ (function () {
      * }});
      */
     Query.prototype.addColumn = function (descriptor, author) {
-        var columns = (descriptor.justsorted)
-            ? this.justsorted
-            : this.columns;
+        // let columns = (descriptor.justsorted) 
+        //     ? this.justsorted 
+        //     : this.columns;
         var newColumn;
         if (descriptor.column) {
             newColumn = descriptor.column;
@@ -6448,17 +6588,22 @@ var Query = /** @class */ (function () {
                 newColumn.expr.dataType = attr.dataType;
             }
             newColumn.caption = descriptor.caption || newColumn.caption;
-            newColumn.sorting = descriptor.sorting || SortDirection.None;
-            newColumn.sortIndex = descriptor.sortIndex || -1;
+            newColumn._sorting = descriptor.sorting || SortDirection.None;
+            newColumn._sortIndex = descriptor.sortIndex || -1;
             newColumn.enabled = public_api/* utils.getIfDefined */.P6.getIfDefined(descriptor.enabled, true);
             newColumn.setReadOnly(public_api/* utils.getIfDefined */.P6.getIfDefined(descriptor.readonly, false));
         }
-        if (descriptor.index && descriptor.index >= 0 && descriptor.index < columns.length) {
-            columns.splice(descriptor.index, 0, newColumn);
-        }
-        else {
-            columns.push(newColumn);
+        var justsorted = descriptor.justsorted || (descriptor.column && descriptor.column.isJustSorted());
+        if (!justsorted) {
+            if (descriptor.index && descriptor.index >= 0 && descriptor.index < this.columns.length) {
+                this.columns.splice(descriptor.index, 0, newColumn);
+            }
+            else {
+                this.columns.push(newColumn);
+            }
         }
+        this.setColumnSorting(newColumn, newColumn._sorting);
+        this.fireColumnsChangedEvent(QueryChangeAction.Add, newColumn, justsorted);
         return newColumn;
     };
     /**
@@ -6473,6 +6618,7 @@ var Query = /** @class */ (function () {
      * query.addColumn(column, 1)
      */
     Query.prototype.addColumnObj = function (column, index, author) {
+        var _this = this;
         var columns = this.columns;
         if (typeof column.length == "undefined") {
             if (typeof index == "number") {
@@ -6481,6 +6627,10 @@ var Query = /** @class */ (function () {
             else {
                 columns.push(column);
             }
+            if (column.sorting != SortDirection.None) {
+                this.addColumnToSorted(column);
+            }
+            this.fixupSortingIndices();
         }
         else {
             if (typeof index == "number") {
@@ -6489,6 +6639,12 @@ var Query = /** @class */ (function () {
             else {
                 columns.push.apply(columns, [].concat(column));
             }
+            column.forEach(function (col) {
+                if (col.sorting != SortDirection.None) {
+                    _this.addColumnToSorted(col);
+                }
+            });
+            this.fixupSortingIndices();
         }
     };
     /**
@@ -6561,6 +6717,7 @@ var Query = /** @class */ (function () {
     Query.prototype.moveColumn = function (index1, index2) {
         var columns = this.getColumns();
         public_api/* utils.moveArrayItem */.P6.moveArrayItem(columns, index1, index2);
+        this.adjustColumnsSorting();
     };
     /**
      * Removes the column.
@@ -6568,10 +6725,11 @@ var Query = /** @class */ (function () {
      * @param author The author
      */
     Query.prototype.removeColumn = function (column, author) {
-        var columns = (column.isJustSorted())
-            ? this.getJustSortedColumns()
-            : this.getColumns();
-        public_api/* utils.removeArrayItem */.P6.removeArrayItem(columns, column);
+        // const columns = (column.isJustSorted()) 
+        //     ? this.getJustSortedColumns()
+        //     : this.getColumns();
+        public_api/* utils.removeArrayItem */.P6.removeArrayItem(this.columns, column);
+        public_api/* utils.removeArrayItem */.P6.removeArrayItem(this.sortedColumns, column);
     };
     /**
      * Adds a condition group - a group of simple conditions (predicates) linked by AND or OR
@@ -6677,10 +6835,13 @@ var Query = /** @class */ (function () {
         }
         if (columns.length > 0) {
             removeFromArray(this.getColumns(), columns);
+            removeFromArray(this.sortedColumns, columns);
         }
         if (justSortedColumns.length > 0) {
-            removeFromArray(this.getJustSortedColumns(), justSortedColumns);
+            //removeFromArray(this.getJustSortedColumns(), justSortedColumns);
+            removeFromArray(this.sortedColumns, justSortedColumns);
         }
+        this.fixupSortingIndices();
     };
     /**
      * Fires process event.
@@ -6980,7 +7141,7 @@ var BrowserQueryStorage = /** @class */ (function () {
     BrowserQueryStorage.prototype.newQuery = function (options) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            var query = new Query(_this.context.getModel());
+            var query = new Query(_this.context.getModel(), null, { context: _this.context });
             query.reset();
             query.setDefaultName();
             if (options) {
@@ -7257,7 +7418,7 @@ var EqQueryFileLoader = /** @class */ (function () {
         });
         var request = actionResult.getRequest();
         return actionResult.then(function (responseData) {
-            var blob = new Blob([JSON.stringify(responseData)]);
+            var blob = new Blob([responseData]);
             var dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
             var fileName = dispositionHeader
                 ? dispositionHeader.match(/filename="(.*)"/)[1]
@@ -7433,7 +7594,7 @@ var EqServiceProvider = /** @class */ (function () {
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = function (_) { return new DataModel(); };
         this.modelStorageResolver = null;
-        this.queryResolver = function (context) { return new Query(context.getModel()); };
+        this.queryResolver = function (context) { return new Query(context.getModel(), null, { context: context }); };
         this.modelLoaderResolver = function (context) { return new EqServerModelLoader(context); };
         this.queryStorageResolver = function (context) { return new BrowserQueryStorage(context); };
         this.querySynchronizerResolver = function (context) { return new EqServerQuerySynchronizer(context); };
@@ -7686,6 +7847,7 @@ var EqActionResult;
 })(EqActionResult || (EqActionResult = {}));
 
 ;// CONCATENATED MODULE: ./src/eqs/eqs_exporter.ts
+
 var EqServerExporter = /** @class */ (function () {
     function EqServerExporter(context) {
         this.context = context;
@@ -7701,7 +7863,8 @@ var EqServerExporter = /** @class */ (function () {
         var query = exportOptions.query || this.context.getQuery();
         var modelId = query.getModel().getId();
         var requestData = {
-            'settings': exportOptions.settings
+            'settings': exportOptions.settings,
+            'chunk': EmptyChunk
         };
         if (typeof (exportOptions.queryId) !== 'undefined') {
             requestData.queryId = exportOptions.queryId;
@@ -7766,6 +7929,8 @@ var context_assign = (undefined && undefined.__assign) || function () {
 
 
 
+
+
 /**
  * Encapsulates all information about EasyQuery components on some webpage
  * and provides some basic operation over those components
@@ -7778,6 +7943,9 @@ var context_assign = (undefined && undefined.__assign) || function () {
 var EqContext = /** @class */ (function () {
     function EqContext() {
         var _this = this;
+        this.options = {
+            syncSortOrderWithColumnsOrder: true
+        };
         this.servicesInitialized = false;
         this.internalListCache = {};
         this.loadModelOnStart = true;
@@ -7907,8 +8075,8 @@ var EqContext = /** @class */ (function () {
         return Array.from(this.exporters.keys());
     };
     EqContext.prototype.addDefaultExporters = function () {
-        this.registerServerExporter('csv', '');
-        this.registerServerExporter('excel-html', '');
+        this.registerServerExporter('csv', 'arraybuffer');
+        this.registerServerExporter('excel-html', 'arraybuffer');
     };
     EqContext.prototype.resolveEndpoint = function (endpointKey, options) {
         options = options || {};
@@ -7971,6 +8139,7 @@ var EqContext = /** @class */ (function () {
         if (!this.servicesInitialized)
             this.initStart();
         options = options || {};
+        this.setOptions(options);
         if (typeof (options.debugMode) !== 'undefined') {
             this.debugMode = options.debugMode;
         }
@@ -8069,8 +8238,7 @@ var EqContext = /** @class */ (function () {
             this.exporters.clear();
             for (var _i = 0, _a = options.serverExporters; _i < _a.length; _i++) {
                 var format = _a[_i];
-                var responseType = format == 'csv' || format == 'excel-html' ? '' : 'arraybuffer';
-                this.registerServerExporter(format, responseType);
+                this.registerServerExporter(format, "arraybuffer");
             }
         }
         var query = this.getQuery();
@@ -8092,6 +8260,9 @@ var EqContext = /** @class */ (function () {
             this.fireEvent('ready');
         }
     };
+    EqContext.prototype.setOptions = function (options) {
+        public_api/* utils.assignDeep */.P6.assignDeep(this.options, options);
+    };
     Object.defineProperty(EqContext.prototype, "backendInfo", {
         get: function () {
             return this._backendInfo;
@@ -8549,6 +8720,7 @@ var EqContext = /** @class */ (function () {
                         validate: false
                     });
                 }
+                _this.limitCustomSqlColumns();
                 _this.fireEvent('loadQuery');
                 _this.endProcess({
                     result: EqActionResult.Success,
@@ -9132,6 +9304,7 @@ var EqContext = /** @class */ (function () {
     EqContext.prototype.exportResult = function (options) {
         var _this = this;
         options = options || {};
+        options.chunk = options.chunk || EmptyChunk;
         if (this.beforeExportResult) {
             this.beforeExportResult(this, options);
         }
@@ -9181,6 +9354,15 @@ var EqContext = /** @class */ (function () {
             }
         }
     };
+    EqContext.prototype.limitCustomSqlColumns = function () {
+        if (!this.options.allowCustomExpressions) {
+            this.query.getColumns().forEach(function (col) {
+                if (col.expr.tag === ExprTag.CustomSql) {
+                    col.enabled = false;
+                }
+            });
+        }
+    };
     return EqContext;
 }());