dbgate-datalib 7.0.6 → 7.1.0

package/lib/CollectionGridDisplay.d.ts

@@ -1,7 +1,7 @@
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
 import type { EngineDriver, CollectionInfo } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
-export declare function analyseCollectionDisplayColumns(rows: any, display: any): any[];
+export declare function analyseCollectionDisplayColumns(rows: any, display: any): any;
 export declare class CollectionGridDisplay extends GridDisplay {
     collection: CollectionInfo;
     constructor(collection: CollectionInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, loadedRows: any, changeSet: any, readOnly?: boolean, currentSettings?: any);

package/lib/CollectionGridDisplay.js

@@ -79,7 +79,7 @@ function getDisplayColumn(basePath, columnName, display) {
     };
 }
 function analyseCollectionDisplayColumns(rows, display) {
-    var _a;
+    var _a, _b;
     const res = [];
     const addedColumns = (_a = display === null || display === void 0 ? void 0 : display.config) === null || _a === void 0 ? void 0 : _a.addedColumns;
     for (const row of rows || []) {
@@ -90,7 +90,9 @@ function analyseCollectionDisplayColumns(rows, display) {
             continue;
         res.push(getDisplayColumn([], added, display));
     }
-    return (res.map(col => (Object.assign(Object.assign({}, col), { isChecked: display.isColumnChecked(col) }))) || []);
+    // Use driver-specific column sorting if available
+    const sortedColumns = ((_b = display === null || display === void 0 ? void 0 : display.driver) === null || _b === void 0 ? void 0 : _b.sortCollectionDisplayColumns) ? display.driver.sortCollectionDisplayColumns(res) : res;
+    return (sortedColumns.map(col => (Object.assign(Object.assign({}, col), { isChecked: display.isColumnChecked(col) }))) || []);
 }
 exports.analyseCollectionDisplayColumns = analyseCollectionDisplayColumns;
 class CollectionGridDisplay extends GridDisplay_1.GridDisplay {

package/lib/FreeTableGridDisplay.d.ts

@@ -4,7 +4,9 @@ import { GridConfig, GridCache } from './GridConfig';
 import { FreeTableModel } from './FreeTableModel';
 export declare class FreeTableGridDisplay extends GridDisplay {
     model: FreeTableModel;
-    constructor(model: FreeTableModel, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc);
+    constructor(model: FreeTableModel, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, options?: {
+        filterable?: boolean;
+    });
     getDisplayColumns(model: FreeTableModel): {
         isChecked: boolean;
         pureName: string;

package/lib/FreeTableGridDisplay.js

@@ -5,17 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeTableGridDisplay = void 0;
 const lodash_1 = __importDefault(require("lodash"));
+const dbgate_tools_1 = require("dbgate-tools");
 const GridDisplay_1 = require("./GridDisplay");
 const _1 = require(".");
 class FreeTableGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(model, config, setConfig, cache, setCache) {
-        var _a;
+    constructor(model, config, setConfig, cache, setCache, options = {}) {
+        var _a, _b;
         super(config, setConfig, cache, setCache);
         this.model = model;
         this.columns = ((_a = model === null || model === void 0 ? void 0 : model.structure) === null || _a === void 0 ? void 0 : _a.__isDynamicStructure)
             ? (0, _1.analyseCollectionDisplayColumns)(model === null || model === void 0 ? void 0 : model.rows, this)
             : this.getDisplayColumns(model);
-        this.filterable = false;
+        this.filterable = (_b = options.filterable) !== null && _b !== void 0 ? _b : false;
+        this.filterBehaviourOverride = dbgate_tools_1.evalFilterBehaviour;
         this.sortable = false;
     }
     getDisplayColumns(model) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.0.6",
+  "version": "7.1.0",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -19,14 +19,14 @@
   ],
   "dependencies": {
     "date-fns": "^4.1.0",
-    "dbgate-filterparser": "^7.0.6",
-    "dbgate-sqltree": "^7.0.6",
-    "dbgate-tools": "^7.0.6",
+    "dbgate-filterparser": "^7.1.0",
+    "dbgate-sqltree": "^7.1.0",
+    "dbgate-tools": "^7.1.0",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^7.0.6",
+    "dbgate-types": "^7.1.0",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"