@michalrakus/x-react-web-lib 1.30.0 → 1.31.0

package/lib/components/XFieldSet/XFieldSetBase.d.ts

@@ -73,7 +73,7 @@ export interface XFieldSetValues {
 }
 export type XFieldXFieldMetaMap = Map<string, XFieldMeta>;
 export declare class XFieldSetBase {
-    static createXFieldXFieldMetaMap(xFieldSetMeta: XFieldSetMeta): XFieldXFieldMetaMap;
+    static createXFieldXFieldMetaMap(xFieldSetMeta: XFieldSetMeta, filterFromParent?: string): XFieldXFieldMetaMap;
     static xFieldSetValuesAsUI(xFieldSetValues: XFieldSetValues, xFieldXFieldMetaMap: XFieldXFieldMetaMap): string;
     private static createMapForXFieldMeta;
 }

package/lib/components/XFieldSet/XFieldSetBase.js

@@ -64,9 +64,11 @@ var XFieldSetBase = /** @class */ (function () {
     function XFieldSetBase() {
     }
     // api metoda na vytvorenie Map instancie, ktora sluzi na rychle najdenie prislusneho XFieldMeta podla nazvu fieldu
-    XFieldSetBase.createXFieldXFieldMetaMap = function (xFieldSetMeta) {
+    // ak je zadany filterFromParent, tak vracia len children/subchildren/... fieldu s field = filterFromParent
+    // (filterFromParent je casto groupField)
+    XFieldSetBase.createXFieldXFieldMetaMap = function (xFieldSetMeta, filterFromParent) {
         var xFieldXFieldMetaMap = new Map();
-        XFieldSetBase.createMapForXFieldMeta(xFieldSetMeta.xFieldMetaRoot, xFieldXFieldMetaMap);
+        XFieldSetBase.createMapForXFieldMeta(xFieldSetMeta.xFieldMetaRoot, filterFromParent, xFieldXFieldMetaMap);
         return xFieldXFieldMetaMap;
     };
     // api metoda na vyrenderovanie field set atributu
@@ -111,14 +113,21 @@ var XFieldSetBase = /** @class */ (function () {
         }
         return valueUIList.join(", ");
     };
-    XFieldSetBase.createMapForXFieldMeta = function (xFieldMeta, xFieldXFieldMetaMap) {
+    XFieldSetBase.createMapForXFieldMeta = function (xFieldMeta, filterFromParent, xFieldXFieldMetaMap) {
         var e_2, _a;
-        xFieldXFieldMetaMap.set(xFieldMeta.field, xFieldMeta);
+        if (filterFromParent === undefined) {
+            // no filter is used
+            xFieldXFieldMetaMap.set(xFieldMeta.field, xFieldMeta);
+        }
+        else if (filterFromParent === xFieldMeta.field) {
+            // the searched parent field has been found, all his children/subchildren/... will be added to the list (we remove the filter)
+            filterFromParent = undefined;
+        }
         if (xFieldMeta.xFieldMetaList) {
             try {
                 for (var _b = __values(xFieldMeta.xFieldMetaList), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var insideXFieldMeta = _c.value;
-                    XFieldSetBase.createMapForXFieldMeta(insideXFieldMeta, xFieldXFieldMetaMap);
+                    XFieldSetBase.createMapForXFieldMeta(insideXFieldMeta, filterFromParent, xFieldXFieldMetaMap);
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }

package/lib/components/XFormComponentDT.d.ts

@@ -1,5 +1,5 @@
 import { XFormBase } from "./XFormBase";
-import { Component } from "react";
+import React, { Component } from "react";
 import { OperationType } from "./XUtils";
 import { XError } from "./XErrors";
 import { XCustomFilter } from "../serverApi/FindParam";
@@ -10,6 +10,11 @@ export interface XFormComponentDTProps {
     rowData: any;
     readOnly?: XTableFieldReadOnlyProp;
     onChange?: XTableFieldOnChange;
+    placeholder?: string;
+    label?: string;
+    tooltip?: string;
+    desc?: string;
+    labelStyle?: React.CSSProperties;
 }
 export declare abstract class XFormComponentDT<P extends XFormComponentDTProps> extends Component<P> {
     private valueChanged;
@@ -19,6 +24,8 @@ export declare abstract class XFormComponentDT<P extends XFormComponentDTProps>
     onValueChangeBase(value: any, onChange?: XTableFieldOnChange, assocObjectChange?: OperationType): void;
     abstract isNotNull(): boolean;
     isReadOnly(): boolean;
+    getLabel(): string | undefined;
+    getLabelStyle(): React.CSSProperties;
     validate(): {
         field: string;
         xError: XError;

package/lib/components/XFormComponentDT.js

@@ -78,6 +78,25 @@ var XFormComponentDT = /** @class */ (function (_super) {
         }
         return readOnly;
     };
+    // *********** label support - len pre ne-DT componenty pouzivany ************
+    // ak je label undefined, label element sa nevykresli
+    XFormComponentDT.prototype.getLabel = function () {
+        var label = this.props.label;
+        if (label !== undefined) {
+            // test na readOnly je tu hlavne koli tomu aby sme nemali * pri ID atribute, ktory sa pri inserte generuje az pri zapise do DB
+            if (this.isNotNull() && !this.isReadOnly()) {
+                label = XUtils_1.XUtils.markNotNull(label);
+            }
+        }
+        return label;
+    };
+    XFormComponentDT.prototype.getLabelStyle = function () {
+        var _a;
+        var labelStyle = (_a = this.props.labelStyle) !== null && _a !== void 0 ? _a : {};
+        // this.props.inline nepouzivame, lebo je to asi zombie
+        XUtils_1.XUtils.addCssPropIfNotExists(labelStyle, { width: XUtils_1.XUtils.FIELD_LABEL_WIDTH });
+        return labelStyle;
+    };
     // *********** validation support ************
     // volane po kliknuti na Save
     // vrati (field, XError) ak nezbehne "field validacia", ak zbehne, vrati undefined

package/lib/components/XInputDT.d.ts

@@ -1,7 +1,9 @@
 import { XField } from "../serverApi/XEntityMetadata";
 import { XFormComponentDT, XFormComponentDTProps } from "./XFormComponentDT";
+import React from "react";
 export interface XInputDTProps extends XFormComponentDTProps {
     field: string;
+    inputStyle?: React.CSSProperties;
 }
 export declare abstract class XInputDT<P extends XInputDTProps> extends XFormComponentDT<P> {
     protected xField: XField;

package/lib/components/XInputDate.js

@@ -40,7 +40,6 @@ var XInputDate = /** @class */ (function (_super) {
     };
     XInputDate.prototype.render = function () {
         var _a;
-        // 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(), scale: (_a = this.props.scale) !== null && _a !== void 0 ? _a : this.xField.scale, datetime: this.xField.type === 'datetime' })));

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

@@ -15,6 +15,7 @@
         "ok": "Ok",
         "save": "Save",
         "cancel": "Cancel",
+        "formRemoveRowConfirm": "Are you sure to remove the row?",
         "expRowCount": "Row count",
         "expExportType": "Export type",
         "expCreateHeaderLine": "Create header line",

package/package.json

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