@michalrakus/x-react-web-lib 1.20.0 → 1.21.0

package/XParamBrowse.d.ts

@@ -0,0 +1,3 @@
+// generated by gulp
+
+export * from './lib/administration/XParamBrowse';

package/XParamBrowse.js

@@ -0,0 +1,5 @@
+// generated by gulp
+
+'use strict';
+
+module.exports = require('./lib/administration/XParamBrowse.js');

package/XParamForm.d.ts

@@ -0,0 +1,3 @@
+// generated by gulp
+
+export * from './lib/administration/XParamForm';

package/XParamForm.js

@@ -0,0 +1,5 @@
+// generated by gulp
+
+'use strict';
+
+module.exports = require('./lib/administration/XParamForm.js');

package/gulpfile.js

@@ -13,10 +13,12 @@ function generateApi(cb) {
     const fs = require('fs');
 
     const apiFileList = [
-        "./lib/administration/XUserBrowse",
-        "./lib/administration/XUserForm",
         "./lib/administration/XBrowseMetaBrowse",
         "./lib/administration/XBrowseMetaForm",
+        "./lib/administration/XParamBrowse",
+        "./lib/administration/XParamForm",
+        "./lib/administration/XUserBrowse",
+        "./lib/administration/XUserForm",
 
         "./lib/components/XFormRowCol/XFormCol",
         "./lib/components/XFormRowCol/XFormInlineRow",

package/lib/administration/XParamBrowse.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { XBrowseProps } from "../components/XLazyDataTable/XLazyDataTable";
+import { XCustomFilter } from "../serverApi/FindParam";
+export declare const XParamBrowse: (props: XBrowseProps & {
+    customFilter?: XCustomFilter;
+}) => JSX.Element;

package/lib/administration/XParamBrowse.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XParamBrowse = void 0;
+var react_1 = __importDefault(require("react"));
+var XLazyDataTable_1 = require("../components/XLazyDataTable/XLazyDataTable");
+var XParamForm_1 = require("./XParamForm");
+var XParamBrowse = function (props) {
+    var onAddRow = function () {
+        // openForm pridavame automaticky v XFormNavigator3 pri renderovani komponentu
+        props.openForm(react_1.default.createElement(XParamForm_1.XParamForm, null));
+    };
+    var onEdit = function (selectedRow) {
+        // openForm pridavame automaticky v XFormNavigator3 pri renderovani komponentu
+        props.openForm(react_1.default.createElement(XParamForm_1.XParamForm, { id: selectedRow.id }));
+    };
+    return (react_1.default.createElement(XLazyDataTable_1.XLazyDataTable, { entity: "XParam", sortField: "id", rows: 30, customFilter: props.customFilter, onAddRow: onAddRow, onEdit: onEdit, removeRow: true, displayed: props.displayed },
+        react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "id", header: "ID", width: "8rem" }),
+        react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "code", header: "Code", width: "16rem" }),
+        react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "name", header: "Name", width: "45rem" }),
+        react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "value", header: "Value", width: "16rem" })));
+};
+exports.XParamBrowse = XParamBrowse;

package/lib/administration/XParamForm.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+import { XFormBaseModif } from "../components/XFormBaseModif";
+import { XObject } from "../components/XObject";
+export declare class XParamForm extends XFormBaseModif {
+    createNewObject(): XObject;
+    render(): JSX.Element;
+}

package/lib/administration/XParamForm.js

