@michalrakus/x-react-web-lib 1.11.0 → 1.11.1

package/lib/components/XAutoComplete.d.ts

@@ -4,12 +4,14 @@ import { XAssoc } from "../serverApi/XEntityMetadata";
 import { OperationType } from "./XUtils";
 import { XError } from "./XErrors";
 import { XObject } from "./XObject";
+import { DataTableSortMeta } from "primereact/datatable";
 export interface XAutoCompleteProps extends XFormComponentProps<XObject> {
     assocField: string;
     displayField: string;
     searchBrowse?: JSX.Element;
     assocForm?: JSX.Element;
     filter?: XFilterProp;
+    sortField?: string | DataTableSortMeta[];
     suggestions?: any[];
     size?: number;
     inputStyle?: React.CSSProperties;

package/lib/components/XAutoComplete.js

@@ -79,17 +79,18 @@ var XAutoComplete = /** @class */ (function (_super) {
         this.readAndSetSuggestions();
     };
     XAutoComplete.prototype.readAndSetSuggestions = function () {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var suggestions;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!(this.props.suggestions === undefined)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.xAssoc.entityName, this.getFilterBase(this.props.filter), this.props.displayField)];
+                        return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.xAssoc.entityName, this.getFilterBase(this.props.filter), (_a = this.props.sortField) !== null && _a !== void 0 ? _a : this.props.displayField)];
                     case 1:
-                        suggestions = _a.sent();
+                        suggestions = _b.sent();
                         this.setState({ suggestions: suggestions });
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2: return [2 /*return*/];
                 }
             });

package/lib/components/XAutoCompleteBase.js

@@ -377,7 +377,7 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
             react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, field: this.props.field, 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 && !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, {
+                react_1.default.createElement(dialog_1.Dialog, { visible: this.state.formDialogOpened, onHide: this.formDialogOnHide, header: this.formDialogObjectId ? 'Modification' : 'New row' }, react_1.default.cloneElement(this.props.valueForm, {
                     id: this.formDialogObjectId, initValues: this.formDialogInitValuesForInsert, onSaveOrCancel: this.formDialogOnSaveOrCancel
                 } /*, this.props.valueForm.children*/))
                 : undefined,

package/lib/components/XCheckboxDT.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="react" />
 import { XFormBase } from "./XFormBase";
 import { XField } from "../serverApi/XEntityMetadata";
+import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare const XCheckboxDT: (props: {
     form: XFormBase;
     xField: XField;
     field: string;
     rowData: any;
-    readOnly?: boolean | undefined;
+    readOnly?: XTableFieldReadOnlyProp | undefined;
 }) => JSX.Element;

package/lib/components/XCheckboxDT.js

@@ -7,16 +7,8 @@ exports.XCheckboxDT = void 0;
 var react_1 = __importDefault(require("react"));
 var tristatecheckbox_1 = require("primereact/tristatecheckbox");
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
+var XUtils_1 = require("./XUtils");
 var XCheckboxDT = function (props) {
-    // ak mame path, field je vzdy readOnly
-    var readOnly;
-    var posDot = props.field.indexOf(".");
-    if (posDot !== -1) {
-        readOnly = true;
-    }
-    else {
-        readOnly = props.readOnly !== undefined ? props.readOnly : false;
-    }
     var onValueChange = function (field, rowData, newValue) {
         // pri klikani na TriStateCheckbox prichadza v newValue cyklicky: true -> false -> null
         // ak mame not null atribut, tak pri null hodnote skocime rovno na true
@@ -41,6 +33,7 @@ var XCheckboxDT = function (props) {
         // konvertovat null hodnotu na "" (vo funkcii stringAsUI) je dolezite aby sa prejavila zmena na null v modeli (a tiez aby korektne pridal novy riadok)
         fieldValue = rowDataValue;
     }
+    var readOnly = XUtils_1.XUtils.isReadOnlyTableField(props.field, props.readOnly, props.form.state.object, props.rowData);
     return (react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { id: props.field, value: fieldValue, onChange: function (e) { return onValueChange(props.field, props.rowData, e.value); }, disabled: readOnly }));
 };
 exports.XCheckboxDT = XCheckboxDT;

package/lib/components/XDropdownDT.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { XFormBase } from "./XFormBase";
-import { XDropdownOptionsMap } from "./XFormDataTable2";
+import { XDropdownOptionsMap, XTableFieldReadOnlyProp } from "./XFormDataTable2";
 import { XCustomFilter } from "../serverApi/FindParam";
 export declare const XDropdownDT: (props: {
     form: XFormBase;
@@ -12,5 +12,5 @@ export declare const XDropdownDT: (props: {
     dropdownOptionsMap: XDropdownOptionsMap;
     onDropdownOptionsMapChange: (dropdownOptionsMap: XDropdownOptionsMap) => void;
     rowData: any;
-    readOnly?: boolean | undefined;
+    readOnly?: XTableFieldReadOnlyProp | undefined;
 }) => JSX.Element;

package/lib/components/XDropdownDT.js

@@ -103,7 +103,6 @@ var XDropdownDT = function (props) {
             }
         });
     }); };
