@michalrakus/x-react-web-lib 1.28.0 → 1.30.0

package/lib/components/XAutoCompleteBase.js

@@ -335,8 +335,8 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
                             maxRows: this.props.lazyLoadMaxRows + 1,
                             fullTextSearch: { fields: this.getFields(), value: event.query.trim(), splitValue: this.props.splitQueryValue, matchMode: "contains" },
                             entity: this.props.suggestionsQuery.entity,
-                            filterItems: XUtils_1.XUtils.createCustomFilterItems(filter),
-                            multiSortMeta: XUtils_1.XUtils.createMultiSortMeta(this.getSortField()),
+                            filterItems: XUtilsCommon_1.XUtilsCommon.createCustomFilterItems(filter),
+                            multiSortMeta: XUtilsCommon_1.XUtilsCommon.createMultiSortMeta(this.getSortField()),
                             fields: this.props.suggestionsQuery.fields
                         };
                         return [4 /*yield*/, XUtils_1.XUtils.fetchOne('x-lazy-auto-complete-suggestions', suggestionsRequest)];
@@ -346,7 +346,7 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
                         // ak sme nesortovali v DB (co je draha operacia) tak zosortujeme teraz
                         // (itemTemplateString sa vola duplicitne ale pre tych cca 20 zaznamov je to ok)
                         if (this.props.suggestionsQuery.sortField === undefined) {
-                            filteredSuggestions = XUtils_1.XUtils.arraySort(filteredSuggestions, this.itemTemplateString);
+                            filteredSuggestions = XUtilsCommon_1.XUtilsCommon.arraySort(filteredSuggestions, this.itemTemplateString);
                         }
                         // ak mame o 1 zaznam viac ako je lazyLoadMaxRows, zmenime posledny zaznam na ...
                         // TODO - lepsie by bolo posledny zaznam vyhodit a popisok ... zobrazit do footer-a (odpadnu problemy z pripadnou selekciou pseudozaznamu ...)
@@ -727,17 +727,13 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         // Dialog pre konkretny form:
         // <DobrovolnikForm id={this.formDialogObjectId} object={this.formDialogInitValuesForInsert} onSaveOrCancel={this.formDialogOnSaveOrCancel}/>
         // formgroup-inline lepi SplitButton na autocomplete a zarovna jeho vysku