@@ -0,0 +1,60 @@
+"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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XParamForm = void 0;
+var react_1 = __importDefault(require("react"));
+var XFormBaseModif_1 = require("../components/XFormBaseModif");
+var XFormBase_1 = require("../components/XFormBase");
+var XInputDecimal_1 = require("../components/XInputDecimal");
+var XInputDate_1 = require("../components/XInputDate");
+var XInputText_1 = require("../components/XInputText");
+var XFormFooter_1 = require("../components/XFormFooter");
+var XParamForm = /** @class */ (function (_super) {
+    __extends(XParamForm, _super);
+    function XParamForm() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    XParamForm.prototype.createNewObject = function () {
+        return { version: 0 };
+    };
+    XParamForm.prototype.render = function () {
+        return (react_1.default.createElement("div", null,
+            react_1.default.createElement("div", { className: "x-form-row" },
+                react_1.default.createElement("div", { className: "x-form-col" },
+                    react_1.default.createElement(XInputDecimal_1.XInputDecimal, { form: this, field: "id", label: "ID", readOnly: true }),
+                    react_1.default.createElement(XInputDate_1.XInputDate, { form: this, field: "modifDate", label: "Modified at", readOnly: true }),
+                    react_1.default.createElement(XInputText_1.XInputText, { form: this, field: "modifXUser.name", label: "Modified by", inputStyle: { width: '12.5rem' } }),
+                    react_1.default.createElement(XInputText_1.XInputText, { form: this, field: "code", label: "Code", inputStyle: { width: '16rem' } }),
+                    react_1.default.createElement(XInputText_1.XInputText, { form: this, field: "name", label: "Name", inputStyle: { width: '45rem' } }),
+                    react_1.default.createElement(XInputText_1.XInputText, { form: this, field: "value", label: "Value", inputStyle: { width: '45rem' } }))),
+            react_1.default.createElement(XFormFooter_1.XFormFooter, { form: this })));
+    };
+    XParamForm = __decorate([
+        (0, XFormBase_1.Form)("XParam")
+    ], XParamForm);
+    return XParamForm;
+}(XFormBaseModif_1.XFormBaseModif));
+exports.XParamForm = XParamForm;

package/lib/components/XAutoCompleteBase.js

@@ -614,39 +614,12 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         return itemTemplate;
     };
     XAutoCompleteBase.prototype.computeDefaultDisplayValue = function (suggestion) {
-        var e_2, _a;
-        var displayValue = "";
+        var displayValue;
         if (XAutoCompleteBase.isMoreSuggestions(suggestion)) {
             displayValue = suggestion;
         }
         else {
-            try {
-                for (var _b = __values(this.getFields()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var field = _c.value;
-                    // TODO - konverzie na spravny typ/string
-                    var _d = __read(XUtilsCommon_1.XUtilsCommon.getPrefixAndField(field), 2), prefix = _d[0], fieldOnly = _d[1];
-                    var value = XUtilsCommon_1.XUtilsCommon.getValueByPath(suggestion, fieldOnly);
-                    if (value !== null && value !== undefined) {
-                        var valueStr = value.toString(); // TODO - spravnu konverziu
-                        if (valueStr !== "") {
-                            if (displayValue !== "") {
-                                displayValue += " ";
-                            }
-                            if (prefix) {
-                                displayValue += prefix;
-                            }
-                            displayValue += valueStr;
-                        }
-                    }
-                }
-            }
-            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; }
-            }
+            displayValue = XUtilsCommon_1.XUtilsCommon.createDisplayValue(suggestion, this.getFields());
         }
         return displayValue;
     };

package/lib/components/XFormComponent.d.ts

@@ -11,6 +11,7 @@ export interface XFormComponentProps<T> {
     form: XFormBase;
     label?: string;
     tooltip?: string;
+    placeholder?: string;
     readOnly?: XReadOnlyProp;
     labelStyle?: React.CSSProperties;
     inline?: boolean;

package/lib/components/XInputText.js

@@ -63,7 +63,7 @@ var XInputText = /** @class */ (function (_super) {
         var label = this.getLabel();
         return (react_1.default.createElement("div", { className: "field grid" },
             label !== undefined ? react_1.default.createElement("label", { htmlFor: this.props.field, className: "col-fixed", style: this.getLabelStyle() }, label) : null,
-            react_1.default.createElement(inputtext_1.InputText, __assign({ id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), maxLength: this.xField.length, size: size, style: this.props.inputStyle }, this.getClassNameTooltip(), { onBlur: this.onBlur }))));
+            react_1.default.createElement(inputtext_1.InputText, __assign({ id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), maxLength: this.xField.length, size: size, style: this.props.inputStyle }, this.getClassNameTooltip(), { onBlur: this.onBlur, placeholder: this.props.placeholder }))));
     };
     return XInputText;
 }(XInput_1.XInput));

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

@@ -15,6 +15,10 @@ export interface XAppButtonForRow {
     label: string;
     onClick: (selectedRow: any) => void;
 }
