awing-library 2.1.76-beta → 2.1.78-beta

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewContent.js

@@ -91,6 +91,7 @@ var ViewContent = function (_a) {
         var _a;
         var keys = fieldPath.split('.');
         var fieldChange = templateDatasUpdated[keys[1]];
+        console.log(fieldPath, fieldChange);
         var indexOfFieldChange = (_a = viewInfoData.viewDatas) === null || _a === void 0 ? void 0 : _a.findIndex(function (field) { return field.fieldName === fieldChange.fieldName; });
         onChange(['viewDatas', String(indexOfFieldChange), 'fieldValue'], fieldChange.fieldValue);
         setChanged();

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/index.js

@@ -52,6 +52,7 @@ var ViewList_1 = __importDefault(require("./Components/ViewList"));
 var ViewContent_1 = __importDefault(require("./ViewContent"));
 var ViewInfo_1 = __importDefault(require("./ViewInfo"));
 var Context_2 = require("../../../../Context");
+var Helpers_1 = require("../../../../Utils/Helpers");
 var TabView = function (_a) {
     var isCreate = _a.isCreate;
     var _b = (0, recoil_1.useRecoilState)((0, Recoil_1.pageState)('views')), _c = _b[0], views = _c.views, page = _c.page, setView = _b[1];
@@ -130,7 +131,7 @@ var TabView = function (_a) {
             return;
         }
         setView((0, immer_1.default)(function (draf) {
-            (0, Utils_1.setObject)(draf, keys, value);
+            (0, Helpers_1.setObject)(draf, keys, value);
         }));
     };
     var handleChange = function (key) {

package/lib/ACM-AXN/Page/CreateOrEdit/Utils.d.ts

@@ -4,7 +4,6 @@ export declare const isObjectType: (value: unknown) => value is object;
 export declare const isObject: <T extends object>(value: unknown) => value is T;
 export declare const composeKey: <F extends (...p: any[]) => any, G extends (...p: any[]) => any>(f: F, g: G) => F;
 export declare const concatKey: (parent: string | string[]) => (child: string | string[]) => string[];
-export declare const setObject: <O extends {}>(obj: O, arrKey: Array<keyof O>, value: unknown) => void;
 export declare const convertTreeArrayToFlatArray: (treeArray: DataObject[]) => any[];
 export declare const convertValueByType: (type: string, val: any) => any;
 export declare const getFieldsValid: (templateDatas: TemplateData[]) => boolean[];

package/lib/ACM-AXN/Page/CreateOrEdit/Utils.js

@@ -15,12 +15,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTemplateDatas = exports.updateStateByPageModel = exports.getFieldsValid = exports.convertValueByType = exports.convertTreeArrayToFlatArray = exports.setObject = exports.concatKey = exports.composeKey = exports.isObject = exports.isObjectType = void 0;
+exports.getTemplateDatas = exports.updateStateByPageModel = exports.getFieldsValid = exports.convertValueByType = exports.convertTreeArrayToFlatArray = exports.concatKey = exports.composeKey = exports.isObject = exports.isObjectType = void 0;
 var Enum_1 = require("../../ViewTemplate/Enum");
 var lodash_1 = require("lodash");
 var immer_1 = __importDefault(require("immer"));
 var common_1 = require("../../ViewTemplate/common");
 var enums_1 = require("../enums");
+var Helpers_1 = require("../../../Utils/Helpers");
 // }
 var isDateObject = function (value) { return value instanceof Date; };
 var isNullOrUndefined = function (value) {
@@ -53,14 +54,22 @@ var concatKey = function (parent) {
     };
 };
 exports.concatKey = concatKey;
-var setObject = function (obj, arrKey, value) {
-    (0, lodash_1.set)(obj, arrKey.reduce(function (acc, val) { return acc + '[' + val + ']'; }, ''), value);
-};
-exports.setObject = setObject;
 var convertTreeArrayToFlatArray = function (treeArray) {
     var result = [];
     treeArray === null || treeArray === void 0 ? void 0 : treeArray.forEach(function (data) {
-        getChilds(data, function (item) { return result.push(item); });
+        getChilds(data, function (item) {
+            if (item.fieldType === Enum_1.TYPE_FIELD_TEMPLATE.OBJECT && !item.fieldName.includes('.')) {
+                var child_1 = {};
+                getChilds(item, function (el) {
+                    var keys = el.fieldName.split('.');
+                    if (keys.length > 1) {
+                        (0, Helpers_1.setObject)(child_1, keys, el.fieldValue || el.defaultValue);
+                    }
+                });
+                item.fieldValue = JSON.stringify((0, lodash_1.get)(child_1, item.fieldName));
+            }
+            result.push(item);
+        });
     });
     return result;
 };
@@ -215,8 +224,6 @@ function updateStateByPageModel(pageModel) {
     }));
 }
 exports.updateStateByPageModel = updateStateByPageModel;