-        return (react_1.default.createElement("div", { className: "x-auto-complete-base", style: { width: this.props.width, maxWidth: this.props.maxWidth } },
-            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ key: "autoComplete", value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, itemTemplate: this.itemTemplate, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(error), { inputClassName: this.props.inputClassName, showEmptyMessage: true })),
-            buttons,
-            this.props.valueForm != undefined ?
-                react_1.default.createElement(dialog_1.Dialog, { key: "dialogForm", className: "x-dialog-without-header", visible: this.state.formDialogOpened, onHide: this.formDialogOnHide }, react_1.default.cloneElement(this.props.valueForm, {
+        return (react_1.default.createElement.apply(react_1.default, __spreadArray(__spreadArray(["div", { className: "x-auto-complete-base", style: { width: this.props.width, maxWidth: this.props.maxWidth } }, react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, itemTemplate: this.itemTemplate, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(error), { inputClassName: this.props.inputClassName, showEmptyMessage: true }))], __read(buttons), false), [this.props.valueForm != undefined ?
+                react_1.default.createElement(dialog_1.Dialog, { key: "dialog-form", className: "x-dialog-without-header", visible: this.state.formDialogOpened, onHide: this.formDialogOnHide }, react_1.default.cloneElement(this.props.valueForm, {
                     id: this.formDialogObjectId, initValues: this.formDialogInitValuesForInsert, onSaveOrCancel: this.formDialogOnSaveOrCancel
                 } /*, this.props.valueForm.children*/))
-                : undefined,
-            this.props.searchBrowse != undefined && !readOnly ?
-                react_1.default.createElement(dialog_1.Dialog, { key: "dialogBrowse", className: "x-dialog-without-header", visible: this.state.searchDialogOpened, onHide: this.searchDialogOnHide }, react_1.default.cloneElement(this.props.searchBrowse, { searchBrowseParams: this.createSearchBrowseParams() } /*, props.searchBrowse.children*/))
-                : undefined));
+                : undefined, this.props.searchBrowse != undefined && !readOnly ?
+                react_1.default.createElement(dialog_1.Dialog, { key: "dialog-browse", className: "x-dialog-without-header", visible: this.state.searchDialogOpened, onHide: this.searchDialogOnHide }, react_1.default.cloneElement(this.props.searchBrowse, { searchBrowseParams: this.createSearchBrowseParams() } /*, props.searchBrowse.children*/))
+                : undefined], false)));
     };
     XAutoCompleteBase.valueMoreSuggestions = "...";
     XAutoCompleteBase.defaultProps = {

package/lib/components/XEditBrowse.js

@@ -110,6 +110,7 @@ var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XUtils_1 = require("./XUtils");
 var XLazyDataTable_1 = require("./XLazyDataTable/XLazyDataTable");
 var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
+var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 // TODO - pouzit extends XEditBrowseBase, ako je tomu pri CarForm?
 var XEditBrowse = /** @class */ (function (_super) {
     __extends(XEditBrowse, _super);
@@ -281,7 +282,7 @@ var XEditBrowse = /** @class */ (function (_super) {
         var index = this.getIndexForColumn(field);
         if (index !== undefined) {
             var xBrowseMeta = this.state.xBrowseMeta;
-            XUtils_1.XUtils.arrayMoveElement(xBrowseMeta.columnMetaList, index, offset);
+            XUtilsCommon_1.XUtilsCommon.arrayMoveElement(xBrowseMeta.columnMetaList, index, offset);
             // TODO - tu mozno treba setnut funkciu - koli moznej asynchronicite
             this.setState({ xBrowseMeta: xBrowseMeta });
         }

package/lib/components/XFieldSet/XFieldSetBase.d.ts

@@ -0,0 +1,79 @@
+/// <reference types="react" />
+export interface XFieldSetMeta {
+    id?: number;
+    fieldSetId: string;
+    xFieldMetaRoot: XFieldMeta;
+    modifDate: Date | null;
+    modifXUser: any | null;
+    version: number;
+}
+export declare enum XFieldType {
+    rootField = "rootField",
+    fieldGroup = "fieldGroup",
+    fieldGroupWithCheckbox = "fieldGroupWithCheckbox",
+    checkbox = "checkbox",
+    checkboxNullable = "checkboxNullable",
+    inputText = "inputText",
+    inputDecimal = "inputDecimal"
+}
+export declare enum XChildrenLayout {
+    column = "column",
+    row = "row",
+    tabView = "tabView",
+    tabViewWithHeaderGroup = "tabViewWithHeaderGroup"
+}
+export declare enum XFieldPropValuesFrom {
+    parent = "parent",
+    this = "this"
+}
+export interface XFieldMeta {
+    type?: XFieldType;
+    childrenLayout?: XChildrenLayout;
+    width?: string;
+    labelWidth?: string;
+    inputWidth?: string;
+    suppressFieldGroupPanel?: true;
+    field: string;
+    label: string;
+    tooltip?: string;
+    decimalProps?: {
+        scale: number;
+    };
+    dateFrom?: Date;
+    dateTo?: Date;
+    xFieldMetaList?: XFieldMeta[];
+    fieldPropValuesMapForEdit?: XFieldPropValuesMapForEdit;
+    fieldPropValuesMapCached?: XFieldPropValuesMap;
+    xFieldMetaParentCached?: XFieldMeta;
+}
+export interface XFieldPropValuesMapForEdit {
+    [field: string]: XFieldPropValuesForEdit;
+}
+export interface XFieldPropValuesMap {
+    [field: string]: XFieldPropValues;
+}
+export interface XFieldPropValuesForEdit {
+    valuesFrom: XFieldPropValuesFrom;
+    values?: XFieldPropValues;
+    error?: string;
+}
+export type XFieldPropValues = any | undefined;
+export interface XFieldProp {
+    id: string;
+    label: string;
+    fieldPropEdit?: JSX.Element;
+}
+export interface XFieldPropEditProps {
+    value?: XFieldPropValues;
+    onChange?: (value: XFieldPropValues) => void;
+    onErrorChange?: (error: (string | undefined)) => void;
+}
+export interface XFieldSetValues {
+    [field: string]: any;
+}
+export type XFieldXFieldMetaMap = Map<string, XFieldMeta>;
+export declare class XFieldSetBase {
+    static createXFieldXFieldMetaMap(xFieldSetMeta: XFieldSetMeta): XFieldXFieldMetaMap;
+    static xFieldSetValuesAsUI(xFieldSetValues: XFieldSetValues, xFieldXFieldMetaMap: XFieldXFieldMetaMap): string;
+    private static createMapForXFieldMeta;
+}

package/lib/components/XFieldSet/XFieldSetBase.js

@@ -0,0 +1,135 @@
+"use strict";
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XFieldSetBase = exports.XFieldPropValuesFrom = exports.XChildrenLayout = exports.XFieldType = void 0;
+var XUtilsConversions_1 = require("../../serverApi/XUtilsConversions");
+var XFieldType;
+(function (XFieldType) {
+    XFieldType["rootField"] = "rootField";
+    XFieldType["fieldGroup"] = "fieldGroup";
+    XFieldType["fieldGroupWithCheckbox"] = "fieldGroupWithCheckbox";
+    XFieldType["checkbox"] = "checkbox";
+    XFieldType["checkboxNullable"] = "checkboxNullable";
+    XFieldType["inputText"] = "inputText";
+    XFieldType["inputDecimal"] = "inputDecimal";
+})(XFieldType = exports.XFieldType || (exports.XFieldType = {}));
+// children layout sa da nastavit len na type, ktory ma children - rootField, fieldGroup
+var XChildrenLayout;
+(function (XChildrenLayout) {
+    XChildrenLayout["column"] = "column";
+    XChildrenLayout["row"] = "row";
+    XChildrenLayout["tabView"] = "tabView";
+    XChildrenLayout["tabViewWithHeaderGroup"] = "tabViewWithHeaderGroup"; // to iste co tabView ale prvy fieldGroup (0-ty tab) zobrazi nad tabView (aby bol vzdy pristupny)
+})(XChildrenLayout = exports.XChildrenLayout || (exports.XChildrenLayout = {}));
+// poznamka - tabView a tabViewWithHeaderGroup odignoruju bezne simple children - ak take budu existovat, zobrazi sa uzivatelovi warning pri nastaveni tabView
+// pouzijeme len checkbox supressFieldGroupPanel
+// pouziva sa len pre typ fieldGroup a len v pripade ak dany fieldGroup nie je vyrenderovany v nejakej tab-ke (jeho parent ma nastaveny layout tabView*)
+// export enum XFieldGroupPanelViewStatus {
+//     show = "show",  // default - vyrenderuje Panel aj s labelom a vo vnutri panelu umiestni children
+//     hide = "hide"   // nerenderuje Panel, children umiestni do div elementu (label sa nepouzije) - pouziva sa na vytvorenie stlpcov v (parent) fieldGroup-e
+// }
+var XFieldPropValuesFrom;
+(function (XFieldPropValuesFrom) {
+    XFieldPropValuesFrom["parent"] = "parent";
+    XFieldPropValuesFrom["this"] = "this"; // field prop values preberame z current fieldu
+})(XFieldPropValuesFrom = exports.XFieldPropValuesFrom || (exports.XFieldPropValuesFrom = {}));
+// zatial provizorne len na staticke metody
+var XFieldSetBase = /** @class */ (function () {
+    function XFieldSetBase() {
+    }
+    // api metoda na vytvorenie Map instancie, ktora sluzi na rychle najdenie prislusneho XFieldMeta podla nazvu fieldu
+    XFieldSetBase.createXFieldXFieldMetaMap = function (xFieldSetMeta) {
+        var xFieldXFieldMetaMap = new Map();
+        XFieldSetBase.createMapForXFieldMeta(xFieldSetMeta.xFieldMetaRoot, xFieldXFieldMetaMap);
+        return xFieldXFieldMetaMap;
+    };
+    // api metoda na vyrenderovanie field set atributu
+    // logicky patri do src/serverApi/XUtilsConversions.ts a zisla by sa aj pri exporte do excelu ale XFieldXFieldMetaMap (a jeho "parent"-a XFieldSetBase) mame len na frontende
+    XFieldSetBase.xFieldSetValuesAsUI = function (xFieldSetValues, xFieldXFieldMetaMap) {
+        var e_1, _a;
+        var _b;
+        // budeme mat vzdy spravne poradie? nebudeme... asi najjednoduchsie zosortovat tu "valueUIList" podla abecedy
+        var valueUIList = [];
+        try {
+            for (var _c = __values(Object.entries(xFieldSetValues)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var _e = __read(_d.value, 2), field = _e[0], value = _e[1];
+                var xFieldMeta = xFieldXFieldMetaMap.get(field);
+                if (xFieldMeta) {
+                    if (xFieldMeta.type === XFieldType.checkbox) {
+                        valueUIList.push(xFieldMeta.label);
+                    }
+                    else if (xFieldMeta.type === XFieldType.inputText) {
+                        valueUIList.push("".concat(xFieldMeta.label, ": \"").concat(value, "\""));
+                    }
+                    else if (xFieldMeta.type === XFieldType.inputDecimal) {
+                        valueUIList.push("".concat(xFieldMeta.label, ": ").concat((0, XUtilsConversions_1.numberAsUI)((0, XUtilsConversions_1.numberFromModel)(value), (_b = xFieldMeta.decimalProps) === null || _b === void 0 ? void 0 : _b.scale)));
+                    }
+                    else {
+                        // neznamy typ
+                        valueUIList.push("".concat(xFieldMeta.label, ": \"").concat(value, "\""));
+                    }
+                }
+                else {
+                    // field bol z formulara odstraneny (nemalo by sa to takto pouzivat, skor by sa mala datumom ohranicit platnost fieldu)
+                    // zobrazime v surovom stave
+                    valueUIList.push("".concat(field, ": ").concat(typeof value === 'string' ? '"' + value + '"' : value));
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return valueUIList.join(", ");
+    };
+    XFieldSetBase.createMapForXFieldMeta = function (xFieldMeta, xFieldXFieldMetaMap) {
+        var e_2, _a;
+        xFieldXFieldMetaMap.set(xFieldMeta.field, xFieldMeta);
+        if (xFieldMeta.xFieldMetaList) {
+            try {
+                for (var _b = __values(xFieldMeta.xFieldMetaList), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var insideXFieldMeta = _c.value;
+                    XFieldSetBase.createMapForXFieldMeta(insideXFieldMeta, xFieldXFieldMetaMap);
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+        }
+    };
+    return XFieldSetBase;
+}());
+exports.XFieldSetBase = XFieldSetBase;

package/lib/components/XFormBase.js

@@ -169,7 +169,7 @@ var XFormBase = /** @class */ (function (_super) {
                                 assocToSort = _b.value;
                                 assocRowList = object[assocToSort.assoc];
                                 if (assocRowList) {
-                                    object[assocToSort.assoc] = XUtils_1.XUtils.arraySort(assocRowList, assocToSort.sortField);
+                                    object[assocToSort.assoc] = XUtilsCommon_1.XUtilsCommon.arraySort(assocRowList, assocToSort.sortField);
                                 }
                             }
                         }

package/lib/components/XFormDataTable2.d.ts

@@ -1,6 +1,6 @@
 import { XFormBase } from "./XFormBase";
 import React, { Component, ReactChild } from "react";
-import { DataTableFilterMeta } from "primereact/datatable";
+import { DataTableFilterMeta, DataTableSortMeta } from "primereact/datatable";
 import { ColumnBodyOptions } from "primereact/column";
 import { XEntity, XField } from "../serverApi/XEntityMetadata";
 import { XViewStatusOrBoolean } from "./XUtils";
@@ -26,7 +26,7 @@ export interface XFormDataTableProps {
     rows?: number;
     filterDisplay: "menu" | "row" | "none";
     sortable: boolean;
-    sortField?: string;
+    sortField: string;
     scrollable: boolean;
     scrollWidth?: string;
     scrollHeight?: string;
@@ -48,6 +48,7 @@ export declare class XFormDataTable2 extends Component<XFormDataTableProps> {
     static defaultProps: {
         filterDisplay: string;
         sortable: boolean;
+        sortField: string;
         scrollable: boolean;
         scrollWidth: string;
         scrollHeight: string;
@@ -116,6 +117,8 @@ export interface XFormAutoCompleteColumnProps extends XFormColumnBaseProps {
     searchBrowse?: JSX.Element;
     assocForm?: JSX.Element;
     filter?: XTableFieldFilterProp;
+    sortField?: string | DataTableSortMeta[];
+    fields?: string[];
     suggestions?: any[];
 }
 export interface XFormSearchButtonColumnProps extends XFormColumnBaseProps {

package/lib/components/XFormDataTable2.js

@@ -277,7 +277,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
     };
     XFormDataTable2.prototype.getFilterMatchMode = function (xField) {
         var filterMatchMode;
-        if (xField.type === "string") {
+        if (xField.type === "string" || xField.type === "jsonb") {
             filterMatchMode = api_1.FilterMatchMode.CONTAINS;
         }
         // zatial vsetky ostatne EQUALS
@@ -404,7 +404,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
         else if (columnProps.type === "autoComplete") {
             var columnPropsAutoComplete = columnProps;
-            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, searchBrowse: columnPropsAutoComplete.searchBrowse, assocForm: columnPropsAutoComplete.assocForm, filter: columnPropsAutoComplete.filter, suggestions: columnPropsAutoComplete.suggestions, rowData: rowData, readOnly: readOnly });
+            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, searchBrowse: columnPropsAutoComplete.searchBrowse, assocForm: columnPropsAutoComplete.assocForm, filter: columnPropsAutoComplete.filter, sortField: columnPropsAutoComplete.sortField, fields: columnPropsAutoComplete.fields, suggestions: columnPropsAutoComplete.suggestions, rowData: rowData, readOnly: readOnly });
         }
         else if (columnProps.type === "searchButton") {
             var columnPropsSearchButton = columnProps;
@@ -527,7 +527,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
     };
     XFormDataTable2.prototype.render = function () {
         var _this = this;
-        var _a, _b, _c;
+        var _a, _b;
         var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(this.getEntity());
         var paginator = this.props.paginator !== undefined ? this.props.paginator : false;
         var rows = undefined;
@@ -540,8 +540,14 @@ var XFormDataTable2 = /** @class */ (function (_super) {
             }
         }
         var filterDisplay = this.props.filterDisplay !== "none" ? this.props.filterDisplay : undefined;
-        // default sortovanie - ak mame insert tak nesortujeme (drzime poradie v akom user zaznam vytvoril), ak mame update tak podla id zosortujeme (nech je to zobrazene vzdy rovnako)
-        var sortField = (_a = this.props.sortField) !== null && _a !== void 0 ? _a : (this.props.form.isAddRow() ? undefined : xEntity.idField);
+        var sortField = this.props.sortField;
+        if (sortField === "idFieldOnUpdate") {
+            // default sortovanie - ak mame insert tak nesortujeme (drzime poradie v akom user zaznam vytvoril), ak mame update tak podla id zosortujeme (nech je to zobrazene vzdy rovnako)
+            sortField = (this.props.form.isAddRow() ? undefined : xEntity.idField);
+        }
+        else if (sortField === "none") {
+            sortField = undefined;
+        }
         var label = this.props.label !== undefined ? this.props.label : this.props.assocField;
         var readOnly = this.isReadOnly();
         // v bloku function (child) nejde pouzit priamo this, thisLocal uz ide pouzit
@@ -679,8 +685,8 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         var removeRowLabel = undefined;
         if (this.props.showAddRemoveButtons) {
             // calling xLocaleOption does not work in standard default values initialisation place (public static defaultProps)
-            addRowLabel = (_b = this.props.addRowLabel) !== null && _b !== void 0 ? _b : (0, XLocale_1.xLocaleOption)('addRow');
-            removeRowLabel = (_c = this.props.removeRowLabel) !== null && _c !== void 0 ? _c : (0, XLocale_1.xLocaleOption)('removeRow');
+            addRowLabel = (_a = this.props.addRowLabel) !== null && _a !== void 0 ? _a : (0, XLocale_1.xLocaleOption)('addRow');
+            removeRowLabel = (_b = this.props.removeRowLabel) !== null && _b !== void 0 ? _b : (0, XLocale_1.xLocaleOption)('removeRow');
         }
         return (react_1.default.createElement("div", null,
             react_1.default.createElement("div", { className: "flex justify-content-center" },
@@ -696,6 +702,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
     XFormDataTable2.defaultProps = {
         filterDisplay: "none",
         sortable: false,
+        sortField: "idFieldOnUpdate",
         scrollable: true,
         scrollWidth: '100%',
         scrollHeight: '200vh',

package/lib/components/XLazyDataTable/XLazyDataTable.d.ts

@@ -3,7 +3,7 @@ import { DataTableFilterMeta, DataTableFilterMetaData, DataTableOperatorFilterMe
 import { ColumnBodyOptions, ColumnFilterElementTemplateOptions } from 'primereact/column';
 import { XViewStatusOrBoolean } from "../XUtils";
 import { XSearchBrowseParams } from "../XSearchBrowseParams";
-import { XAggregateType, XCustomFilter } from "../../serverApi/FindParam";
+import { XAggregateFunction, XCustomFilter } from "../../serverApi/FindParam";
 import { XOnSaveOrCancelProp } from "../XFormBase";
 import { IconType } from "primereact/utils";
 import { ButtonProps } from "primereact/button";
@@ -110,7 +110,8 @@ export interface XLazyColumnProps {
     betweenFilter?: XBetweenFilterProp | "noBetween";
     width?: string;
     contentType?: XContentType;
-    aggregateType?: XAggregateType;
+    fieldSetId?: string;
+    aggregateType?: XAggregateFunction;
     columnViewStatus: XViewStatusOrBoolean;
     filterElement?: XFilterElementProp;
     body?: React.ReactNode | ((data: any, options: ColumnBodyOptions) => React.ReactNode);