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

package/lib/components/XAutoCompleteBase.d.ts

@@ -9,6 +9,7 @@ export interface XAutoCompleteBaseProps {
     valueForm?: any;
     idField?: string;
     maxLength?: number;
+    readOnly?: boolean;
     error?: string;
     onErrorChange: (error: string | undefined) => void;
     setFocusOnCreate?: boolean;

package/lib/components/XAutoCompleteBase.js

@@ -265,6 +265,8 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
     };
     XAutoCompleteBase.prototype.render = function () {
         var _this = this;
+        var _a;
+        var readOnly = (_a = this.props.readOnly) !== null && _a !== void 0 ? _a : false;
         var dropdownButton;
         if (this.props.valueForm) {
             // mame CRUD operacie, potrebujeme SplitButton
@@ -324,11 +326,11 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
                     _this.autoCompleteRef.current.search(e, '', 'dropdown');
                 }
             });
-            dropdownButton = react_1.default.createElement(splitbutton_1.SplitButton, { model: splitButtonItems, className: 'x-splitbutton-only-dropdown' + XUtils_1.XUtils.mobileCssSuffix(), menuClassName: 'x-splitbutton-only-dropdown-menu' + XUtils_1.XUtils.mobileCssSuffix() });
+            dropdownButton = react_1.default.createElement(splitbutton_1.SplitButton, { model: splitButtonItems, className: 'x-splitbutton-only-dropdown' + XUtils_1.XUtils.mobileCssSuffix(), menuClassName: 'x-splitbutton-only-dropdown-menu' + XUtils_1.XUtils.mobileCssSuffix(), disabled: readOnly });
         }
         else {
             // mame len 1 operaciu - dame jednoduchy button
-            dropdownButton = react_1.default.createElement(button_1.Button, { icon: "pi pi-chevron-down", onClick: function (e) { return _this.autoCompleteRef.current.search(e, '', 'dropdown'); }, className: 'x-dropdownbutton' + XUtils_1.XUtils.mobileCssSuffix() });
+            dropdownButton = react_1.default.createElement(button_1.Button, { icon: "pi pi-chevron-down", onClick: function (e) { return _this.autoCompleteRef.current.search(e, '', 'dropdown'); }, className: 'x-dropdownbutton' + XUtils_1.XUtils.mobileCssSuffix(), disabled: readOnly });
         }
         // vypocitame inputValue
         var inputValue = this.computeInputValue();
@@ -352,9 +354,9 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         // <DobrovolnikForm id={this.formDialogObjectId} object={this.formDialogInitObjectForInsert} onSaveOrCancel={this.formDialogOnSaveOrCancel}/>
         // formgroup-inline lepi SplitButton na autocomplete a zarovna jeho vysku
         return (react_1.default.createElement("div", { className: "x-auto-complete-base" },
-            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod }, fieldOrItemTemplate, { onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, maxLength: this.props.maxLength, ref: this.autoCompleteRef }, XUtils_1.XUtils.createErrorProps(error))),
+            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod }, fieldOrItemTemplate, { onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, maxLength: this.props.maxLength, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createErrorProps(error))),
             dropdownButton,
-            this.props.valueForm != undefined ?
+            this.props.valueForm != undefined && !readOnly ?
                 react_1.default.createElement(dialog_1.Dialog, { visible: this.state.formDialogOpened, onHide: this.formDialogOnHide, header: this.formDialogObjectId ? 'Modification' : 'New record' }, react_1.default.cloneElement(this.props.valueForm, {
                     id: this.formDialogObjectId, object: this.formDialogInitObjectForInsert, onSaveOrCancel: this.formDialogOnSaveOrCancel
                 }, this.props.valueForm.children))

package/lib/components/XAutoCompleteDT.js

