@michalrakus/x-react-web-lib 1.3.0 → 1.4.1

package/lib/components/XInputDate.js

@@ -1,58 +1,63 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XInputDate = void 0;
 var react_1 = __importDefault(require("react"));
-var calendar_1 = require("primereact/calendar");
-var XUtilsConversions_1 = require("./XUtilsConversions");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
-var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
-var XUtils_1 = require("./XUtils");
-var XInputDate = function (props) {
-    var _a, _b;
-    props.form.addField(props.field);
-    var xField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPathStr(props.form.getEntity(), props.field);
-    var showTime = (xField.type === 'datetime');
-    var cssClassName = showTime ? 'x-input-datetime' : 'x-input-date';
-    var label = (_a = props.label) !== null && _a !== void 0 ? _a : props.field;
-    var readOnly = XUtils_1.XUtils.isReadOnly(props.field, props.readOnly) || props.form.formReadOnlyBase(props.field);
-    if (!xField.isNullable && !readOnly) {
-        label = XUtils_1.XUtils.markNotNull(label);
+var XCalendar_1 = require("./XCalendar");
+var XInput_1 = require("./XInput");
+var XInputDate = /** @class */ (function (_super) {
+    __extends(XInputDate, _super);
+    function XInputDate(props) {
+        var _this = _super.call(this, props) || this;
+        _this.onValueChange = _this.onValueChange.bind(_this);
+        _this.onBlur = _this.onBlur.bind(_this);
+        return _this;
     }
-    var onValueChange = function (e) {
-        // z Calendar prichadza e.value - typ Date alebo null
-        // typ Date prichadza ak uzivatel vyplnil validny datum, null (typeof e.value vracia "object") prichadza ak uzivatel vymazal datum
-        // alebo je este datum nekompletny (uzivatel prave zadava datum)
-        //console.log(typeof e.value);
-        //console.log(e.value instanceof Date);
-        props.form.onFieldChange(props.field, e.value);
-    };
-    var fieldValue = undefined;
-    var object = props.form.state.object;
-    if (object !== null) {
-        var objectValue = XUtilsCommon_1.XUtilsCommon.getValueByPath(object, props.field);
-        //  pre istotu dame na null, null je standard
-        //if (objectValue === undefined) {
-        //    objectValue = null;
-        //}
-        // TODO - konvertovat null hodnotu na "" (vo funkcii stringAsUI) je dolezite aby sa prejavila zmena na null v modeli
-        // - otestovat ci zmena na null funguje dobre -
-        //fieldValue = stringAsUI(objectValue);
+    XInputDate.prototype.getValue = function () {
+        var value = null;
+        var objectValue = this.getValueFromObject();
         // tuto zatial hack, mal by prist Date
         if (typeof objectValue === 'string') {
-            fieldValue = new Date(objectValue);
+            value = new Date(objectValue);
         }
         else if (typeof objectValue === 'object' && objectValue instanceof Date) {
-            fieldValue = objectValue;
+            value = objectValue;
         }
-        // fieldValue zostalo undefined (konvertujeme null -> undefined) - Calendar pozaduje undefined, nechce null
-    }
-    var labelStyle = (_b = props.labelStyle) !== null && _b !== void 0 ? _b : {};
-    XUtils_1.XUtils.addCssPropIfNotExists(labelStyle, { width: XUtils_1.XUtils.FIELD_LABEL_WIDTH });
-    return (react_1.default.createElement("div", { className: "field grid" },
-        react_1.default.createElement("label", { htmlFor: props.field, className: "col-fixed", style: labelStyle }, label),
-        react_1.default.createElement(calendar_1.Calendar, { id: props.field, value: fieldValue, onChange: onValueChange, disabled: readOnly, showIcon: true, dateFormat: (0, XUtilsConversions_1.dateFormatCalendar)(), showTime: showTime, showSeconds: showTime, inputClassName: cssClassName, showOnFocus: false })));
-};
+        // value zostalo null ak nebol vykonany ziaden if
+        return value;
+    };
+    XInputDate.prototype.onValueChange = function (value) {
+        // z XCalendar prichadza value - typ Date alebo null
+        this.onValueChangeBase(value);
+    };
+    // nedame do onChange inputu, lebo by sa nas onChange volal po kazdej zmene pismenka
+    // ak bude treba, mozme este dorobit metodu "onChange2", ktora sa bude volat po kazdej zmene pismenka (asi iba do XInputText)
+    XInputDate.prototype.onBlur = function (e) {
+        this.callOnChangeFromOnBlur();
+    };
+    XInputDate.prototype.render = function () {
+        // note: style overrides size (width of the input according to character count)
+        return (react_1.default.createElement("div", { className: "field grid" },
+            react_1.default.createElement("label", { htmlFor: this.props.field, className: "col-fixed", style: this.getLabelStyle() }, this.getLabel()),
+            react_1.default.createElement(XCalendar_1.XCalendar, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), datetime: this.xField.type === 'datetime' })));
+    };
+    return XInputDate;
+}(XInput_1.XInput));
 exports.XInputDate = XInputDate;

