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

package/XFormHeader.d.ts

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

package/XFormHeader.js

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

package/gulpfile.js

@@ -53,6 +53,7 @@ function generateApi(cb) {
         "./lib/components/XFormBaseT",
         "./lib/components/XFormDataTable2",
         "./lib/components/XFormFooter",
+        "./lib/components/XFormHeader",
         "./lib/components/XFormNavigator3",
         "./lib/components/XHolders",
         "./lib/components/XInputDate",

package/lib/administration/XParamBrowse.js

@@ -16,7 +16,7 @@ var XParamBrowse = function (props) {
         // 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 },
+    return (react_1.default.createElement(XLazyDataTable_1.XLazyDataTable, { entity: "XParam", label: "Parameters", 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" }),

package/lib/administration/XParamForm.js

@@ -32,6 +32,7 @@ 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 XFormHeader_1 = require("../components/XFormHeader");
 var XParamForm = /** @class */ (function (_super) {
     __extends(XParamForm, _super);
     function XParamForm() {
@@ -42,6 +43,7 @@ var XParamForm = /** @class */ (function (_super) {
     };
     XParamForm.prototype.render = function () {
         return (react_1.default.createElement("div", null,
+            react_1.default.createElement(XFormHeader_1.XFormHeader, { label: "Parameter" }),
             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 }),

package/lib/administration/XUserBrowse.js

@@ -75,7 +75,7 @@ var XUserBrowse = function (props) {
             }
         });
     }); };
-    return (react_1.default.createElement(XLazyDataTable_1.XLazyDataTable, { entity: "XUser", rows: 10, onAddRow: onAddRow, onEdit: onEdit, removeRow: onRemoveRow, displayed: props.displayed },
+    return (react_1.default.createElement(XLazyDataTable_1.XLazyDataTable, { entity: "XUser", label: "Users", rows: 10, onAddRow: onAddRow, onEdit: onEdit, removeRow: onRemoveRow, displayed: props.displayed },
         react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "id", header: "ID" }),
         react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "username", header: "Username", width: "17rem" }),
         react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "name", header: "Name", width: "17rem" }),

package/lib/administration/XUserForm.js

@@ -75,6 +75,7 @@ var XCheckbox_1 = require("../components/XCheckbox");
 var XEnvVars_1 = require("../components/XEnvVars");
 var XFormBaseModif_1 = require("../components/XFormBaseModif");
 var XInputDate_1 = require("../components/XInputDate");
+var XFormHeader_1 = require("../components/XFormHeader");
 var XUserForm = /** @class */ (function (_super) {
     __extends(XUserForm, _super);
     function XUserForm(props) {
@@ -100,8 +101,9 @@ var XUserForm = /** @class */ (function (_super) {
             var e_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!this.validateSave()) {
+                    case 0: return [4 /*yield*/, this.validateSave()];
+                    case 1:
+                        if (!(_a.sent())) {
                             return [2 /*return*/];
                         }
                         // v deme nedovolime zmenit uzivatelov ktori sa pouzivaju na skusanie dema
@@ -134,18 +136,18 @@ var XUserForm = /** @class */ (function (_super) {
                             }
                         }
                         this.preSave(this.state.object);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, XUtils_1.XUtils.post('userSaveRow', { entity: this.getEntity(), object: this.state.object })];
+                        _a.label = 2;
                     case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, XUtils_1.XUtils.post('userSaveRow', { entity: this.getEntity(), object: this.state.object })];
                     case 3:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
                         e_1 = _a.sent();
                         XUtils_1.XUtils.showErrorMessage("Save row failed.", e_1);
                         return [2 /*return*/]; // zostavame vo formulari
-                    case 4:
+                    case 5:
                         this.props.openForm(null); // save zbehol, ideme naspet do browsu
                         return [2 /*return*/];
                 }
@@ -167,6 +169,7 @@ var XUserForm = /** @class */ (function (_super) {
             ];
         }
         return (react_1.default.createElement("div", null,
+            react_1.default.createElement(XFormHeader_1.XFormHeader, { label: "User" }),
             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, labelStyle: { width: '14rem' } }),

package/lib/components/XCalendar.d.ts

@@ -1,9 +1,16 @@
 /// <reference types="react" />
-export declare const XCalendar: (props: {
-    id?: string | undefined;
-    value: Date | null;
-    onChange: (value: Date | null) => void;
-    readOnly?: boolean | undefined;
-    error?: string | undefined;
-    datetime?: boolean | undefined;
-}) => JSX.Element;
+import { XDateScale } from "../serverApi/XUtilsConversions";
+export declare const XCalendar: {
+    (props: {
+        id?: string | undefined;
+        value: Date | null;
+        onChange: (value: Date | null) => void;
+        readOnly?: boolean | undefined;
+        error?: string | undefined;
+        scale: XDateScale;
+        datetime?: boolean | undefined;
+    }): JSX.Element;
+    defaultProps: {
+        scale: XDateScale;
+    };
+};

package/lib/components/XCalendar.js

@@ -84,7 +84,7 @@ var XCalendar = function (props) {
     var onBlur = function (e) {
         if (inputChanged) {
             // poznamka: e.target.value aj inputValueState obsahuju tu istu string hodnotu
-            var value = (0, XUtilsConversions_1.dateFromUI)(e.target.value);
+            var value = (0, XUtilsConversions_1.dateFromUI)(e.target.value, props.scale);
             props.onChange(value !== null && value !== void 0 ? value : null); // nekorektnu hodnotu reprezentovanu cez undefined budeme riesit akokeby user zadal null (field sa vyprazdni)
             setInputChanged(false);
             setInputValueState(undefined); // pre poriadok
@@ -100,9 +100,28 @@ var XCalendar = function (props) {
         }
         return inputValue;
     };
+    var getView = function (dateScale) {
+        var view;
+        if (dateScale === XUtilsConversions_1.XDateScale.Date) {
+            view = "date";
+        }
+        else if (dateScale === XUtilsConversions_1.XDateScale.Month) {
+            view = "month";
+        }
+        else if (dateScale === XUtilsConversions_1.XDateScale.Year) {
+            view = "year";
+        }
+        else {
+            throw "Unimplemented dateScale = " + dateScale;
+        }
+        return view;
+    };
     var datetime = (_a = props.datetime) !== null && _a !== void 0 ? _a : false;
     // poznamka: parseDateTime nerobi ziadny parse, nechceme aby Calendar "rusil" uzivatela pri typovani datumu
     // konverzia (a volanie props.onChange) sa robi az pri onBlur
-    return (react_1.default.createElement(calendar_1.Calendar, __assign({ id: props.id, value: getInputValue(), onChange: onChange, disabled: props.readOnly, showIcon: true, showOnFocus: false, dateFormat: (0, XUtilsConversions_1.dateFormatCalendar)(), keepInvalid: true, parseDateTime: function (text) { return text; }, showTime: datetime, showSeconds: datetime, inputClassName: datetime ? 'x-input-datetime' : 'x-input-date', onSelect: onSelect, onBlur: onBlur }, XUtils_1.XUtils.createErrorProps(props.error))));
+    return (react_1.default.createElement(calendar_1.Calendar, __assign({ id: props.id, value: getInputValue(), onChange: onChange, disabled: props.readOnly, showIcon: true, showOnFocus: false, view: getView(props.scale), dateFormat: (0, XUtilsConversions_1.dateFormatCalendar)(props.scale), keepInvalid: true, parseDateTime: function (text) { return text; }, showTime: datetime, showSeconds: datetime, inputClassName: datetime ? 'x-input-datetime' : 'x-input-date', onSelect: onSelect, onBlur: onBlur }, XUtils_1.XUtils.createErrorProps(props.error))));
 };
 exports.XCalendar = XCalendar;
+exports.XCalendar.defaultProps = {
+    scale: XUtilsConversions_1.XDateScale.Date
+};

package/lib/components/XFormHeader.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+export declare const XFormHeader: (props: {
+    label: string;
+}) => JSX.Element;

package/lib/components/XFormHeader.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XFormHeader = void 0;
+var react_1 = __importDefault(require("react"));
+var XFormHeader = function (props) {
+    return (react_1.default.createElement("div", { className: "x-form-header" }, props.label));
+};
+exports.XFormHeader = XFormHeader;

package/lib/components/XInputDate.js

@@ -42,7 +42,7 @@ var XInputDate = /** @class */ (function (_super) {
         // 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(), error: this.getError(), datetime: this.xField.type === 'datetime' })));
+            react_1.default.createElement(XCalendar_1.XCalendar, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), error: this.getError(), scale: this.xField.scale, datetime: this.xField.type === 'datetime' })));
     };
     return XInputDate;
 }(XInput_1.XInput));

package/lib/components/XInputDateDT.js

@@ -37,7 +37,7 @@ var XInputDateDT = /** @class */ (function (_super) {
         this.onValueChangeBase(value, this.props.onChange);
     };
     XInputDateDT.prototype.render = function () {
-        return (react_1.default.createElement(XCalendar_1.XCalendar, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), error: this.getError(), datetime: this.xField.type === 'datetime' }));
+        return (react_1.default.createElement(XCalendar_1.XCalendar, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), error: this.getError(), scale: this.xField.scale, datetime: this.xField.type === 'datetime' }));
     };
     return XInputDateDT;
 }(XInputDT_1.XInputDT));

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