-    var readOnly = props.readOnly !== undefined ? props.readOnly : false;
     var onValueChange = function (assocField, rowData, newValue) {
         // zmenime hodnotu v modeli (odtial sa hodnota cita)
         var newValueOrNull;
@@ -118,7 +117,6 @@ var XDropdownDT = function (props) {
         // kedze "rowData" je sucastou "props.form.state.object", tak nam staci zavolat setState({object: object}), aby sa zmena prejavila
         props.form.onObjectDataChange();
     };
-    // TODO - readOnly implementovat
     // Dropdown setuje do atributu object.assocField asociovany objekt zo zoznamu objektov ktore ziskame podla asociacie
     var assocObject = null;
     if (props.rowData !== null) {
@@ -129,7 +127,8 @@ var XDropdownDT = function (props) {
         }
     }
     var options = props.dropdownOptionsMap[props.assocField] !== undefined ? props.dropdownOptionsMap[props.assocField] : []; // mozno mozme do options prasknut rovno undefined...
+    var readOnly = XUtils_1.XUtils.isReadOnlyTableField(undefined, props.readOnly, props.form.state.object, props.rowData);
     // appendTo={document.body} appenduje overlay panel na element body - eliminuje problem s overflow (pozri poznamku v XDropdownDTFilter)
-    return (react_1.default.createElement(dropdown_1.Dropdown, { appendTo: document.body, id: props.assocField, optionLabel: props.displayField, value: assocObject, options: options, dataKey: idField, onChange: function (e) { return onValueChange(props.assocField, props.rowData, e.target.value); } }));
+    return (react_1.default.createElement(dropdown_1.Dropdown, { appendTo: document.body, id: props.assocField, optionLabel: props.displayField, value: assocObject, options: options, dataKey: idField, onChange: function (e) { return onValueChange(props.assocField, props.rowData, e.target.value); }, readOnly: readOnly, disabled: readOnly }));
 };
 exports.XDropdownDT = XDropdownDT;

package/lib/components/XFormBase.d.ts

@@ -1,8 +1,8 @@
 import { Component } from "react";
 import { XObject } from "./XObject";
 import { OperationType } from "./XUtils";