package/lib/components/XInputDecimalBase.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+export declare const XInputDecimalBase: (props: {
+    id?: string | undefined;
+    value: number | null;
+    onChange: (value: number | null) => void;
+    readOnly?: boolean | undefined;
+    useGrouping?: boolean | undefined;
+    fractionDigits?: number | undefined;
+    min?: number | undefined;
+    max?: number | undefined;
+    size?: number | undefined;
+}) => JSX.Element;

package/lib/components/XInputDecimalBase.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XInputDecimalBase = void 0;
+var react_1 = __importDefault(require("react"));
+var inputnumber_1 = require("primereact/inputnumber");
+// wrapper for InputNumber component - zatial taky zjednoduseny, len na filter polozky pouzivame
+var XInputDecimalBase = function (props) {
+    var onChange = function (e) {
+        // z InputNumber prichadza e.value - typ number alebo null
+        props.onChange(e.value);
+    };
+    // null konvertujeme na undefined (zevraj InputNumber nechce null)
+    return (react_1.default.createElement(inputnumber_1.InputNumber, { id: props.id, value: props.value !== null ? props.value : undefined, onChange: onChange, readOnly: props.readOnly, mode: "decimal", locale: "de-DE", useGrouping: props.useGrouping, minFractionDigits: props.fractionDigits, maxFractionDigits: props.fractionDigits, min: props.min, max: props.max, size: props.size }));
+};
+exports.XInputDecimalBase = XInputDecimalBase;

package/lib/components/XLazyDataTable.d.ts

@@ -1,7 +1,10 @@
-import { ReactChild } from 'react';
+import React, { ReactChild } from 'react';
+import { DataTableFilterMetaData, DataTableOperatorFilterMetaData } from 'primereact/datatable';
+import { ColumnBodyOptions, ColumnFilterElementTemplateOptions } from 'primereact/column';
 import { SearchTableParams } from "./SearchTableParams";
 import { XCustomFilter } from "../serverApi/FindParam";
 import { XOnSaveOrCancelProp } from "./XFormBase";
+export type XBetweenFilterProp = "row" | "column" | undefined;
 export interface XEditModeHandlers {
     onStart: () => void;
     onSave: () => void;
@@ -18,6 +21,7 @@ export interface XLazyDataTableProps {
     paginator: boolean;
     rows: number;
     filterDisplay: "menu" | "row";
+    betweenFilter?: XBetweenFilterProp;
     scrollable: boolean;
     scrollWidth: string;
     scrollHeight: string;
@@ -49,12 +53,17 @@ export declare const XLazyDataTable: {
         shrinkWidth: boolean;
     };
 };
+export type XSetFilterItem = (field: string, filterItem: DataTableFilterMetaData | DataTableOperatorFilterMetaData) => void;
+export type XFilterElementProp = (setFilterItem: XSetFilterItem, options: ColumnFilterElementTemplateOptions) => React.ReactNode;
 export interface XLazyColumnProps {
     field: string;
     header?: any;
     align?: "left" | "center" | "right";
     dropdownInFilter?: boolean;
     showFilterMenu?: boolean;
+    betweenFilter?: XBetweenFilterProp | "noBetween";
     width?: string;
+    filterElement?: XFilterElementProp;
+    body?: React.ReactNode | ((data: any, options: ColumnBodyOptions) => React.ReactNode);
 }
 export declare const XLazyColumn: (props: XLazyColumnProps) => null;

package/lib/components/XLazyDataTable.js

@@ -112,6 +112,8 @@ var tristatecheckbox_1 = require("primereact/tristatecheckbox");
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 var XExportRowsDialog_1 = require("./XExportRowsDialog");
 var api_1 = require("primereact/api");
+var XCalendar_1 = require("./XCalendar");
+var XInputDecimalBase_1 = require("./XInputDecimalBase");
 var XLazyDataTable = function (props) {
     // must be here, is used in createInitFilters()
     var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity);
@@ -476,58 +478,90 @@ var XLazyDataTable = function (props) {
             console.log("Nie je vyselectovany ziaden zaznam.");
         }
     };