-var getFieldsValue = function (template) {
-};
 /**
  * Retrieves the template data based on the provided template parameters, view information data, page ID, and view number.
  *
@@ -232,15 +239,6 @@ var getTemplateDatas = function (templateParameters, viewInfoData, pageId, viewN
             ? viewInfoData.viewDatas.find(function (el) { return el.fieldName === parameter.fieldName; })
             : null;
         var valData = tempData ? tempData.fieldValue : null;
-        var child = {};
-        getChilds(parameter, function (item) {
-            var keys = item.fieldName.split('.');
-            if (keys.length > 1) {
-                console.log("item.fieldValue", item.fieldValue);
-                child[keys.at(-1)] = item.fieldValue;
-            }
-        });
-        console.log("child", child);
         var fieldValue = valData !== null && valData !== void 0 ? valData : (parameter.defaultValue ? parameter.defaultValue : '');
         fieldValue = (0, exports.convertValueByType)(parameter.fieldType, fieldValue);
         return {

package/lib/ACM-AXN/PlaceGroup/ContentCreateOrEdit.d.ts

@@ -1,7 +0,0 @@
-/**
- *
- * @author dauquan1108@gmail.com on 01/26/2024.
- *
- **/
-declare function ContentCreateOrEdit(): import("react/jsx-runtime").JSX.Element;
-export default ContentCreateOrEdit;

package/lib/ACM-AXN/PlaceGroup/ContentCreateOrEdit.js