+export interface XOptionalCustomFilter {
+    label: string;
+    filter: XCustomFilter;
+}
 export interface XEditModeHandlers {
     onStart: () => void;
     onSave: () => void;
@@ -52,6 +56,7 @@ export interface XLazyDataTableProps {
     appButtons?: any;
     filters?: DataTableFilterMeta;
     customFilter?: XCustomFilter;
+    optionalCustomFilters?: XOptionalCustomFilter[];
     sortField?: string | DataTableSortMeta[];
     fullTextSearch: boolean | string[];
     fields?: string[];
@@ -62,6 +67,7 @@ export interface XLazyDataTableProps {
     width?: string;
     rowClassName?: (data: any) => object | string | undefined;
     dataLoadedState?: [boolean, React.Dispatch<React.SetStateAction<boolean>>];
+    exportFieldsToDuplicateValues?: string[];
     editMode?: boolean;
     editModeHandlers?: XEditModeHandlers;
     displayed?: boolean;

package/lib/components/XLazyDataTable/XLazyDataTable.js

@@ -130,6 +130,7 @@ var editor_1 = require("primereact/editor");
 var XMultilineSwitch_1 = require("./XMultilineSwitch");
 var XMultilineRenderer_1 = require("./XMultilineRenderer");
 var XHtmlRenderer_1 = require("./XHtmlRenderer");
+var XOcfDropdown_1 = require("./XOcfDropdown");
 var XLazyDataTable = function (props) {
     var _a;
     // must be here, is used in createInitFilters()
@@ -239,14 +240,16 @@ var XLazyDataTable = function (props) {
     var _f = __read((0, react_1.useState)(filtersInit), 2), filters = _f[0], setFilters = _f[1]; // filtrovanie na "controlled manner" (moze sa sem nainicializovat nejaka hodnota)
     var initFtsInputValue = props.fullTextSearch ? createInitFtsInputValue() : undefined;
     var _g = __read((0, react_1.useState)(initFtsInputValue), 2), ftsInputValue = _g[0], setFtsInputValue = _g[1];
-    var _h = __read((0, react_1.useState)(props.multilineSwitchInitValue), 2), multilineSwitchValue = _h[0], setMultilineSwitchValue = _h[1];
-    var _j = __read((0, react_1.useState)(XUtils_1.XUtils.createMultiSortMeta(props.sortField)), 2), multiSortMeta = _j[0], setMultiSortMeta = _j[1];
-    var _k = __read((0, react_1.useState)(null), 2), selectedRow = _k[0], setSelectedRow = _k[1];
-    var _l = __read((_a = props.dataLoadedState) !== null && _a !== void 0 ? _a : (0, react_1.useState)(false), 2), dataLoaded = _l[0], setDataLoaded = _l[1]; // priznak kde si zapiseme, ci uz sme nacitali data
-    var _m = __read((0, react_1.useState)(false), 2), exportRowsDialogOpened = _m[0], setExportRowsDialogOpened = _m[1];
-    var _o = __read((0, react_1.useState)(), 2), exportRowsDialogRowCount = _o[0], setExportRowsDialogRowCount = _o[1]; // param pre dialog
-    var _p = __read((0, react_1.useState)(filtersInit), 2), filtersAfterFiltering = _p[0], setFiltersAfterFiltering = _p[1]; // sem si odkladame stav filtra po kliknuti na button Filter (chceme exportovat presne to co vidno vyfiltrovane)
-    var _q = __read((0, react_1.useState)(initFtsInputValue), 2), ftsInputValueAfterFiltering = _q[0], setFtsInputValueAfterFiltering = _q[1]; // tak isto ako filtersAfterFiltering
+    var _h = __read((0, react_1.useState)(undefined), 2), optionalCustomFilter = _h[0], setOptionalCustomFilter = _h[1];
+    var _j = __read((0, react_1.useState)(props.multilineSwitchInitValue), 2), multilineSwitchValue = _j[0], setMultilineSwitchValue = _j[1];
+    var _k = __read((0, react_1.useState)(XUtils_1.XUtils.createMultiSortMeta(props.sortField)), 2), multiSortMeta = _k[0], setMultiSortMeta = _k[1];
+    var _l = __read((0, react_1.useState)(null), 2), selectedRow = _l[0], setSelectedRow = _l[1];
+    var _m = __read((_a = props.dataLoadedState) !== null && _a !== void 0 ? _a : (0, react_1.useState)(false), 2), dataLoaded = _m[0], setDataLoaded = _m[1]; // priznak kde si zapiseme, ci uz sme nacitali data
+    var _o = __read((0, react_1.useState)(false), 2), exportRowsDialogOpened = _o[0], setExportRowsDialogOpened = _o[1];
+    var _p = __read((0, react_1.useState)(), 2), exportRowsDialogRowCount = _p[0], setExportRowsDialogRowCount = _p[1]; // param pre dialog
+    var _q = __read((0, react_1.useState)(filtersInit), 2), filtersAfterFiltering = _q[0], setFiltersAfterFiltering = _q[1]; // sem si odkladame stav filtra po kliknuti na button Filter (chceme exportovat presne to co vidno vyfiltrovane)
+    var _r = __read((0, react_1.useState)(initFtsInputValue), 2), ftsInputValueAfterFiltering = _r[0], setFtsInputValueAfterFiltering = _r[1]; // tak isto ako filtersAfterFiltering
+    var _s = __read((0, react_1.useState)(undefined), 2), optionalCustomFilterAfterFiltering = _s[0], setOptionalCustomFilterAfterFiltering = _s[1]; // tak isto ako filtersAfterFiltering
     // parameter [] zabezpeci ze sa metoda zavola len po prvom renderingu (a nie po kazdej zmene stavu (zavolani setNieco()))
     (0, react_1.useEffect)(function () {
         // jednoduchy sposob - nepouzivame parameter props.displayed a priznak dataLoaded
@@ -276,10 +279,13 @@ var XLazyDataTable = function (props) {
     // TODO - preco je to tu? presunut dole ak sa da...
     var dataKey = props.dataKey !== undefined ? props.dataKey : XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity).idField;
     var onPage = function (event) { return __awaiter(void 0, void 0, void 0, function () {
+        var findParam;
         return __generator(this, function (_a) {
             //console.log("zavolany onPage");
             setFirst(event.first);
-            loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: event.first, rows: rows, filters: filters, fullTextSearch: createXFullTextSearch(ftsInputValue), customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+            findParam = createFindParam();
+            findParam.first = event.first; // prepiseme first, lebo je tam stara hodnota (volanie setFirst nezmeni first hned)
+            loadDataBase(findParam);
             return [2 /*return*/];
         });
     }); };
@@ -293,7 +299,9 @@ var XLazyDataTable = function (props) {
         //console.log("zavolany onSort - this.state.multiSortMeta = " + JSON.stringify(multiSortMeta));
         //console.log("zavolany onSort - event.multiSortMeta = " + JSON.stringify(event.multiSortMeta));
         setMultiSortMeta(event.multiSortMeta);
-        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, fullTextSearch: createXFullTextSearch(ftsInputValue), customFilterItems: customFilterItems, multiSortMeta: event.multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+        var findParam = createFindParam();
+        findParam.multiSortMeta = event.multiSortMeta; // prepiseme multiSortMeta, lebo je tam stara hodnota (volanie setMultiSortMeta nezmeni multiSortMeta hned)
+        loadDataBase(findParam);
     };
     var onClickFilter = function () {
         //console.log("zavolany onClickFilter");
@@ -306,9 +314,26 @@ var XLazyDataTable = function (props) {
         if (ftsInputValue) {
             setFtsInputValue(createInitFtsInputValue());
         }
+        if (props.optionalCustomFilters) {
+            setOptionalCustomFilter(undefined);
+        }
     };
     var loadData = function () {
-        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, fullTextSearch: createXFullTextSearch(ftsInputValue), customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+        loadDataBase(createFindParam());
+    };
+    var createFindParam = function () {
+        return {
+            resultType: FindParam_1.ResultType.RowCountAndPagedRows,
+            first: first,
+            rows: rows,
+            filters: filters,
+            fullTextSearch: createXFullTextSearch(ftsInputValue),
+            customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilter),
+            multiSortMeta: multiSortMeta,
+            entity: props.entity,
+            fields: getFields(true),
+            aggregateItems: aggregateItems
+        };
     };
     var loadDataBase = function (findParam) { return __awaiter(void 0, void 0, void 0, function () {
         var findResult;
@@ -325,6 +350,7 @@ var XLazyDataTable = function (props) {
                     // odlozime si filter hodnoty pre pripadny export - deep cloning vyzera ze netreba
                     setFiltersAfterFiltering(filters);
                     setFtsInputValueAfterFiltering(ftsInputValue ? __assign({}, ftsInputValue) : undefined);
+                    setOptionalCustomFilterAfterFiltering(optionalCustomFilter);
                     return [2 /*return*/];
             }
         });
@@ -353,7 +379,10 @@ var XLazyDataTable = function (props) {
         }
         return xFullTextSearch;
     };
-    var getFields = function () {
+    var createXCustomFilterItems = function (customFilterItems, optionalCustomFilter) {
+        return XUtils_1.XUtils.filterAnd(customFilterItems, optionalCustomFilter === null || optionalCustomFilter === void 0 ? void 0 : optionalCustomFilter.filter);
+    };
+    var getFields = function (addPropsFields) {
         // krasne zobrazi cely objekt!
         //console.log(dataTableEl.current);
         var e_3, _a;
@@ -372,8 +401,10 @@ var XLazyDataTable = function (props) {
             }
             finally { if (e_3) throw e_3.error; }
         }
-        if (props.fields) {
-            fields.push.apply(fields, __spreadArray([], __read(props.fields), false));
+        if (addPropsFields) {
+            if (props.fields) {
+                fields.push.apply(fields, __spreadArray([], __read(props.fields), false));
+            }
         }
         return fields;
     };
@@ -504,7 +535,18 @@ var XLazyDataTable = function (props) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    findParam = { resultType: FindParam_1.ResultType.OnlyRowCount, first: first, rows: rows, filters: filtersAfterFiltering, fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering), customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems };
+                    findParam = {
+                        resultType: FindParam_1.ResultType.OnlyRowCount,
+                        first: first,
+                        rows: rows,
+                        filters: filtersAfterFiltering,
+                        fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering),
+                        customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilterAfterFiltering),
+                        multiSortMeta: multiSortMeta,
+                        entity: props.entity,
+                        fields: getFields(false),
+                        aggregateItems: aggregateItems
+                    };
                     return [4 /*yield*/, findByFilter(findParam)];
                 case 1:
                     findResult = _a.sent();
@@ -516,7 +558,15 @@ var XLazyDataTable = function (props) {
         });
     }); };
     var createExportParams = function () {
-        var queryParam = { filters: filtersAfterFiltering, fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering), customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() };
+        var queryParam = {
+            filters: filtersAfterFiltering,
+            fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering),
+            customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilterAfterFiltering),
+            multiSortMeta: multiSortMeta,
+            entity: props.entity,
+            fields: getFields(false),
+            fieldsToDuplicateValues: props.exportFieldsToDuplicateValues
+        };
         return {
             path: "x-lazy-data-table-export",
             queryParam: queryParam,
@@ -902,12 +952,13 @@ var XLazyDataTable = function (props) {
         }
         return react_1.default.createElement(column_1.Column, { field: childColumn.props.field, header: header, footer: footer, filter: true, sortable: true, filterElement: filterElement, dataType: dataType, showFilterMenu: showFilterMenu, showClearButton: showClearButton, body: body, headerStyle: headerStyle, align: align });
     });