@@ -130,11 +130,10 @@ var XAutoCompleteDT = /** @class */ (function (_super) {
     XAutoCompleteDT.prototype.render = function () {
         var xEntityAssoc = XUtilsMetadata_1.XUtilsMetadata.getXEntity(this.xAssoc.entityName);
         //const xDisplayField = XUtilsMetadata.getXFieldByPath(xEntityAssoc, this.props.displayField);
-        // TODO - readOnly
         // TODO - size
         //const size = this.props.size ?? xDisplayField.length;
         // div className="col" nam zabezpeci aby XAutoCompleteBase nezaberal celu dlzku grid-u (ma nastaveny width=100% vdaka "formgroup-inline")
-        return (react_1.default.createElement(XAutoCompleteBase_1.XAutoCompleteBase, { value: this.getValue(), suggestions: this.state.suggestions, onChange: this.onChangeAutoCompleteBase, field: this.props.displayField, valueForm: this.props.assocForm, idField: xEntityAssoc.idField, error: this.getError(), onErrorChange: this.onErrorChangeAutoCompleteBase }));
+        return (react_1.default.createElement(XAutoCompleteBase_1.XAutoCompleteBase, { value: this.getValue(), suggestions: this.state.suggestions, onChange: this.onChangeAutoCompleteBase, field: this.props.displayField, valueForm: this.props.assocForm, idField: xEntityAssoc.idField, readOnly: this.isReadOnly(), error: this.getError(), onErrorChange: this.onErrorChangeAutoCompleteBase }));
     };
     return XAutoCompleteDT;
 }(XFormComponentDT_1.XFormComponentDT));

package/lib/components/XDropdown.js

@@ -125,12 +125,14 @@ var XDropdown = /** @class */ (function (_super) {
     XDropdown.prototype.render = function () {
         // TODO - pridat cez generikum typ objektu v Dropdown-e (ak sa da)
         var options = this.state.options;
-        // TODO - readOnly implementovat
+        // TODO - mozno by nebolo od veci pouzivat InputText ak readOnly === true (chybala by len sipka (rozbalovac)) a dalo by sa copy-paste-ovat
+        // propertiesy na Dropdown-e: readOnly vyseduje, disabled znemoznuje vyber polozky
+        var readOnly = this.isReadOnly();
         // Dropdown setuje do atributu object.assocField asociovany objekt zo zoznamu objektov ktore ziskame podla asociacie
         // appendTo={document.body} appenduje overlay panel na element body - eliminuje "skakanie" formularu na mobile pri kliknuti na dropdown
         return (react_1.default.createElement("div", { className: "field grid" },
             react_1.default.createElement("label", { htmlFor: this.props.assocField, className: "col-fixed", style: this.getLabelStyle() }, this.getLabel()),
-            react_1.default.createElement(dropdown_1.Dropdown, __assign({ appendTo: document.body, id: this.props.assocField, optionLabel: this.props.displayField, value: this.getValue(), options: options, onChange: this.onValueChange }, this.getClassNameTooltip()))));
+            react_1.default.createElement(dropdown_1.Dropdown, __assign({ appendTo: document.body, id: this.props.assocField, optionLabel: this.props.displayField, value: this.getValue(), options: options, onChange: this.onValueChange, readOnly: readOnly, disabled: readOnly }, this.getClassNameTooltip()))));
     };
     return XDropdown;
 }(XFormComponent_1.XFormComponent));

package/lib/components/XExportRowsDialog.js