@@ -1,15 +1,20 @@
 /// <reference types="react" />
 import { ExportType, LazyDataTableQueryParam } from "../../serverApi/ExportImportParam";
 export interface XExportParams {
-    path: string;
+    rowCount: number;
+    existsToManyAssoc: boolean;
     queryParam: LazyDataTableQueryParam | any;
-    headers?: string[];
+    headers: string[];
+    widths: string[];
+    fieldsToDuplicateValues?: string[];
     fileName: string;
 }
-export declare const XExportRowsDialog: (props: {
+export interface XExportRowsDialogState {
     dialogOpened: boolean;
+    exportParams?: XExportParams;
+}
+export declare const XExportRowsDialog: (props: {
+    dialogState: XExportRowsDialogState;
     hideDialog: () => void;
-    rowCount?: number;
     exportTypeOptions?: ExportType[];
-    exportParams: XExportParams | (() => XExportParams);
 }) => JSX.Element;

package/lib/components/XLazyDataTable/XExportRowsDialog.js

@@ -87,46 +87,65 @@ var XUtils_1 = require("../XUtils");
 var XUtilsConversions_1 = require("../../serverApi/XUtilsConversions");
 var XLocale_1 = require("../XLocale");
 var XExportRowsDialog = function (props) {
-    var _a, _b;
-    var _c = __read((0, react_1.useState)(ExportImportParam_1.ExportType.Csv), 2), exportType = _c[0], setExportType = _c[1];
-    var _d = __read((0, react_1.useState)(true), 2), createHeaderLine = _d[0], setCreateHeaderLine = _d[1];
-    var _e = __read((0, react_1.useState)(ExportImportParam_1.CsvSeparator.Semicolon), 2), csvSeparator = _e[0], setCsvSeparator = _e[1];
-    var _f = __read((0, react_1.useState)(ExportImportParam_1.CsvDecimalFormat.Comma), 2), decimalFormat = _f[0], setDecimalFormat = _f[1];
-    var _g = __read((0, react_1.useState)(ExportImportParam_1.CsvEncoding.Win1250), 2), csvEncoding = _g[0], setCsvEncoding = _g[1];
+    var _a, _b, _c, _d, _e;
+    var _f = __read((0, react_1.useState)(ExportImportParam_1.ExportType.Excel), 2), exportType = _f[0], setExportType = _f[1];
+    var _g = __read((0, react_1.useState)(true), 2), createHeaderLine = _g[0], setCreateHeaderLine = _g[1];
+    var _h = __read((0, react_1.useState)(ExportImportParam_1.XMultilineExportType.Multiline), 2), detailRowsExport = _h[0], setDetailRowsExport = _h[1];
+    var _j = __read((0, react_1.useState)(ExportImportParam_1.CsvSeparator.Semicolon), 2), csvSeparator = _j[0], setCsvSeparator = _j[1];
+    var _k = __read((0, react_1.useState)(ExportImportParam_1.CsvDecimalFormat.Comma), 2), decimalFormat = _k[0], setDecimalFormat = _k[1];
+    var _l = __read((0, react_1.useState)(ExportImportParam_1.CsvEncoding.Win1250), 2), csvEncoding = _l[0], setCsvEncoding = _l[1];
     // bez tejto metody by pri opetovnom otvoreni dialogu ponechal povodne hodnoty
     var onShow = function () {
-        setExportType(ExportImportParam_1.ExportType.Csv);
-        setCreateHeaderLine(true); // excel hadze hlasky koli prvemu riadku header-ov
+        setExportType(ExportImportParam_1.ExportType.Excel);
+        setCreateHeaderLine(true);
+        setDetailRowsExport(ExportImportParam_1.XMultilineExportType.Multiline);
         setCsvSeparator(ExportImportParam_1.CsvSeparator.Semicolon);
         setDecimalFormat(ExportImportParam_1.CsvDecimalFormat.Comma);
         setCsvEncoding(ExportImportParam_1.CsvEncoding.Win1250);
     };
     var onExport = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var exportParams, csvParam, exportParam, response, e_1, fileExt, fileName, respBlob, url, a;
+        var exportParams, apiPath, requestPayload, exportExcelParam, exportCsvParam, exportJsonParam, response, e_1, fileExt, fileName, respBlob, url, a;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     // export vykoname az po zatvoreni dialogu - moze dlho trvat a pobezi asynchronne (user zatial moze pracovat s aplikaciou)
                     // zavrieme dialog
                     props.hideDialog();
-                    if (typeof props.exportParams === 'function') {
-                        exportParams = props.exportParams();
+                    exportParams = props.dialogState.exportParams;
+                    if (exportType === ExportImportParam_1.ExportType.Excel) {
+                        apiPath = "x-lazy-data-table-export-excel";
+                        exportExcelParam = {
+                            queryParam: exportParams.queryParam,
+                            excelCsvParam: createExcelCsvParam(exportParams),
+                            widths: exportParams.widths
+                        };
+                        requestPayload = exportExcelParam;
                     }
-                    else {
-                        exportParams = props.exportParams;
+                    else if (exportType === ExportImportParam_1.ExportType.Csv) {
+                        apiPath = "x-lazy-data-table-export-csv";
+                        exportCsvParam = {
+                            queryParam: exportParams.queryParam,
+                            excelCsvParam: createExcelCsvParam(exportParams),
+                            csvParam: {
+                                csvSeparator: csvSeparator, csvDecimalFormat: decimalFormat, csvEncoding: csvEncoding
+                            }
+                        };
+                        requestPayload = exportCsvParam;
+                    }
+                    else if (exportType === ExportImportParam_1.ExportType.Json) {
+                        apiPath = "x-lazy-data-table-export-json";
+                        exportJsonParam = {
+                            queryParam: exportParams.queryParam
+                        };
+                        requestPayload = exportJsonParam;
                     }
-                    csvParam = undefined;
-                    if (exportType === ExportImportParam_1.ExportType.Csv) {
-                        csvParam = { useHeaderLine: createHeaderLine, csvSeparator: csvSeparator, csvDecimalFormat: decimalFormat, csvEncoding: csvEncoding };
-                        if (csvParam.useHeaderLine) {
-                            csvParam.headers = exportParams.headers;
-                        }
+                    else {
+                        throw "Unimplemented exportType = ".concat(exportType);
                     }
-                    exportParam = { exportType: exportType, csvParam: csvParam, queryParam: exportParams.queryParam };
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, XUtils_1.XUtils.fetchBasicJson(exportParams.path, exportParam)];
+                    return [4 /*yield*/, XUtils_1.XUtils.fetchBasicJson(apiPath, requestPayload)];
                 case 2:
                     response = _a.sent();
                     return [3 /*break*/, 4];
@@ -135,7 +154,7 @@ var XExportRowsDialog = function (props) {
                     XUtils_1.XUtils.showErrorMessage("Export failed.", e_1);
                     return [2 /*return*/];
                 case 4:
-                    fileExt = exportType;
+                    fileExt = exportType === ExportImportParam_1.ExportType.Excel ? "xlsx" : exportType;
                     fileName = "".concat(exportParams.fileName, ".").concat(fileExt);
                     return [4 /*yield*/, response.blob()];
                 case 5:
@@ -149,36 +168,52 @@ var XExportRowsDialog = function (props) {
             }
         });
     }); };
-    var elem = null;
-    if (props.dialogOpened) {
+    var createExcelCsvParam = function (exportParams) {
+        return {
+            headers: createHeaderLine ? exportParams.headers : undefined,
+            fieldsToDuplicateValues: exportParams.fieldsToDuplicateValues,
+            toManyAssocExport: detailRowsExport,
+            multilineTextExport: ExportImportParam_1.XMultilineExportType.Multiline // TODO - dorobit aj tuto dropdown kde si uzivatel vyberie ci chce mat v texte \n alebo nechce - aj na backende treba dorobit
+        };
+    };
+    var elem = [];
+    if (props.dialogState.dialogOpened) {
+        if (exportType === ExportImportParam_1.ExportType.Excel || exportType === ExportImportParam_1.ExportType.Csv) {
+            elem.push(react_1.default.createElement("div", { key: "expCreateHeaderLine", className: "field grid" },
+                react_1.default.createElement("label", { className: "col-fixed", style: { width: '12rem' } }, (0, XLocale_1.xLocaleOption)('expCreateHeaderLine')),
+                react_1.default.createElement(checkbox_1.Checkbox, { checked: createHeaderLine, onChange: function (e) { return setCreateHeaderLine(e.checked); } })));
+            if ((_a = props.dialogState.exportParams) === null || _a === void 0 ? void 0 : _a.existsToManyAssoc) {
+                elem.push(react_1.default.createElement("div", { key: "expDetailRowsExport", className: "field grid" },
+                    react_1.default.createElement("label", { className: "col-fixed", style: { width: '12rem' } }, (0, XLocale_1.xLocaleOption)('expDetailRowsExport')),
+                    react_1.default.createElement(dropdown_1.Dropdown, { value: detailRowsExport, options: XUtils_1.XUtils.multilineExportTypeOptions, onChange: function (e) { return setDetailRowsExport(e.value); } })));
+            }
+        }
         if (exportType === ExportImportParam_1.ExportType.Csv) {
-            elem = react_1.default.createElement("span", null,
-                react_1.default.createElement("div", { className: "field grid" },
-                    react_1.default.createElement("label", { className: "col-fixed", style: { width: '10rem' } }, (0, XLocale_1.xLocaleOption)('expCreateHeaderLine')),
-                    react_1.default.createElement(checkbox_1.Checkbox, { checked: createHeaderLine, onChange: function (e) { return setCreateHeaderLine(e.checked); } })),
-                react_1.default.createElement("div", { className: "field grid" },
-                    react_1.default.createElement("label", { className: "col-fixed", style: { width: '10rem' } }, (0, XLocale_1.xLocaleOption)('expCsvSeparator')),
+            elem.push([
+                react_1.default.createElement("div", { key: "expCsvSeparator", className: "field grid" },
+                    react_1.default.createElement("label", { className: "col-fixed", style: { width: '12rem' } }, (0, XLocale_1.xLocaleOption)('expCsvSeparator')),
                     react_1.default.createElement(dropdown_1.Dropdown, { value: csvSeparator, options: XUtils_1.XUtils.csvSeparatorOptions, onChange: function (e) { return setCsvSeparator(e.value); } })),
-                react_1.default.createElement("div", { className: "field grid" },
-                    react_1.default.createElement("label", { className: "col-fixed", style: { width: '10rem' } }, (0, XLocale_1.xLocaleOption)('expDecimalFormat')),
+                react_1.default.createElement("div", { key: "expDecimalFormat", className: "field grid" },
+                    react_1.default.createElement("label", { className: "col-fixed", style: { width: '12rem' } }, (0, XLocale_1.xLocaleOption)('expDecimalFormat')),
                     react_1.default.createElement(dropdown_1.Dropdown, { value: decimalFormat, options: XUtils_1.XUtils.decimalFormatOptions, onChange: function (e) { return setDecimalFormat(e.value); } })),
-                react_1.default.createElement("div", { className: "field grid" },
-                    react_1.default.createElement("label", { className: "col-fixed", style: { width: '10rem' } }, (0, XLocale_1.xLocaleOption)('expEncoding')),
-                    react_1.default.createElement(dropdown_1.Dropdown, { value: csvEncoding, options: XUtils_1.XUtils.csvEncodingOptions, onChange: function (e) { return setCsvEncoding(e.value); } })));
+                react_1.default.createElement("div", { key: "expEncoding", className: "field grid" },
+                    react_1.default.createElement("label", { className: "col-fixed", style: { width: '12rem' } }, (0, XLocale_1.xLocaleOption)('expEncoding')),
+                    react_1.default.createElement(dropdown_1.Dropdown, { value: csvEncoding, options: XUtils_1.XUtils.csvEncodingOptions, onChange: function (e) { return setCsvEncoding(e.value); } }))
+            ]);
         }
     }
     // poznamka: renderovanie vnutornych komponentov Dialogu sa zavola az po otvoreni dialogu
-    return (react_1.default.createElement(dialog_1.Dialog, { visible: props.dialogOpened, onShow: onShow, onHide: function () { return props.hideDialog(); } },
-        props.rowCount ?
-            react_1.default.createElement("div", { className: "field grid" },
-                react_1.default.createElement("label", { className: "col-fixed", style: { width: '10rem' } }, (0, XLocale_1.xLocaleOption)('expRowCount')),
-                react_1.default.createElement(inputtext_1.InputText, { value: (0, XUtilsConversions_1.numberAsUI)((_a = props.rowCount) !== null && _a !== void 0 ? _a : null, 0), readOnly: true }))
+    return (react_1.default.createElement(dialog_1.Dialog, { visible: props.dialogState.dialogOpened, onShow: onShow, onHide: function () { return props.hideDialog(); } },
+        ((_b = props.dialogState.exportParams) === null || _b === void 0 ? void 0 : _b.rowCount) ?
+            react_1.default.createElement("div", { key: "expRowCount", className: "field grid" },
+                react_1.default.createElement("label", { className: "col-fixed", style: { width: '12rem' } }, (0, XLocale_1.xLocaleOption)('expRowCount')),
+                react_1.default.createElement(inputtext_1.InputText, { value: (0, XUtilsConversions_1.numberAsUI)((_d = (_c = props.dialogState.exportParams) === null || _c === void 0 ? void 0 : _c.rowCount) !== null && _d !== void 0 ? _d : null, 0), readOnly: true }))
             : null,
-        react_1.default.createElement("div", { className: "field grid" },
-            react_1.default.createElement("label", { className: "col-fixed", style: { width: '10rem' } }, (0, XLocale_1.xLocaleOption)('expExportType')),
-            react_1.default.createElement(dropdown_1.Dropdown, { value: exportType, options: (_b = props.exportTypeOptions) !== null && _b !== void 0 ? _b : XUtils_1.XUtils.exportTypeOptions, onChange: function (e) { return setExportType(e.value); } })),
+        react_1.default.createElement("div", { key: "expExportType", className: "field grid" },
+            react_1.default.createElement("label", { className: "col-fixed", style: { width: '12rem' } }, (0, XLocale_1.xLocaleOption)('expExportType')),
+            react_1.default.createElement(dropdown_1.Dropdown, { value: exportType, options: (_e = props.exportTypeOptions) !== null && _e !== void 0 ? _e : XUtils_1.XUtils.exportTypeOptions, onChange: function (e) { return setExportType(e.value); } })),
         elem,
-        react_1.default.createElement("div", { className: "flex justify-content-center" },
+        react_1.default.createElement("div", { key: "exportRows", className: "flex justify-content-center" },
             react_1.default.createElement(XButton_1.XButton, { label: (0, XLocale_1.xLocaleOption)('exportRows'), onClick: onExport }))));
 };
 exports.XExportRowsDialog = XExportRowsDialog;

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

@@ -38,6 +38,7 @@ export interface XSearchBrowseProps {
 }
 export interface XLazyDataTableProps {
     entity: string;
+    label?: string;
     dataKey?: string;
     paginator: boolean;
     rows: number;

package/lib/components/XLazyDataTable/XLazyDataTable.js

@@ -245,11 +245,11 @@ var XLazyDataTable = function (props) {
     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
+    var _o = __read((0, react_1.useState)({ dialogOpened: false }), 2), exportRowsDialogState = _o[0], setExportRowsDialogState = _o[1];
+    //const [exportRowsDialogRowCount, setExportRowsDialogRowCount] = useState<number>(); // 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 _r = __read((0, react_1.useState)(undefined), 2), optionalCustomFilterAfterFiltering = _r[0], setOptionalCustomFilterAfterFiltering = _r[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
@@ -430,6 +430,28 @@ var XLazyDataTable = function (props) {
         }
         return headers;
     };
+    var getWidths = function () {
+        var e_5, _a;
+        var _b;
+        // vrati sirky stlpcov napr. ['7.75rem', '20rem', '8.5rem', '8.5rem', '6rem']
+        // nevracia aktualne sirky stlpcov (po manualnom rozsireni) ale tie ktore boli nastavene/vypocitane v kode
+        var widths = [];
+        var columns = dataTableEl.current.props.children;
+        try {
+            for (var columns_5 = __values(columns), columns_5_1 = columns_5.next(); !columns_5_1.done; columns_5_1 = columns_5.next()) {
+                var column = columns_5_1.value;
+                widths.push((_b = column.props.headerStyle) === null || _b === void 0 ? void 0 : _b.width);
+            }
+        }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (columns_5_1 && !columns_5_1.done && (_a = columns_5.return)) _a.call(columns_5);
+            }
+            finally { if (e_5) throw e_5.error; }
+        }
+        return widths;
+    };
     var hasContentTypeHtml = function () {
         var columns = props.children;
         return columns.some(function (column) { return column.props.contentType === "html"; });
@@ -467,7 +489,7 @@ var XLazyDataTable = function (props) {
         }
     };
     var onClickRemoveRow = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var reread, e_5, e_6;
+        var reread, e_6, e_7;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -482,8 +504,8 @@ var XLazyDataTable = function (props) {
                     reread = _a.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    e_5 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_5);
+                    e_6 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_6);
                     return [3 /*break*/, 4];
                 case 4:
                     if (reread) {
@@ -505,8 +527,8 @@ var XLazyDataTable = function (props) {
                     _a.sent();
                     return [3 /*break*/, 9];
                 case 8:
-                    e_6 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_6);
+                    e_7 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_7);
                     return [3 /*break*/, 9];
                 case 9:
                     loadData();
@@ -531,10 +553,11 @@ var XLazyDataTable = function (props) {
         }
     };
     var onClickExport = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var findParam, findResult;
+        var fields, findParam, findResult, exportParams;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    fields = getFields(false);
                     findParam = {
                         resultType: FindParam_1.ResultType.OnlyRowCount,
                         first: first,
@@ -544,36 +567,41 @@ var XLazyDataTable = function (props) {
                         customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilterAfterFiltering),
                         multiSortMeta: multiSortMeta,
                         entity: props.entity,
-                        fields: getFields(false),
+                        fields: fields,
                         aggregateItems: aggregateItems
                     };
                     return [4 /*yield*/, findByFilter(findParam)];
                 case 1:
                     findResult = _a.sent();
-                    //setLoading(false);
-                    setExportRowsDialogRowCount(findResult.totalRecords); // param pre dialog
-                    setExportRowsDialogOpened(true);
+                    exportParams = createExportParams(fields, findResult.totalRecords);
+                    setExportRowsDialogState({ dialogOpened: true, exportParams: exportParams });
                     return [2 /*return*/];
             }
         });
     }); };