-    // align-items-center centruje vertikalne (posuva smerom doulu do stredu)
+    // align-items-center centruje vertikalne (posuva smerom dolu do stredu)
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "flex justify-content-center align-items-center" },
             ftsInputValue ? react_1.default.createElement(XFtsInput_1.XFtsInput, { value: ftsInputValue, onChange: function (value) { return setFtsInputValue(value); } }) : null,
             react_1.default.createElement(XButton_1.XButton, { key: "filter", label: (0, XLocale_1.xLocaleOption)('filter'), onClick: onClickFilter }),
             react_1.default.createElement(XButton_1.XButton, { key: "clearFilter", label: (0, XLocale_1.xLocaleOption)('clearFilter'), onClick: onClickClearFilter }),
+            props.optionalCustomFilters ? react_1.default.createElement(XOcfDropdown_1.XOcfDropdown, { optionalCustomFilters: props.optionalCustomFilters, value: optionalCustomFilter, onChange: function (value) { return setOptionalCustomFilter(value); }, className: "m-1" }) : null,
             props.multilineSwitch ? react_1.default.createElement(XMultilineSwitch_1.XMultilineSwitch, { value: multilineSwitchValue, onChange: function (value) { return setMultilineSwitchValue(value); }, className: "m-1" }) : null),
         react_1.default.createElement("div", { className: "flex justify-content-center" },
             react_1.default.createElement(datatable_1.DataTable, { value: value.rowList, dataKey: dataKey, paginator: props.paginator, rows: rows, totalRecords: value.totalRecords, lazy: true, first: first, onPage: onPage, loading: loading, filterDisplay: props.filterDisplay, filters: filters, onFilter: onFilter, sortMode: "multiple", removableSort: true, multiSortMeta: multiSortMeta, onSort: onSort, selectionMode: "single", selection: selectedRow, onSelectionChange: onSelectionChange, onRowDoubleClick: onRowDoubleClick, rowClassName: props.rowClassName, ref: dataTableEl, className: "p-datatable-sm x-lazy-datatable", resizableColumns: true, columnResizeMode: "expand", tableStyle: tableStyle, paginatorLeft: paginatorLeft, paginatorRight: paginatorRight, scrollable: props.scrollable, scrollHeight: scrollHeight, style: style }, columnElemList)),

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { XOptionalCustomFilter } from "./XLazyDataTable";
+export declare const XOcfDropdown: (props: {
+    optionalCustomFilters: XOptionalCustomFilter[];
+    value: XOptionalCustomFilter | undefined;
+    onChange: (value: XOptionalCustomFilter | undefined) => void;
+    className?: string | undefined;
+}) => JSX.Element;

