awing-library 2.1.146-beta → 2.1.146

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

@@ -77,7 +77,6 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 /* eslint-disable testing-library/no-node-access */
 /* eslint-disable testing-library/no-container */
 /* eslint-disable testing-library/no-wait-for-side-effects */
-require("@testing-library/jest-dom/extend-expect");
 var react_1 = require("@testing-library/react");
 var Parameter_1 = __importDefault(require("./Parameter"));
 var Utils = __importStar(require("./Utils"));
@@ -111,27 +110,6 @@ var rows = [
         isRequired: true,
         childrens: [],
     },
-    {
-        id: '14896',
-        templateId: '4671435926616395650',
-        fieldName: 'video_inbanner_2',
-        fieldType: 'object',
-        defaultValue: null,
-        labelName: 'File banner nền video',
-        isRequired: true,
-        childrens: [
-            {
-                id: '148967',
-                templateId: '4671435926616395650',
-                fieldName: 'video_inbanner_2',
-                fieldType: 'image',
-                defaultValue: null,
-                labelName: 'File banner nền video',
-                isRequired: true,
-                childrens: [],
-            },
-        ],
-    },
     {
         id: '148961',
         templateId: '4671435926616395650',
@@ -154,13 +132,11 @@ var rows = [
         ],
     },
 ];
