awing-library 2.1.75-beta → 2.1.77-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/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/index.js

@@ -33,8 +33,10 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var BasicDataForm_1 = __importDefault(require("./BasicDataForm"));
 var i18n_1 = __importDefault(require("../../i18n"));
 var react_i18next_1 = require("react-i18next");
+var x_date_pickers_1 = require("@mui/x-date-pickers");
+var AdapterMoment_1 = require("@mui/x-date-pickers/AdapterMoment");
 function BasicDataForm(props) {
-    return ((0, jsx_runtime_1.jsx)(react_i18next_1.I18nextProvider, { i18n: i18n_1.default, children: (0, jsx_runtime_1.jsx)(BasicDataForm_1.default, __assign({}, props)) }));
+    return ((0, jsx_runtime_1.jsx)(react_i18next_1.I18nextProvider, { i18n: i18n_1.default, children: (0, jsx_runtime_1.jsx)(x_date_pickers_1.LocalizationProvider, { dateAdapter: AdapterMoment_1.AdapterMoment, children: (0, jsx_runtime_1.jsx)(BasicDataForm_1.default, __assign({}, props)) }) }));
 }
 exports.BasicDataForm = BasicDataForm;
 __exportStar(require("./interface"), exports);

package/lib/AWING/Chart/BarLineComponent.js

@@ -41,8 +41,8 @@ var BarLineComponent = function (props) {
                 bodySpacing: 8,
                 callbacks: {
                     title: function (tooltipItems) {
-                        //Sửa lại với thời gian theo giờ
                         var _a;
+                        //Sửa lại với thời gian theo giờ
                         var timeFormat = (_a = tooltipItems[0].raw) === null || _a === void 0 ? void 0 : _a.x;
                         var isTimelineHour = (timeFormat === null || timeFormat === void 0 ? void 0 : timeFormat.length) > 8;
                         if (isTimelineHour) {
@@ -93,16 +93,7 @@ var BarLineComponent = function (props) {
         },
         scales: {
             x: optionsDefault
-                ? {
-                    type: 'timeseries',
-                    time: {
-                        parser: 'YYYYMMDD',
-                    },
-                    unit: 'month',
-                    displayFormats: {
-                        month: 'DD/MM'
-                    },
-                }
+                ? {}
                 : {
                     type: 'time',
                     display: true,

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.75-beta",
+  "version": "2.1.77-beta",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",