@@ -1,136 +1 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var jsx_runtime_1 = require("react/jsx-runtime");
-/**
- *
- * @author dauquan1108@gmail.com on 01/26/2024.
- *
- **/
-var react_1 = require("react");
-var react_router_dom_1 = require("react-router-dom");
-var react_i18next_1 = require("react-i18next");
-var Types_1 = require("./Types");
-var AWING_1 = require("../../AWING");
-var Hooks_1 = __importDefault(require("./Hooks"));
-var PlaceListInfo_1 = __importDefault(require("./PlaceListInfo"));
-function ContentCreateOrEdit() {
-    var t = (0, react_i18next_1.useTranslation)().t;
-    var id = (0, react_router_dom_1.useParams)().id;
-    var _a = (0, Hooks_1.default)(), service = _a.service, snackbar = _a.appHelper.snackbar;
-    var _b = (0, AWING_1.useDrawer)(), drawerState = _b.drawerState, setDrawerState = _b.setDrawerState, setDrawerTitle = _b.setDrawerTitle, setConfirmExit = _b.setConfirmExit;
-    var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
-    var _d = (0, react_1.useState)(false), loadingTable = _d[0], setLoadingTable = _d[1];
-    var _e = (0, react_1.useState)(), placeGroup = _e[0], setPlaceGroup = _e[1];
-    var _f = (0, react_1.useState)(), placeFilter = _f[0], setPlaceFilter = _f[1];
-    var _g = (0, react_1.useState)([]), places = _g[0], setPlaces = _g[1];
-    // Update DrawerNavigate
-    (0, react_1.useEffect)(function () {
-        var _a;
-        setDrawerTitle(id
-            ? "".concat(t('PlaceGroup.TitleEdit'), ": ").concat(placeGroup ? placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name : 'Loading...')
-            : t('PlaceGroup.TitleCreate'));
-        !(placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name) || !((_a = placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name) === null || _a === void 0 ? void 0 : _a.trim())
-            ? setDrawerState(AWING_1.DrawerStateEnum.INVALID)
-            : setDrawerState(AWING_1.DrawerStateEnum.VALID);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name]);
-    (0, react_1.useEffect)(function () {
-        if (drawerState === AWING_1.DrawerStateEnum.IN_PROGRESS) {
-            handleSubmit();
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [drawerState]);
-    // End update DrawerNavigate
-    (0, react_1.useEffect)(function () {
-        if (!placeGroup && id) {
-            setLoading(true);
-            service
-                .placeGroupsGet(id)
-                .then(function (placeGroupData) {
-                setPlaceGroup(placeGroupData);
-                setPlaceFilter(placeGroupData.placeFilter);
-            })
-                .finally(function () {
-                setLoading(false);
-            });
-        }
-    }, [placeGroup, service, id]);
-    (0, react_1.useEffect)(function () {
-        if (id) {
-            setLoadingTable(true);
-            service
-                .placesQuery({ groupIds: [id] })
-                .then(setPlaces)
-                .finally(function () {
-                setLoadingTable(false);
-            });
-        }
-    }, [service, id]);
-    var handleDetailSubmit = (0, react_1.useCallback)(function (placesSelected, placeFilter) {
-        setConfirmExit(true);
-        setPlaces(placesSelected);
-        setPlaceFilter(placeFilter);
-    }, []);
-    var handleSubmit = function () {
-        var newPlaceGroup = __assign(__assign({}, placeGroup), { placeIds: places.map(function (place) { return place.placeId; }), placeFilter: placeFilter !== null && placeFilter !== void 0 ? placeFilter : {
-                operandGroups: [
-                    {
-                        operands: [
-                            {
-                                operator: Types_1.LogicalOperator.In,
-                                type: Types_1.PlaceFilterOperandType.PlaceId,
-                                value: '[]',
-                            },
-                        ],
-                    },
-                ],
-            } });
-        var handleServiceCall = function (promise) {
-            return promise
-                .then(function () {
-                snackbar('success');
-                setDrawerState(AWING_1.DrawerStateEnum.SUBMIT_SUCCESS);
-            })
-                .catch(function () {
-                snackbar('error');
-                setDrawerState(AWING_1.DrawerStateEnum.VALID);
-            });
-        };
-        return id
-            ? handleServiceCall(service.placeGroupsPut(newPlaceGroup))
-            : handleServiceCall(service.placeGroupsPost(newPlaceGroup));
-    };
-    return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(AWING_1.BasicDataForm, { caption: t('PlaceGroup.TitlePlaceGroupInfo'), fields: [
-                        {
-                            fieldName: 'name',
-                            type: 'text',
-                            label: t('Common.GroupName'),
-                            required: true,
-                        },
-                        {
-                            fieldName: 'description',
-                            type: 'text',
-                            label: t('PlaceGroup.Description'),
-                        },
-                    ], oldValue: placeGroup, onUpdate: function (validState, valueForm) {
-                        setConfirmExit(true);
-                        setPlaceGroup(function (oldPlaceGroup) {
-                            return (__assign(__assign({}, oldPlaceGroup), valueForm));
-                        });
-                    } }), (0, jsx_runtime_1.jsx)(PlaceListInfo_1.default, { rows: places, loading: loadingTable, onDetailSubmit: handleDetailSubmit, placeFilter: placeFilter })] })) }));
-}
-exports.default = ContentCreateOrEdit;