-import { FieldOnChange, XFormComponent } from "./XFormComponent";
-import { TableFieldOnChange, XFormDataTable2, XRowTechData } from "./XFormDataTable2";
+import { XFieldOnChange, XFormComponent } from "./XFormComponent";
+import { XTableFieldOnChange, XFormDataTable2, XRowTechData } from "./XFormDataTable2";
 import { XErrorMap, XErrors } from "./XErrors";
 export type XOnSaveOrCancelProp = (object: XObject | null, objectChange: OperationType) => void;
 export interface XFormProps {
@@ -35,12 +35,12 @@ export declare abstract class XFormBase extends Component<XFormProps> {
     getXObject(): XObject;
     getObject(): any;
     isAddRow(): any;
-    onFieldChange(field: string, value: any, error?: string | undefined, onChange?: FieldOnChange, assocObjectChange?: OperationType): void;
-    onTableFieldChange(rowData: any, field: string, value: any, error?: string | undefined, onChange?: TableFieldOnChange, assocObjectChange?: OperationType): void;
+    onFieldChange(field: string, value: any, error?: string | undefined, onChange?: XFieldOnChange, assocObjectChange?: OperationType): void;
+    onTableFieldChange(rowData: any, field: string, value: any, error?: string | undefined, onChange?: XTableFieldOnChange, assocObjectChange?: OperationType): void;
     /**
      * @deprecated - mal by sa pouzivat onTableFieldChange
      */
-    onObjectDataChange(row?: any, onChange?: TableFieldOnChange): void;
+    onObjectDataChange(row?: any, onChange?: XTableFieldOnChange): void;
     setStateXForm(): void;
     onTableAddRow(assocField: string, newRow: any, dataKey?: string, selectedRow?: {}): void;
     static getNextRowId(rowList: any[], dataKey: string): number;

package/lib/components/XFormComponent.d.ts

@@ -4,7 +4,7 @@ import { XError } from "./XErrors";
 import { OperationType } from "./XUtils";
 import { XFieldChangeEvent } from "./XFieldChangeEvent";
 import { XCustomFilter } from "../serverApi/FindParam";
-export type FieldOnChange = (e: XFieldChangeEvent<any>) => void;
+export type XFieldOnChange = (e: XFieldChangeEvent<any>) => void;
 export type XReadOnlyProp = boolean | ((object: any) => boolean);
 export type XFilterProp = XCustomFilter | ((object: any) => XCustomFilter | undefined);
 export interface XFormComponentProps<T> {
@@ -13,13 +13,13 @@ export interface XFormComponentProps<T> {
     readOnly?: XReadOnlyProp;
     labelStyle?: React.CSSProperties;
     inline?: boolean;
-    onChange?: FieldOnChange;
+    onChange?: XFieldOnChange;
 }
 export declare abstract class XFormComponent<T, P extends XFormComponentProps<T>> extends Component<P> {
     protected constructor(props: P);
     abstract getField(): string;
     getValueFromObject(): any;
-    onValueChangeBase(value: any, onChange?: FieldOnChange, assocObjectChange?: OperationType): void;
+    onValueChangeBase(value: any, onChange?: XFieldOnChange, assocObjectChange?: OperationType): void;
     abstract isNotNull(): boolean;
     isReadOnly(): boolean;
     getLabel(): string;

package/lib/components/XFormComponentDT.d.ts

@@ -3,19 +3,19 @@ import { Component } from "react";
 import { OperationType } from "./XUtils";
 import { XError } from "./XErrors";
 import { XCustomFilter } from "../serverApi/FindParam";
-import { XTableFieldFilterProp, TableFieldOnChange } from "./XFormDataTable2";
+import { XTableFieldFilterProp, XTableFieldOnChange, XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export interface XFormComponentDTProps {
     form: XFormBase;
     entity: string;
     rowData: any;
-    readOnly?: boolean;
-    onChange?: TableFieldOnChange;
+    readOnly?: XTableFieldReadOnlyProp;
+    onChange?: XTableFieldOnChange;
 }
 export declare abstract class XFormComponentDT<P extends XFormComponentDTProps> extends Component<P> {
     protected constructor(props: P);
     abstract getField(): string;
     getValueFromRowData(): any;
-    onValueChangeBase(value: any, onChange?: TableFieldOnChange, assocObjectChange?: OperationType): void;
+    onValueChangeBase(value: any, onChange?: XTableFieldOnChange, assocObjectChange?: OperationType): void;
     abstract isNotNull(): boolean;
     isReadOnly(): boolean;
     validate(): {

package/lib/components/XFormComponentDT.js

@@ -60,17 +60,16 @@ var XFormComponentDT = /** @class */ (function (_super) {
         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 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(), this.props.rowData);
+            }
+            else {
+                readOnly = true;
+            }
+        }
         else {
             // readOnly is undefined
             readOnly = false;

package/lib/components/XFormDataTable2.d.ts

@@ -67,6 +67,7 @@ export declare class XFormDataTable2 extends Component<XFormDataTableProps> {
     constructor(props: XFormDataTableProps);
     getPathForColumn(columnProps: XFormColumnProps): string;
     static getHeader(columnProps: XFormColumnProps, xEntity: XEntity, field: string, xField: XField): string;
+    static isReadOnlyHeader(path: string | undefined, readOnly: XTableFieldReadOnlyProp | undefined): boolean;
     getEntity(): string;
     createInitFilters(): DataTableFilterMeta;
     getFilterMatchMode(xField: XField): FilterMatchMode;
@@ -85,16 +86,17 @@ export declare class XFormDataTable2 extends Component<XFormDataTableProps> {
     isReadOnly(): boolean;
     render(): JSX.Element;
 }
-export type TableFieldOnChange = (e: XTableFieldChangeEvent<any, any>) => void;
+export type XTableFieldOnChange = (e: XTableFieldChangeEvent<any, any>) => void;
+export type XTableFieldReadOnlyProp = boolean | ((object: any, tableRow: any) => boolean);
 export type XTableFieldFilterProp = XCustomFilter | ((object: any, rowData: any) => XCustomFilter | undefined);
 export interface XFormColumnProps {
     type: "inputSimple" | "dropdown" | "autoComplete" | "searchButton";
     header?: any;
-    readOnly?: boolean;
+    readOnly?: XTableFieldReadOnlyProp;
     dropdownInFilter?: boolean;
     showFilterMenu?: boolean;
     width?: string;
-    onChange?: TableFieldOnChange;
+    onChange?: XTableFieldOnChange;
 }
 export interface XFormInputSimpleColumnProps extends XFormColumnProps {
     field: string;

package/lib/components/XFormDataTable2.js

@@ -79,6 +79,7 @@ var tristatecheckbox_1 = require("primereact/tristatecheckbox");
 var api_1 = require("primereact/api");
 var XAutoCompleteDT_1 = require("./XAutoCompleteDT");
 var XButtonIconNarrow_1 = require("./XButtonIconNarrow");
+var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 var XLocale_1 = require("./XLocale");
 var XInputIntervalDT_1 = require("./XInputIntervalDT");
 var XFormDataTable2 = /** @class */ (function (_super) {
@@ -151,7 +152,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
     };
     XFormDataTable2.getHeader = function (columnProps, xEntity, field, xField) {
-        var _a, _b, _c, _d;
+        var _a;
         // poznamky - parametre field a xField by sme mohli vyratavat na zaklade columnProps ale kedze ich uz mame, setrime performance a neduplikujeme vypocet
         // nie je to tu uplne idealne nakodene, ale je to pomerne prehladne
         var isNullable = true;
@@ -159,35 +160,58 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         if (columnProps.type === "inputSimple") {
             var columnPropsInputSimple = columnProps;
             isNullable = xField.isNullable;
-            readOnly = XUtils_1.XUtils.isReadOnly(columnPropsInputSimple.field, columnProps.readOnly);
+            readOnly = XFormDataTable2.isReadOnlyHeader(columnPropsInputSimple.field, columnProps.readOnly);
         }
         else if (columnProps.type === "dropdown") {
             var columnPropsDropdown = columnProps;
             var xAssoc = XUtilsMetadata_1.XUtilsMetadata.getXAssocToOne(xEntity, columnPropsDropdown.assocField);
             isNullable = xAssoc.isNullable;
-            readOnly = (_a = columnProps.readOnly) !== null && _a !== void 0 ? _a : false;
+            readOnly = XFormDataTable2.isReadOnlyHeader(undefined, columnProps.readOnly);
         }
         else if (columnProps.type === "autoComplete") {
             var columnPropsAutoComplete = columnProps;
             var xAssoc = XUtilsMetadata_1.XUtilsMetadata.getXAssocToOne(xEntity, columnPropsAutoComplete.assocField);
             isNullable = xAssoc.isNullable;
-            readOnly = (_b = columnProps.readOnly) !== null && _b !== void 0 ? _b : false;
+            readOnly = XFormDataTable2.isReadOnlyHeader(undefined, columnProps.readOnly);
         }
         else if (columnProps.type === "searchButton") {
             var columnPropsSearchButton = columnProps;
             var xAssoc = XUtilsMetadata_1.XUtilsMetadata.getXAssocToOne(xEntity, columnPropsSearchButton.assocField);
             isNullable = xAssoc.isNullable;
-            readOnly = (_c = columnProps.readOnly) !== null && _c !== void 0 ? _c : false;
+            readOnly = XFormDataTable2.isReadOnlyHeader(undefined, columnProps.readOnly);
         }
         else {
             throw "Unknown prop type = " + columnProps.type;
         }
-        var header = (_d = columnProps.header) !== null && _d !== void 0 ? _d : field;
+        var header = (_a = columnProps.header) !== null && _a !== void 0 ? _a : field;
         if (!isNullable && !readOnly) {
             header = XUtils_1.XUtils.markNotNull(header);
         }
         return header;
     };
+    // helper
+    XFormDataTable2.isReadOnlyHeader = function (path, readOnly) {
+        var isReadOnly;
+        if (path && !XUtilsCommon_1.XUtilsCommon.isSingleField(path)) {
+            // if the length of field is 2 or more, then readOnly
+            isReadOnly = true;
+        }
+        // formReadOnlyBase is called on the level XFormDataTable2
+        // else if (this.props.form.formReadOnlyBase("xxx")) {
+        //     isReadOnly = true;
+        // }
+        else if (typeof readOnly === 'boolean') {
+            isReadOnly = readOnly;
+        }
+        else if (typeof readOnly === 'function') {
+            isReadOnly = false;
+        }
+        else {
+            // readOnly is undefined
+            isReadOnly = false;
+        }
+        return isReadOnly;
+    };
     XFormDataTable2.prototype.getEntity = function () {
         if (this.entity === undefined) {
             throw "Unexpected error: this.entity is undefined";
@@ -324,12 +348,11 @@ var XFormDataTable2 = /** @class */ (function (_super) {
     */
     // body={(rowData: any) => bodyTemplate(childColumn.props.field, rowData)}
     XFormDataTable2.prototype.bodyTemplate = function (columnProps, tableReadOnly, rowData, xEntity) {
-        var _a, _b;
         var body;
+        // tableReadOnly has higher prio then property readOnly
+        var readOnly = tableReadOnly ? true : columnProps.readOnly;
         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: readOnly, onChange: columnPropsInputSimple.onChange });
@@ -350,12 +373,10 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
         else if (columnProps.type === "dropdown") {
             var columnPropsDropdown = columnProps;
-            body = react_1.default.createElement(XDropdownDT_1.XDropdownDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsDropdown.assocField, displayField: columnPropsDropdown.displayField, sortField: columnPropsDropdown.sortField, filter: columnPropsDropdown.filter, dropdownOptionsMap: this.state.dropdownOptionsMap, onDropdownOptionsMapChange: this.onDropdownOptionsMapChange, rowData: rowData });
+            body = react_1.default.createElement(XDropdownDT_1.XDropdownDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsDropdown.assocField, displayField: columnPropsDropdown.displayField, sortField: columnPropsDropdown.sortField, filter: columnPropsDropdown.filter, dropdownOptionsMap: this.state.dropdownOptionsMap, onDropdownOptionsMapChange: this.onDropdownOptionsMapChange, rowData: rowData, readOnly: readOnly });
         }
         else if (columnProps.type === "autoComplete") {
             var columnPropsAutoComplete = columnProps;
-            // 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, searchBrowse: columnPropsAutoComplete.searchBrowse, assocForm: columnPropsAutoComplete.assocForm, filter: columnPropsAutoComplete.filter, suggestions: columnPropsAutoComplete.suggestions, rowData: rowData, readOnly: readOnly });
         }
         else if (columnProps.type === "searchButton") {

package/lib/components/XInputDateDT.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="react" />
 import { XFormBase } from "./XFormBase";
 import { XField } from "../serverApi/XEntityMetadata";
+import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare const XInputDateDT: (props: {
     form: XFormBase;
     xField: XField;
     field: string;
     rowData: any;
-    readOnly?: boolean | undefined;
+    readOnly?: XTableFieldReadOnlyProp | undefined;
 }) => JSX.Element;

package/lib/components/XInputDateDT.js

@@ -8,18 +8,10 @@ var XUtilsConversions_1 = require("./XUtilsConversions");
 var calendar_1 = require("primereact/calendar");
 var react_1 = __importDefault(require("react"));
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
+var XUtils_1 = require("./XUtils");
 var XInputDateDT = function (props) {
     var showTime = (props.xField.type === 'datetime');
     var cssClassName = showTime ? 'x-input-datetime' : 'x-input-date';
-    // ak mame path, field je vzdy readOnly
-    var readOnly;
-    var posDot = props.field.indexOf(".");
-    if (posDot !== -1) {
-        readOnly = true;
-    }
-    else {
-        readOnly = props.readOnly !== undefined ? props.readOnly : false;
-    }
     var onValueChange = function (field, rowData, newValue) {
         // z Calendar prichadza e.value - typ Date alebo null
         // zmenime hodnotu v modeli (odtial sa hodnota cita)
@@ -47,6 +39,7 @@ var XInputDateDT = function (props) {
         }
         // fieldValue zostalo undefined (konvertujeme null -> undefined) - Calendar pozaduje undefined, nechce null
     }
+    var readOnly = XUtils_1.XUtils.isReadOnlyTableField(props.field, props.readOnly, props.form.state.object, props.rowData);
     // TODO - nefunguje dobre pridavanie noveho riadku - su tam stare neupdatnute hodnoty - este to asi neopravili https://github.com/primefaces/primereact/issues/1277
     // test mame na TestovaciForm
     // appendTo={document.body} appenduje overlay panel na element body - eliminuje problem s overflow (pozri poznamku v XDropdownDTFilter)

package/lib/components/XInputTextDT.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="react" />
 import { XFormBase } from "./XFormBase";
+import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare const XInputTextDT: (props: {
     form: XFormBase;
     entity: string;
     field: string;
     rowData: any;
-    readOnly?: boolean | undefined;
+    readOnly?: XTableFieldReadOnlyProp | undefined;
 }) => JSX.Element;

package/lib/components/XInputTextDT.js

@@ -9,17 +9,9 @@ var inputtext_1 = require("primereact/inputtext");
 var XUtilsConversions_1 = require("./XUtilsConversions");
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
+var XUtils_1 = require("./XUtils");
 var XInputTextDT = function (props) {
     var xField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPathStr(props.entity, props.field);
-    // ak mame path, field je vzdy readOnly
-    var readOnly;
-    var posDot = props.field.indexOf(".");
-    if (posDot !== -1) {
-        readOnly = true;
-    }
-    else {
-        readOnly = props.readOnly !== undefined ? props.readOnly : false;
-    }
     var onValueChange = function (field, rowData, newValue) {
         // zmenime hodnotu v modeli (odtial sa hodnota cita)
         rowData[field] = (0, XUtilsConversions_1.stringFromUI)(newValue);
@@ -37,6 +29,7 @@ var XInputTextDT = function (props) {
         // konvertovat null hodnotu na "" (vo funkcii stringAsUI) je dolezite aby sa prejavila zmena na null v modeli (a tiez aby korektne pridal novy riadok)
         fieldValue = (0, XUtilsConversions_1.stringAsUI)(rowDataValue);
     }
+    var readOnly = XUtils_1.XUtils.isReadOnlyTableField(props.field, props.readOnly, props.form.state.object, props.rowData);
     return (react_1.default.createElement(inputtext_1.InputText, { id: props.field, value: fieldValue, onChange: function (e) { return onValueChange(props.field, props.rowData, e.target.value); }, readOnly: readOnly, maxLength: xField.length, className: "x-input-to-resize" }));
 };
 exports.XInputTextDT = XInputTextDT;

package/lib/components/XSearchButtonDT.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { XFormBase } from "./XFormBase";
+import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare const XSearchButtonDT: (props: {
     form: XFormBase;
     entity: string;
@@ -8,5 +9,5 @@ export declare const XSearchButtonDT: (props: {
     searchBrowse: JSX.Element;
     assocForm?: JSX.Element | undefined;
     rowData: any;
-    readOnly?: boolean | undefined;
+    readOnly?: XTableFieldReadOnlyProp | undefined;
 }) => JSX.Element;

package/lib/components/XSearchButtonDT.js

@@ -102,7 +102,6 @@ var XSearchButtonDT = function (props) {
         }
         return inputValue;
     };
-    var readOnly = props.readOnly !== undefined ? props.readOnly : false;
     var onInputValueChange = function (e) {
         setInputChanged(true);
         setInputValueState(e.target.value);
@@ -177,6 +176,7 @@ var XSearchButtonDT = function (props) {
     };
     // vypocitame inputValue
     var inputValue = computeInputValue();
+    var readOnly = XUtils_1.XUtils.isReadOnlyTableField(undefined, props.readOnly, props.form.state.object, props.rowData);
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "x-search-button-base" },
             react_1.default.createElement(inputtext_1.InputText, { id: props.assocField, value: inputValue, onChange: onInputValueChange, onBlur: onInputBlur, readOnly: readOnly, ref: inputTextRef }),

package/lib/components/XUtils.d.ts

@@ -4,6 +4,9 @@ import React from "react";
 import { XEnvVar } from "./XEnvVars";
 import { XError, XErrorMap } from "./XErrors";
 import { XCustomFilter, XCustomFilterItem } from "../serverApi/FindParam";
+import { DataTableSortMeta } from "primereact/datatable";
+import { XObject } from "./XObject";
+import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
@@ -44,7 +47,7 @@ export declare class XUtils {
     static registerAppForm(elem: any, entity: string, formId?: string): void;
     static getAppForm(entity: string, formId?: string): any;
     static fetchMany(path: string, value: any, usePublicToken?: boolean | XToken): Promise<any[]>;
-    static fetchRows(entity: string, customFilter?: XCustomFilter | undefined, sortField?: string, fields?: string[]): Promise<any[]>;
+    static fetchRows(entity: string, customFilter?: XCustomFilter | undefined, sortField?: string | DataTableSortMeta[] | undefined, fields?: string[]): Promise<any[]>;
     static fetchOne(path: string, value: any, usePublicToken?: boolean | XToken): Promise<any>;
     static fetchString(path: string, value: any): Promise<string>;
     static fetch(path: string, value: any, usePublicToken?: boolean | XToken): Promise<any>;
@@ -86,6 +89,7 @@ export declare class XUtils {
      */
     static arrayIntersect<T>(array1: T[], array2: T[], idField: string): T[];
     static isReadOnly(path: string, readOnlyInit?: boolean): boolean;
+    static isReadOnlyTableField(path: string | undefined, readOnly: XTableFieldReadOnlyProp | undefined, object: XObject | null, tableRow: any): boolean;
     static markNotNull(label: string): string;
     static showErrorMessage(message: string, e: unknown): void;
     static createErrorProps(error: string | undefined): {};
@@ -99,4 +103,5 @@ export declare class XUtils {
     static normalizeString(value: string): string;
     static createCustomFilterItems(customFilter: XCustomFilter | undefined): XCustomFilterItem[] | undefined;
     static filterAnd(...filters: (XCustomFilter | undefined)[]): XCustomFilterItem[] | undefined;
+    static isTableRowInserted(tableRow: any): boolean;
 }

package/lib/components/XUtils.js

@@ -265,11 +265,20 @@ var XUtils = /** @class */ (function () {
     // pomocna metodka pouzivajuca lazyDataTable service
     XUtils.fetchRows = function (entity, customFilter, sortField, fields) {
         return __awaiter(this, void 0, void 0, function () {
-            var findParam, rowList;
+            var multiSortMeta, findParam, rowList;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilterItems: XUtils.createCustomFilterItems(customFilter), multiSortMeta: sortField ? [{ field: sortField, order: 1 }] : undefined, fields: fields };
+                        multiSortMeta = undefined;
+                        if (sortField) {
+                            if (Array.isArray(sortField)) {
+                                multiSortMeta = sortField;
+                            }
+                            else {
+                                multiSortMeta = [{ field: sortField, order: 1 }];
+                            }
+                        }
+                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilterItems: XUtils.createCustomFilterItems(customFilter), multiSortMeta: multiSortMeta, fields: fields };
                         return [4 /*yield*/, XUtils.fetchOne('lazyDataTableFindRows', findParam)];
                     case 1:
                         rowList = (_a.sent()).rowList;
@@ -546,6 +555,35 @@ var XUtils = /** @class */ (function () {
         }
         return readOnly;
     };
+    // docasna funkcia, kym sa vsade nebude pouzivat XFormComponentDT a jej isReadOnly()
+    XUtils.isReadOnlyTableField = function (path, readOnly, object, tableRow) {
+        var isReadOnly;
+        if (path && !XUtilsCommon_1.XUtilsCommon.isSingleField(path)) {
+            // if the length of field is 2 or more, then readOnly
+            isReadOnly = true;
+        }
+        // formReadOnlyBase is called on the level XFormDataTable2
+        // else if (this.props.form.formReadOnlyBase("xxx")) {
+        //     isReadOnly = true;
+        // }
+        else if (typeof readOnly === 'boolean') {
+            isReadOnly = readOnly;
+        }
+        else if (typeof readOnly === 'function') {
+            // TODO - tazko povedat ci niekedy bude object === null (asi ano vid metodu getFilterBase)
+            if (object) {
+                isReadOnly = readOnly(object, tableRow);
+            }
+            else {
+                isReadOnly = true;
+            }
+        }
+        else {
+            // readOnly is undefined
+            isReadOnly = false;
+        }
+        return isReadOnly;
+    };
     XUtils.markNotNull = function (label) {
         return label + ' *';
     };
@@ -685,6 +723,11 @@ var XUtils = /** @class */ (function () {
         }
         return customFilterItemsResult;
     };
+    // pomocna metodka
+    XUtils.isTableRowInserted = function (tableRow) {
+        var _a;
+        return (_a = tableRow.__x_generatedRowId) !== null && _a !== void 0 ? _a : false; // specialny priznak, ze sme vygenerovali id-cko
+    };
     XUtils.dropdownEmptyOptionValue = " ";
     XUtils.xBackendUrl = undefined;
     // nacachovany XToken - na rozlicnych miestach potrebujeme vediet uzivatela

package/package.json

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