awing-library 2.1.153-beta → 2.1.154-beta

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

@@ -0,0 +1,6 @@
+import { ITemplateModel } from '../../../ACM-AXN/Template';
+import { Template } from '../Types';
+export declare const usePageCache: () => {
+    getTemplate: (templateId: string) => Promise<ITemplateModel>;
+    getTemplateList: (directoryId: string) => Promise<Template[]>;
+};

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

@@ -0,0 +1,63 @@
+"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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    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.usePageCache = void 0;
+var react_1 = __importDefault(require("react"));
+var Context_1 = __importDefault(require("../Context"));
+var recoil_1 = require("recoil");
+var Recoil_1 = require("./Recoil");
+var usePageCache = function () {
+    var _a = (0, recoil_1.useRecoilState)(Recoil_1.pageCacheData), _b = _a[0], directoryTemplate = _b.directoryTemplate, templates = _b.templates, setPageCache = _a[1];
+    var service = (0, Context_1.default)().service;
+    return {
+        getTemplate: react_1.default.useCallback(function (templateId) {
+            return new Promise(function (resolve) {
+                var template = templates.find(function (item) { return item.template.id === templateId; });
+                if (template)
+                    resolve(template);
+                else
+                    service.templatesGet(templateId).then(function (res) {
+                        setPageCache(function (p) { return (__assign(__assign({}, p), { templates: __spreadArray(__spreadArray([], p.templates, true), [res], false) })); });
+                        resolve(res);
+                    });
+            });
+        }, 
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        [templates]),
+        getTemplateList: react_1.default.useCallback(function (directoryId) { return new Promise(function (resolve) {
+            var directory = directoryTemplate.find(function (item) { return item.directoryId === directoryId; });
+            if (directory)
+                resolve(directory.templateList);
+            else {
+                service.templatesGetByDirectoryId(directoryId).then(function (res) {
+                    setPageCache(function (p) { return (__assign(__assign({}, p), { directoryTemplate: __spreadArray(__spreadArray([], p.directoryTemplate, true), [{ directoryId: directoryId, templateList: res }], false) })); });
+                    resolve(res);
+                });
+            }
+            // eslint-disable-next-line react-hooks/exhaustive-deps
+        }); }, [directoryTemplate]),
+    };
+};
+exports.usePageCache = usePageCache;

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

@@ -1,5 +1,6 @@
 import { Directory } from '../../Campaign/Types';
-import { FormValid, PageModel, PageViewEvent } from '../Types';
+import { FormValid, PageModel, PageViewEvent, Template } from '../Types';
+import { ITemplateModel, ITemplateType } from '../../../ACM-AXN/Template';
 export declare const pageDirectoriesState: import("recoil").RecoilState<Directory[]>;
 export declare const wiewMounted: import("recoil").RecoilState<boolean>;
 export declare const pageRootDeirectory: import("recoil").RecoilState<string>;