-    var createExportParams = function () {
+    var createExportParams = function (fields, rowCount) {
         var queryParam = {
             filters: filtersAfterFiltering,
             fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering),
             customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilterAfterFiltering),
             multiSortMeta: multiSortMeta,
             entity: props.entity,
-            fields: getFields(false),
-            fieldsToDuplicateValues: props.exportFieldsToDuplicateValues
+            fields: fields
         };
         return {
-            path: "x-lazy-data-table-export",
+            rowCount: rowCount,
+            existsToManyAssoc: existsToManyAssoc(fields),
             queryParam: queryParam,
             headers: getHeaders(),
+            widths: getWidths(),
+            fieldsToDuplicateValues: props.exportFieldsToDuplicateValues,
             fileName: "".concat(props.entity)
         };
     };
+    var existsToManyAssoc = function (fields) {
+        var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity);
+        return fields.some(function (value) { return XUtilsMetadataCommon_1.XUtilsMetadataCommon.hasPathToManyAssoc(xEntity, value); });
+    };
     var onClickChoose = function () {
         //console.log("zavolany onClickChoose");
         if (selectedRow !== null) {
@@ -852,12 +880,12 @@ var XLazyDataTable = function (props) {
                     // 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" }));
+                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value); }, scale: xField.scale, 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); }, scale: xField.scale, 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" });
+                    filterElement = react_1.default.createElement(XCalendar_1.XCalendar, { value: dateValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value); }, scale: xField.scale, datetime: xField.type === "datetime" });
                 }
             }
             else if (xField.type === "decimal" || xField.type === "number") {
@@ -953,13 +981,16 @@ 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 dolu do stredu)
+    // x-lazy-datatable-label-right-compensation - vyvazuje label, aby item-y v strede isli aspon priblizne do stredu
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "flex justify-content-center align-items-center" },
+            props.label ? react_1.default.createElement("div", { className: "x-lazy-datatable-label" }, props.label) : null,
             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),