package/lib/components/XLazyDataTable/XOcfDropdown.js

@@ -0,0 +1,52 @@
+"use strict";
+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;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XOcfDropdown = void 0;
+var react_1 = __importDefault(require("react"));
+var dropdown_1 = require("primereact/dropdown");
+var XOcfDropdown = function (props) {
+    var onChange = function (e) {
+        var value;
+        // specialna null polozka nema ziadne atributy
+        if (Object.keys(e.value).length === 0) {
+            value = undefined;
+        }
+        else {
+            value = e.value;
+        }
+        props.onChange(value);
+    };
+    // pridame prazdnu polozku
+    // polozku pridavame do kopie zoznamu, lebo inac sa nam "polozka" v props.optionalCustomFilters "mnozi"
+    var options = __spreadArray([], __read(props.optionalCustomFilters), false);
+    options.splice(0, 0, {});
+    return (react_1.default.createElement(dropdown_1.Dropdown, { options: options, optionLabel: "label", value: props.value, onChange: onChange, className: props.className }));
+};
+exports.XOcfDropdown = XOcfDropdown;

package/lib/serverApi/ExportImportParam.d.ts

@@ -16,6 +16,7 @@ export interface LazyDataTableQueryParam {
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields: string[];
+    fieldsToDuplicateValues?: string[];
 }
 export declare enum CsvSeparator {
     Semicolon = ";",

package/lib/serverApi/XUtilsCommon.d.ts

@@ -9,10 +9,14 @@ export declare class XUtilsCommon {
     static getPathToAssocAndField(path: string): [string | null, string];
     static isSingleField(path: string): boolean;
     static getPrefixAndField(path: string): [string | null, string];
+    static createDisplayValue(object: any, fields: string[]): string;
     static objectAsJSON(value: any): string;
     static arrayCreateMap<ID, T>(array: T[], idField: string): Map<ID, T>;
     static getDayName(date: Date | null | undefined): string | undefined;
     static dateAddDays(date: Date | null, days: number): Date | null;
+    static dateAddMonths(date: Date | null, months: number): Date | null;
+    static dateEquals(date1: Date | null, date2: Date | null): boolean;
+    static dateDiffInYears(dateOld: Date | null, dateNew: Date | null): number | null;
     static findFirstMatch(pattern: RegExp, value: string): string | null;
     static sqlMaxDateIfNull(sqlExp: string): string;
     static today(): Date;

package/lib/serverApi/XUtilsCommon.js

@@ -168,6 +168,38 @@ var XUtilsCommon = /** @class */ (function () {
             return [prefix, pathOnly];
         }
     };
+    XUtilsCommon.createDisplayValue = function (object, fields) {
+        var e_2, _a;
+        var displayValue = "";
+        try {
+            for (var fields_1 = __values(fields), fields_1_1 = fields_1.next(); !fields_1_1.done; fields_1_1 = fields_1.next()) {
+                var field = fields_1_1.value;
+                // TODO - konverzie na spravny typ/string
+                var _b = __read(XUtilsCommon.getPrefixAndField(field), 2), prefix = _b[0], fieldOnly = _b[1];
+                var value = XUtilsCommon.getValueByPath(object, fieldOnly);
+                if (value !== null && value !== undefined) {
+                    var valueStr = value.toString(); // TODO - spravnu konverziu
+                    if (valueStr !== "") {
+                        if (displayValue !== "") {
+                            displayValue += " ";
+                        }
+                        if (prefix) {
+                            displayValue += prefix;
+                        }
+                        displayValue += valueStr;
+                    }
+                }
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (fields_1_1 && !fields_1_1.done && (_a = fields_1.return)) _a.call(fields_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return displayValue;
+    };
     XUtilsCommon.objectAsJSON = function (value) {
         // sem treba dat nejaku pre nas vhodnu serializaciu
         // zatial provizorne robene cez antipatern - modifikaciu prototype funcii primitivnych typov
@@ -191,7 +223,7 @@ var XUtilsCommon = /** @class */ (function () {
         return json;
     };
     XUtilsCommon.arrayCreateMap = function (array, idField) {
-        var e_2, _a;
+        var e_3, _a;
         var idRowMap = new Map();
         try {
             for (var array_1 = __values(array), array_1_1 = array_1.next(); !array_1_1.done; array_1_1 = array_1.next()) {
@@ -201,12 +233,12 @@ var XUtilsCommon = /** @class */ (function () {
                 }
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
                 if (array_1_1 && !array_1_1.done && (_a = array_1.return)) _a.call(array_1);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         return idRowMap;
     };
@@ -222,6 +254,49 @@ var XUtilsCommon = /** @class */ (function () {
         }
         return result;
     };
+    XUtilsCommon.dateAddMonths = function (date, months) {
+        var result = null;
+        if (date !== null) {
+            result = new Date(date);
+            result.setMonth(result.getMonth() + months);
+        }
+        return result;
+    };
+    // helper method, because date1 === date2 compares pointers, not values (Date is not primitive type like string or number)
+    XUtilsCommon.dateEquals = function (date1, date2) {
+        var result = false;
+        if (date1 === null && date2 === null) {
+            result = true;
+        }
+        else if (date1 !== null && date2 !== null) {
+            result = (date1.getTime() === date2.getTime());
+        }
+        return result;
+    };
+    // solution from internet
+    XUtilsCommon.dateDiffInYears = function (dateOld, dateNew) {
+        var diff = null;
+        if (dateOld !== null && dateNew !== null) {
+            var yearNew = dateNew.getFullYear();
+            var monthNew = dateNew.getMonth();
+            var dayNew = dateNew.getDate();
+            var yearOld = dateOld.getFullYear();
+            var monthOld = dateOld.getMonth();
+            var dayOld = dateOld.getDate();
+            diff = yearNew - yearOld;
+            if (monthOld > monthNew) {
+                diff--;
+            }
+            else {
+                if (monthOld === monthNew) {
+                    if (dayOld > dayNew) {
+                        diff--;
+                    }
+                }
+            }
+        }
+        return diff;
+    };
     XUtilsCommon.findFirstMatch = function (pattern, value) {
         var match = pattern.exec(value);
         return match != null ? match[0] : null;

package/lib/serverApi/XUtilsConversions.d.ts

@@ -19,7 +19,8 @@ export declare function intervalAsUI(valueInterval: IPostgresInterval | null): s
 export declare function booleanAsUIText(value: boolean | null): string;
 export declare enum AsUIType {
     Form = 1,
-    Text = 2
+    Text = 2,
+    Excel = 3
 }
 /**
  * converts values of object
@@ -31,3 +32,4 @@ export declare enum AsUIType {
  */
 export declare function convertObject(entity: string, object: any, fromModel: boolean, asUI: AsUIType | undefined): void;
 export declare function convertValue(xField: XField, value: any, fromModel: boolean, asUI: AsUIType | undefined): any;
+export declare function convertValueBase(fieldType: string, fractionDigits: number | undefined, value: any, fromModel: boolean, asUI: AsUIType | undefined): any;

package/lib/serverApi/XUtilsConversions.js

@@ -27,7 +27,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertValue = exports.convertObject = exports.AsUIType = exports.booleanAsUIText = exports.intervalAsUI = exports.intervalFromUI = exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromUI = exports.dateFromModel = exports.numberFromModel = exports.numberAsUI = exports.intFromUI = exports.stringAsDB = exports.stringAsUI = exports.stringFromUI = void 0;
+exports.convertValueBase = exports.convertValue = exports.convertObject = exports.AsUIType = exports.booleanAsUIText = exports.intervalAsUI = exports.intervalFromUI = exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromUI = exports.dateFromModel = exports.numberFromModel = exports.numberAsUI = exports.intFromUI = exports.stringAsDB = exports.stringAsUI = exports.stringFromUI = void 0;
 var XUtilsCommon_1 = require("./XUtilsCommon");
 var XLocale_1 = require("../components/XLocale");
 var XUtilsMetadataCommon_1 = require("./XUtilsMetadataCommon");
@@ -284,7 +284,8 @@ exports.booleanAsUIText = booleanAsUIText;
 var AsUIType;
 (function (AsUIType) {
     AsUIType[AsUIType["Form"] = 1] = "Form";
-    AsUIType[AsUIType["Text"] = 2] = "Text"; // reporty - boolean sa konvertuje na ano/nie
+    AsUIType[AsUIType["Text"] = 2] = "Text";
+    AsUIType[AsUIType["Excel"] = 3] = "Excel"; // excel - nie vsetko konvertujeme do string-u, vecsinou zostavame pri typoch number, Date
 })(AsUIType = exports.AsUIType || (exports.AsUIType = {}));
 /**
  * converts values of object
@@ -345,23 +346,27 @@ function convertObject(entity, object, fromModel, asUI) {
 }
 exports.convertObject = convertObject;
 function convertValue(xField, value, fromModel, asUI) {
-    if (xField.type === "decimal") {
+    return convertValueBase(xField.type, xField.scale, value, fromModel, asUI);
+}
+exports.convertValue = convertValue;
+function convertValueBase(fieldType, fractionDigits, value, fromModel, asUI) {
+    if (fieldType === "decimal") {
         if (fromModel) {
             value = numberFromModel(value);
         }
-        if (asUI) {
-            value = numberAsUI(value, xField.scale);
+        if (asUI && asUI !== AsUIType.Excel) {
+            value = numberAsUI(value, fractionDigits);
         }
     }
-    else if (xField.type === "date") {
+    else if (fieldType === "date") {
         if (fromModel) {
             value = dateFromModel(value);
         }
-        if (asUI) {
+        if (asUI && asUI !== AsUIType.Excel) {
             value = dateAsUI(value);
         }
     }
-    else if (xField.type === "datetime") {
+    else if (fieldType === "datetime") {
         if (fromModel) {
             value = dateFromModel(value);
         }
@@ -369,25 +374,25 @@ function convertValue(xField, value, fromModel, asUI) {
             value = datetimeAsUI(value);
         }
     }
-    else if (xField.type === "interval") {
+    else if (fieldType === "interval") {
         // konverziu z modelu (json objekt-u) netreba
         if (asUI) {
             value = intervalAsUI(value);
         }
     }
-    else if (xField.type === "boolean") {
+    else if (fieldType === "boolean") {
         // konverziu z modelu (json objekt-u) netreba
         // pre AsUIType.Form ponechame typ boolean (spracujeme neskor)
-        if (asUI === AsUIType.Text) {
+        if (asUI === AsUIType.Text || asUI === AsUIType.Excel) {
             value = booleanAsUIText(value);
         }
     }
     else {
         // vsetko ostatne
-        if (asUI) {
-            value = value ? value.toString() : "";
+        if (asUI && asUI !== AsUIType.Excel) {
+            value = (value !== null && value !== undefined) ? value.toString() : "";
         }
     }
     return value;
 }
-exports.convertValue = convertValue;
+exports.convertValueBase = convertValueBase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.20.0",
+  "version": "1.21.0",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",