@@ -52,13 +52,13 @@ var XUtilsConversions_1 = require("./XUtilsConversions");
 var XExportRowsDialog = function (props) {
     var _a;
     var _b = __read((0, react_1.useState)(ExportImportParam_1.ExportType.Csv), 2), exportType = _b[0], setExportType = _b[1];
-    var _c = __read((0, react_1.useState)(false), 2), createHeaderLine = _c[0], setCreateHeaderLine = _c[1];
+    var _c = __read((0, react_1.useState)(true), 2), createHeaderLine = _c[0], setCreateHeaderLine = _c[1];
     var _d = __read((0, react_1.useState)(ExportImportParam_1.CsvSeparator.Semicolon), 2), csvSeparator = _d[0], setCsvSeparator = _d[1];
     var _e = __read((0, react_1.useState)(ExportImportParam_1.CsvDecimalFormat.Comma), 2), decimalFormat = _e[0], setDecimalFormat = _e[1];
     // bez tejto metody by pri opetovnom otvoreni dialogu ponechal povodne hodnoty
     var onShow = function () {
         setExportType(ExportImportParam_1.ExportType.Csv);
-        setCreateHeaderLine(false); // excel hadze hlasky koli prvemu riadku header-ov
+        setCreateHeaderLine(true); // excel hadze hlasky koli prvemu riadku header-ov
         setCsvSeparator(ExportImportParam_1.CsvSeparator.Semicolon);
         setDecimalFormat(ExportImportParam_1.CsvDecimalFormat.Comma);
     };

package/lib/components/XFormBase.d.ts

@@ -45,11 +45,13 @@ export declare abstract class XFormBase extends Component<FormProps> {
     addXFormComponent(xFormComponent: XFormComponent<any, any>): void;
     findXFormComponent(field: string): XFormComponent<any, any> | undefined;
     addXFormDataTable(xFormDataTable: XFormDataTable2): void;
+    formReadOnlyBase(field: string): boolean;
     onClickSave(): Promise<void>;
     onClickCancel(): void;
     validateSave(): boolean;
     validateForm(): XErrorMap;
     fieldValidation(): XErrorMap;
+    formReadOnly(object: XObject, field: string): boolean;
     preInitForm(object: XObject, operationType: OperationType.Insert | OperationType.Update): void;
     validate(object: XObject): XErrors;
     preSave(object: XObject): void;

package/lib/components/XFormBase.js

@@ -345,6 +345,10 @@ var XFormBase = /** @class */ (function (_super) {
     XFormBase.prototype.addXFormDataTable = function (xFormDataTable) {
         this.xFormDataTableList.push(xFormDataTable);
     };
+    XFormBase.prototype.formReadOnlyBase = function (field) {
+        // TODO - bude this.state.object vzdycky !== undefined?
+        return this.formReadOnly(this.state.object, field);
+    };
     XFormBase.prototype.onClickSave = function () {
         return __awaiter(this, void 0, void 0, function () {
             var isAddRow, object, e_3;
@@ -493,6 +497,12 @@ var XFormBase = /** @class */ (function (_super) {
         }
         return xErrorMap;
     };
+    // this method can be overriden in subclass if needed
+    // (the purpose is to put the whole form to read only mode (maybe with exception a few fields))
+    // if returns true for the param "field", then the field is read only, otherwise the property readOnly of the XInput* is processed
+    XFormBase.prototype.formReadOnly = function (object, field) {
+        return false;
+    };
     // this method can be overriden in subclass if needed (to modify/save object after read from DB and before set into the form)
     XFormBase.prototype.preInitForm = function (object, operationType) {
     };

package/lib/components/XFormComponent.d.ts

@@ -5,11 +5,12 @@ import { OperationType } from "./XUtils";
 import { XFieldChangeEvent } from "./XFieldChangeEvent";
 import { XCustomFilter } from "../serverApi/FindParam";
 export type FieldOnChange = (e: XFieldChangeEvent<any>) => void;
+export type XReadOnlyProp = boolean | ((object: any) => boolean);
 export type XFilterProp = XCustomFilter | ((object: any) => XCustomFilter | undefined);
 export interface XFormComponentProps<T> {
     form: XFormBase;
     label?: string;
-    readOnly?: boolean;
+    readOnly?: XReadOnlyProp;
     labelStyle?: React.CSSProperties;
     inline?: boolean;
     onChange?: FieldOnChange;

package/lib/components/XFormComponent.js

@@ -47,8 +47,34 @@ var XFormComponent = /** @class */ (function (_super) {
         this.props.form.onFieldChange(this.getField(), value, error, onChange, assocObjectChange);
     };
     XFormComponent.prototype.isReadOnly = function () {
-        // tuto do buducna planujeme pridat aj dynamicky readOnly, bude ho treba ukladat do form.state podobne ako sa ukladaju errory do form.state.errorMap
-        return XUtils_1.XUtils.isReadOnly(this.getField(), this.props.readOnly);
+        var readOnly;
+        if (!XUtilsCommon_1.XUtilsCommon.isSingleField(this.getField())) {
+            // if the length of field is 2 or more, then readOnly
+            readOnly = true;
+        }
+        // the purpose of formReadOnly is to put the whole form to read only mode,
+        // that's why the formReadOnly has higher prio then property this.props.readOnly
+        else if (this.props.form.formReadOnlyBase(this.getField())) {
+            readOnly = true;
+        }
+        else if (typeof this.props.readOnly === 'boolean') {
+            readOnly = this.props.readOnly;
+        }
+        else if (typeof this.props.readOnly === 'function') {
+            // TODO - tazko povedat ci niekedy bude object === null (asi ano vid metodu getFilterBase)
+            var object = this.props.form.state.object;
+            if (object) {
+                readOnly = this.props.readOnly(this.props.form.getXObject());
+            }
+            else {
+                readOnly = true;
+            }
+        }
+        else {
+            // readOnly is undefined
+            readOnly = false;
+        }
+        return readOnly;
     };
     XFormComponent.prototype.getLabel = function () {
         var _a;

package/lib/components/XFormComponentDT.js

@@ -48,8 +48,34 @@ var XFormComponentDT = /** @class */ (function (_super) {
         this.props.form.onTableFieldChange(this.props.rowData, this.getField(), value, error, onChange, assocObjectChange);
     };
     XFormComponentDT.prototype.isReadOnly = function () {
-        // tuto do buducna planujeme pridat aj dynamicky readOnly, bude ho treba ukladat do form.state podobne ako sa ukladaju errory do form.state.errorMap
-        return XUtils_1.XUtils.isReadOnly(this.getField(), this.props.readOnly);
+        var readOnly;
+        if (!XUtilsCommon_1.XUtilsCommon.isSingleField(this.getField())) {
+            // if the length of field is 2 or more, then readOnly
+            readOnly = true;
+        }
+        // formReadOnlyBase is called on the level XFormDataTable2
+        // else if (this.props.form.formReadOnlyBase("xxx")) {
+        //     readOnly = true;
+        // }
+        else if (typeof this.props.readOnly === 'boolean') {
+            readOnly = this.props.readOnly;
+        }
+        // else if (typeof this.props.readOnly === 'function') {
+        //     // TODO - tazko povedat ci niekedy bude object === null (asi ano vid metodu getFilterBase)
+        // TODO - use also this.props.rowData
+        //     const object: XObject = this.props.form.state.object;
+        //     if (object) {
+        //         readOnly = this.props.readOnly(this.props.form.getXObject());
+        //     }
+        //     else {
+        //         readOnly = true;
+        //     }
+        // }
+        else {
+            // readOnly is undefined
+            readOnly = false;
+        }
+        return readOnly;
     };
     // *********** validation support ************
     // volane po kliknuti na Save

package/lib/components/XFormDataTable2.d.ts

@@ -75,12 +75,13 @@ export declare class XFormDataTable2 extends Component<XFormDataTableProps> {
     getCheckboxFilterValue(field: string): boolean | null;
     onDropdownFilterChange(field: string, displayValue: any): void;
     getDropdownFilterValue(field: string): any;
-    bodyTemplate(columnProps: XFormColumnProps, rowData: any, xEntity: XEntity): any;
+    bodyTemplate(columnProps: XFormColumnProps, tableReadOnly: boolean, rowData: any, xEntity: XEntity): any;
     onClickAddRow(): void;
     onClickRemoveRowBySelection(): void;
     removeRow(row: any): void;
     validate(): void;
     getErrorMessages(): string;
+    isReadOnly(): boolean;
     render(): JSX.Element;
 }
 export type TableFieldOnChange = (e: XTableFieldChangeEvent<any, any>) => void;

package/lib/components/XFormDataTable2.js

@@ -334,23 +334,26 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
     */
     // body={(rowData: any) => bodyTemplate(childColumn.props.field, rowData)}
-    XFormDataTable2.prototype.bodyTemplate = function (columnProps, rowData, xEntity) {
+    XFormDataTable2.prototype.bodyTemplate = function (columnProps, tableReadOnly, rowData, xEntity) {
+        var _a, _b;
         var body;
         if (columnProps.type === "inputSimple") {
             var columnPropsInputSimple = columnProps;
+            // tableReadOnly has higher prio then property readOnly
+            var readOnly = tableReadOnly || ((_a = columnPropsInputSimple.readOnly) !== null && _a !== void 0 ? _a : false);
             var xField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPath(xEntity, columnPropsInputSimple.field);
             if (xField.type === "decimal" || xField.type === "number") {
-                body = react_1.default.createElement(XInputDecimalDT_1.XInputDecimalDT, { form: this.props.form, entity: this.getEntity(), field: columnPropsInputSimple.field, rowData: rowData, readOnly: columnPropsInputSimple.readOnly, onChange: columnPropsInputSimple.onChange });
+                body = react_1.default.createElement(XInputDecimalDT_1.XInputDecimalDT, { form: this.props.form, entity: this.getEntity(), field: columnPropsInputSimple.field, rowData: rowData, readOnly: readOnly, onChange: columnPropsInputSimple.onChange });
             }
             else if (xField.type === "date" || xField.type === "datetime") {
-                body = react_1.default.createElement(XInputDateDT_1.XInputDateDT, { form: this.props.form, xField: xField, field: columnPropsInputSimple.field, rowData: rowData, readOnly: columnPropsInputSimple.readOnly });
+                body = react_1.default.createElement(XInputDateDT_1.XInputDateDT, { form: this.props.form, xField: xField, field: columnPropsInputSimple.field, rowData: rowData, readOnly: readOnly });
             }
             else if (xField.type === "boolean") {
-                body = react_1.default.createElement(XCheckboxDT_1.XCheckboxDT, { form: this.props.form, xField: xField, field: columnPropsInputSimple.field, rowData: rowData, readOnly: columnPropsInputSimple.readOnly });
+                body = react_1.default.createElement(XCheckboxDT_1.XCheckboxDT, { form: this.props.form, xField: xField, field: columnPropsInputSimple.field, rowData: rowData, readOnly: readOnly });
             }
             else {
                 // xField.type === "string", pripadne ine jednoduche typy
-                body = react_1.default.createElement(XInputTextDT_1.XInputTextDT, { form: this.props.form, entity: this.getEntity(), field: columnPropsInputSimple.field, rowData: rowData, readOnly: columnPropsInputSimple.readOnly });
+                body = react_1.default.createElement(XInputTextDT_1.XInputTextDT, { form: this.props.form, entity: this.getEntity(), field: columnPropsInputSimple.field, rowData: rowData, readOnly: readOnly });
             }
         }
         else if (columnProps.type === "dropdown") {
@@ -359,7 +362,9 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
         else if (columnProps.type === "autoComplete") {
             var columnPropsAutoComplete = columnProps;
-            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, searchTable: columnPropsAutoComplete.searchTable, assocForm: columnPropsAutoComplete.assocForm, filter: columnPropsAutoComplete.filter, rowData: rowData });
+            // tableReadOnly has higher prio then property readOnly
+            var readOnly = tableReadOnly || ((_b = columnPropsAutoComplete.readOnly) !== null && _b !== void 0 ? _b : false);
+            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, searchTable: columnPropsAutoComplete.searchTable, assocForm: columnPropsAutoComplete.assocForm, filter: columnPropsAutoComplete.filter, rowData: rowData, readOnly: readOnly });
         }
         else if (columnProps.type === "searchButton") {
             var columnPropsSearchButton = columnProps;
@@ -459,6 +464,34 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
         return msg;
     };
+    // TODO - velmi podobna funkcia ako XFormComponent.isReadOnly() - zjednotit ak sa da
+    XFormDataTable2.prototype.isReadOnly = function () {
+        var readOnly;
+        // the purpose of formReadOnly is to put the whole form to read only mode,
+        // that's why the formReadOnly has higher prio then property this.props.readOnly
+        if (this.props.form.formReadOnlyBase(this.props.assocField)) {
+            readOnly = true;
+        }
+        else if (typeof this.props.readOnly === 'boolean') {
+            readOnly = this.props.readOnly;
+        }
+        // TODO
+        // else if (typeof this.props.readOnly === 'function') {
+        //     // TODO - tazko povedat ci niekedy bude object === null (asi ano vid metodu getFilterBase)
+        //     const object: XObject = this.props.form.state.object;
+        //     if (object) {
+        //         readOnly = this.props.readOnly(this.props.form.getXObject());
+        //     }
+        //     else {
+        //         readOnly = true;
+        //     }
+        // }
+        else {
+            // readOnly is undefined
+            readOnly = false;
+        }
+        return readOnly;
+    };
     XFormDataTable2.prototype.render = function () {
         var _this = this;
         var paginator = this.props.paginator !== undefined ? this.props.paginator : false;
@@ -473,7 +506,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
         var filterDisplay = this.props.filterDisplay !== "none" ? this.props.filterDisplay : undefined;
         var label = this.props.label !== undefined ? this.props.label : this.props.assocField;
-        var readOnly = this.props.readOnly !== undefined ? this.props.readOnly : false;
+        var readOnly = this.isReadOnly();
         // v bloku function (child) nejde pouzit priamo this, thisLocal uz ide pouzit
         var thisLocal = this;
         var object = this.props.form.state.object;
@@ -577,11 +610,11 @@ var XFormDataTable2 = /** @class */ (function (_super) {
                 align = "center";
             }
             // }
-            return react_1.default.createElement(column_1.Column, { field: field, header: header, filter: thisLocal.props.filterDisplay !== "none", sortable: thisLocal.props.sortable, filterElement: filterElement, showFilterMenu: showFilterMenu, showClearButton: showClearButton, headerStyle: headerStyle, align: align, body: function (rowData) { return thisLocal.bodyTemplate(childColumnProps, rowData, xEntity); } });
+            return react_1.default.createElement(column_1.Column, { field: field, header: header, filter: thisLocal.props.filterDisplay !== "none", sortable: thisLocal.props.sortable, filterElement: filterElement, showFilterMenu: showFilterMenu, showClearButton: showClearButton, headerStyle: headerStyle, align: align, body: function (rowData) { return thisLocal.bodyTemplate(childColumnProps, readOnly, rowData, xEntity); } });
         });
         if (this.props.removeButtonInRow) {
             // je dolezite nastavit sirku header-a, lebo inac ma stlpec sirku 0 a nevidno ho
-            columnElemList.push(react_1.default.createElement(column_1.Column, { key: "removeButton", headerStyle: { width: '2rem' }, body: function (rowData) { return react_1.default.createElement(XButtonIconNarrow_1.XButtonIconNarrow, { icon: "pi pi-times", onClick: function () { return _this.removeRow(rowData); }, addMargin: false }); } }));
+            columnElemList.push(react_1.default.createElement(column_1.Column, { key: "removeButton", headerStyle: { width: '2rem' }, body: function (rowData) { return react_1.default.createElement(XButtonIconNarrow_1.XButtonIconNarrow, { icon: "pi pi-times", onClick: function () { return _this.removeRow(rowData); }, disabled: readOnly, addMargin: false }); } }));
         }
         return (react_1.default.createElement("div", null,
             react_1.default.createElement("div", { className: "flex justify-content-center" },
@@ -589,8 +622,8 @@ var XFormDataTable2 = /** @class */ (function (_super) {
             react_1.default.createElement("div", { className: "flex justify-content-center" },
                 react_1.default.createElement(datatable_1.DataTable, { ref: function (el) { return _this.dt = el; }, value: valueList, dataKey: this.dataKey, paginator: paginator, rows: rows, totalRecords: valueList.length, filterDisplay: filterDisplay, filters: this.state.filters, onFilter: this.onFilter, sortMode: "multiple", removableSort: true, selectionMode: "single", selection: this.state.selectedRow, onSelectionChange: this.onSelectionChange, className: "p-datatable-sm x-form-datatable", resizableColumns: true, columnResizeMode: "expand", tableStyle: tableStyle, scrollable: this.props.scrollable, scrollHeight: scrollHeight, style: style }, columnElemList)),
             react_1.default.createElement("div", { className: "flex justify-content-center" },
-                react_1.default.createElement(XButton_1.XButton, { icon: this.props.addRowIcon, label: this.props.addRowLabel, onClick: this.onClickAddRow }),
-                this.props.removeButtonInRow ? undefined : react_1.default.createElement(XButton_1.XButton, { icon: this.props.removeRowIcon, label: this.props.removeRowLabel, onClick: this.onClickRemoveRowBySelection }))));
+                react_1.default.createElement(XButton_1.XButton, { icon: this.props.addRowIcon, label: this.props.addRowLabel, onClick: this.onClickAddRow, disabled: readOnly }),
+                this.props.removeButtonInRow ? undefined : react_1.default.createElement(XButton_1.XButton, { icon: this.props.removeRowIcon, label: this.props.removeRowLabel, onClick: this.onClickRemoveRowBySelection, disabled: readOnly }))));
     };
     XFormDataTable2.defaultProps = {
         filterDisplay: "row",

package/lib/components/XInputDate.js

@@ -17,7 +17,7 @@ var XInputDate = function (props) {
     var showTime = (xField.type === 'datetime');
     var cssClassName = showTime ? 'x-input-datetime' : 'x-input-date';
     var label = (_a = props.label) !== null && _a !== void 0 ? _a : props.field;
-    var readOnly = XUtils_1.XUtils.isReadOnly(props.field, props.readOnly);
+    var readOnly = XUtils_1.XUtils.isReadOnly(props.field, props.readOnly) || props.form.formReadOnlyBase(props.field);
     if (!xField.isNullable && !readOnly) {
         label = XUtils_1.XUtils.markNotNull(label);
     }

package/lib/components/XLazyDataTable.js

@@ -438,7 +438,7 @@ var XLazyDataTable = function (props) {
                     if (csvParam && csvParam.useHeaderLine) {
                         csvParam.headers = getHeaders();
                     }
-                    exportParam = { exportType: exportType, filters: filtersAfterFiltering, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), csvParam: csvParam };
+                    exportParam = { exportType: exportType, filters: filtersAfterFiltering, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), csvParam: csvParam };
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);

package/lib/serverApi/ExportImportParam.d.ts

@@ -1,4 +1,5 @@
 import { DataTableFilterMeta, DataTableSortMeta } from "primereact/datatable";
+import { XCustomFilter } from "./FindParam";
 export declare enum ExportType {
     Csv = "csv",
     Json = "json"
@@ -6,6 +7,7 @@ export declare enum ExportType {
 export interface ExportParam {
     exportType: ExportType;
     filters: DataTableFilterMeta;
+    customFilter?: XCustomFilter;
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields: string[];

package/package.json

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