+            props.multilineSwitch ? react_1.default.createElement(XMultilineSwitch_1.XMultilineSwitch, { value: multilineSwitchValue, onChange: function (value) { return setMultilineSwitchValue(value); }, className: "m-1" }) : null,
+            props.label ? react_1.default.createElement("div", { className: "x-lazy-datatable-label-right-compensation" }) : 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)),
         react_1.default.createElement("div", { className: "flex justify-content-center" },
@@ -970,7 +1001,7 @@ var XLazyDataTable = function (props) {
             props.appButtonsForRow ? props.appButtonsForRow.map(function (xAppButton) { return react_1.default.createElement(XButton_1.XButton, { key: xAppButton.key, icon: xAppButton.icon, label: xAppButton.label, onClick: function () { return onClickAppButtonForRow(xAppButton.onClick); } }); }) : null,
             props.appButtons,
             props.searchBrowseParams !== undefined ? react_1.default.createElement(XButton_1.XButton, { key: "choose", label: (0, XLocale_1.xLocaleOption)('chooseRow'), onClick: onClickChoose }) : null,
-            exportRows ? react_1.default.createElement(XExportRowsDialog_1.XExportRowsDialog, { key: "exportRowsDialog", dialogOpened: exportRowsDialogOpened, hideDialog: function () { return setExportRowsDialogOpened(false); }, rowCount: exportRowsDialogRowCount, exportParams: createExportParams }) : null),
+            exportRows ? react_1.default.createElement(XExportRowsDialog_1.XExportRowsDialog, { key: "exportRowsDialog", dialogState: exportRowsDialogState, hideDialog: function () { return setExportRowsDialogState({ dialogOpened: false }); } }) : null),
         hasContentTypeHtml() ? react_1.default.createElement(editor_1.Editor, { style: { display: 'none' }, showHeader: false }) : null /* we want to import css if needed (<style type="text/css" data-primereact-style-id="editor">) */));
 };
 exports.XLazyDataTable = XLazyDataTable;