@@ -9,3 +10,12 @@ export declare const pageEventState: import("recoil").RecoilState<PageViewEvent[
 export declare const validForm: import("recoil").RecoilState<FormValid>;
 export declare const pageState: (param: keyof PageModel) => import("recoil").RecoilState<PageModel>;
 export declare const hasDeprecated: import("recoil").RecoilState<boolean>;
+export declare const pageCacheData: import("recoil").RecoilState<{
+    directoryTemplate: {
+        directoryId: string;
+        templateList: Template[];
+    }[];
+    templates: ITemplateModel[];
+}>;
+export declare const templateTypeState: import("recoil").RecoilState<ITemplateType[]>;
+export declare const templateDirectoriesState: import("recoil").RecoilState<Directory[]>;

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

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasDeprecated = exports.pageState = exports.validForm = exports.pageEventState = exports.pageRootState = exports.pageChangedFormState = exports.pageRootDeirectory = exports.wiewMounted = exports.pageDirectoriesState = void 0;
+exports.templateDirectoriesState = exports.templateTypeState = exports.pageCacheData = exports.hasDeprecated = exports.pageState = exports.validForm = exports.pageEventState = exports.pageRootState = exports.pageChangedFormState = exports.pageRootDeirectory = exports.wiewMounted = exports.pageDirectoriesState = void 0;
 var lodash_1 = require("lodash");
 var recoil_1 = require("recoil");
 var Constant_1 = require("../Constant");
@@ -130,3 +130,18 @@ exports.hasDeprecated = (0, recoil_1.atom)({
     key: 'hasDeprecated',
     default: false,
 });
+exports.pageCacheData = (0, recoil_1.atom)({
+    key: 'pageCacheData',
+    default: {
+        directoryTemplate: [],
+        templates: [],
+    },
+});
+exports.templateTypeState = (0, recoil_1.atom)({
+    key: 'templateTypeState',
+    default: [],
+});
+exports.templateDirectoriesState = (0, recoil_1.atom)({
+    key: 'templateDirectoriesState',
+    default: [],
+});

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

@@ -72,11 +72,13 @@ var enums_1 = require("../../enums");
 var Recoil_1 = require("../Recoil");
 var Utils_1 = require("../Utils");
 var Styles_1 = require("./Styles");
+var ListenTemplate_1 = require("../ListenTemplate");
 var ViewContent = function (_a) {
     var _b, _c, _d, _e, _f;
     var viewInfoData = _a.viewInfoData, pageId = _a.pageId, viewNumber = _a.viewNumber, onChange = _a.onChange, isCreate = _a.isCreate;
     var _g = (0, Context_2.default)(), service = _g.service, pageCode = _g.pageCode, domainId = _g.domainId, CONFIGS = _g.configs;
     var appHelper = (0, Context_1.useAwing)().appHelper;
+    var getTemplate = (0, ListenTemplate_1.usePageCache)().getTemplate;
     var _h = react_1.default.useState(''), scriptValidationTemplate = _h[0], setScriptValidationTemplate = _h[1];
     var _j = react_1.default.useState(''), scriptAutoField = _j[0], setScriptAutoField = _j[1];
     var _k = react_1.default.useState(false), loading = _k[0], setLoading = _k[1];
@@ -84,20 +86,17 @@ var ViewContent = function (_a) {
     var rootDirectory = (0, recoil_1.useRecoilValue)(Recoil_1.pageRootDeirectory);
     var _l = (0, recoil_1.useRecoilState)(Recoil_1.pageEventState), events = _l[0], setEvent = _l[1];
     react_1.default.useEffect(function () {
+        onChange(['viewDatas'], []);
         if (viewInfoData === null || viewInfoData === void 0 ? void 0 : viewInfoData.templateId) {
             setLoading(true);
-            service
-                .templatesGet(viewInfoData.templateId)
+            getTemplate(viewInfoData.templateId)
                 .then(handleResData)
                 .finally(function () {
                 setLoading(false);
             });
         }
-        else {
-            onChange(['viewDatas'], []);
-        }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [viewInfoData.templateId, viewInfoData.viewDatas.length]);
+    }, [viewInfoData.templateId]);
     react_1.default.useEffect(function () {
         if (!isUniq.current) {
             setEvent(function (prev) {

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewInfo.d.ts

@@ -1,12 +1,11 @@
 import React from 'react';
-import { Directory } from '../../../Campaign/Types';
 import { ViewModel } from '../../Types';
 import { ITemplateType } from '../../../../ACM-AXN/Template/Types';
 interface ViewInfoProps {
     templateTypes: ITemplateType[];
-    directories: Directory[];
     onChange: (keys: string[], value: unknown) => void;
     viewInfoData: ViewModel;
+    viewNumber: number;
 }
 declare const ViewInfo: React.FC<ViewInfoProps>;
 export default ViewInfo;

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

@@ -49,17 +49,21 @@ var Constant_1 = require("../../../../ACM-AXN/Page/Constant");
 var react_router_dom_1 = require("react-router-dom");
 var recoil_1 = require("recoil");
 var Recoil_1 = require("../Recoil");
+var Constant_2 = require("../../../../ACM-AXN/Common/Constant");
+var ListenTemplate_1 = require("../ListenTemplate");
 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 setDeprecated = (0, recoil_1.useSetRecoilState)(Recoil_1.hasDeprecated);
-    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;
+    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]);
     (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) {
@@ -82,8 +86,9 @@ var ViewInfo = function (_a) {
             if (keyUpdate === 'directoryId') {
                 localStorage.setItem(Constant_1.PAGE_LOGIN_DIRECTORY_SELECTED, JSON.stringify((_a = {}, _a[Array.isArray(domainId) ? 'awingPge' : domainId] = obj[keyUpdate], _a)));
             }
-            overWriteOnChange(['templateId'], null);
+            overWriteOnChange(['templateId'], '');
         }
+        setEvent(function (res) { return res.filter(function (x) { return x.viewNumber !== viewNumber; }); });
         overWriteOnChange([keyUpdate], obj[keyUpdate]);
     }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -98,6 +103,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
@@ -108,24 +117,17 @@ 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)
+        getTemplateList(directoryId)
             .then(function (res) {
-            var viewDeprecate = res.find(function (x) { return x.id === viewInfoData.templateId && x.isDeprecated; });
+            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_2.Constants.DEBOUNCE_TIME_300), []);
     var templateOptions = react_1.default.useMemo(function () {
         var result = [];
         if (viewInfoData.templateTypeId) {

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 Helpers_1 = require("../../../../Utils/Helpers");
 var immer_1 = __importDefault(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 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];
     var _d = react_1.default.useState(0), activeViewIndex = _d[0], setActiveViewIndex = _d[1];
-    var _e = react_1.default.useState([]), directories = _e[0], setDirectories = _e[1];
-    var _f = react_1.default.useState([]), templateTypes = _f[0], setTemplateTypes = _f[1];
-    var _g = (0, Context_1.default)(), service = _g.service, pageCode = _g.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');
                 });
@@ -140,6 +134,6 @@ var TabView = function (_a) {
     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)); }) }) }));
