@michalrakus/x-react-web-lib 1.32.7 → 1.32.8

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

@@ -75,5 +75,6 @@ export type XFieldXFieldMetaMap = Map<string, XFieldMeta>;
 export declare class XFieldSetBase {
     static createXFieldXFieldMetaMap(xFieldSetMeta: XFieldSetMeta, filterFromParent?: string): XFieldXFieldMetaMap;
     static xFieldSetValuesAsUI(xFieldSetValues: XFieldSetValues, xFieldXFieldMetaMap: XFieldXFieldMetaMap): string;
+    static xFieldSetValueAsUI(xFieldMeta: XFieldMeta, value: any): string;
     private static createMapForXFieldMeta;
 }

package/lib/components/XFieldSet/XFieldSetBase.js

@@ -75,27 +75,14 @@ var XFieldSetBase = /** @class */ (function () {
     // logicky patri do src/serverApi/XUtilsConversions.ts a zisla by sa aj pri exporte do excelu ale XFieldXFieldMetaMap (a jeho "parent"-a XFieldSetBase) mame len na frontende
     XFieldSetBase.xFieldSetValuesAsUI = function (xFieldSetValues, xFieldXFieldMetaMap) {
         var e_1, _a;
-        var _b;
         // budeme mat vzdy spravne poradie? nebudeme... asi najjednoduchsie zosortovat tu "valueUIList" podla abecedy
         var valueUIList = [];
         try {
-            for (var _c = __values(Object.entries(xFieldSetValues)), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var _e = __read(_d.value, 2), field = _e[0], value = _e[1];
+            for (var _b = __values(Object.entries(xFieldSetValues)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var _d = __read(_c.value, 2), field = _d[0], value = _d[1];
                 var xFieldMeta = xFieldXFieldMetaMap.get(field);
                 if (xFieldMeta) {
-                    if (xFieldMeta.type === XFieldType.checkbox) {
-                        valueUIList.push(xFieldMeta.label);
-                    }
-                    else if (xFieldMeta.type === XFieldType.inputText) {
-                        valueUIList.push("".concat(xFieldMeta.label, ": \"").concat(value, "\""));
-                    }
-                    else if (xFieldMeta.type === XFieldType.inputDecimal) {
-                        valueUIList.push("".concat(xFieldMeta.label, ": ").concat((0, XUtilsConversions_1.numberAsUI)((0, XUtilsConversions_1.numberFromModel)(value), (_b = xFieldMeta.decimalProps) === null || _b === void 0 ? void 0 : _b.scale)));
-                    }
-                    else {
-                        // neznamy typ
-                        valueUIList.push("".concat(xFieldMeta.label, ": \"").concat(value, "\""));
-                    }
+                    valueUIList.push(XFieldSetBase.xFieldSetValueAsUI(xFieldMeta, value));
                 }
                 else {
                     // field bol z formulara odstraneny (nemalo by sa to takto pouzivat, skor by sa mala datumom ohranicit platnost fieldu)
@@ -107,12 +94,30 @@ var XFieldSetBase = /** @class */ (function () {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
             finally { if (e_1) throw e_1.error; }
         }
         return valueUIList.join(", ");
     };
+    XFieldSetBase.xFieldSetValueAsUI = function (xFieldMeta, value) {
+        var _a;
+        var valueAsUI;
+        if (xFieldMeta.type === XFieldType.checkbox) {
+            valueAsUI = xFieldMeta.label;
+        }
+        else if (xFieldMeta.type === XFieldType.inputText) {
+            valueAsUI = "".concat(xFieldMeta.label, ": \"").concat(value, "\"");
+        }
+        else if (xFieldMeta.type === XFieldType.inputDecimal) {
+            valueAsUI = "".concat(xFieldMeta.label, ": ").concat((0, XUtilsConversions_1.numberAsUI)((0, XUtilsConversions_1.numberFromModel)(value), (_a = xFieldMeta.decimalProps) === null || _a === void 0 ? void 0 : _a.scale));
+        }
+        else {
+            // neznamy typ
+            valueAsUI = "".concat(xFieldMeta.label, ": \"").concat(value, "\"");
+        }
+        return valueAsUI;
+    };
     XFieldSetBase.createMapForXFieldMeta = function (xFieldMeta, filterFromParent, xFieldXFieldMetaMap) {
         var e_2, _a;
         if (filterFromParent === undefined) {

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

@@ -141,6 +141,7 @@ export interface XLazyColumnProps {
     autoComplete?: XAutoCompleteInFilterProps | true;
     showFilterMenu?: boolean;
     betweenFilter?: XBetweenFilterProp | "noBetween";
+    autoFilter: boolean;
     width?: string;
     contentType?: XContentType;
     fieldSetId?: string;
@@ -156,5 +157,6 @@ export declare const XLazyColumn: {
     (props: XLazyColumnProps): null;
     defaultProps: {
         columnViewStatus: boolean;
+        autoFilter: boolean;
     };
 };

package/lib/components/XLazyDataTable/XLazyDataTable.js

@@ -295,7 +295,7 @@ var XLazyDataTable = function (props) {
     */
     var getStateKey = function (stateKeySuffix) {
         var _a;
-        return "xldt-state-".concat((_a = props.stateKey) !== null && _a !== void 0 ? _a : props.entity, "-").concat(stateKeySuffix);
+        return "x-ldt-state-".concat((_a = props.stateKey) !== null && _a !== void 0 ? _a : props.entity, "-").concat(stateKeySuffix);
     };
     var removePagingFromStorage = function () {
         XUtils_1.XUtils.removeValueFromStorage(getStateKey(XStateKeySuffix.pagingFirst));
@@ -394,7 +394,7 @@ var XLazyDataTable = function (props) {
         // tymto zavolanim sa zapise znak zapisany klavesnicou do inputu filtra (ak prikaz zakomentujeme, input filtra zostane prazdny)
         setFilters(event.filters);
         removePagingFromStorage();
-        loadDataBaseIfAutoFilter(event.filters);
+        loadDataBaseIfAutoFilter(event.filters, false);
     };
     var onSort = function (event) {
         //console.log("zavolany onSort - this.state.multiSortMeta = " + JSON.stringify(multiSortMeta));
@@ -404,8 +404,8 @@ var XLazyDataTable = function (props) {
         findParam.multiSortMeta = event.multiSortMeta; // prepiseme multiSortMeta, lebo je tam stara hodnota (volanie setMultiSortMeta nezmeni multiSortMeta hned)
         loadDataBase(findParam);
     };
-    var loadDataBaseIfAutoFilter = function (filters) {
-        if (props.autoFilter) {
+    var loadDataBaseIfAutoFilter = function (filters, fieldAutoFilter) {
+        if (props.autoFilter || fieldAutoFilter) {
             var findParam = createFindParam();
             findParam.filters = filters; // prepiseme filters, lebo je tam stara hodnota
             loadDataBase(findParam);
@@ -868,9 +868,9 @@ var XLazyDataTable = function (props) {
     };
     // ****** dropdown vo filtri ********
     // pouziva sa len pre simple filtrovanie (filterDisplay="row")
-    var onDropdownFilterChange = function (field, displayValue) {
+    var onDropdownFilterChange = function (field, displayValue, fieldAutoFilter) {
         var filterValue = displayValue !== XUtils_1.XUtils.dropdownEmptyOptionValue ? displayValue : null;
-        setFilterValue(field, filterValue, api_1.FilterMatchMode.EQUALS);
+        setFilterValue(field, filterValue, api_1.FilterMatchMode.EQUALS, undefined, fieldAutoFilter);
     };
     var getDropdownFilterValue = function (field) {
         var filterValue = getFilterValue(field);
@@ -885,7 +885,7 @@ var XLazyDataTable = function (props) {
         var filtersCloned = __assign({}, filters);
         setFilters(filtersCloned);
         removePagingFromStorage();
-        loadDataBaseIfAutoFilter(filtersCloned);
+        loadDataBaseIfAutoFilter(filtersCloned, false);
     };
     // vseobecna specialna metodka pouzvana pri custom filtri (XLazyColumn.filterElement)
     var getFilterItem = function (field) {
@@ -893,7 +893,7 @@ var XLazyDataTable = function (props) {
     };
     // vseobecna metodka - nastavi hodnotu do filtra
     // ak je matchMode === undefined, tak zachova povodnu hodnotu matchMode
-    var setFilterValue = function (field, value, matchMode, customFilterItems) {
+    var setFilterValue = function (field, value, matchMode, customFilterItems, fieldAutoFilter) {
         var filterValue = filters[field]; // funguje len pre filterDisplay="row"
         filterValue.value = value;
         if (matchMode !== undefined) {
@@ -906,7 +906,7 @@ var XLazyDataTable = function (props) {
         // we had problem when page was set to e.g. 3 (more than 1), after setting some filter value that caused that only 1 page should be returned
         // - after returning back to browse no rows were displayed (because requested page was 3) (this is quick fix)
         removePagingFromStorage();
-        loadDataBaseIfAutoFilter(filtersCloned);
+        loadDataBaseIfAutoFilter(filtersCloned, fieldAutoFilter);
     };
     // vseobecna metodka - precita hodnotu z filtra (vrati napr. typ Date | null)
     var getFilterValue = function (field) {
@@ -921,7 +921,7 @@ var XLazyDataTable = function (props) {
     // ****** vseobecne metodky pre set/get do/z filtra - pre betweenFilter ********
     // do DataTableFilterMetaData.value ulozime dvojprvkove pole [value1, value2]
     // na backende spracujeme toto dvojprvkove pole
-    var setFilterValue1 = function (field, value) {
+    var setFilterValue1 = function (field, value, fieldAutoFilter) {
         // na zaciatku (po inicializacii lazy table) je filterValue = null
         var filterValue = getFilterValue(field);
         if (filterValue !== null) {
@@ -930,9 +930,9 @@ var XLazyDataTable = function (props) {
         else {
             filterValue = [value, null];
         }
-        setFilterValue(field, filterValue, api_1.FilterMatchMode.BETWEEN);
+        setFilterValue(field, filterValue, api_1.FilterMatchMode.BETWEEN, undefined, fieldAutoFilter);
     };
-    var setFilterValue2 = function (field, value) {
+    var setFilterValue2 = function (field, value, fieldAutoFilter) {
         // na zaciatku (po inicializacii lazy table) je filterValue = null
         var filterValue = getFilterValue(field);
         if (filterValue !== null) {
@@ -941,7 +941,7 @@ var XLazyDataTable = function (props) {
         else {
             filterValue = [null, value];
         }
-        setFilterValue(field, filterValue, api_1.FilterMatchMode.BETWEEN);
+        setFilterValue(field, filterValue, api_1.FilterMatchMode.BETWEEN, undefined, fieldAutoFilter);
     };
     var getFilterValue1 = function (field) {
         return getFilterValue1or2(field, 0);
@@ -1215,20 +1215,20 @@ var XLazyDataTable = function (props) {
             }
             var xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOneByPath(xEntity, assocField_1);
             var object = getFilterValue(childColumn.props.field);
-            filterElement = react_1.default.createElement(XAutoCompleteBase_1.XAutoCompleteBase, { value: object, onChange: function (object, objectChange) { return setFilterValue(childColumn.props.field, object, undefined, object !== null ? [{ where: "[".concat(assocField_1, "] = ").concat(object['id']), params: {} }] : undefined); }, error: undefined, onErrorChange: function (error) { }, idField: "id", field: displayField, suggestionsQuery: { entity: xAssoc.entityName, filter: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.filter, sortField: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.sortField }, searchBrowse: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.searchBrowse, valueForm: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.valueForm, addRowEnabled: false, width: "100%", scrollHeight: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.scrollHeight, suggestionsLoad: "lazy", lazyLoadMaxRows: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.lazyLoadMaxRows, minLength: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.minLength });
+            filterElement = react_1.default.createElement(XAutoCompleteBase_1.XAutoCompleteBase, { value: object, onChange: function (object, objectChange) { return setFilterValue(childColumn.props.field, object, undefined, object !== null ? [{ where: "[".concat(assocField_1, "] = ").concat(object['id']), params: {} }] : undefined, childColumn.props.autoFilter); }, error: undefined, onErrorChange: function (error) { }, idField: "id", field: displayField, suggestionsQuery: { entity: xAssoc.entityName, filter: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.filter, sortField: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.sortField }, searchBrowse: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.searchBrowse, valueForm: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.valueForm, addRowEnabled: false, width: "100%", scrollHeight: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.scrollHeight, suggestionsLoad: "lazy", lazyLoadMaxRows: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.lazyLoadMaxRows, minLength: autoComplete === null || autoComplete === void 0 ? void 0 : autoComplete.minLength });
         }
         else {
             if (xField.type === "boolean") {
                 var checkboxValue = getFilterValue(childColumn.props.field);
-                filterElement = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: checkboxValue, onChange: function (e) { return setFilterValue(childColumn.props.field, e.value, api_1.FilterMatchMode.EQUALS); } });
+                filterElement = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: checkboxValue, onChange: function (e) { return setFilterValue(childColumn.props.field, e.value, api_1.FilterMatchMode.EQUALS, undefined, childColumn.props.autoFilter); } });
             }
             else if (childColumn.props.dropdownInFilter) {
                 var dropdownValue = getDropdownFilterValue(childColumn.props.field);
-                filterElement = react_1.default.createElement(XDropdownDTFilter_1.XDropdownDTFilter, { entity: props.entity, path: childColumn.props.field, value: dropdownValue, onValueChange: onDropdownFilterChange, filter: childColumn.props.dropdownFilter, sortField: childColumn.props.dropdownSortField });
+                filterElement = react_1.default.createElement(XDropdownDTFilter_1.XDropdownDTFilter, { entity: props.entity, path: childColumn.props.field, value: dropdownValue, onValueChange: function (field, displayValue) { return onDropdownFilterChange(field, displayValue, childColumn.props.autoFilter); }, filter: childColumn.props.dropdownFilter, sortField: childColumn.props.dropdownSortField });
             }
             else if (xField.type === "string") {
                 var stringValue = getFilterValue(childColumn.props.field);
-                filterElement = react_1.default.createElement(XInputTextBase_1.XInputTextBase, { value: stringValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value); } });
+                filterElement = react_1.default.createElement(XInputTextBase_1.XInputTextBase, { value: stringValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value, undefined, undefined, childColumn.props.autoFilter); } });
             }
             else if (xField.type === "date" || xField.type === "datetime") {
                 betweenFilter = getBetweenFilter(childColumn.props.betweenFilter, props.betweenFilter);
@@ -1236,12 +1236,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); }, 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" }));
+                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value, childColumn.props.autoFilter); }, 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, childColumn.props.autoFilter); }, 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); }, scale: xField.scale, datetime: xField.type === "datetime" });
+                    filterElement = react_1.default.createElement(XCalendar_1.XCalendar, { value: dateValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value, undefined, undefined, childColumn.props.autoFilter); }, scale: xField.scale, datetime: xField.type === "datetime" });
                 }
             }
             else if (xField.type === "decimal" || xField.type === "number") {
@@ -1251,12 +1251,12 @@ var XLazyDataTable = function (props) {
                     // display: 'flex' umiestni input elementy pod seba (betweenFilter = "column") resp. vedla seba (betweenFilter = "row")
                     filterElement =
                         react_1.default.createElement("div", { style: { display: 'flex', flexDirection: betweenFilter } },
-                            react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value); } }, params)),
-                            react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: getFilterValue2(childColumn.props.field), onChange: function (value) { return setFilterValue2(childColumn.props.field, value); } }, params)));
+                            react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value, childColumn.props.autoFilter); } }, params)),
+                            react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: getFilterValue2(childColumn.props.field), onChange: function (value) { return setFilterValue2(childColumn.props.field, value, childColumn.props.autoFilter); } }, params)));
                 }
                 else {
                     var numberValue = getFilterValue(childColumn.props.field);
-                    filterElement = react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: numberValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value); } }, params));
+                    filterElement = react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: numberValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value, undefined, undefined, childColumn.props.autoFilter); } }, params));
                 }
             }
         }
@@ -1400,5 +1400,6 @@ var XLazyColumn = function (props) {
 exports.XLazyColumn = XLazyColumn;
 exports.XLazyColumn.defaultProps = {
     //autoCompleteEnabled: "forStringOnly",
-    columnViewStatus: true // XViewStatus.ReadWrite
+    columnViewStatus: true,
+    autoFilter: false
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.32.7",
+  "version": "1.32.8",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",
@@ -40,7 +40,7 @@
   "peerDependencies": {
     "primeflex": "^3.3.1",
     "primeicons": "^7.0.0",
-    "primereact": "10.9.2",
+    "primereact": "10.8.5",
     "quill": "^2.0.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",