-    // ****** checkbox vo filtri ********
+    // ****** dropdown vo filtri ********
     // pouziva sa len pre simple filtrovanie (filterDisplay="row")
-    var onCheckboxFilterChange = function (field, checkboxValue) {
-        // TODO - treba vyklonovat?
+    var onDropdownFilterChange = function (field, displayValue) {
+        var filterValue = displayValue !== XUtils_1.XUtils.dropdownEmptyOptionValue ? displayValue : null;
+        setFilterValue(field, filterValue, api_1.FilterMatchMode.EQUALS);
+    };
+    var getDropdownFilterValue = function (field) {
+        var filterValue = getFilterValue(field);
+        return filterValue !== null ? filterValue : XUtils_1.XUtils.dropdownEmptyOptionValue;
+    };
+    // ****** vseobecne metodky pre set/get do/z filtra ********
+    // zatial funguje len pre simple filtrovanie (filterDisplay="row")
+    // vseobecna specialna metodka pouzvana pri custom filtri (XLazyColumn.filterElement)
+    var setFilterItem = function (field, filterItem) {
+        filters[field] = filterItem;
+        // neskusal som, ci treba aj toto klonovat ale pravdepodobne hej
         var filtersCloned = __assign({}, filters);
-        if (checkboxValue !== null) {
-            filtersCloned[field] = { value: checkboxValue ? "1" : "0", matchMode: api_1.FilterMatchMode.EQUALS };
-        }
-        else {
-            // pouzivatel zrusil hodnotu vo filtri (vybral prazdny stav v checkboxe), zrusime polozku z filtra
-            //delete filtersCloned[field];
-            filtersCloned[field] = { value: null, matchMode: api_1.FilterMatchMode.EQUALS };
-        }
         setFilters(filtersCloned);
     };
-    var getCheckboxFilterValue = function (field) {
-        var checkboxValue = null;
-        var filterValue = filters[field];
-        if (filterValue !== undefined && filterValue !== null) {
-            if (filterValue.value === '1') {
-                checkboxValue = true;
-            }
-            else if (filterValue.value === '0') {
-                checkboxValue = false;
-            }
+    // vseobecna metodka - nastavi hodnotu do filtra
+    // ak je matchMode === undefined, tak zachova povodnu hodnotu matchMode
+    var setFilterValue = function (field, value, matchMode) {
+        var filterValue = filters[field]; // funguje len pre filterDisplay="row"
+        filterValue.value = value;
+        if (matchMode !== undefined) {
+            filterValue.matchMode = matchMode;
+        }
+        // treba klonovat, inac react nezobrazi zmenenu hodnotu
+        var filtersCloned = __assign({}, filters);
+        setFilters(filtersCloned);
+    };
+    // vseobecna metodka - precita hodnotu z filtra (vrati napr. typ Date | null)
+    var getFilterValue = function (field) {
+        var filterValue = filters[field]; // funguje len pre filterDisplay="row"
+        return filterValue.value;
+    };
+    // ****** vseobecne metodky pre set/get do/z filtra - pre betweenFilter ********
+    // do DataTableFilterMetaData.value ulozime dvojprvkove pole [value1, value2]
+    // na backende spracujeme toto dvojprvkove pole
+    var setFilterValue1 = function (field, value) {
+        // na zaciatku (po inicializacii lazy table) je filterValue = null
+        var filterValue = getFilterValue(field);
+        if (filterValue !== null) {
+            filterValue[0] = value;
+        }
+        else {
+            filterValue = [value, null];
         }
-        return checkboxValue;
+        setFilterValue(field, filterValue, api_1.FilterMatchMode.BETWEEN);
     };
-    // ****** dropdown vo filtri ********
-    // pouziva sa len pre simple filtrovanie (filterDisplay="row")
-    var onDropdownFilterChange = function (field, displayValue) {
-        // TODO - treba vyklonovat?
-        var filtersCloned = __assign({}, filters);
-        if (displayValue !== XUtils_1.XUtils.dropdownEmptyOptionValue) {
-            filtersCloned[field] = { value: displayValue, matchMode: api_1.FilterMatchMode.EQUALS };
+    var setFilterValue2 = function (field, value) {
+        // na zaciatku (po inicializacii lazy table) je filterValue = null
+        var filterValue = getFilterValue(field);
+        if (filterValue !== null) {
+            filterValue[1] = value;
         }
         else {
-            // pouzivatel zrusil hodnotu vo filtri (vybral prazdny riadok), zrusime polozku z filtra
-            //delete filtersCloned[field];
-            filtersCloned[field] = { value: null, matchMode: api_1.FilterMatchMode.EQUALS };
+            filterValue = [null, value];
         }
-        setFilters(filtersCloned);
+        setFilterValue(field, filterValue, api_1.FilterMatchMode.BETWEEN);
     };
-    var getDropdownFilterValue = function (field) {
-        var dropdownValue = XUtils_1.XUtils.dropdownEmptyOptionValue;
-        var filterValue = filters[field];
-        if (filterValue !== undefined && filterValue !== null) {
-            if (filterValue.value !== null) {
-                dropdownValue = filterValue.value;
+    var getFilterValue1 = function (field) {
+        return getFilterValue1or2(field, 0);
+    };
+    var getFilterValue2 = function (field) {
+        return getFilterValue1or2(field, 1);
+    };
+    var getFilterValue1or2 = function (field, index) {
+        var filterValue = getFilterValue(field);
+        return filterValue !== null ? filterValue[index] : null;
+    };
+    var getBetweenFilter = function (columnBetweenFilter, tableBetweenFilter) {
+        var betweenFilter = undefined;
+        // columnBetweenFilter has higher prio than tableBetweenFilter
+        if (columnBetweenFilter !== undefined) {
+            if (columnBetweenFilter === "row" || columnBetweenFilter === "column") {
+                betweenFilter = columnBetweenFilter;
             }
+            // for "noBetween" stays betweenFilter = undefined (simple filter used)
+        }
+        else {
+            betweenFilter = tableBetweenFilter; // betweenFilter from XLazyDataTable property
         }
-        return dropdownValue;
+        return betweenFilter;
     };
     var bodyTemplate = function (columnProps, rowData, xField) {
         var rowDataValue = XUtilsCommon_1.XUtilsCommon.getValueByPath(rowData, columnProps.field);
@@ -684,14 +718,61 @@ var XLazyDataTable = function (props) {
             header = headerLabel;
         }
         // *********** filterElement ***********
+        var betweenFilter = undefined;
         var filterElement;
-        if (xField.type === "boolean") {
-            var checkboxValue = getCheckboxFilterValue(childColumn.props.field);
-            filterElement = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: checkboxValue, onChange: function (e) { return onCheckboxFilterChange(childColumn.props.field, e.value); } });
+        if (childColumn.props.filterElement !== undefined) {
+            filterElement = function (options) {
+                // compilator sa stazoval ze childColumn.props.filterElement muze byt undefined, preto som pridal "!"
+                return childColumn.props.filterElement(setFilterItem, options);
+            };
         }
-        else if (childColumn.props.dropdownInFilter) {
-            var dropdownValue = getDropdownFilterValue(childColumn.props.field);
-            filterElement = react_1.default.createElement(XDropdownDTFilter_1.XDropdownDTFilter, { entity: props.entity, path: childColumn.props.field, value: dropdownValue, onValueChange: onDropdownFilterChange });
+        else {
+            if (xField.type === "boolean") {
+                var checkboxValue = getFilterValue(childColumn.props.field);
+                filterElement = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: checkboxValue, onChange: function (e) { return setFilterValue(childColumn.props.field, e.value, api_1.FilterMatchMode.EQUALS); } });
+            }
+            else if (childColumn.props.dropdownInFilter) {
+                var dropdownValue = getDropdownFilterValue(childColumn.props.field);
+                filterElement = react_1.default.createElement(XDropdownDTFilter_1.XDropdownDTFilter, { entity: props.entity, path: childColumn.props.field, value: dropdownValue, onValueChange: onDropdownFilterChange });
+            }
+            else if (xField.type === "date" || xField.type === "datetime") {
+                betweenFilter = getBetweenFilter(childColumn.props.betweenFilter, props.betweenFilter);
+                if (betweenFilter !== undefined) {
+                    // display: 'flex' umiestni XCalendar elementy vedla seba
+                    filterElement =
+                        react_1.default.createElement("div", { style: betweenFilter === "row" ? { display: 'flex' } : undefined },
+                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value); }, datetime: xField.type === "datetime" }),
+                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue2(childColumn.props.field), onChange: function (value) { return setFilterValue2(childColumn.props.field, value); }, datetime: xField.type === "datetime" }));
+                }
+                else {
+                    var dateValue = getFilterValue(childColumn.props.field);
+                    filterElement = react_1.default.createElement(XCalendar_1.XCalendar, { value: dateValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value); }, datetime: xField.type === "datetime" });
+                }
+            }
+            else if (xField.type === "decimal" || xField.type === "number") {
+                var params = XUtilsMetadata_1.XUtilsMetadata.getParamsForInputNumber(xField);
+                betweenFilter = getBetweenFilter(childColumn.props.betweenFilter, props.betweenFilter);
+                if (betweenFilter !== undefined) {
+                    // display: 'flex' umiestni input elementy pod seba (betweenFilter = "column") resp. vedla seba (betweenFilter = "row")
+                    filterElement =
+                        react_1.default.createElement("div", { style: { display: 'flex', flexDirection: betweenFilter } },
+                            react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value); } }, params)),
+                            react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: getFilterValue2(childColumn.props.field), onChange: function (value) { return setFilterValue2(childColumn.props.field, value); } }, params)));
+                }
+                else {
+                    var numberValue = getFilterValue(childColumn.props.field);
+                    filterElement = react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: numberValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value); } }, params));
+                }
+            }
+        }
+        // ************** dataType **************
+        // depending on the dataType of the column, suitable match modes are displayed in filter
+        var dataType = undefined;
+        if (xField.type === "decimal" || xField.type === "number") {
+            dataType = "numeric";
+        }
+        else if (xField.type === "date" || xField.type === "datetime") {
+            dataType = "date";
         }
         // *********** showFilterMenu ***********
         var showFilterMenu;