package/lib/ACM-AXN/PlaceGroup/ContentCreateOrEdit.test.js

@@ -59,7 +59,7 @@ var jsx_runtime_1 = require("react/jsx-runtime");
  **/
 var react_1 = require("@testing-library/react");
 var react_router_dom_1 = require("react-router-dom");
-var ContentCreateOrEdit_1 = __importDefault(require("./ContentCreateOrEdit"));
+var CreateOrEdit_1 = __importDefault(require("./CreateOrEdit"));
 var AWING_1 = require("../../AWING");
 require("@testing-library/jest-dom");
 var mockPlaceGroup = {
@@ -281,7 +281,7 @@ describe('ContentCreateOrEdit component(PlaceGroup).', function () {
         });
     });
     var renderUi = function () {
-        return (0, react_1.render)((0, jsx_runtime_1.jsx)(react_router_dom_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(ContentCreateOrEdit_1.default, {}) }));
+        return (0, react_1.render)((0, jsx_runtime_1.jsx)(react_router_dom_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(CreateOrEdit_1.default, {}) }));
     };
     it('Render component', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {

package/lib/ACM-AXN/PlaceGroup/CreateOrEdit.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -9,9 +20,93 @@ var jsx_runtime_1 = require("react/jsx-runtime");
  * @author dauquan1108@gmail.com on 01/26/2024.
  *
  **/
-var DrawerNavigate_1 = __importDefault(require("../../AWING/DrawerNavigate"));
-var ContentCreateOrEdit_1 = __importDefault(require("./ContentCreateOrEdit"));
+var react_1 = require("react");
+var react_router_dom_1 = require("react-router-dom");
+var react_i18next_1 = require("react-i18next");
+var Types_1 = require("./Types");
+var AWING_1 = require("../../AWING");
+var Hooks_1 = __importDefault(require("./Hooks"));
+var PlaceListInfo_1 = __importDefault(require("./PlaceListInfo"));
+var ClassicDrawer_1 = __importDefault(require("../../Commons/Components/ClassicDrawer"));
 function CreateOrEdit() {
-    return ((0, jsx_runtime_1.jsx)(DrawerNavigate_1.default, { childrenWrapperStyle: { padding: 0 }, children: (0, jsx_runtime_1.jsx)(ContentCreateOrEdit_1.default, {}) }));
+    var t = (0, react_i18next_1.useTranslation)().t;
+    var id = (0, react_router_dom_1.useParams)().id;
+    var service = (0, Hooks_1.default)().service;
+    var _a = (0, react_1.useState)(false), confirmExit = _a[0], setConfirmExit = _a[1];
+    var _b = (0, react_1.useState)(false), validState = _b[0], setValidState = _b[1];
+    var _c = (0, react_1.useState)(true), loading = _c[0], setLoading = _c[1];
+    var _d = (0, react_1.useState)(false), loadingTable = _d[0], setLoadingTable = _d[1];
+    var _e = (0, react_1.useState)(), placeGroup = _e[0], setPlaceGroup = _e[1];
+    var _f = (0, react_1.useState)(), placeFilter = _f[0], setPlaceFilter = _f[1];
+    var _g = (0, react_1.useState)([]), places = _g[0], setPlaces = _g[1];
+    (0, react_1.useEffect)(function () {
+        if (!placeGroup && id) {
+            setLoading(true);
+            service
+                .placeGroupsGet(id)
+                .then(function (placeGroupData) {
+                setPlaceGroup(placeGroupData);
+                setPlaceFilter(placeGroupData.placeFilter);
+            })
+                .finally(function () {
+                setLoading(false);
+            });
+        }
+    }, [placeGroup, service, id]);
+    (0, react_1.useEffect)(function () {
+        if (id) {
+            setLoadingTable(true);
+            service
+                .placesQuery({ groupIds: [id] })
+                .then(setPlaces)
+                .finally(function () {
+                setLoadingTable(false);
+            });
+        }
+    }, [service, id]);
+    var handleDetailSubmit = (0, react_1.useCallback)(function (placesSelected, placeFilter) {
+        setConfirmExit(true);
+        setPlaces(placesSelected);
+        setPlaceFilter(placeFilter);
+    }, []);
+    var handleSubmit = function () {
+        var newPlaceGroup = __assign(__assign({}, placeGroup), { placeIds: places.map(function (place) { return place.placeId; }), placeFilter: placeFilter !== null && placeFilter !== void 0 ? placeFilter : {
+                operandGroups: [
+                    {
+                        operands: [
+                            {
+                                operator: Types_1.LogicalOperator.In,
+                                type: Types_1.PlaceFilterOperandType.PlaceId,
+                                value: '[]',
+                            },
+                        ],
+                    },
+                ],
+            } });
+        return service[id ? 'placeGroupsPut' : 'placeGroupsPost'](newPlaceGroup);
+    };
+    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: id
+            ? "".concat(t('PlaceGroup.TitleEdit'), ": ").concat(placeGroup ? placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name : 'Loading...')
+            : t('PlaceGroup.TitleCreate'), onSubmit: handleSubmit, confirmExit: confirmExit, disableButtonSubmit: !validState, children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(AWING_1.BasicDataForm, { caption: t('PlaceGroup.TitlePlaceGroupInfo'), fields: [
+                        {
+                            fieldName: 'name',
+                            type: 'text',
+                            label: t('Common.GroupName'),
+                            required: true,
+                        },
+                        {
+                            fieldName: 'description',
+                            type: 'text',
+                            length: 200,
+                            pattern: false,
+                            label: t('PlaceGroup.Description'),
+                        },
+                    ], oldValue: placeGroup, onUpdate: function (validState, valueForm) {
+                        setConfirmExit(true);
+                        setValidState(validState);
+                        setPlaceGroup(function (oldPlaceGroup) {
+                            return (__assign(__assign({}, oldPlaceGroup), valueForm));
+                        });
+                    } }), (0, jsx_runtime_1.jsx)(PlaceListInfo_1.default, { rows: places, loading: loadingTable, onDetailSubmit: handleDetailSubmit, placeFilter: placeFilter })] })) }));
 }
 exports.default = CreateOrEdit;