-var props = {
-    handleSetParameter: function (fn) {
-        return fn(rows);
-    },
-};
 describe('Template Infomation Tab Component', function () {
-    beforeAll(function () { });
+    beforeAll(function () {
+        ;
+        Utils.enhancedUpdate.mockImplementation(utils.enhancedUpdate);
+    });
     var renderUi = function () {
         return (0, react_1.render)((0, jsx_runtime_1.jsx)(recoil_1.RecoilRoot, { initializeState: function (_a) {
                 var set = _a.set;
@@ -170,33 +146,62 @@ describe('Template Infomation Tab Component', function () {
     it('renders without crashing', function () {
         renderUi();
     });
-    it('trigger add rows', function () {
-        var updateSpy = jest.spyOn(props, 'handleSetParameter');
-        renderUi();
-        var addBtn = react_1.screen.getByRole('button', { name: /button-add/i });
-        react_1.fireEvent.click(addBtn);
-        expect(updateSpy).toBeCalled();
-        // expect(addBtn).toBeInTheDocument()
-    });
+    it('trigger add rows', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var addBtn;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    renderUi();
+                    addBtn = react_1.screen.getByRole('button', { name: /button-add/i });
+                    react_1.fireEvent.click(addBtn);
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            expect(react_1.screen.getAllByText('image')[0]).toBeInTheDocument();
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('trigger add Object Children', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var addBtn;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    renderUi();
+                    addBtn = react_1.screen.getAllByTitle('Common.Add');
+                    addBtn.forEach(function (btn) {
+                        react_1.fireEvent.click(btn);
+                    });
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            expect(react_1.screen.getAllByText('image')[0]).toBeInTheDocument();
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('trigger edit cell', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var updateSpy, container, labelNameInput, fieldTypeInput;
+        var container, labelNameInput, fieldTypeInput;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    updateSpy = jest.spyOn(props, 'handleSetParameter');
                     container = renderUi().container;
-                    labelNameInput = container.querySelector("input[name=\"labelName--148961-148967s\"]");
-                    fieldTypeInput = container.querySelector("input[name=\"fieldType--148961-148967s\"]");
+                    labelNameInput = container.querySelector("input[name=\"labelName-148961-148967s\"]");
+                    fieldTypeInput = container.querySelector("input[name=\"fieldType-148961-148967s\"]");
                     react_1.fireEvent.change(labelNameInput, {
                         target: { value: 'fieldInput-change' },
                     });
                     react_1.fireEvent.change(fieldTypeInput, {
                         target: { value: 'video' },
                     });
+                    // expect(screen.getAllByText('color')[0]).toBeInTheDocument()
                     return [4 /*yield*/, (0, react_1.waitFor)(function () {
-                            expect(updateSpy).toBeCalledTimes(1);
+                            expect(Utils.enhancedUpdate).toBeCalledTimes(3);
                         })];
                 case 1:
+                    // expect(screen.getAllByText('color')[0]).toBeInTheDocument()
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -205,16 +210,22 @@ describe('Template Infomation Tab Component', function () {
     it('Remove row', function () { return __awaiter(void 0, void 0, void 0, function () {
         var removeBtn;
         return __generator(this, function (_a) {
-            ;
-            Utils.enhancedUpdate.mockImplementation(utils.enhancedUpdate);
-            renderUi();
-            removeBtn = react_1.screen.getAllByRole('button', {
-                name: /Common.Delete/i,
-            });
-            removeBtn.forEach(function (btn) {
-                react_1.fireEvent.click(btn);
-            });
-            return [2 /*return*/];
+            switch (_a.label) {
+                case 0:
+                    renderUi();
+                    removeBtn = react_1.screen.getAllByRole('button', {
+                        name: /Common.Delete/i,
+                    });
+                    removeBtn.forEach(function (btn) {
+                        react_1.fireEvent.click(btn);
+                    });
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            expect(Utils.enhancedUpdate).toBeCalledTimes(2);
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
         });
     }); });
 });

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

@@ -1,15 +1,36 @@
+/// <reference types="lodash" />
 import { ITemplateParameter } from '../../Types';
 import { DataObject } from '../../../../AWING';
-export declare const CUSTOM_FIELD_NAME: {
+export interface IFlatParameter {
+    parentFieldType: string | undefined;
+    parentId: string[];
+    parentFieldName: string[];
+    errField: boolean;
+    shouldRemove: boolean;
+    id: string;
+    templateId: string;
+    fieldName: string;
+    fieldType: string;
+    defaultValue: string | number | boolean | null;
+    labelName: string;
+    isRequired: boolean;
+    childrens: IFlatParameter[];
+    isAdvanced: boolean;
+}
+export declare const FIELDS: {
     CHILDRENS: string;
     REMOVE: string;
     FIELD_TYPE: string;
+    FIELD_NAME: string;
     IS_REQUIRED: string;
     IS_ADVANCED: string;
+    LABEL_NAME: string;
+    DEFAULT_VALUE: string;
+    PARENT_ID: string;
 };
 export declare const removeFiledName: (templateParameters: ITemplateParameter[]) => ITemplateParameter[];
-export declare const flattenParameter4Parent: (rows: DataObject[], parentFieldName?: string[]) => DataObject[];
-export declare const flattenParameter: (parameters: DataObject[], parentId?: string[], parentFieldType?: string, parentFieldName?: string[]) => DataObject[];
+export declare const flattenParameter4Parent: ((rows: DataObject[], parentFieldName?: string[]) => DataObject[]) & import("lodash").MemoizedFunction;
+export declare const flattenParameter: ((parameters: DataObject[], parentId?: string[], parentFieldType?: string, parentFieldName?: string[]) => IFlatParameter[]) & import("lodash").MemoizedFunction;
 export declare const enhancedFindIndex: (rows: DataObject[], ids: string[]) => number[];
 /**
  * function enhancedUpdate
@@ -22,4 +43,7 @@ export declare const enhancedFindIndex: (rows: DataObject[], ids: string[]) => n
  * @param defaultParam
  */
 export declare const enhancedUpdate: (rows: DataObject[], ids: string[], field: string, value: any, defaultParam: ITemplateParameter) => void;
-export declare const enhancedRemove: (ids: string[]) => void;
+/**
+ * viết type là DataObject thôi nhưng type của nó là:
+ */
+export declare const getFieldName: ((row: IFlatParameter) => string) & import("lodash").MemoizedFunction;

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

@@ -20,22 +20,26 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enhancedRemove = exports.enhancedUpdate = exports.enhancedFindIndex = exports.flattenParameter = exports.flattenParameter4Parent = exports.removeFiledName = exports.CUSTOM_FIELD_NAME = void 0;
+exports.getFieldName = exports.enhancedUpdate = exports.enhancedFindIndex = exports.flattenParameter = exports.flattenParameter4Parent = exports.removeFiledName = exports.FIELDS = void 0;
 var Enum_1 = require("../../../../ACM-AXN/ViewTemplate/Enum");
 var lodash_1 = require("lodash");
-exports.CUSTOM_FIELD_NAME = {
+exports.FIELDS = {
     CHILDRENS: 'childrens',
     REMOVE: 'remove',
     FIELD_TYPE: 'fieldType',
+    FIELD_NAME: 'fieldName',
     IS_REQUIRED: 'isRequired',
     IS_ADVANCED: 'isAdvanced',
+    LABEL_NAME: 'labelName',
+    DEFAULT_VALUE: 'defaultValue',
+    PARENT_ID: 'parentId',
 };
 var removeFiledName = function (templateParameters) { return templateParameters.map(function (item) {
     var _a;
     return (__assign(__assign({}, item), { childrens: (0, exports.removeFiledName)(item.childrens), fieldName: (_a = item === null || item === void 0 ? void 0 : item.fieldName) === null || _a === void 0 ? void 0 : _a.split('.').at(-1) }));
 }); };
 exports.removeFiledName = removeFiledName;
-var flattenParameter4Parent = function (rows, parentFieldName) {
+exports.flattenParameter4Parent = (0, lodash_1.memoize)(function (rows, parentFieldName) {
     if (parentFieldName === void 0) { parentFieldName = []; }
     parentFieldName = parentFieldName.filter(Boolean);
     return rows
@@ -50,15 +54,14 @@ var flattenParameter4Parent = function (rows, parentFieldName) {
         ], false).flat()), true);
     })
         .flat();
-};
-exports.flattenParameter4Parent = flattenParameter4Parent;
-var flattenParameter = function (parameters, parentId, parentFieldType, parentFieldName) {
+});
+exports.flattenParameter = (0, lodash_1.memoize)(function (parameters, parentId, parentFieldType, parentFieldName) {
     if (parentId === void 0) { parentId = []; }
     if (parentFieldName === void 0) { parentFieldName = []; }
     var shouldRemove = parameters.length > 1;
     return parameters
         .map(function (item) {
-        var errField = !!parameters.find(function (el) { return el.id !== item.id && el.fieldName === item.fieldName; });
+        var errField = !!parameters.find(function (el) { return el.id !== item.id && el.fieldName === item.fieldName; }) || item.fieldName === '';
         var childrens = __spreadArray([], item.childrens, true);
         parentFieldName = parentFieldName.filter(function (field) { return field !== undefined; });
         // delete item.childrens
@@ -69,9 +72,17 @@ var flattenParameter = function (parameters, parentId, parentFieldType, parentFi
             item.fieldName,
         ], false).flat()), true);
     })
-        .flat();
-};
-exports.flattenParameter = flattenParameter;
+        .flat().map(function (item) {
+        Object.keys(item).forEach(function (key) {
+            var value = item[key];
+            if (Array.isArray(value)) {
+                ;
+                item[key] = value.filter(Boolean);
+            }
+        });
+        return item;
+    });
+});
 var enhancedFindIndex = function (rows, ids) {
     var indexs = [];
     var index = (0, lodash_1.findIndex)(rows, { id: ids[0] });
@@ -102,14 +113,14 @@ var enhancedUpdate = function (rows, ids, field, value, defaultParam) {
         }
         else {
             switch (field) {
-                case exports.CUSTOM_FIELD_NAME.CHILDRENS:
+                case exports.FIELDS.CHILDRENS:
                     rowsUpdate[indexs[turn]].childrens.push(value);
                     break;
-                case exports.CUSTOM_FIELD_NAME.REMOVE: {
+                case exports.FIELDS.REMOVE: {
                     rowsUpdate.splice(indexs[turn], 1);
                     break;
                 }
-                case exports.CUSTOM_FIELD_NAME.FIELD_TYPE: {
+                case exports.FIELDS.FIELD_TYPE: {
                     ;
                     rowsUpdate[indexs[turn]][field] = value;
                     rowsUpdate[indexs[turn]].childrens = [];
@@ -134,5 +145,22 @@ var enhancedUpdate = function (rows, ids, field, value, defaultParam) {
     }
 };
 exports.enhancedUpdate = enhancedUpdate;
-var enhancedRemove = function (ids) { };
-exports.enhancedRemove = enhancedRemove;
+/**
+ * viết type là DataObject thôi nhưng type của nó là:
+ */
+exports.getFieldName = (0, lodash_1.memoize)(function (row) {
+    var value = '';
+    var parentName = row.parentFieldName.length
+        ? __spreadArray(__spreadArray([], row.parentFieldName, true), [''], false).join('.')
+        : '';
+    if (parentName.split('.').length === row.parentId.length) {
+        parentName += '.';
+    }
+    if (row.fieldName) {
+        value += parentName + row.fieldName;
+    }
+    if (row.parentId.length && !value.split('.').at(row.parentId.length)) {
+        value = parentName;
+    }
+    return value;
+});

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

@@ -58,7 +58,7 @@ var TabFile_1 = __importDefault(require("../../../ACM-AXN/Page/CreateOrEdit/TabF
 var enums_1 = require("../../../ACM-AXN/Page/enums");
 var AWING_1 = require("../../../AWING");
 var Wrapper_1 = __importDefault(require("../../../AWING/HOC/Wrapper"));
-var immer_1 = __importDefault(require("immer"));
+var immer_1 = require("immer");
 var Router_1 = require("../../../AWING/Router");
 var validation_1 = require("../../../AWING/ultis/validation");
 var ClassicDrawer_1 = __importDefault(require("../../../Commons/Components/ClassicDrawer"));
@@ -90,6 +90,7 @@ var CreateOrEdit = function () {
     var _e = (0, react_1.useState)([]), templateTypes = _e[0], setTemplateTypes = _e[1];
     var _f = (0, recoil_1.useRecoilState)(Recoils_1.templateState), templateData = _f[0], setTemplateData = _f[1];
     var confirmExit = (0, recoil_1.useRecoilValue)(Recoils_1.isEditState);
+    var isError = (0, recoil_1.useRecoilValue)(Recoils_1.isErrorParameterState);
     var _g = (0, react_1.useState)('0'), value = _g[0], setValue = _g[1];
     (0, react_1.useEffect)(function () {
         setLoading(true);
@@ -104,7 +105,7 @@ var CreateOrEdit = function () {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     (0, react_1.useEffect)(function () {
-        setTemplateData((0, immer_1.default)(function (prev) {
+        setTemplateData((0, immer_1.produce)(function (prev) {
             var _a;
             prev.template.directoryId =
                 prev.template.directoryId ||
@@ -152,7 +153,7 @@ var CreateOrEdit = function () {
     var fetchTemplateData = function () {
         if (templateId) {
             return service.templatesGet(templateId).then(function (res) {
-                setTemplateData(__assign(__assign({}, res), { templateParameters: (0, Utils_1.removeFiledName)(res.templateParameters) }));
+                setTemplateData(__assign(__assign({}, res), { template: __assign(__assign({}, res.template), { pageCode: isNaN(Number(res.template.pageCode)) ? res.template.pageCode : Number(res.template.pageCode) ? 'lgn' : 'wlc' }), templateParameters: (0, Utils_1.removeFiledName)(res.templateParameters) }));
             });
         }
     };
@@ -205,7 +206,10 @@ var CreateOrEdit = function () {
         }
         return service.templatesPost(data4Update);
     };
-    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['TemplateManagement', templateId ? 'Edit' : 'Create'].join('.'))).concat(templateId ? ": ".concat((_a = templateData === null || templateData === void 0 ? void 0 : templateData.template) === null || _a === void 0 ? void 0 : _a.description) : '', "\n               "), onSubmit: handleSubmit, disableButtonSubmit: !((_b = templateData.template) === null || _b === void 0 ? void 0 : _b.templateTypeId) || !descriptionValid.valid || !confirmExit, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, sx: {
+    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['TemplateManagement', templateId ? 'Edit' : 'Create'].join('.'))).concat(templateId ? ": ".concat((_a = templateData === null || templateData === void 0 ? void 0 : templateData.template) === null || _a === void 0 ? void 0 : _a.description) : '', "\n               "), onSubmit: handleSubmit, disableButtonSubmit: !((_b = templateData.template) === null || _b === void 0 ? void 0 : _b.templateTypeId) ||
+            !descriptionValid.valid ||
+            !confirmExit ||
+            isError, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, sx: {
                 display: 'flex',
                 flexDirection: 'column',
                 flexGrow: 1,

package/lib/ACM-AXN/Template/Import.js

@@ -51,7 +51,7 @@ var ImportTemplate = function () {
     };
     var handleSubmit = function () {
         var directoryId = bussinessData.directoryId, id = bussinessData.id, name = bussinessData.name;
-        return service.templatesImport(directoryId, id, name, {
+        return service.templatesImport(directoryId, id || '0', name, {
             data: tempFile,
             fileName: tempFile === null || tempFile === void 0 ? void 0 : tempFile.name,
         });
@@ -59,7 +59,7 @@ var ImportTemplate = function () {
     var handleChangeFormData = (0, react_1.useCallback)(function (obj, valid, key) {
         setBussinessData(function (prev) {
             var _a;
-            return (__assign(__assign({}, prev), (_a = {}, _a[key] = obj[key], _a.id = prev.id || (obj === null || obj === void 0 ? void 0 : obj.id) || '0', _a.directoryId = (obj === null || obj === void 0 ? void 0 : obj.directoryId) || rootDirectoryId, _a)));
+            return (__assign(__assign({}, prev), (_a = {}, _a[key] = obj[key], _a.directoryId = (obj === null || obj === void 0 ? void 0 : obj.directoryId) || rootDirectoryId, _a)));
         });
     }, [rootDirectoryId]);
     return ((0, jsx_runtime_1.jsxs)(ClassicDrawer_1.default, { title: t('TemplateManagement.ImportTemplate'), onSubmit: handleSubmit, disableButtonSubmit: !(tempFile === null || tempFile === void 0 ? void 0 : tempFile.name), confirmExit: true, childrenWrapperStyle: { padding: 0 }, children: [(0, jsx_runtime_1.jsx)(AWING_1.DataForm, { fields: [

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/TransactionLog/Detail.js

@@ -92,7 +92,7 @@ var newStyles = {
             removedGutterBackground: '#ececec',
         },
         titleBlock: {
-            fontFamily: "'AW-Roboto', sans-serif",
+            fontFamily: "'Roboto', sans-serif",
             fontSize: '12px',
             fontWeight: 'bold',
         },

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

@@ -43,17 +43,16 @@ var Preview = function (props) {
     var _a;
     var classes = useStyles();
     var t = (0, react_i18next_1.useTranslation)().t;
-    var validStatus = props.validStatus, pagePath = props.pagePath, templateDatas = props.templateDatas, 
-    // domainId,
-    configs = props.configs;
+    var validStatus = props.validStatus, pagePath = props.pagePath, templateDatas = props.templateDatas, domainId = props.domainId, configs = props.configs;
     var viewIndex = ((_a = templateDatas[0]) === null || _a === void 0 ? void 0 : _a.viewNumber) || -1;
     var formRef = react_1.default.useRef(null);
     var iframeSrc = (0, react_1.useMemo)(function () {
-        var result = "".concat(configs.CAPTIVE_DOMAIN, "/").concat(configs.TEMPLATE_PREVIEW);
+        var result = "".concat(configs.CAPTIVE_DOMAIN, "/").concat(configs.TEMPLATE_PREVIEW, "?domainId=").concat(domainId);
         if (result.startsWith("http://"))
             result = result.replace("http://", "https://");
         return result;
-    }, [configs.CAPTIVE_DOMAIN, configs.TEMPLATE_PREVIEW]);
+    }, [configs.CAPTIVE_DOMAIN, configs.TEMPLATE_PREVIEW, domainId]);
+    var iframeName = react_1.default.useMemo(function () { return "iframe-demo".concat(viewIndex); }, [viewIndex]);
     (0, react_1.useEffect)(function () {
         var handleFormdata = function (_a) {
             var formData = _a.formData;
@@ -87,6 +86,6 @@ var Preview = function (props) {
                 }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "body1", style: {
                             fontWeight: "bold",
                             textTransform: "uppercase",
-                        }, children: t("ViewTemplate.PreviewTitle") }), (0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: t("Common.Refresh") || "", placement: "top", children: (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { onClick: function () { return formRef.current.submit(); }, "aria-label": "refresh", style: { float: "right" }, disabled: !validStatus, children: (0, jsx_runtime_1.jsx)(Refresh_1.default, {}) }) }) })] }), (0, jsx_runtime_1.jsx)("form", { action: iframeSrc, method: "post", target: "iframe-demo", ref: formRef }), (0, jsx_runtime_1.jsx)("iframe", { title: "iframe-demo-".concat(viewIndex), id: "iframe-demo", name: "iframe-demo", className: classes.root, width: "100%" })] }));
+                        }, children: t("ViewTemplate.PreviewTitle") }), (0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: t("Common.Refresh") || "", placement: "top", children: (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { onClick: function () { return formRef.current.submit(); }, "aria-label": "refresh", style: { float: "right" }, disabled: !validStatus, children: (0, jsx_runtime_1.jsx)(Refresh_1.default, {}) }) }) })] }), (0, jsx_runtime_1.jsx)("form", { action: iframeSrc, method: "post", target: iframeName, ref: formRef }), (0, jsx_runtime_1.jsx)("iframe", { title: iframeName, id: iframeName, name: iframeName, className: classes.root, width: "100%" })] }));
 };
 exports.default = Preview;

package/lib/ACM-AXN/ViewTemplate/TemplateField/Event.js

@@ -27,22 +27,32 @@ var Events = function (_a) {
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var _b = react_1.default.useState(''), tempValue = _b[0], setTempValue = _b[1];
     var _c = react_1.default.useState(''), error = _c[0], setError = _c[1];
+    var handleValue = function () {
+        if (tempValue.trim() === '') {
+            return;
+        }
+        var _a = (0, validation_1.textValidation)(tempValue, 50, false, /^[a-zA-Z0-9đĐ_.()\u0080-\uFFFF]+$/g), valid = _a.valid, message = _a.message;
+        var isStartWithNumber = tempValue.match(/^\d/);
+        if (viewEvents.map(function (item) { return item.event; }).includes((0, Helpers_1.changeToAlias)(tempValue)) || !valid || isStartWithNumber) {
+            setError(!valid ? message : isStartWithNumber ? t('Common.InvalidData') : t('Common.Existed').replace('{0}', tempValue));
+            return;
+        }
+        onChangeEvent((0, lodash_1.uniqBy)(viewEvents.concat({ event: tempValue, id: 0 }), function (item) { return (0, Helpers_1.changeToAlias)(item.event); }));
+        setTempValue('');
+    };
     return ((0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
             marginBottom: 2,
             width: '100%',
         }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ error: !!error, helperText: error, fullWidth: true, variant: "standard", placeholder: "".concat(t('Common.Events'), "...") }, (!disabledLabel && { label: t('Common.Events') }), { inputProps: {
                 autoComplete: 'off',
             }, value: tempValue, onKeyDown: function (e) {
-                if (e.key === 'Enter') {
-                    var _a = (0, validation_1.textValidation)(tempValue, 50, false, /^[a-zA-Z0-9đĐ_.()\u0080-\uFFFF]+$/g), valid = _a.valid, message = _a.message;
-                    var isStartWithNumber = tempValue.match(/^\d/);
-                    if (viewEvents.map(function (item) { return item.event; }).includes((0, Helpers_1.changeToAlias)(tempValue)) || !valid || isStartWithNumber) {
-                        setError(!valid ? message : isStartWithNumber ? t('Common.InvalidData') : t('Common.Existed').replace('{0}', tempValue));
-                        return;
-                    }
-                    onChangeEvent((0, lodash_1.uniqBy)(viewEvents.concat({ event: tempValue, id: 0 }), function (item) { return (0, Helpers_1.changeToAlias)(item.event); }));
-                    setTempValue('');
+                if (e.key === 'Enter' || e.key === 'Tab' || e.key === ',') {
+                    e.preventDefault();
+                    handleValue();
                 }
+            }, onBlur: function (e) {
+                e.preventDefault();
+                handleValue();
             }, onChange: function (event) {
                 setTempValue(event.target.value);
                 setError('');
@@ -62,8 +72,10 @@ var Events = function (_a) {
                         marginRight: 1,
                         marginBottom: 0.5,
                     }, label: option.event, title: option.event, disabled: option === null || option === void 0 ? void 0 : option.protected, onDelete: function () {
-                        onChangeEvent(viewEvents.filter(function (item) { return item.event !== option.event; }));
-                    } }, option.event)); }),
+                        var res = viewEvents.filter(function (item) { return item.event !== option.event; });
+                        console.log("res", res);
+                        onChangeEvent(res);
+                    } }, JSON.stringify(option))); }),
             } })) }));
 };
 exports.default = Events;

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