+    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/index.js

@@ -81,12 +81,14 @@ var Helpers_1 = require("../../../Utils/Helpers");
 var lodash_1 = require("lodash");
 var Wrapper_1 = __importDefault(require("../../../AWING/HOC/Wrapper"));
 var Context_2 = require("../../../Context");
+var ListenTemplate_1 = require("./ListenTemplate");
 var CreateOrEdit = function (_a) {
     var type = _a.type;
     var t = (0, react_i18next_1.useTranslation)().t;
     var pageId = (0, react_router_dom_1.useParams)().pageId;
     var na = (0, react_router_dom_1.useNavigate)();
     var appHelper = (0, Context_2.useAwing)().appHelper;
+    var getTemplate = (0, ListenTemplate_1.usePageCache)().getTemplate;
     var _b = (0, Context_1.default)(), service = _b.service, pageCode = _b.pageCode;
     var _c = react_1.default.useState(false), loading = _c[0], setLoading = _c[1];
     var _d = (0, recoil_1.useRecoilState)(Recoil_1.hasDeprecated), isDeprecated = _d[0], setDeprecated = _d[1];
@@ -143,7 +145,7 @@ var CreateOrEdit = function (_a) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     var checkDeprecated = function (templateIds) {
-        return Promise.all(templateIds.map(function (id) { return service.templatesGet(id); })).then(function (res) { return res.some(function (x) { return x.template.isDeprecated; }); });
+        return Promise.all(templateIds.map(function (id) { return getTemplate(id); })).then(function (res) { return res.some(function (x) { return x.template.isDeprecated; }); });
     };
     var fetchDirectories = function () {
         return service

package/lib/ACM-AXN/Template/CreateOrEdit/Template/Parameter.js

@@ -74,6 +74,7 @@ var Parameter = function (_a) {
         defaultValue: undefined,
         labelName: undefined,
         isRequired: false,
+        isAdvanced: false,
         childrens: [],
     };
     var tableRow = react_1.default.useMemo(function () { return (0, Utils_1.flattenParameter)(rows); }, [rows]);

package/lib/ACM-AXN/Template/Types.d.ts

@@ -10,15 +10,15 @@ export interface ITemplateType {
     templateTypeCode?: string;
 }
 export interface ITemplateParameter {
-    id?: string;
-    templateId?: string;
-    fieldName?: string;
-    fieldType?: string;
-    defaultValue?: string;
-    labelName?: string;
-    isRequired?: boolean;
-    childrens?: ITemplateParameter[];
-    isAdvanced?: boolean;
+    id: string;
+    templateId: string;
+    fieldName: string;
+    fieldType: string;
+    defaultValue: string | number | boolean | undefined;
+    labelName: string | undefined;
+    isRequired: boolean;
+    childrens: ITemplateParameter[];
+    isAdvanced: boolean;
 }
 export interface ITemplateEvent {
     id?: number;

package/lib/ACM-AXN/ViewTemplate/TemplateField/Fields/BasicField/index.js

@@ -77,7 +77,6 @@ function BasicField(props) {
                 }
             }
             else {
-                console.log("fieldValue", { fieldValue: fieldValue });
                 if (defaultValue && !fieldValue) {
                     timeOut = setTimeout(function () {
                         setFormValue(fieldPath, defaultValue);

package/lib/AWING/DataForm/DataInput.js

@@ -43,11 +43,11 @@ var GeoFencing_1 = __importDefault(require("../../ACM-AXN/GeoFencing"));
 var i18n_1 = __importDefault(require("../../i18n"));
 var omit = require('lodash/omit');
 function DataInput(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var fieldDefinition = props.fieldDefinition, onChange = props.onChange, value = props.value, error = props.error, disableHelperText = props.disableHelperText;
     var fieldName = fieldDefinition.fieldName, type = fieldDefinition.type, onValidate = fieldDefinition.onValidate, min = fieldDefinition.min, max = fieldDefinition.max, pattern = fieldDefinition.pattern, other = __rest(fieldDefinition, ["fieldName", "type", "onValidate", "min", "max", "pattern"]);
-    var _k = react_2.default.useState(t('Common.InvalidData')), errorText = _k[0], setErrorText = _k[1];
+    var _m = react_2.default.useState(t('Common.InvalidData')), errorText = _m[0], setErrorText = _m[1];
     var checkValidationValue = function (fieldDefinition, val) {
         if (!fieldDefinition.required &&
             (val === undefined || val === null || val === '' || (Array.isArray(val) && val.length === 0)))
@@ -108,6 +108,7 @@ function DataInput(props) {
                         : '' }) }));
         }
         case 'autocomplete': {
+            var autocompleteValue_1 = (_b = fieldDefinition.value) !== null && _b !== void 0 ? _b : value;
             return ((0, jsx_runtime_1.jsx)(material_1.Autocomplete, { multiple: fieldDefinition.multiple, options: fieldDefinition.options, getOptionLabel: function (option) { var _a, _b; return (_b = (_a = option.label) !== null && _a !== void 0 ? _a : option.text) !== null && _b !== void 0 ? _b : ''; }, isOptionEqualToValue: function (option, value) {
                     return (option === null || option === void 0 ? void 0 : option.value) === (value === null || value === void 0 ? void 0 : value.value);
                 }, getOptionKey: function (option) { return option.value; }, disableclearable: fieldDefinition.disableClearable, getOptionDisabled: function (option) { return option === null || option === void 0 ? void 0 : option.disabled; }, onChange: function (e, value) {
@@ -117,9 +118,9 @@ function DataInput(props) {
                     onChange(newValue, checkValidationValue(fieldDefinition, newValue));
                 }, value: fieldDefinition.multiple
                     ? fieldDefinition.options.filter(function (x) {
-                        return (value !== null && value !== void 0 ? value : []).includes(x.value);
+                        return (autocompleteValue_1 !== null && autocompleteValue_1 !== void 0 ? autocompleteValue_1 : []).includes(x.value);
                     })
-                    : fieldDefinition.options.find(function (x) { return x.value === value; }) || null, clearOnEscape: true, fullWidth: true, disableCloseOnSelect: fieldDefinition.multiple, readOnly: fieldDefinition.readOnly, renderInput: function (params) {
+                    : (_c = fieldDefinition.options.find(function (x) { return x.value === autocompleteValue_1; })) !== null && _c !== void 0 ? _c : '', clearOnEscape: true, fullWidth: true, disableCloseOnSelect: fieldDefinition.multiple, readOnly: fieldDefinition.readOnly, renderInput: function (params) {
                     var _a;
                     return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({}, params, other, { variant: "standard", error: error, helperText: !disableHelperText && error
                             ? (_a = fieldDefinition.helperText) !== null && _a !== void 0 ? _a : t('Common.InvalidData')
@@ -143,7 +144,7 @@ function DataInput(props) {
                     return onChange(date === null || date === void 0 ? void 0 : date.toDate(), checkValidationValue(fieldDefinition, date === null || date === void 0 ? void 0 : date.toDate()));
                 }, readOnly: fieldDefinition.readOnly, slotProps: {
                     textField: __assign(__assign({ required: fieldDefinition.required, fullWidth: true, variant: 'standard' }, other), { error: error, helperText: !disableHelperText && error
-                            ? (_b = fieldDefinition.helperText) !== null && _b !== void 0 ? _b : t('Common.InvalidData')
+                            ? (_d = fieldDefinition.helperText) !== null && _d !== void 0 ? _d : t('Common.InvalidData')
                             : '' }),
                 } }));
         }
@@ -152,12 +153,12 @@ function DataInput(props) {
                     return onChange(date === null || date === void 0 ? void 0 : date.toDate(), checkValidationValue(fieldDefinition, date === null || date === void 0 ? void 0 : date.toDate()));
                 }, slotProps: {
                     textField: __assign(__assign({ required: fieldDefinition.required, fullWidth: true, variant: 'standard' }, other), { error: error, helperText: !disableHelperText && error
-                            ? (_c = fieldDefinition.helperText) !== null && _c !== void 0 ? _c : t('Common.InvalidData')
+                            ? (_e = fieldDefinition.helperText) !== null && _e !== void 0 ? _e : t('Common.InvalidData')
                             : '' }),
                 }, readOnly: fieldDefinition.readOnly }));
         }
         case 'date-range': {
-            var _l = other, isDayBlocked = _l.isDayBlocked, isOutsideRange = _l.isOutsideRange;
+            var _o = other, isDayBlocked = _o.isDayBlocked, isOutsideRange = _o.isOutsideRange;
             return ((0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { noBorder: true, variant: "standard", textFieldProps: __assign({ fullWidth: true, style: { margin: '8px 0px' } }, omit(other, ['isDayBlocked', 'isOutsideRange'])), value: {
                     startDate: (value === null || value === void 0 ? void 0 : value[0]) || null,
                     endDate: (value === null || value === void 0 ? void 0 : value[1]) || null,
@@ -165,7 +166,7 @@ function DataInput(props) {
                     var newValue = [dateRange.startDate, dateRange.endDate];
                     onChange(newValue, checkValidationValue(fieldDefinition, newValue));
                 }, label: fieldDefinition.label, error: error, helperText: !disableHelperText && error
-                    ? (_d = fieldDefinition.helperText) !== null && _d !== void 0 ? _d : t('Common.InvalidData')
+                    ? (_f = fieldDefinition.helperText) !== null && _f !== void 0 ? _f : t('Common.InvalidData')
                     : '', disableHelperText: disableHelperText, isDayBlocked: isDayBlocked, isOutsideRange: isOutsideRange }));
         }
         case 'number': {
@@ -173,7 +174,7 @@ function DataInput(props) {
                     var newValue = Number(event.target.value);
                     onChange(newValue, checkValidationValue(fieldDefinition, newValue));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_e = fieldDefinition.helperText) !== null && _e !== void 0 ? _e : t('Common.InvalidData')
+                    ? (_g = fieldDefinition.helperText) !== null && _g !== void 0 ? _g : t('Common.InvalidData')
                     : '' })));
         }
         case 'radio': {
@@ -188,7 +189,7 @@ function DataInput(props) {
         case 'text':
         case 'text-area': {
             return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ id: fieldName.toString(), name: fieldName.toString(), type: 'text', fullWidth: true, variant: "standard", multiline: fieldDefinition.type === 'text-area', error: error, helperText: !disableHelperText && error
-                    ? (_f = fieldDefinition.helperText) !== null && _f !== void 0 ? _f : errorText
+                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : errorText
                     : '' }, other, { value: value !== null && value !== void 0 ? value : '', onChange: function (event) {
                     return onChange(event.target.value, checkValidationValue(fieldDefinition, event.target.value));
                 } })));