package/lib/ACM-AXN/TaskScheduler/CreateOrEdit.js

@@ -49,7 +49,6 @@ var AWING_1 = require("../../AWING");
 var validation_1 = require("../../AWING/ultis/validation");
 var ClassicDrawer_1 = __importStar(require("../../Commons/Components/ClassicDrawer"));
 var Context_1 = require("../../Context");
-var Utils_1 = require("../Page/CreateOrEdit/Utils");
 var BasicInput_1 = __importDefault(require("./Components/BasicInput"));
 var CornJobInput_1 = __importDefault(require("./Components/CornJobInput"));
 var InputParameters_1 = __importDefault(require("./Components/InputParameters"));
@@ -57,7 +56,8 @@ var TriggerInput_1 = __importDefault(require("./Components/TriggerInput"));
 var Constant_1 = require("./Constant");
 var Context_2 = require("./Context");
 var Enums_1 = require("./Enums");
-var Utils_2 = require("./Utils");
+var Utils_1 = require("./Utils");
+var Helpers_1 = require("../../Utils/Helpers");
 var JobInput = (_a = {},
     _a[Enums_1.JobTypeEnum.Cron] = CornJobInput_1.default,
     _a[Enums_1.JobTypeEnum.Trigger] = TriggerInput_1.default,
@@ -81,7 +81,7 @@ var CreateOrEdit = function () {
     var _e = react_1.default.useState(), jobActionSelected = _e[0], setJobActionSelected = _e[1];
     var _f = react_1.default.useState(false), enableSubmit = _f[0], setEnableSubmit = _f[1];
     react_1.default.useEffect(function () {
-        setEnableSubmit((0, Utils_2.getFormValidation)(jobModel, jobValid.current));
+        setEnableSubmit((0, Utils_1.getFormValidation)(jobModel, jobValid.current));
     }, [jobModel]);
     react_1.default.useEffect(function () {
         setLoading(true);
@@ -95,7 +95,7 @@ var CreateOrEdit = function () {
             var initJobActions = responses[0];
             setJobActions(initJobActions);
             if (responses.length > 1) {
-                var model_1 = (0, Utils_2.cloneValue)(responses[1]);
+                var model_1 = (0, Utils_1.cloneValue)(responses[1]);
                 setJobModel(model_1);
                 setJobActionSelected(initJobActions.find(function (x) { return x.name === model_1.jobAction; }));
             }
@@ -121,7 +121,7 @@ var CreateOrEdit = function () {
         setConfirmExit(true);
         var keys = path.split('.');
         setJobModel((0, immer_1.default)(function (draft) {
-            (0, Utils_1.setObject)(draft, keys, value);
+            (0, Helpers_1.setObject)(draft, keys, value);
             // draft.inputParameters[index] = item
         }));
     };

package/lib/ACM-AXN/ViewTemplate/TemplateField/Fields/ObjectField.d.ts

@@ -1,3 +1,5 @@
 import { FieldProps, FieldInfo } from "../../interface";
+import { DataObject } from "../../../../AWING";
 export default function ObjectField(props: FieldProps): import("react/jsx-runtime").JSX.Element;
+export declare const getChilds: <T extends Record<string, DataObject>>(child: T, action: (p: T) => any) => any;
 export declare const getObjectDefaultValue: (fieldInfo: FieldInfo) => any;

package/lib/ACM-AXN/ViewTemplate/TemplateField/Fields/ObjectField.js

@@ -14,13 +14,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getObjectDefaultValue = void 0;
+exports.getObjectDefaultValue = exports.getChilds = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var ListField_1 = require("./ListField");
 var material_1 = require("@mui/material");
 var styles_1 = require("@mui/styles");
 var TemplateField_1 = __importDefault(require("../../TemplateField"));
 var react_1 = require("react");
+var Helpers_1 = require("../../../../Utils/Helpers");
+var lodash_1 = require("lodash");
 var useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
     root: {
         textAlign: "center",
@@ -70,13 +72,27 @@ function ObjectField(props) {
                     fieldChild.fieldName.split(".").slice(-1)[0]) }), index)); }) })] }));
 }
 exports.default = ObjectField;