@@ -701,7 +782,7 @@ var XLazyDataTable = function (props) {
         else {
             showFilterMenu = true; // default
             if (props.filterDisplay === "row") {
-                if (xField.type === "boolean" || childColumn.props.dropdownInFilter) {
+                if (xField.type === "boolean" || childColumn.props.dropdownInFilter || betweenFilter !== undefined) {
                     showFilterMenu = false;
                 }
             }
@@ -710,9 +791,12 @@ var XLazyDataTable = function (props) {
         // pre filterDisplay = "row" nechceme clear button, chceme setrit miesto
         var showClearButton = props.filterDisplay === "menu";
         // *********** body ***********
-        // TODO - mozno by bolo dobre vytvarat body pre kazdy field, nech je to vsetko konzistentne
         var body;
-        if (xField.type === "decimal" || xField.type === "date" || xField.type === "datetime" || xField.type === "boolean") {
+        if (childColumn.props.body !== undefined) {
+            body = childColumn.props.body;
+        }
+        // TODO - mozno by bolo dobre vytvarat body pre kazdy typ fieldu, nech je to vsetko konzistentne
+        else if (xField.type === "decimal" || xField.type === "date" || xField.type === "datetime" || xField.type === "boolean") {
             body = function (rowData) { return bodyTemplate(childColumn.props, rowData, xField); };
         }
         // *********** width/headerStyle ***********
@@ -721,7 +805,7 @@ var XLazyDataTable = function (props) {
             // TODO - if filter not used at all, then buttons flags should be false
             var filterMenuInFilterRow = props.filterDisplay === "row" && showFilterMenu;
             var filterButtonInHeader = props.filterDisplay === "menu";
-            width = XUtilsMetadata_1.XUtilsMetadata.computeColumnWidth(xField, filterMenuInFilterRow, undefined, headerLabel, true, filterButtonInHeader);
+            width = XUtilsMetadata_1.XUtilsMetadata.computeColumnWidth(xField, betweenFilter, filterMenuInFilterRow, undefined, headerLabel, true, filterButtonInHeader);
         }
         var headerStyle = {};
         if (width !== undefined) {
@@ -741,7 +825,7 @@ var XLazyDataTable = function (props) {
                 align = "center";
             }
         }
-        return react_1.default.createElement(column_1.Column, { field: childColumn.props.field, header: header, filter: true, sortable: true, filterElement: filterElement, showFilterMenu: showFilterMenu, showClearButton: showClearButton, body: body, headerStyle: headerStyle, align: align });
+        return react_1.default.createElement(column_1.Column, { field: childColumn.props.field, header: header, filter: true, sortable: true, filterElement: filterElement, dataType: dataType, showFilterMenu: showFilterMenu, showClearButton: showClearButton, body: body, headerStyle: headerStyle, align: align });
     });
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "flex justify-content-center" },

package/lib/components/XUtilsMetadata.d.ts

@@ -1,5 +1,6 @@
-import { XAssoc, XEntity, XField } from "../serverApi/XEntityMetadata";
+import { XAssoc, XEntity, XField, XRelationType } from "../serverApi/XEntityMetadata";
 import { XBrowseMeta } from "../serverApi/XBrowseMetadata";
+import { XBetweenFilterProp } from "./XLazyDataTable";
 export declare class XUtilsMetadata {
     private static xEntityMap;
     private static xBrowseMetaMap;
@@ -9,6 +10,8 @@ export declare class XUtilsMetadata {
     static getXField(xEntity: XEntity, field: string): XField;
     static getXFieldByPath(xEntity: XEntity, path: string): XField;
     static getXFieldByPathStr(entity: string, path: string): XField;
+    static getXAssocByPath(xEntity: XEntity, path: string): XAssoc;
+    static getLastXAssocByPath(xEntity: XEntity, path: string): XAssoc;
     static getXAssocToOne(xEntity: XEntity, assocField: string): XAssoc;
     static getXAssocToMany(xEntity: XEntity, assocField: string): XAssoc;
     static getXAssocToOneByAssocEntity(xEntity: XEntity, assocEntityName: string): XAssoc;
@@ -16,6 +19,7 @@ export declare class XUtilsMetadata {
     static getXEntityForAssocToOne(xEntity: XEntity, assocField: string): XEntity;
     static getXEntityForAssocToMany(xEntity: XEntity, assocField: string): XEntity;
     static getXFieldList(xEntity: XEntity): XField[];
+    static getXAssocList(xEntity: XEntity, relationTypeList?: XRelationType[]): XAssoc[];
     static getParamsForInputNumber(xField: XField): {
         useGrouping: boolean;
         fractionDigits?: number;
@@ -24,7 +28,7 @@ export declare class XUtilsMetadata {
         size?: number;
     };
     static CHAR_SIZE: number;
-    static computeColumnWidth(xField: XField, filterMenuInFilterRow: boolean, formColumnType: string | undefined, header: string | undefined, sortableButtonInHeader: boolean, filterButtonInHeader: boolean): string | undefined;
+    static computeColumnWidth(xField: XField, betweenFilter: XBetweenFilterProp, filterMenuInFilterRow: boolean, formColumnType: string | undefined, header: string | undefined, sortableButtonInHeader: boolean, filterButtonInHeader: boolean): string | undefined;
     static computeColumnWidthBase(charSize?: number, paddingAndOther?: number): number | undefined;
     static getXBrowseMeta(entity: string, browseId?: string): XBrowseMeta;
     static setXBrowseMeta(entity: string, browseId: string | undefined, xBrowseMeta: XBrowseMeta): void;