package/lib/components/XLazyDataTable/XMultilineSwitch.js

@@ -15,6 +15,6 @@ var XMultilineSwitch = function (props) {
     var itemTemplate = function (option) {
         return react_1.default.createElement("i", { className: option.icon });
     };
-    return (react_1.default.createElement(selectbutton_1.SelectButton, { value: props.value, onChange: function (e) { return props.onChange(e.value); }, options: options, optionValue: "value", itemTemplate: itemTemplate, className: props.className }));
+    return (react_1.default.createElement(selectbutton_1.SelectButton, { value: props.value, onChange: function (e) { return props.onChange(e.value); }, options: options, optionValue: "value", itemTemplate: itemTemplate, allowEmpty: false, className: props.className }));
 };
 exports.XMultilineSwitch = XMultilineSwitch;

package/lib/components/XLazyDataTable/XOcfDropdown.js

@@ -31,6 +31,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XOcfDropdown = void 0;
 var react_1 = __importDefault(require("react"));
 var dropdown_1 = require("primereact/dropdown");
+// dropdown for optional custom filter (ocf)
 var XOcfDropdown = function (props) {
     var onChange = function (e) {
         var value;

package/lib/components/XUtils.d.ts

@@ -1,5 +1,5 @@
 import { XToken } from "./XToken";
-import { CsvDecimalFormat, CsvEncoding, CsvSeparator, ExportType } from "../serverApi/ExportImportParam";
+import { CsvDecimalFormat, CsvEncoding, CsvSeparator, ExportType, XMultilineExportType } from "../serverApi/ExportImportParam";
 import React from "react";
 import { XEnvVar } from "./XEnvVars";
 import { XError, XErrorMap } from "./XErrors";
@@ -36,6 +36,7 @@ export declare class XUtils {
     static xTokenPublic: XToken;
     private static appFormMap;
     static exportTypeOptions: ExportType[];
+    static multilineExportTypeOptions: XMultilineExportType[];
     static csvSeparatorOptions: CsvSeparator[];
     static decimalFormatOptions: CsvDecimalFormat[];
     static csvEncodingOptions: CsvEncoding[];
@@ -60,6 +61,7 @@ export declare class XUtils {
     static fetchString(path: string, value: any): Promise<string>;
     static fetch(path: string, value: any, usePublicToken?: boolean | XToken): Promise<any>;
     static post(path: string, value: any): Promise<Response>;
+    static openExcelReport(apiPath: string, requestPayload: any, fileName?: string): Promise<boolean>;
     static fetchBasicJson(path: string, value: any, usePublicToken?: boolean | XToken): Promise<Response>;
     static fetchFile(path: string, jsonFieldValue: any, fileToPost: any): Promise<any>;
     static fetchBasicAuthBasic(path: string, headers: any, body: any, usePublicToken?: boolean | XToken): Promise<Response>;

package/lib/components/XUtils.js

@@ -334,6 +334,36 @@ var XUtils = /** @class */ (function () {
     XUtils.post = function (path, value) {
         return XUtils.fetchBasicJson(path, value);
     };
+    XUtils.openExcelReport = function (apiPath, requestPayload, fileName) {
+        return __awaiter(this, void 0, void 0, function () {
+            var response, e_5, fileNameExt, respBlob, url, a;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, XUtils.fetchBasicJson(apiPath, requestPayload)];
+                    case 1:
+                        response = _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        e_5 = _a.sent();
+                        XUtils.showErrorMessage("Nepodarilo sa vytvori\u0165/stiahnu\u0165 xlsx s\u00FAbor.", e_5); // dalsie info (apiPath, payload) by mali byt v "e"
+                        return [2 /*return*/, false];
+                    case 3:
+                        fileNameExt = "".concat(fileName !== null && fileName !== void 0 ? fileName : apiPath, ".xlsx");
+                        return [4 /*yield*/, response.blob()];
+                    case 4:
+                        respBlob = _a.sent();
+                        url = window.URL.createObjectURL(respBlob);
+                        a = document.createElement('a');
+                        a.href = url;
+                        a.download = fileNameExt;
+                        a.click();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
     XUtils.fetchBasicJson = function (path, value, usePublicToken) {
         return XUtils.fetchBasic(path, { 'Content-Type': 'application/json' }, XUtilsCommon_1.XUtilsCommon.objectAsJSON(value), usePublicToken);
     };
@@ -538,7 +568,7 @@ var XUtils = /** @class */ (function () {
      * @param idField
      */
     XUtils.arrayIntersect = function (array1, array2, idField) {
-        var e_5, _a;
+        var e_6, _a;
         var array2IdSet = new Set();
         try {
             for (var array2_1 = __values(array2), array2_1_1 = array2_1.next(); !array2_1_1.done; array2_1_1 = array2_1.next()) {
@@ -548,12 +578,12 @@ var XUtils = /** @class */ (function () {
                 }
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (array2_1_1 && !array2_1_1.done && (_a = array2_1.return)) _a.call(array2_1);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         return array1.filter(function (item) { return item && array2IdSet.has(item[idField]); });
     };
@@ -642,7 +672,7 @@ var XUtils = /** @class */ (function () {
     // pomocna metodka
     // ak nie su v xErrorMap ziadne chyby, vrati ""
     XUtils.getErrorMessages = function (xErrorMap) {
-        var e_6, _a;
+        var e_7, _a;
         var _b;
         var msg = "";
         try {
@@ -656,12 +686,12 @@ var XUtils = /** @class */ (function () {
                 }
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         return msg;
     };
@@ -732,7 +762,7 @@ var XUtils = /** @class */ (function () {
     };
     // pomocna metodka
     XUtils.filterAnd = function () {
-        var e_7, _a;
+        var e_8, _a;
         var filters = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             filters[_i] = arguments[_i];
@@ -749,12 +779,12 @@ var XUtils = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            catch (e_8_1) { e_8 = { error: e_8_1 }; }
             finally {
                 try {
                     if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
                 }
-                finally { if (e_7) throw e_7.error; }
+                finally { if (e_8) throw e_8.error; }
             }
         }
         return customFilterItemsResult;
@@ -799,7 +829,9 @@ var XUtils = /** @class */ (function () {
     XUtils.xTokenPublic = { username: "xPublicUser", password: "xPublicUserPassword123" };
     // nacachovane metadata (setuju sa v App.fetchAndSetXMetadata)
     XUtils.appFormMap = {};
-    XUtils.exportTypeOptions = [ExportImportParam_1.ExportType.Csv, ExportImportParam_1.ExportType.Json];
+    XUtils.exportTypeOptions = [ExportImportParam_1.ExportType.Excel, ExportImportParam_1.ExportType.Csv, ExportImportParam_1.ExportType.Json];
+    // moznost Off zatial nie je implementovana
+    XUtils.multilineExportTypeOptions = [ExportImportParam_1.XMultilineExportType.Multiline, ExportImportParam_1.XMultilineExportType.Singleline /*, XMultilineExportType.Off*/];
     XUtils.csvSeparatorOptions = [ExportImportParam_1.CsvSeparator.Semicolon, ExportImportParam_1.CsvSeparator.Comma];
     XUtils.decimalFormatOptions = [ExportImportParam_1.CsvDecimalFormat.Comma, ExportImportParam_1.CsvDecimalFormat.Dot];
     XUtils.csvEncodingOptions = [ExportImportParam_1.CsvEncoding.Utf8, ExportImportParam_1.CsvEncoding.Win1250];

package/lib/components/locale/x-en.json

@@ -16,6 +16,7 @@
         "expRowCount": "Row count",
         "expExportType": "Export type",
         "expCreateHeaderLine": "Create header line",
+        "expDetailRowsExport": "Detail rows export",
         "expCsvSeparator": "Csv separator",
         "expDecimalFormat": "Decimal format",
         "expEncoding": "Encoding",

package/lib/serverApi/ExportImportParam.d.ts

@@ -1,13 +1,22 @@
 import { DataTableFilterMeta, DataTableSortMeta } from "primereact/datatable";
 import { XCustomFilterItem, XFullTextSearch } from "./FindParam";
 export declare enum ExportType {
+    Excel = "excel",
     Csv = "csv",
     Json = "json"
 }
-export interface ExportParam {
-    exportType: ExportType;
-    csvParam?: CsvParam;
-    queryParam: LazyDataTableQueryParam | any;
+export interface ExportExcelParam {
+    queryParam: LazyDataTableQueryParam;
+    excelCsvParam: ExcelCsvParam;
+    widths: string[];
+}
+export interface ExportCsvParam {
+    queryParam: LazyDataTableQueryParam;
+    excelCsvParam: ExcelCsvParam;
+    csvParam: CsvParam;
+}
+export interface ExportJsonParam {
+    queryParam: LazyDataTableQueryParam;
 }
 export interface LazyDataTableQueryParam {
     filters: DataTableFilterMeta;
@@ -16,8 +25,23 @@ export interface LazyDataTableQueryParam {
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields: string[];
+}
+export interface ExcelCsvParam {
+    headers?: string[];
+    toManyAssocExport: XMultilineExportType;
+    multilineTextExport: XMultilineExportType;
     fieldsToDuplicateValues?: string[];
 }
+export declare enum XMultilineExportType {
+    Singleline = "singleline",
+    Multiline = "multiline",
+    Off = "off"
+}
+export interface CsvParam {
+    csvSeparator: CsvSeparator;
+    csvDecimalFormat: CsvDecimalFormat;
+    csvEncoding: CsvEncoding;
+}
 export declare enum CsvSeparator {
     Semicolon = ";",
     Comma = ","
@@ -30,13 +54,6 @@ export declare enum CsvEncoding {
     Utf8 = "utf-8",
     Win1250 = "win1250"
 }
-export interface CsvParam {
-    useHeaderLine: boolean;
-    headers?: string[];
-    csvSeparator: CsvSeparator;
-    csvDecimalFormat: CsvDecimalFormat;
-    csvEncoding: CsvEncoding;
-}
 export declare enum ImportType {
     Csv = "csv",
     Json = "json"

package/lib/serverApi/ExportImportParam.js

@@ -1,11 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportType = exports.CsvEncoding = exports.CsvDecimalFormat = exports.CsvSeparator = exports.ExportType = void 0;
+exports.ImportType = exports.CsvEncoding = exports.CsvDecimalFormat = exports.CsvSeparator = exports.XMultilineExportType = exports.ExportType = void 0;
+// ************** export ***************
 var ExportType;
 (function (ExportType) {
+    ExportType["Excel"] = "excel";
     ExportType["Csv"] = "csv";
     ExportType["Json"] = "json";
 })(ExportType = exports.ExportType || (exports.ExportType = {}));
+// exportovanie hodnot z toMany asociacii, pripadne viacriadkovych textov
+var XMultilineExportType;
+(function (XMultilineExportType) {
+    XMultilineExportType["Singleline"] = "singleline";
+    XMultilineExportType["Multiline"] = "multiline";
+    XMultilineExportType["Off"] = "off"; // stlpce obsahujuce viac hodnot/riadkov sa vynechaju z exportu
+})(XMultilineExportType = exports.XMultilineExportType || (exports.XMultilineExportType = {}));
 // vo windowse zavisi od regionalnych nastaveni, default nastavenie je ";" a preto vecsinou aj excel produkuje csv s ";" (menej sa to bije s decimalmi)
 // takze primarne pouzivame ";" a sekundarne "," napr. pri generickom exporte do csv davame uzivatelovi na vyber
 var CsvSeparator;
@@ -27,6 +36,7 @@ var CsvEncoding;
     CsvEncoding["Utf8"] = "utf-8";
     CsvEncoding["Win1250"] = "win1250";
 })(CsvEncoding = exports.CsvEncoding || (exports.CsvEncoding = {}));
+// ************** import ***************
 var ImportType;
 (function (ImportType) {
     ImportType["Csv"] = "csv";

package/lib/serverApi/XUtilsCommon.d.ts

@@ -17,6 +17,7 @@ export declare class XUtilsCommon {
     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 monthDiff(monthOld: Date | null, monthNew: 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

@@ -297,6 +297,18 @@ var XUtilsCommon = /** @class */ (function () {
         }
         return diff;
     };
+    // returns month diff for 2 dates of type month (YYYY-MM-01) - days are ignored
+    XUtilsCommon.monthDiff = function (monthOld, monthNew) {
+        var diff = null;
+        if (monthOld !== null && monthNew !== null) {
+            var yearCountNew = monthNew.getFullYear();
+            var monthCountNew = monthNew.getMonth();
+            var yearCountOld = monthOld.getFullYear();
+            var monthCountOld = monthOld.getMonth();
+            diff = (yearCountNew - yearCountOld) * 12 + (monthCountNew - monthCountOld);
+        }
+        return diff;
+    };
     XUtilsCommon.findFirstMatch = function (pattern, value) {
         var match = pattern.exec(value);
         return match != null ? match[0] : null;

package/lib/serverApi/XUtilsConversions.d.ts

@@ -6,13 +6,19 @@ export declare function stringAsDB(value: string | null): string;
 export declare function intFromUI(stringValue: string): number | null | undefined;
 export declare function numberAsUI(value: number | null, fractionDigits?: number): string;
 export declare function numberFromModel(value: any): number | null;
+export declare function numberFromString(valueString: string): number | null;
+export declare enum XDateScale {
+    Date = 1,
+    Month = 2,
+    Year = 3
+}
 export declare function dateFromModel(value: any): Date | null;
-export declare function dateFromUI(valueString: string): Date | null | undefined;
-export declare function dateAsUI(value: Date | null): string;
+export declare function dateFromUI(valueString: string, dateScale?: XDateScale): Date | null | undefined;
+export declare function dateAsUI(value: Date | null, dateScale?: XDateScale): string;
 export declare function datetimeAsUI(value: Date | null): string;
 export declare function timeFromModel(value: any): Date | null;
-export declare function dateFormatUI(): string;
-export declare function dateFormatCalendar(): string;
+export declare function dateFormatUI(dateScale?: XDateScale): string;
+export declare function dateFormatCalendar(dateScale?: XDateScale): string;
 export declare function datetimeFormatUI(): string;
 export declare function intervalFromUI(valueString: string): IPostgresInterval | null | undefined;
 export declare function intervalAsUI(valueInterval: IPostgresInterval | null): string;
@@ -32,4 +38,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;
+export declare function convertValueBase(fieldType: string, scale: 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.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;
+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.XDateScale = exports.numberFromString = 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");
@@ -95,6 +95,23 @@ function numberFromModel(value) {
     return numberValue;
 }
 exports.numberFromModel = numberFromModel;
+// konvertuje hodnotu napr. 12.34
+function numberFromString(valueString) {
+    var numberValue = parseFloat(valueString);
+    if (isNaN(numberValue)) {
+        numberValue = null;
+    }
+    return numberValue;
+}
+exports.numberFromString = numberFromString;
+// upresnenie typu datumu - pouzivame typ number, lebo zneuzivame atribut scale v TypeORM na zadanie upresnenia
+var XDateScale;
+(function (XDateScale) {
+    XDateScale[XDateScale["Date"] = 1] = "Date";
+    XDateScale[XDateScale["Month"] = 2] = "Month";
+    XDateScale[XDateScale["Year"] = 3] = "Year"; // yyyy
+})(XDateScale = exports.XDateScale || (exports.XDateScale = {}));
+//export type XDateType = "month" | "year" | "date";
 // v modeli na klientovi by mal byt vzdy Date, teraz je tam niekedy string (z json-u zo servera) a niekedy Date (z komponentu)
 // provizorne zatial takato konverzia
 function dateFromModel(value) {
@@ -108,9 +125,10 @@ function dateFromModel(value) {
     return dateValue;
 }
 exports.dateFromModel = dateFromModel;
-function dateFromUI(valueString) {
+function dateFromUI(valueString, dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
     // converts valueString (e.g. 21.2.2024) into Date
-    // if stringValue is invalid, returns undefined
+    // if valueString is invalid, returns undefined
     var valueDate = undefined;
     if (valueString === '') {
         valueDate = null;
@@ -120,22 +138,46 @@ function dateFromUI(valueString) {
         var day = void 0;
         var month = null;
         var year = null;
-        var posDot = valueString.indexOf('.');
-        if (posDot === -1) {
-            day = intFromUI(valueString);
+        if (dateScale === XDateScale.Date) {
+            // format "dd.mm.yyyy"
+            var posDot = valueString.indexOf('.');
+            if (posDot === -1) {
+                day = intFromUI(valueString);
+            }
+            else {
+                day = intFromUI(valueString.substring(0, posDot));
+                var rest = valueString.substring(posDot + 1);
+                var posDot2 = rest.indexOf('.');
+                if (posDot2 === -1) {
+                    month = intFromUI(rest);
+                }
+                else {
+                    month = intFromUI(rest.substring(0, posDot2));
+                    year = intFromUI(rest.substring(posDot2 + 1));
+                }
+            }
         }
-        else {
-            day = intFromUI(valueString.substring(0, posDot));
-            var rest = valueString.substring(posDot + 1);
-            var posDot2 = rest.indexOf('.');
-            if (posDot2 === -1) {
-                month = intFromUI(rest);
+        else if (dateScale === XDateScale.Month) {
+            // format "mm.yyyy"
+            day = 1;
+            var posDot = valueString.indexOf('.');
+            if (posDot === -1) {
+                month = intFromUI(valueString);
             }
             else {
-                month = intFromUI(rest.substring(0, posDot2));
-                year = intFromUI(rest.substring(posDot2 + 1));
+                month = intFromUI(valueString.substring(0, posDot));
+                year = intFromUI(valueString.substring(posDot + 1));
             }
         }
+        else if (dateScale === XDateScale.Year) {
+            // format "yyyy"
+            day = 1;
+            month = 1;
+            year = intFromUI(valueString);
+        }
+        else {
+            throw "Unimplemented dateScale = " + dateScale;
+        }
         // doplnime mesiac a rok ak uzivatel nezadal (ak mame undefined, tak umyselne nedoplname)
         if (month === null) {
             month = XUtilsCommon_1.XUtilsCommon.today().getMonth() + 1; // o 1 mesiac viac (januar je 0)
@@ -163,9 +205,10 @@ function dateFromUI(valueString) {
     return valueDate;
 }
 exports.dateFromUI = dateFromUI;
-function dateAsUI(value) {
+function dateAsUI(value, dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
     if (value !== null) {
-        return (0, XUtilsCommon_1.dateFormat)(value, dateFormatUI());
+        return (0, XUtilsCommon_1.dateFormat)(value, dateFormatUI(dateScale));
     }
     else {
         return "";
@@ -208,12 +251,40 @@ function timeFromModel(value) {
     return timeValue;
 }
 exports.timeFromModel = timeFromModel;
-function dateFormatUI() {
-    return "dd.mm.yyyy";
+function dateFormatUI(dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
+    var format;
+    if (dateScale === XDateScale.Date) {
+        format = "dd.mm.yyyy";
+    }
+    else if (dateScale === XDateScale.Month) {
+        format = "mm.yyyy";
+    }
+    else if (dateScale === XDateScale.Year) {
+        format = "yyyy";
+    }
+    else {
+        throw "Unimplemented dateScale = " + dateScale;
+    }
+    return format;
 }
 exports.dateFormatUI = dateFormatUI;
-function dateFormatCalendar() {
-    return "dd.mm.yy";
+function dateFormatCalendar(dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
+    var format;
+    if (dateScale === XDateScale.Date) {
+        format = "dd.mm.yy";
+    }
+    else if (dateScale === XDateScale.Month) {
+        format = "mm.yy";
+    }
+    else if (dateScale === XDateScale.Year) {
+        format = "yy";
+    }
+    else {
+        throw "Unimplemented dateScale = " + dateScale;
+    }
+    return format;
 }
 exports.dateFormatCalendar = dateFormatCalendar;
 function datetimeFormatUI() {
@@ -349,21 +420,21 @@ function convertValue(xField, value, fromModel, asUI) {
     return convertValueBase(xField.type, xField.scale, value, fromModel, asUI);
 }
 exports.convertValue = convertValue;
-function convertValueBase(fieldType, fractionDigits, value, fromModel, asUI) {
+function convertValueBase(fieldType, scale, value, fromModel, asUI) {
     if (fieldType === "decimal") {
         if (fromModel) {
             value = numberFromModel(value);
         }
         if (asUI && asUI !== AsUIType.Excel) {
-            value = numberAsUI(value, fractionDigits);
+            value = numberAsUI(value, scale);
         }
     }
     else if (fieldType === "date") {
         if (fromModel) {
             value = dateFromModel(value);
         }
-        if (asUI && asUI !== AsUIType.Excel) {
-            value = dateAsUI(value);
+        if (asUI && (asUI !== AsUIType.Excel || scale === XDateScale.Month || scale === XDateScale.Year)) {
+            value = dateAsUI(value, scale);
         }
     }
     else if (fieldType === "datetime") {

package/lib/serverApi/XUtilsMetadataCommon.d.ts

@@ -13,6 +13,7 @@ export declare class XUtilsMetadataCommon {
     static getXField(xEntity: XEntity, field: string): XField;
     static getXFieldByPathBase(xEntity: XEntity, path: string): XField | undefined;
     static getXFieldByPath(xEntity: XEntity, path: string): XField;
+    static hasPathToManyAssoc(xEntity: XEntity, path: string): boolean;
     static getXFieldByPathStr(entity: string, path: string): XField;
     static getXAssocBase(xEntity: XEntity, assocField: string): XAssoc | undefined;
     static getXAssocByPath(xEntity: XEntity, path: string): XAssoc;

package/lib/serverApi/XUtilsMetadataCommon.js

@@ -91,6 +91,23 @@ var XUtilsMetadataCommon = /** @class */ (function () {
             return XUtilsMetadataCommon.getXFieldByPath(xAssocEntity, restPath);
         }
     };
+    // returns true if path contains some toMany assoc
+    XUtilsMetadataCommon.hasPathToManyAssoc = function (xEntity, path) {
+        var _a = __read(XUtilsCommon_1.XUtilsCommon.getFieldAndRestPath(path), 2), field = _a[0], restPath = _a[1];
+        if (restPath === null) {
+            return false;
+        }
+        else {
+            var xAssoc = XUtilsMetadataCommon.getXAssoc(xEntity, field);
+            if (xAssoc.relationType === "one-to-many" || xAssoc.relationType === "many-to-many") {
+                return true;
+            }
+            else {
+                var xAssocEntity = XUtilsMetadataCommon.getXEntity(xAssoc.entityName);
+                return XUtilsMetadataCommon.hasPathToManyAssoc(xAssocEntity, restPath);
+            }
+        }
+    };
     XUtilsMetadataCommon.getXFieldByPathStr = function (entity, path) {
         return XUtilsMetadataCommon.getXFieldByPath(XUtilsMetadataCommon.getXEntity(entity), path);
     };

package/package.json

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