+var getChilds = function (child, action) {
+    var _a;
+    action(child);
+    if (((_a = child === null || child === void 0 ? void 0 : child.childrens) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+        return child.childrens.map(function (c) { return (0, exports.getChilds)(c, action); });
+    }
+};
+exports.getChilds = getChilds;
 var getObjectDefaultValue = function (fieldInfo) {
     var _a;
     var result = {};
     (_a = fieldInfo === null || fieldInfo === void 0 ? void 0 : fieldInfo.childrens) === null || _a === void 0 ? void 0 : _a.map(function (child) {
         if (child.fieldType !== "list") {
-            var defaultValue = child.defaultValue || "";
-            result[child.fieldName.split(".").slice(-1)[0]] = defaultValue;
+            var item_1 = {};
+            (0, exports.getChilds)(child, function (el) {
+                var keys = el.fieldName.split('.');
+                if (keys.length > 1) {
+                    (0, Helpers_1.setObject)(item_1, keys, el.defaultValue);
+                }
+            });
+            result[child.fieldName.split(".").slice(-1)[0]] = (0, lodash_1.get)(item_1, child.fieldName);
         }
         else {
             result[child.fieldName.split(".").slice(-1)[0]] =

package/lib/ACM-AXN/ViewTemplate/container.js

@@ -106,7 +106,7 @@ var addChilds = function (fields, fieldInfo) {
     return result;
 };
 var convertToTreeData = function (data) {
-    return data
+    var treeData = data
         .map(function (item) { return addChilds(data, item); })
         .filter(function (item) { return !item.fieldName.includes("."); })
         .map(function (item) {
@@ -121,4 +121,5 @@ var convertToTreeData = function (data) {
             return item;
         }
     });
+    return treeData;
 };

package/lib/AWING/BasicDataForm/interface.d.ts

@@ -21,14 +21,14 @@ export interface BasicFieldDefinition extends BaseTextFieldProps {
     /**
      * Định dạng regex cho hàm textValid
     */
-    pattern?: RegExp;
+    pattern?: RegExp | false;
     /**
     *
     * @param value
     * @param length - Độ dài byte, only type text và text-area
     * @param pattern - Định dạng regex, only type text và text-area
     */
-    checkValid?(value: any, length?: number, pattern?: RegExp): boolean;
+    checkValid?(value: any, length?: number, pattern?: RegExp | false): boolean;
     options?: MenuOption[];
     loading?: boolean;
     readOnly?: boolean;

package/lib/AWING/DataForm/interface.d.ts

@@ -87,14 +87,14 @@ export interface TextFieldDefinition<T extends DataObject> extends BaseFieldDefi
     /**
      * Định dạng regex cho hàm textValid
      */
-    pattern?: RegExp;
+    pattern?: RegExp | false;
     /**
      *
      * @param value
      * @param length - Độ dài byte, only type text và text-area
      * @param pattern - Định dạng regex, only type text và text-area
      */
-    onValidate?(value?: string, length?: number, pattern?: RegExp): boolean;
+    onValidate?(value?: string, length?: number, pattern?: RegExp | false): boolean;
     defaultValue?: string;
     autoFormula?: string;
 }

package/lib/AWING/PageManagement/PageManagement.js

@@ -59,9 +59,9 @@ var PageManagement = function (props) {
     // }, [queryInput, onChangeQueryInput, window.location.pathname]);
     (0, react_1.useEffect)(function () {
         var _a;
-        if (((_a = location.state) === null || _a === void 0 ? void 0 : _a.pageAction) === ClassicDrawer_1.CloseAction.Reload ||
+        if (((_a = location.state) === null || _a === void 0 ? void 0 : _a.action) === ClassicDrawer_1.CloseAction.Reload ||
             !(0, lodash_1.isEqual)(queryInput, cachedQueryInput.current)) {
-            handleChangeQueryInput(queryInput);
+            handleChangeQueryInput((0, lodash_1.cloneDeep)(queryInput));
             cachedQueryInput.current = (0, lodash_1.cloneDeep)(queryInput);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps

package/lib/AWING/ultis/validation.d.ts

@@ -23,7 +23,7 @@ export declare function logicExpressionValid(value: string | null | undefined):
  * @param invertRegex - The inverted regular expression pattern to match against the text string. Default is undefined.
  * @returns An object containing the validation result and a message describing any validation errors.
  */
-export declare const textValidation: (str: string, length?: number, required?: boolean, pattern?: RegExp, invertRegex?: RegExp | false) => {
+export declare const textValidation: (str: string, length?: number, required?: boolean, pattern?: RegExp | false, invertRegex?: RegExp | false) => {
     valid: boolean;
     message: string;
 };

package/lib/Commons/Components/ClassicDrawer.js

@@ -67,7 +67,7 @@ var Drawer = function (props) {
             var _a;
             ((_a = location.state) === null || _a === void 0 ? void 0 : _a.type) === 'history'
                 ? navigate(-1)
-                : navigate('..', { state: __assign(__assign({}, location.state), { pageAction: action }) });
+                : navigate('..', { state: __assign(__assign({}, location.state), { action: action }) });
         }, 100);
     };
     var doPromise = function () {
@@ -80,7 +80,7 @@ var Drawer = function (props) {
                     snackbar('success');
                     console.log('success');
                 }, 700);
-                closeDrawer(typeof state === 'string' ? state : CloseAction.Reload);
+                closeDrawer((typeof state === 'string' && state) ? state : CloseAction.Reload);
             })
                 .catch(function () {
                 snackbar('error');

package/lib/Utils/Helpers.d.ts

@@ -104,3 +104,4 @@ export interface IHeadCells {
 }
 export declare const updateObjectFields: (originalObj: any, changedValues: any) => any;
 export declare function formatChartNumber(val: any, language: string): string;
+export declare const setObject: <O extends {}>(obj: O, arrKey: Array<keyof O>, value: unknown) => void;

package/lib/Utils/Helpers.js

@@ -23,10 +23,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatChartNumber = exports.updateObjectFields = exports.validateNumber = exports.getToday = exports.convertDataSetPattern = exports.convertAnalyticModelToChartDataAdvance = exports.getStartOfDay = exports.timestampToStringDDMMYYYY = exports.dateToStringDDMMYYYY = exports.convertTimelineToDateTime = exports.dateTimeToString = exports.convertTimestampToDateTime = exports.convertDateTimeToTimestamp = exports.checkValidUrl = exports.validateAnalyticTypes = exports.stringToListAccessPoint = exports.checkValidMacAddress = exports.checkValidStringListAP = exports.convertTimeLine = exports.WMAPEcalculator = exports.roundDecimalNumber = exports.convertArrayToObject = exports.offlinePaginate = exports.changeToAlias = exports.calculatorDirectoryIdRoot = exports.getRoutePath = exports.timestampToStringDDMMYYYYHHmm = exports.dateToStringddddDDMMYYYYHHmm = exports.downloadZipFile = exports.downloadFilePattern = exports.generateUUID = exports.displayLongString = exports.getQueryVariable = exports.formatNumber = exports.dateToString = exports.getCookie = exports.TIMELINE_TYPE = void 0;
+exports.setObject = exports.formatChartNumber = exports.updateObjectFields = exports.validateNumber = exports.getToday = exports.convertDataSetPattern = exports.convertAnalyticModelToChartDataAdvance = exports.getStartOfDay = exports.timestampToStringDDMMYYYY = exports.dateToStringDDMMYYYY = exports.convertTimelineToDateTime = exports.dateTimeToString = exports.convertTimestampToDateTime = exports.convertDateTimeToTimestamp = exports.checkValidUrl = exports.validateAnalyticTypes = exports.stringToListAccessPoint = exports.checkValidMacAddress = exports.checkValidStringListAP = exports.convertTimeLine = exports.WMAPEcalculator = exports.roundDecimalNumber = exports.convertArrayToObject = exports.offlinePaginate = exports.changeToAlias = exports.calculatorDirectoryIdRoot = exports.getRoutePath = exports.timestampToStringDDMMYYYYHHmm = exports.dateToStringddddDDMMYYYYHHmm = exports.downloadZipFile = exports.downloadFilePattern = exports.generateUUID = exports.displayLongString = exports.getQueryVariable = exports.formatNumber = exports.dateToString = exports.getCookie = exports.TIMELINE_TYPE = void 0;
 var moment_1 = __importDefault(require("moment"));
 var i18n_1 = __importDefault(require("../i18n"));
 var helper_1 = require("../AWING/helper");
+var lodash_1 = require("lodash");
 var TIMELINE_TYPE;
 (function (TIMELINE_TYPE) {
     TIMELINE_TYPE[TIMELINE_TYPE["HOUR"] = 0] = "HOUR";
@@ -532,3 +533,7 @@ function formatChartNumber(val, language) {
     return formatValue;
 }
 exports.formatChartNumber = formatChartNumber;
+var setObject = function (obj, arrKey, value) {
+    (0, lodash_1.set)(obj, arrKey.reduce(function (acc, val) { return acc + '[' + val + ']'; }, ''), value);
+};
+exports.setObject = setObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "awing-library",
-  "version": "2.1.76-beta",
+  "version": "2.1.78-beta",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",