@@ -200,7 +201,7 @@ function DataInput(props) {
                         : event.target.value;
                     onChange(event.target.value, checkValidationValue(fieldDefinition, newValue));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_g = fieldDefinition.helperText) !== null && _g !== void 0 ? _g : t('Common.InvalidData')
+                    ? (_j = fieldDefinition.helperText) !== null && _j !== void 0 ? _j : t('Common.InvalidData')
                     : '' }, other, { children: [!fieldDefinition.required && ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: "", children: (0, jsx_runtime_1.jsx)("em", { children: t('Common.None') }) })), fieldDefinition.options.map(function (item, index) {
                         var _a;
                         return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: item.value, disabled: item.disabled ||
@@ -214,7 +215,7 @@ function DataInput(props) {
             return ((0, jsx_runtime_1.jsx)(AWING_1.MultipleHierarchicalChoice, __assign({}, fieldDefinition, { variant: "standard", value: value, onChange: function (value) {
                     onChange(value, checkValidationValue(fieldDefinition, value));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : t('Common.InvalidData')
+                    ? (_k = fieldDefinition.helperText) !== null && _k !== void 0 ? _k : t('Common.InvalidData')
                     : '' })));
         }
         case 'geo-fencing': {
@@ -227,7 +228,7 @@ function DataInput(props) {
             return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ id: fieldName.toString(), name: fieldName.toString(), type: fieldDefinition.type, fullWidth: true, variant: "standard" }, other, { value: value !== null && value !== void 0 ? value : '', onChange: function (event) {
                     return onChange(event.target.value, checkValidationValue(fieldDefinition, event.target.value));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_j = fieldDefinition.helperText) !== null && _j !== void 0 ? _j : t('Common.InvalidData')
+                    ? (_l = fieldDefinition.helperText) !== null && _l !== void 0 ? _l : t('Common.InvalidData')
                     : '' })));
         }
     }

package/package.json

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