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

package/lib/components/XAutoCompleteBase.js

@@ -689,7 +689,7 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
                 }
                 this.createDropdownItem(buttonItems);
                 if (this.props.buttonsLayout === "buttons") {
-                    buttons = buttonItems.map(function (value) { return react_1.default.createElement(button_1.Button, { icon: value.icon, tooltip: value.tooltip, tooltipOptions: { position: 'top' }, onClick: function (e) { return value.command(e); }, className: 'x-dropdownbutton' + XUtils_1.XUtils.mobileCssSuffix() }); });
+                    buttons = buttonItems.map(function (value, index) { return react_1.default.createElement(button_1.Button, { key: "button".concat(index), icon: value.icon, tooltip: value.tooltip, tooltipOptions: { position: 'top' }, onClick: function (e) { return value.command(e); }, className: 'x-dropdownbutton' + XUtils_1.XUtils.mobileCssSuffix() }); });
                 }
                 else {
                     // buttonsLayout === "splitButton"
@@ -728,15 +728,15 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         // <DobrovolnikForm id={this.formDialogObjectId} object={this.formDialogInitValuesForInsert} onSaveOrCancel={this.formDialogOnSaveOrCancel}/>
         // formgroup-inline lepi SplitButton na autocomplete a zarovna jeho vysku
         return (react_1.default.createElement("div", { className: "x-auto-complete-base", style: { width: this.props.width, maxWidth: this.props.maxWidth } },
-            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, itemTemplate: this.itemTemplate, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(error), { inputClassName: this.props.inputClassName, showEmptyMessage: true })),
+            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ key: "autoComplete", value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, itemTemplate: this.itemTemplate, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(error), { inputClassName: this.props.inputClassName, showEmptyMessage: true })),
             buttons,
             this.props.valueForm != undefined ?
-                react_1.default.createElement(dialog_1.Dialog, { className: "x-dialog-without-header", visible: this.state.formDialogOpened, onHide: this.formDialogOnHide }, react_1.default.cloneElement(this.props.valueForm, {
+                react_1.default.createElement(dialog_1.Dialog, { key: "dialogForm", className: "x-dialog-without-header", visible: this.state.formDialogOpened, onHide: this.formDialogOnHide }, react_1.default.cloneElement(this.props.valueForm, {
                     id: this.formDialogObjectId, initValues: this.formDialogInitValuesForInsert, onSaveOrCancel: this.formDialogOnSaveOrCancel
                 } /*, this.props.valueForm.children*/))
                 : undefined,
             this.props.searchBrowse != undefined && !readOnly ?
-                react_1.default.createElement(dialog_1.Dialog, { className: "x-dialog-without-header", visible: this.state.searchDialogOpened, onHide: this.searchDialogOnHide }, react_1.default.cloneElement(this.props.searchBrowse, { searchBrowseParams: this.createSearchBrowseParams() } /*, props.searchBrowse.children*/))
+                react_1.default.createElement(dialog_1.Dialog, { key: "dialogBrowse", className: "x-dialog-without-header", visible: this.state.searchDialogOpened, onHide: this.searchDialogOnHide }, react_1.default.cloneElement(this.props.searchBrowse, { searchBrowseParams: this.createSearchBrowseParams() } /*, props.searchBrowse.children*/))
                 : undefined));
     };
     XAutoCompleteBase.valueMoreSuggestions = "...";

package/lib/components/XFormBase.d.ts

@@ -42,7 +42,7 @@ export declare abstract class XFormBase extends Component<XFormProps> {
      * @deprecated - mal by sa pouzivat onTableFieldChange
      */
     onObjectDataChange(row?: any, onChange?: XTableFieldOnChange): void;
-    setStateXForm(): void;
+    setStateXForm(callback?: () => void): void;
     onTableAddRow(assocField: string, newRow: any, dataKey?: string, selectedRow?: {}): void;
     static getNextRowId(rowList: any[], dataKey: string): number;
     onTableRemoveRow(assocField: string, row: {}): void;

package/lib/components/XFormBase.js

@@ -199,7 +199,7 @@ var XFormBase = /** @class */ (function (_super) {
                     case 5:
                         this.preInitForm(object, operationType);
                         //console.log("volany XFormBase.componentDidMount() - ideme setnut object");
-                        this.setState({ object: object } /*, () => console.log("volany XFormBase.componentDidMount() - callback setState")*/);
+                        this.setState({ object: object } /*, () => console.log("************** volany XFormBase.componentDidMount() - callback setState")*/);
                         return [2 /*return*/];
                 }
             });
@@ -265,16 +265,15 @@ var XFormBase = /** @class */ (function (_super) {
             // TODO - assocObjectChange dorobit
             onChange({ object: object, tableRow: row, assocObjectChange: undefined });
         }
-        // TODO - tu mozno treba setnut funkciu - koli moznej asynchronicite
         this.setState({ object: object });
     };
     // lepsi nazov ako onObjectDataChange
     // ak niekto zmenil this.state.object alebo this.state.errorMap, zmena sa prejavi vo formulari
     // pouzivame napr. po zavolani onChange na XInputText
