awing-library 2.1.76-beta → 2.1.76

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

@@ -10,77 +10,66 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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");
-var react_1 = __importStar(require("react"));
-var AWING_1 = require("../../../../AWING");
-var react_i18next_1 = require("react-i18next");
-var Context_1 = __importDefault(require("../../Context"));
+var Constant_1 = require("../../../../ACM-AXN/Common/Constant");
+var Constant_2 = require("../../../../ACM-AXN/Page/Constant");
 var lodash_1 = require("lodash");
-var enums_1 = require("../../enums");
-var Utils_1 = require("../Utils");
-var Constant_1 = require("../../../../ACM-AXN/Page/Constant");
+var react_1 = __importDefault(require("react"));
+var react_i18next_1 = require("react-i18next");
 var react_router_dom_1 = require("react-router-dom");
 var recoil_1 = require("recoil");
+var AWING_1 = require("../../../../AWING");
+var Context_1 = __importDefault(require("../../Context"));
+var enums_1 = require("../../enums");
+var ListenTemplate_1 = require("../ListenTemplate");
 var Recoil_1 = require("../Recoil");
+var Utils_1 = require("../Utils");
 var ViewInfo = function (_a) {
-    var directories = _a.directories, templateTypes = _a.templateTypes, onChange = _a.onChange, viewInfoData = _a.viewInfoData;
+    var templateTypes = _a.templateTypes, onChange = _a.onChange, viewInfoData = _a.viewInfoData, viewNumber = _a.viewNumber;
     var pageId = (0, react_router_dom_1.useParams)().pageId;
-    var defaultDirectory = react_1.default.useMemo(function () { return directories.find(function (item) { return item.parentDirectoryId === '99'; }); }, [directories]);
-    var cacheDirectoryId = react_1.default.useRef('');
-    var _b = react_1.default.useState([]), templates = _b[0], setTemplates = _b[1];
-    var _c = react_1.default.useState(false), loadingTemplate = _c[0], setLoadingTemplate = _c[1];
-    var _d = (0, recoil_1.useRecoilState)(Recoil_1.wiewMounted), isMounted = _d[0], setIsMounted = _d[1];
-    var _e = (0, Context_1.default)(), service = _e.service, pageCode = _e.pageCode, domainId = _e.domainId;
+    var _b = (0, Context_1.default)(), pageCode = _b.pageCode, domainId = _b.domainId;
+    var getTemplateList = (0, ListenTemplate_1.usePageCache)().getTemplateList;
     var t = (0, react_i18next_1.useTranslation)().t;
-    (0, react_1.useEffect)(function () {
-        var savedDirectoryId = JSON.parse(localStorage.getItem(Constant_1.PAGE_LOGIN_DIRECTORY_SELECTED) || '{}')[Array.isArray(domainId) ? 'awingPge' : domainId];
-        if (savedDirectoryId && !pageId && !isMounted) {
-            setIsMounted(true);
-            handleChangeForm({ directoryId: savedDirectoryId }, true, 'directoryId');
+    var directories = (0, recoil_1.useRecoilValue)(Recoil_1.templateDirectoriesState);
+    var _c = (0, recoil_1.useRecoilState)(Recoil_1.wiewMounted), isMounted = _c[0], setIsMounted = _c[1];
+    var setEvent = (0, recoil_1.useSetRecoilState)(Recoil_1.pageEventState);
+    var setDeprecated = (0, recoil_1.useSetRecoilState)(Recoil_1.hasDeprecated);
+    var _d = react_1.default.useState([]), templates = _d[0], setTemplates = _d[1];
+    var _e = react_1.default.useState(false), loadingTemplate = _e[0], setLoadingTemplate = _e[1];
+    var defaultDirectory = react_1.default.useMemo(function () { return directories.find(function (item) { return item.parentDirectoryId === '99'; }); }, [directories]);
+    var overWriteOnChange = function (keys, value) {
+        if (keys.includes('templateId')) {
+            setDeprecated(false);
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+        onChange(keys, value);
+    };
     var handleChangeForm = react_1.default.useCallback(function (obj, _valid, keyUpdate) {
         var _a;
-        if ((0, lodash_1.isEmpty)(obj))
+        if (!keyUpdate)
             return;
         if (['templateTypeId', 'directoryId'].includes(keyUpdate)) {
             if (keyUpdate === 'directoryId') {
-                localStorage.setItem(Constant_1.PAGE_LOGIN_DIRECTORY_SELECTED, JSON.stringify((_a = {}, _a[Array.isArray(domainId) ? 'awingPge' : domainId] = obj[keyUpdate], _a)));
+                localStorage.setItem(Constant_2.PAGE_LOGIN_DIRECTORY_SELECTED, JSON.stringify((_a = {}, _a[Array.isArray(domainId) ? 'awingPge' : domainId] = obj[keyUpdate], _a)));
             }
-            onChange(['templateId'], null);
+            overWriteOnChange(['templateId'], '');
         }
-        onChange([keyUpdate], obj[keyUpdate]);
+        setEvent(function (res) { return res.filter(function (x) { return x.viewNumber !== viewNumber; }); });
+        overWriteOnChange([keyUpdate], obj[keyUpdate]);
     }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []);
+    react_1.default.useEffect(function () {
+        var savedDirectoryId = JSON.parse(localStorage.getItem(Constant_2.PAGE_LOGIN_DIRECTORY_SELECTED) || '{}')[Array.isArray(domainId) ? 'awingPge' : domainId];
+        if (savedDirectoryId && !pageId && !isMounted) {
+            setIsMounted(true);
+            handleChangeForm({ directoryId: savedDirectoryId }, true, 'directoryId');
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     react_1.default.useEffect(function () {
         var fieldsRequireStatus = !(0, Utils_1.getFieldsValid)(viewInfoData.viewDatas).includes(false);
         onChange(['fieldsRequireStatus'], fieldsRequireStatus);
@@ -91,6 +80,10 @@ var ViewInfo = function (_a) {
         var validStatus = !(isValidationFields === null || isValidationFields === void 0 ? void 0 : isValidationFields.includes(false)) &&
             fieldsRequireStatus &&
             validProcessStatus === enums_1.VALID_PROCESS_CODE.VALIDATED;
+        var directoryId = viewInfoData.directoryId;
+        if (directoryId) {
+            getTemplates(directoryId, viewInfoData.templateId);
+        }
         onChange(['validStatus'], validStatus);
         // onChangeCompletedTab("1", validStatus);
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -101,24 +94,20 @@ var ViewInfo = function (_a) {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [viewInfoData, defaultDirectory]);
-    react_1.default.useEffect(function () {
-        var directoryId = viewInfoData.directoryId;
-        if (directoryId && cacheDirectoryId.current !== directoryId) {
-            cacheDirectoryId.current = directoryId;
-            getTemplates(directoryId);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [viewInfoData]);
-    var getTemplates = function (directoryId) {
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    var getTemplates = react_1.default.useCallback((0, lodash_1.debounce)(function (directoryId, templateId) {
+        if (templateId === void 0) { templateId = ''; }
         setLoadingTemplate(true);
-        service
-            .templatesGetByDirectoryId(directoryId)
-            .then(setTemplates)
+        getTemplateList(directoryId)
+            .then(function (res) {
+            var viewDeprecate = res.find(function (x) { return x.id === templateId && x.isDeprecated; });
+            setTemplates(res.filter(function (x) { return !x.isDeprecated; }).concat(viewDeprecate ? [viewDeprecate] : []));
+        })
             .finally(function () { return setLoadingTemplate(false); });
-    };
+    }, Constant_1.Constants.DEBOUNCE_TIME_300), []);
     var templateOptions = react_1.default.useMemo(function () {
         var result = [];
-        if (Boolean(viewInfoData.templateTypeId)) {
+        if (viewInfoData.templateTypeId) {
             templates
                 .filter(function (x) {
                 return x.pageCode ===
@@ -135,7 +124,7 @@ var ViewInfo = function (_a) {
             })
                 .forEach(function (template) { return result.push(template); });
         }
-        return result;
+        return result.sort(function (a, b) { return a.description.localeCompare(b.description); });
     }, [viewInfoData, templates, pageCode]);
     return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)(AWING_1.DataForm, { fields: [
                 {
@@ -178,7 +167,7 @@ var ViewInfo = function (_a) {
                     error: true,
                     options: templateOptions.map(function (template) { return ({
                         value: template.id,
-                        text: template.description,
+                        text: template.description + (template.isDeprecated ? " - ".concat(t('TemplateManagement.isDeprecate')) : ''),
                         disabled: template === null || template === void 0 ? void 0 : template.isDeprecated,
                     }); }),
                 },

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

@@ -38,12 +38,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-var immer_1 = __importDefault(require("immer"));
+var Helpers_1 = require("../../../../Utils/Helpers");
+var immer_1 = require("immer");
+var lodash_1 = require("lodash");
 var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
+var Context_1 = require("../../../../Context");
 var Constant_1 = require("../../Constant");
-var Context_1 = __importDefault(require("../../Context"));
+var Context_2 = __importDefault(require("../../Context"));
 var enums_1 = require("../../enums");
 var Recoil_1 = require("../Recoil");
 var Utils_1 = require("../Utils");
@@ -51,39 +54,30 @@ var Panel_1 = __importDefault(require("./Components/Panel"));
 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 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];
     var _d = react_1.default.useState(0), activeViewIndex = _d[0], setActiveViewIndex = _d[1];
-    var _e = react_1.default.useState(true), tempLoading = _e[0], setTempLoading = _e[1];
-    var _f = react_1.default.useState([]), directories = _f[0], setDirectories = _f[1];
-    var _g = react_1.default.useState([]), templateTypes = _g[0], setTemplateTypes = _g[1];
-    var _h = (0, Context_1.default)(), service = _h.service, pageCode = _h.pageCode;
-    var appHelper = (0, Context_2.useAwing)().appHelper;
+    var _e = (0, recoil_1.useRecoilState)(Recoil_1.templateDirectoriesState), directories = _e[0], setDirectories = _e[1];
+    var _f = (0, recoil_1.useRecoilState)(Recoil_1.templateTypeState), templateTypes = _f[0], setTemplateTypes = _f[1];
+    var _g = (0, Context_2.default)(), service = _g.service, pageCode = _g.pageCode;
+    var appHelper = (0, Context_1.useAwing)().appHelper;
     var t = (0, react_i18next_1.useTranslation)().t;
     react_1.default.useEffect(function () {
         fetchData();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    // React.useLayoutEffect(() => {
-    //     const tempId = setTimeout(() => {
-    //         setTempLoading(false)
-    //     }, 0)
-    //     return () => {
-    //         clearTimeout(tempId)
-    //         setTempLoading(true)
-    //     }
-    // }, [activeViewIndex])
     var fetchData = function () {
         Promise.all([
-            service.templatesGetDirectories(),
-            service.templateTypesGet(),
+            !directories.length ? service.templatesGetDirectories() : Promise.resolve(directories),
+            !templateTypes.length ? service.templateTypesGet() : Promise.resolve(templateTypes),
         ]).then(function (_a) {
-            var directories = _a[0], templateTypes = _a[1];
-            setDirectories(directories);
-            setTemplateTypes(function () {
-                var result = templateTypes.filter(function (item) {
+            var resDir = _a[0], resTemplateTypes = _a[1];
+            setDirectories(function (prev) { return (0, lodash_1.isEqual)(prev, resDir) ? prev : resDir; });
+            setTemplateTypes(function (prev) {
+                if ((0, lodash_1.isEqual)(prev, resTemplateTypes))
+                    return prev;
+                var result = resTemplateTypes.filter(function (item) {
                     return item.templateTypeCode ===
                         (pageCode === enums_1.PageCode.Lgn ? 'lgn' : 'wlc');
                 });
@@ -97,7 +91,7 @@ var TabView = function (_a) {
         });
     };
     var addPageView = function () {
-        setView((0, immer_1.default)(function (draft) {
+        setView((0, immer_1.produce)(function (draft) {
             var viewsValid = !views
                 .map(function (viewStatus) { return viewStatus.validStatus; })
                 .includes(false);
@@ -115,7 +109,7 @@ var TabView = function (_a) {
         }));
     };
     var deletePageView = function (tabID) {
-        setView((0, immer_1.default)(function (draft) {
+        setView((0, immer_1.produce)(function (draft) {
             if (draft.views.length === 1)
                 return;
             draft.views = draft.views
@@ -125,21 +119,23 @@ var TabView = function (_a) {
         }));
     };
     var onChange = function (keys, value) {
+        // console.log("keys", keys, "value", value, views, activeViewIndex)
         if (keys.includes('activeViewIndex')) {
             setActiveViewIndex(Number(value));
             return;
         }
-        setView((0, immer_1.default)(function (draf) {
-            (0, Utils_1.setObject)(draf, keys, value);
+        setView((0, immer_1.produce)(function (draft) {
+            if (draft.views.length < Number(keys[1] || 0) + 1)
+                return;
+            (0, Helpers_1.setObject)(draft, keys, value);
         }));
     };
     var handleChange = function (key) {
         if (key === void 0) { key = []; }
         return (0, Utils_1.composeKey)(onChange, (0, Utils_1.concatKey)(key));
     };
-    var handleChangeView = react_1.default.useMemo(function () { return handleChange(['views', String(activeViewIndex)]); }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [activeViewIndex]);
-    return ((0, jsx_runtime_1.jsx)(ViewList_1.default, { isDisableTabHeader: false, activeViewIndex: activeViewIndex, viewCount: views.length, onChangeView: handleChange(), addView: addPageView, deleteView: deletePageView, children: (0, jsx_runtime_1.jsx)(Panel_1.default, { value: activeViewIndex, index: activeViewIndex, children: views.map(function (view, index) { return ((0, jsx_runtime_1.jsx)(react_1.Fragment, { children: activeViewIndex === index && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ViewInfo_1.default, { onChange: handleChangeView, directories: directories, templateTypes: templateTypes, viewInfoData: view }), (0, jsx_runtime_1.jsx)(ViewContent_1.default, { viewInfoData: view, pageId: page.pageId, viewNumber: index, onChange: handleChangeView, isCreate: Boolean(isCreate) })] })) }, index)); }) }) }));
+    var handleChangeView = react_1.default.useMemo(function () { return handleChange(['views', String(activeViewIndex)]); }, [activeViewIndex]);
+    return ((0, jsx_runtime_1.jsx)(ViewList_1.default, { isDisableTabHeader: false, activeViewIndex: activeViewIndex, viewCount: views.length, onChangeView: handleChange(), addView: addPageView, deleteView: deletePageView, children: (0, jsx_runtime_1.jsx)(Panel_1.default, { value: activeViewIndex, index: activeViewIndex, children: views.map(function (view, index) { return ((0, jsx_runtime_1.jsx)(react_1.Fragment, { children: activeViewIndex === index && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ViewInfo_1.default, { onChange: handleChangeView, templateTypes: templateTypes, viewInfoData: view, viewNumber: index + 1 }), (0, jsx_runtime_1.jsx)(ViewContent_1.default, { viewInfoData: view, pageId: page.pageId, viewNumber: index, onChange: handleChangeView, isCreate: Boolean(isCreate) })] })) }, index)); }) }) }));
 };
 exports.default = TabView;

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

@@ -174,7 +174,8 @@ var renderUi = function () {
                     },
                 },
                 commonHtml: '',
-                views: [Constant_1.defaultView, Constant_1.defaultView]
+                views: [Constant_1.defaultView, Constant_1.defaultView],
+                viewEvents: [],
             });
         }, children: (0, jsx_runtime_1.jsx)(_1.default, {}) }));
 };

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

@@ -1,10 +1,10 @@
 import { DataObject } from '../../../AWING';
-import { PageModel, TemplateData, TemplateParameter, ViewModel } from '../Types';
+import { PageModel, TemplateData, ViewModel } from '../Types';
+import { ITemplateParameter } from '../../../ACM-AXN/Template/Types';
 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[];
@@ -14,10 +14,10 @@ export declare function updateStateByPageModel(this: {
 /**
  * Retrieves the template data based on the provided template parameters, view information data, page ID, and view number.
  *
- * @param {TemplateParameter[]} templateParameters - The array of template parameters.
+ * @param {ITemplateParameter[]} templateParameters - The array of template parameters.
  * @param {ViewModel} viewInfoData - The view information data.
  * @param {string} pageId - The page ID.
  * @param {number} viewNumber - The view number.
  * @returns {TemplateData[]} - The array of template data.
  */
-export declare const getTemplateDatas: (templateParameters: TemplateParameter[], viewInfoData: ViewModel, pageId: string, viewNumber: number) => TemplateData[];
+export declare const getTemplateDatas: (templateParameters: ITemplateParameter[], viewInfoData: ViewModel, pageId: string, viewNumber: number) => TemplateData[];

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

@@ -11,16 +11,14 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-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 immer_1 = 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 +51,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;
 };
@@ -77,13 +83,14 @@ var convertValueByType = function (type, val) {
         if (typeof val === 'string')
             val = val === 'true';
     }
-    else if (type === Enum_1.TYPE_FIELD_TEMPLATE.TEXT_FIELD_NUMBER) {
-        val = parseInt(val);
-    }
     else if (type === Enum_1.TYPE_FIELD_TEMPLATE.DROPDOWN_LIST) {
         var spl = val.split('\\n');
         val = spl[0].trim();
     }
+    // Không parse số, trong trường hợp số có thể float
+    // else if (type === TYPE_FIELD_TEMPLATE.TEXT_FIELD_NUMBER) {
+    //     // val = parseInt(val)
+    // }
     return val;
 };
 exports.convertValueByType = convertValueByType;
@@ -194,8 +201,8 @@ var objectFieldValid = function (fieldDatas, indexOfField, fieldValue, isSubFiel
         return !!((_a = fieldDatas[indexOfField]) === null || _a === void 0 ? void 0 : _a.isRequired);
 };
 function updateStateByPageModel(pageModel) {
-    var page = pageModel.page, commonHtml = pageModel.commonHtml, views = pageModel.views;
-    this.setPageRoot((0, immer_1.default)(function (draft) {
+    var page = pageModel.page, commonHtml = pageModel.commonHtml, views = pageModel.views, viewEvents = pageModel.viewEvents;
+    this.setPageRoot((0, immer_1.produce)(function (draft) {
         draft.views = views.map(function (view) { return ({
             templateId: view.templateId,
             viewDatas: view.viewDatas,
@@ -209,18 +216,17 @@ function updateStateByPageModel(pageModel) {
             fieldsRequireStatus: false,
             isChanged: false,
             verifiedStatus: enums_1.VERIFIED_STATUS.NOT_VERIFIED,
-        }); });
+        }); }).sort(function (view1, view2) { return view1.viewDatas.at(-1).viewNumber - view2.viewDatas.at(-1).viewNumber; });
         draft.page = page;
         draft.commonHtml = commonHtml;
+        draft.viewEvents = viewEvents;
     }));
 }
 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.
  *
- * @param {TemplateParameter[]} templateParameters - The array of template parameters.
+ * @param {ITemplateParameter[]} templateParameters - The array of template parameters.
  * @param {ViewModel} viewInfoData - The view information data.
  * @param {string} pageId - The page ID.
  * @param {number} viewNumber - The view number.
@@ -232,15 +238,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 {
@@ -253,6 +250,7 @@ var getTemplateDatas = function (templateParameters, viewInfoData, pageId, viewN
             defaultValue: parameter.defaultValue,
             fieldValue: fieldValue,
             isRequired: parameter.isRequired,
+            isAdvanced: parameter.isAdvanced,
         };
     });
     return result;

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import { PathType } from '../enums';
-type ICreateOrEditComp = React.FC<{
+declare const _default: React.FC<{
     type: PathType;
 }>;
-declare const PageCreateOrEdit: ICreateOrEditComp;
-export default PageCreateOrEdit;
+export default _default;