@@ -0,0 +1,18 @@
+/// <reference types="lodash" />
+import { Configs, FieldInfo } from "../../../../../ACM-AXN/ViewTemplate/interface";
+export declare const getValidationParams: (templateDatas: FieldInfo[], pagePath: string, configs: Configs) => {
+    fieldValue: any;
+    id?: string | undefined;
+    defaultValue?: string | undefined;
+    fieldName: string;
+    fieldType: "object" | "color" | "html" | "textarea" | "video" | "image" | "list" | "checkbox" | "url" | "textfield" | "textfield_number" | "dropdownlist" | "checkboxlist";
+    isRequired: boolean;
+    labelName?: string | undefined;
+    pageId?: string | undefined;
+    templateId?: string | undefined;
+    viewNumber?: number | undefined;
+    childrens?: FieldInfo[] | undefined;
+}[][];
+export declare const runValidate: import("lodash").DebouncedFunc<(scriptValidate: string, fields: FieldInfo[], pagePath: string, notifyError: (errorMessage: string) => void, changeViewValidStatus: (status: boolean) => void, changeViewValidProcess: (processValue: number) => void, configs: Configs) => void>;
+export declare const getAutoFieldParams: (templateDatas: FieldInfo[], fieldPath: string, pagePath: string, configs: Configs) => any[];
+export declare const runAutoField: import("lodash").DebouncedFunc<(scriptAutoField: string, fields: FieldInfo[], fieldPath: string, pagePath: string, updateNewValue: (needUpdateFieldPath: string, newValue: any) => void, configs: Configs) => void>;