-    XFormBase.prototype.setStateXForm = function () {
+    // callback je zavolany, ked dobehne update formulara (mozme pouzit na dalsi update formulara, ktory potrebuje aby boli vsetky komponenty vytvorene)
+    XFormBase.prototype.setStateXForm = function (callback) {
         // TODO - je to ok ze object menime takto?
-        // TODO - tu mozno treba setnut funkciu - koli moznej asynchronicite
-        this.setState({ object: this.state.object, errorMap: this.state.errorMap });
+        this.setState({ object: this.state.object, errorMap: this.state.errorMap }, callback);
     };
     XFormBase.prototype.onTableAddRow = function (assocField, newRow, dataKey, selectedRow) {
         var object = this.getXObject();

package/lib/components/XInputDecimalBase.d.ts

@@ -10,4 +10,5 @@ export declare const XInputDecimalBase: (props: {
     max?: number | undefined;
     size?: number | undefined;
     className?: string | undefined;
+    inputStyle?: React.CSSProperties | undefined;
 }) => React.JSX.Element;

package/lib/components/XInputDecimalBase.js

@@ -13,6 +13,6 @@ var XInputDecimalBase = function (props) {
         props.onChange(e.value);
     };
     // null konvertujeme na undefined (zevraj InputNumber nechce null)
-    return (react_1.default.createElement(inputnumber_1.InputNumber, { id: props.id, value: props.value !== null ? props.value : undefined, onChange: onChange, readOnly: props.readOnly, mode: "decimal", locale: "de-DE", useGrouping: props.useGrouping, minFractionDigits: props.fractionDigits, maxFractionDigits: props.fractionDigits, min: props.min, max: props.max, size: props.size, className: props.className }));
+    return (react_1.default.createElement(inputnumber_1.InputNumber, { id: props.id, value: props.value !== null ? props.value : undefined, onChange: onChange, readOnly: props.readOnly, mode: "decimal", locale: "de-DE", useGrouping: props.useGrouping, minFractionDigits: props.fractionDigits, maxFractionDigits: props.fractionDigits, min: props.min, max: props.max, size: props.size, className: props.className, inputStyle: props.inputStyle }));
 };
 exports.XInputDecimalBase = XInputDecimalBase;

package/lib/components/XUtilsMetadata.d.ts

@@ -12,6 +12,14 @@ export declare class XUtilsMetadata {
         max?: number;
         size?: number;
     };
+    static getParamsForInputNumberBase(useGrouping: boolean, scale: number | undefined, precision: number | undefined, // total number of digits (before + after decimal point (scale))
+    size: number | undefined): {
+        useGrouping: boolean;
+        fractionDigits?: number;
+        min?: number;
+        max?: number;
+        size?: number;
+    };
     static CHAR_SIZE: number;
     static computeColumnWidth(xField: XField, betweenFilter: XBetweenFilterProp, filterMenuInFilterRow: boolean, formColumnType: string | undefined, header: string | undefined, sortableButtonInHeader: boolean, filterButtonInHeader: boolean): string | undefined;
     static computeColumnWidthBase(charSize?: number, paddingAndOther?: number): number | undefined;

package/lib/components/XUtilsMetadata.js

@@ -82,12 +82,12 @@ var XUtilsMetadata = /** @class */ (function () {
     // docasne sem, kym nemame jednotny XInputDecimal/XInputDecimalDT
     XUtilsMetadata.getParamsForInputNumber = function (xField) {
         var useGrouping = true;
-        var fractionDigits = undefined;
+        var scale = undefined;
         var precision = undefined; // total number of digits (before + after decimal point (scale))
         var size = undefined;
         if (xField.type === "decimal") {
             useGrouping = true;
-            fractionDigits = xField.scale;
+            scale = xField.scale;
             precision = xField.precision;
             if (precision !== undefined) {
                 size = precision + Math.floor(precision / 3); // approximatly for 123.456.789,12
@@ -95,7 +95,7 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         else if (xField.type === "number") {
             useGrouping = false;
-            fractionDigits = 0;
+            scale = 0;
             precision = xField.width; // number pouziva width
             if (precision === undefined) {
                 precision = xField.precision; // nech to aj takto zafunguje...
@@ -105,14 +105,18 @@ var XUtilsMetadata = /** @class */ (function () {
         else {
             throw "XInputDecimal: field ".concat(xField.name, " has unsupported type ").concat(xField.type, ". Supported types are decimal and number.");
         }
+        return XUtilsMetadata.getParamsForInputNumberBase(useGrouping, scale, precision, size);
+    };
+    XUtilsMetadata.getParamsForInputNumberBase = function (useGrouping, scale, precision, // total number of digits (before + after decimal point (scale))
+    size) {
         var min = undefined;
         var max = undefined;
-        if (precision !== undefined && fractionDigits !== undefined) {
-            var digits = precision - fractionDigits;
+        if (precision !== undefined && scale !== undefined) {
+            var digits = precision - scale;
             min = -(Math.pow(10, digits) - 1);
             max = Math.pow(10, digits) - 1;
         }
-        return { useGrouping: useGrouping, fractionDigits: fractionDigits, min: min, max: max, size: size };
+        return { useGrouping: useGrouping, fractionDigits: scale, min: min, max: max, size: size };
     };
     XUtilsMetadata.computeColumnWidth = function (xField, betweenFilter, filterMenuInFilterRow, formColumnType, header, sortableButtonInHeader, filterButtonInHeader) {
         var width;

package/lib/serverApi/XUtilsCommon.js

@@ -367,15 +367,19 @@ var XUtilsCommon = /** @class */ (function () {
     XUtilsCommon.sqlMaxDateIfNull = function (sqlExp) {
         return "coalesce(".concat(sqlExp, ", '9999-12-31'::DATE)");
     };
+    // static today(): Date {
+    //     const today = new Date();
+    //     // vynulujeme casovu zlozku
+    //     // poznamka: Date vzdy obsahuje aj casovu zlozku. Nase konverzne funkcie dateFromModel a dateFromUI pouzivaju konverziu new Date('YYYY-MM-DD')
+    //     // a tato konverzia vytvara datum s GMT/UTC/Z casom 00:00:00 (stredoeuropsky 00:01:00 - akokeby sme zadavali new Date('YYYY-MM-DDT00:00:00Z'))
+    //     //today.setHours(0, 0, 0, 0); // nastavi cas 00:00:00 v aktualnej timezone (stredoeuropsky 00:00:00, GMT 23:00:00)
+    //     // - potom nam nefunguje porovnavanie s datumami vytvorenymi cez funkcie dateFromModel a dateFromUI
+    //     today.setUTCHours(0, 0, 0, 0);
+    //     return today;
+    // }
+    // oprava:
     XUtilsCommon.today = function () {
-        var today = new Date();
-        // vynulujeme casovu zlozku
-        // poznamka: Date vzdy obsahuje aj casovu zlozku. Nase konverzne funkcie dateFromModel a dateFromUI pouzivaju konverziu new Date('YYYY-MM-DD')
-        // a tato konverzia vytvara datum s GMT/UTC/Z casom 00:00:00 (stredoeuropsky 00:01:00 - akokeby sme zadavali new Date('YYYY-MM-DDT00:00:00Z'))
-        //today.setHours(0, 0, 0, 0); // nastavi cas 00:00:00 v aktualnej timezone (stredoeuropsky 00:00:00, GMT 23:00:00)
-        // - potom nam nefunguje porovnavanie s datumami vytvorenymi cez funkcie dateFromModel a dateFromUI
-        today.setUTCHours(0, 0, 0, 0);
-        return today;
+        return new Date((0, XUtilsConversions_1.dateAsYYYY_MM_DD)(new Date()));
     };
     // vrati true ak sa string sklada iba z cislic, moze mat + alebo - na zaciatku
     XUtilsCommon.isInt = function (stringValue) {

package/lib/serverApi/XUtilsConversions.d.ts

@@ -15,6 +15,7 @@ export declare enum XDateScale {
 export declare function dateFromModel(value: any): Date | null;
 export declare function dateFromUI(valueString: string, dateScale?: XDateScale): Date | null | undefined;
 export declare function dateAsUI(value: Date | null, dateScale?: XDateScale): string;
+export declare function dateAsYYYY_MM_DD(date: Date): string;
 export declare function datetimeAsUI(value: Date | null): string;
 export declare function timeFromModel(value: any): Date | null;
 export declare function dateFormatUI(dateScale?: XDateScale): string;

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.XDateScale = exports.numberFromString = 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.dateAsYYYY_MM_DD = 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");
@@ -215,6 +215,19 @@ function dateAsUI(value, dateScale) {
     }
 }
 exports.dateAsUI = dateAsUI;
+// specialna funkcia - konvertuje Date na string YYYY-MM-DD
+function dateAsYYYY_MM_DD(date) {
+    var monthStr = (date.getMonth() + 1).toString();
+    if (monthStr.length < 2) {
+        monthStr = "0" + monthStr;
+    }
+    var dayStr = date.getDate().toString();
+    if (dayStr.length < 2) {
+        dayStr = "0" + dayStr;
+    }
+    return "".concat(date.getFullYear(), "-").concat(monthStr, "-").concat(dayStr);
+}
+exports.dateAsYYYY_MM_DD = dateAsYYYY_MM_DD;
 function datetimeAsUI(value) {
     if (value !== null) {
         return (0, XUtilsCommon_1.dateFormat)(value, datetimeFormatUI());

package/package.json

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