awing-library 2.1.98-beta → 2.1.100-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.d.ts +1 -1
  2. package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.js +2 -2
  3. package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/index.d.ts +1 -1
  4. package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/index.js +2 -2
  5. package/lib/ACM-AXN/CampaignSchedule/Components/RowAdvance/component.js +6 -2
  6. package/lib/ACM-AXN/CampaignSchedule/container.d.ts +1 -1
  7. package/lib/ACM-AXN/CampaignSchedule/container.js +2 -2
  8. package/lib/ACM-AXN/CampaignSchedule/interface.d.ts +3 -0
  9. package/lib/ACM-AXN/TaskScheduler/Components/CornJobInput.js +1 -2
  10. package/lib/AWING/ButtonSelect/index.js +2 -2
  11. package/lib/AWING/LogicExpression/script.js +0 -1
  12. package/lib/AWING/ultis/validation.js +3 -10
  13. package/package.json +1 -1
package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { IFiltersProps } from '../../interface';
2
- declare const Filters: ({ campaigns, handleFilters, loadingFlags, placeMultiSelectComponent: PlaceMultiSelect, handleExportExcel, disabledCampaignFilter, }: IFiltersProps) => import("react/jsx-runtime").JSX.Element;
2
+ declare const Filters: ({ campaigns, handleFilters, loadingFlags, placeMultiSelectComponent: PlaceMultiSelect, handleExportExcel, disabledCampaignFilter, isFutureDate }: IFiltersProps) => import("react/jsx-runtime").JSX.Element;
3
3
  export default Filters;
package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.js CHANGED
@@ -78,7 +78,7 @@ var useStyles = (0, styles_1.makeStyles)(function () { return ({
78
78
  }); });
79
79
  var Filters = function (_a) {
80
80
  var _b, _c;
81
- var campaigns = _a.campaigns, handleFilters = _a.handleFilters, loadingFlags = _a.loadingFlags, PlaceMultiSelect = _a.placeMultiSelectComponent, handleExportExcel = _a.handleExportExcel, _d = _a.disabledCampaignFilter, disabledCampaignFilter = _d === void 0 ? false : _d;
81
+ var campaigns = _a.campaigns, handleFilters = _a.handleFilters, loadingFlags = _a.loadingFlags, PlaceMultiSelect = _a.placeMultiSelectComponent, handleExportExcel = _a.handleExportExcel, _d = _a.disabledCampaignFilter, disabledCampaignFilter = _d === void 0 ? false : _d, isFutureDate = _a.isFutureDate;
82
82
  var t = (0, react_i18next_1.useTranslation)().t;
83
83
  var campaignOptions = __assign(__assign({}, campaigns), { 0: { campaignId: 0, name: t('Common.SelectAll') } });
84
84
  var classes = useStyles();
@@ -86,7 +86,7 @@ var Filters = function (_a) {
86
86
  handleFilters('startDate', value.startDate);
87
87
  handleFilters('endDate', value.endDate);
88
88
  };
89
- return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 4, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: true, isFutureDate: true, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), callback: handleChangeDateRange, initialStartDate: (0, moment_1.default)(), initialEndDate: (0, moment_1.default)(), variant: "outlined", textFieldProps: {
89
+ return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 4, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: true, isFutureDate: isFutureDate !== null && isFutureDate !== void 0 ? isFutureDate : true, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), callback: handleChangeDateRange, initialStartDate: (0, moment_1.default)(), initialEndDate: (0, moment_1.default)(), variant: "outlined", textFieldProps: {
90
90
  fullWidth: true,
91
91
  className: classes.outlinedInput,
92
92
  }, isDayBlocked: function (day) {
package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { IControlPanelProps } from '../../interface';
2
- declare const ControlPanel: ({ campaigns, handleFilters, unGroupField, onDragStart, onDragOver, onDrop, handleView, handleExportExcel, loadingFlags, panels, placeMultiSelectComponent, disabledCampaignFilter, }: IControlPanelProps) => import("react/jsx-runtime").JSX.Element;
2
+ declare const ControlPanel: ({ campaigns, handleFilters, unGroupField, onDragStart, onDragOver, onDrop, handleView, handleExportExcel, loadingFlags, panels, placeMultiSelectComponent, disabledCampaignFilter, isFutureDate }: IControlPanelProps) => import("react/jsx-runtime").JSX.Element;
3
3
  export default ControlPanel;
package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/index.js CHANGED
@@ -10,8 +10,8 @@ var react_i18next_1 = require("react-i18next");
10
10
  var Filter_1 = __importDefault(require("./Filter"));
11
11
  var GroupPanel_1 = __importDefault(require("./GroupPanel"));
12
12
  var ControlPanel = function (_a) {
13
- var campaigns = _a.campaigns, handleFilters = _a.handleFilters, unGroupField = _a.unGroupField, onDragStart = _a.onDragStart, onDragOver = _a.onDragOver, onDrop = _a.onDrop, handleView = _a.handleView, handleExportExcel = _a.handleExportExcel, loadingFlags = _a.loadingFlags, panels = _a.panels, placeMultiSelectComponent = _a.placeMultiSelectComponent, disabledCampaignFilter = _a.disabledCampaignFilter;
13
+ var campaigns = _a.campaigns, handleFilters = _a.handleFilters, unGroupField = _a.unGroupField, onDragStart = _a.onDragStart, onDragOver = _a.onDragOver, onDrop = _a.onDrop, handleView = _a.handleView, handleExportExcel = _a.handleExportExcel, loadingFlags = _a.loadingFlags, panels = _a.panels, placeMultiSelectComponent = _a.placeMultiSelectComponent, disabledCampaignFilter = _a.disabledCampaignFilter, isFutureDate = _a.isFutureDate;
14
14
  var t = (0, react_i18next_1.useTranslation)().t;
15
- return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "flex-start", spacing: 2, children: (0, jsx_runtime_1.jsx)(Filter_1.default, { loadingFlags: loadingFlags, campaigns: campaigns, handleFilters: handleFilters, handleExportExcel: handleExportExcel, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter }) }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, justifyContent: "flex-end", item: true, xs: 12, spacing: 2, sx: { marginTop: '0.125rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { id: "wrap-group-panel", item: true, style: { flexGrow: 1, position: 'relative' }, children: (0, jsx_runtime_1.jsx)(GroupPanel_1.default, { panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, sx: { display: 'flex' }, children: (0, jsx_runtime_1.jsx)(material_1.Button, { sx: { height: '40px' }, variant: "contained", color: "primary", onClick: handleView, children: t('Common.View') }) })] })] }) }));
15
+ return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "flex-start", spacing: 2, children: (0, jsx_runtime_1.jsx)(Filter_1.default, { loadingFlags: loadingFlags, campaigns: campaigns, handleFilters: handleFilters, handleExportExcel: handleExportExcel, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter, isFutureDate: isFutureDate }) }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, justifyContent: "flex-end", item: true, xs: 12, spacing: 2, sx: { marginTop: '0.125rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { id: "wrap-group-panel", item: true, style: { flexGrow: 1, position: 'relative' }, children: (0, jsx_runtime_1.jsx)(GroupPanel_1.default, { panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, sx: { display: 'flex' }, children: (0, jsx_runtime_1.jsx)(material_1.Button, { sx: { height: '40px' }, variant: "contained", color: "primary", onClick: handleView, children: t('Common.View') }) })] })] }) }));
16
16
  };
17
17
  exports.default = ControlPanel;
package/lib/ACM-AXN/CampaignSchedule/Components/RowAdvance/component.js CHANGED
@@ -126,7 +126,9 @@ var RowAdvanceComponent = function (_a) {
126
126
  : '', sx: { padding: '0px !important' }, children: (0, jsx_runtime_1.jsxs)("div", { className: classes.wrapFrirstCell, children: [!expandDisabled && ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: open ? ((0, jsx_runtime_1.jsx)(ArrowDropUp_1.default, {})) : ((0, jsx_runtime_1.jsx)(ArrowDropDown_1.default, {})) })), (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "subtitle2", children: stt })] }) }, item.id));
127
127
  case Enum_1.HEAD_CELL_NAMES.PLACE:
128
128
  return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
129
- Enum_1.HEAD_CELL_NAMES.PLACE ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (_a = options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _a === void 0 ? void 0 : _a.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children:
129
+ Enum_1.HEAD_CELL_NAMES.PLACE ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.groupKeyId])
130
+ ? (_a = options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _a === void 0 ? void 0 : _a.name
131
+ : row === null || row === void 0 ? void 0 : row.groupKeyId })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children:
130
132
  // Nếu field hiện tại ko phải groupName đang showOn thì 3Th
131
133
  // TH1: field nằm trong groupNames nhưng đúng trước fieldNameShowOn hiển thị name
132
134
  // TH2: field nằm sau fieldNameShowOn trong groupNames hiển thi total
@@ -146,7 +148,9 @@ var RowAdvanceComponent = function (_a) {
146
148
  (0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: generateCampaignTotalCount(options === null || options === void 0 ? void 0 : options.campaigns, row, t('Schedule.CampaignDefault')) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
147
149
  case Enum_1.HEAD_CELL_NAMES.DOMAIN:
148
150
  return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
149
- Enum_1.HEAD_CELL_NAMES.DOMAIN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (_c = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _c === void 0 ? void 0 : _c.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
151
+ Enum_1.HEAD_CELL_NAMES.DOMAIN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.groupKeyId])
152
+ ? (_c = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _c === void 0 ? void 0 : _c.name
153
+ : row === null || row === void 0 ? void 0 : row.groupKeyId })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
150
154
  .slice(0, priorityGroupLevel - 1)
151
155
  .indexOf(Enum_1.HEAD_CELL_NAMES.DOMAIN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: ((_d = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.domainId]) === null || _d === void 0 ? void 0 : _d.name) || (row === null || row === void 0 ? void 0 : row.totalDomain) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
152
156
  case Enum_1.HEAD_CELL_NAMES.DATE:
package/lib/ACM-AXN/CampaignSchedule/container.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { ICampaignScheduleContainerProps } from './interface';
2
- declare const CampaignScheduleContainer: ({ initialFilters, initialHeadCells, placeMultiSelectComponent, serviceCampaignSchedule, typeSystemAXN, title, disabledCampaignFilter, }: ICampaignScheduleContainerProps) => import("react/jsx-runtime").JSX.Element;
2
+ declare const CampaignScheduleContainer: ({ initialFilters, initialHeadCells, placeMultiSelectComponent, serviceCampaignSchedule, typeSystemAXN, title, disabledCampaignFilter, isFutureDate }: ICampaignScheduleContainerProps) => import("react/jsx-runtime").JSX.Element;
3
3
  export default CampaignScheduleContainer;
package/lib/ACM-AXN/CampaignSchedule/container.js CHANGED
@@ -74,7 +74,7 @@ var Enum_1 = require("./Enum");
74
74
  var component_1 = __importDefault(require("./component"));
75
75
  var CampaignScheduleContainer = function (_a) {
76
76
  var _b;
77
- var initialFilters = _a.initialFilters, initialHeadCells = _a.initialHeadCells, placeMultiSelectComponent = _a.placeMultiSelectComponent, serviceCampaignSchedule = _a.serviceCampaignSchedule, _c = _a.typeSystemAXN, typeSystemAXN = _c === void 0 ? false : _c, title = _a.title, disabledCampaignFilter = _a.disabledCampaignFilter;
77
+ var initialFilters = _a.initialFilters, initialHeadCells = _a.initialHeadCells, placeMultiSelectComponent = _a.placeMultiSelectComponent, serviceCampaignSchedule = _a.serviceCampaignSchedule, _c = _a.typeSystemAXN, typeSystemAXN = _c === void 0 ? false : _c, title = _a.title, disabledCampaignFilter = _a.disabledCampaignFilter, isFutureDate = _a.isFutureDate;
78
78
  var t = (0, react_i18next_1.useTranslation)().t;
79
79
  var _d = (0, react_1.useState)(null), dragPlace = _d[0], setDragPlace = _d[1];
80
80
  var _e = (0, react_1.useState)(initialFilters), filters = _e[0], setFilters = _e[1];
@@ -316,7 +316,7 @@ var CampaignScheduleContainer = function (_a) {
316
316
  ], false), panels.slice(indexMatch + 1), true));
317
317
  setPanels(newPanels);
318
318
  }
319
- return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.Helmet, { children: (0, jsx_runtime_1.jsx)("title", { children: title }) }) }), (0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsxs)(material_1.Paper, { children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { campaigns: (_b = options === null || options === void 0 ? void 0 : options.campaigns) !== null && _b !== void 0 ? _b : {}, panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop, handleView: handleView, handleExportExcel: handleExportExcel, handleFilters: handleFilters, loadingFlags: loadingFlags, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter }), loadingFlags.pages ||
319
+ return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.Helmet, { children: (0, jsx_runtime_1.jsx)("title", { children: title }) }) }), (0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsxs)(material_1.Paper, { children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { campaigns: (_b = options === null || options === void 0 ? void 0 : options.campaigns) !== null && _b !== void 0 ? _b : {}, panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop, handleView: handleView, handleExportExcel: handleExportExcel, handleFilters: handleFilters, loadingFlags: loadingFlags, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter, isFutureDate: isFutureDate }), loadingFlags.pages ||
320
320
  loadingFlags.campaigns ||
321
321
  loadingFlags.places ? ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' }, children: (0, jsx_runtime_1.jsx)(CircularProgress_1.CircularProgress, {}) })) : ((0, jsx_runtime_1.jsx)(component_1.default, { headCells: headCells, onDragOver: onDragOver, onDragStart: onDragStart, onDrop: onDrop, scheduleGroups: scheduleGroups, page: page, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, options: options, filters: filters, serviceCampaignSchedule: serviceCampaignSchedule }))] })] }));
322
322
  };
package/lib/ACM-AXN/CampaignSchedule/interface.d.ts CHANGED
@@ -15,6 +15,7 @@ export interface ICampaignScheduleContainerProps {
15
15
  typeSystemAXN?: boolean;
16
16
  title: string;
17
17
  disabledCampaignFilter?: boolean;
18
+ isFutureDate?: boolean;
18
19
  }
19
20
  export interface ILoadingFlags {
20
21
  campaigns?: boolean;
@@ -184,6 +185,7 @@ export interface IControlPanelProps {
184
185
  loadingFlags: ILoadingFlags;
185
186
  placeMultiSelectComponent: (p?: any) => JSX.Element;
186
187
  disabledCampaignFilter?: boolean;
188
+ isFutureDate?: boolean;
187
189
  }
188
190
  export interface IGroupPanelProps {
189
191
  unGroupField: any;
@@ -199,6 +201,7 @@ export interface IFiltersProps {
199
201
  placeMultiSelectComponent: (p?: any) => JSX.Element;
200
202
  handleExportExcel: () => void;
201
203
  disabledCampaignFilter?: boolean;
204
+ isFutureDate?: boolean;
202
205
  }
203
206
  export interface IOptions {
204
207
  campaigns: any;
package/lib/ACM-AXN/TaskScheduler/Components/CornJobInput.js CHANGED
@@ -32,14 +32,13 @@ var react_1 = __importDefault(require("react"));
32
32
  var react_i18next_1 = require("react-i18next");
33
33
  var BasicInput_1 = __importDefault(require("./BasicInput"));
34
34
  var validation_1 = require("../../../AWING/ultis/validation");
35
- var cronRegex = /^(\*|[0-5]?\d)(?:\/\d+)? (\*|1?\d|2[0-3])(?:\/\d+)? (\*|0?[1-9]|[12]\d|3[01])(?:\/\d+)? (\*|0?[1-9]|1[0-2]|(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec))(?:\/\d+)? (\*|0?[0-7]|(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat))(?:\/\d+)?$/;
36
35
  var CornJobInput = function (_a) {
37
36
  var jobModel = _a.jobModel, handleChange = _a.handleChange;
38
37
  var t = (0, react_i18next_1.useTranslation)().t;
39
38
  return ((0, jsx_runtime_1.jsx)(material_1.Box, { sx: { position: 'relative' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, sx: {
40
39
  marginTop: function (t) { return t.spacing(1); },
41
40
  marginBottom: function (t) { return t.spacing(1); },
42
- }, name: "cronTime", label: t('TaskScheduler.Help.Crontime'), onChange: handleChange, value: jobModel.cronTime, checkValid: function (value) { return (0, validation_1.textValidation)(value, 50, true, cronRegex, /^.*$/); }, InputProps: {
41
+ }, name: "cronTime", label: t('TaskScheduler.Help.Crontime'), onChange: handleChange, value: jobModel.cronTime, checkValid: function (value) { return (0, validation_1.textValidation)(value, 50, true, false, false); }, InputProps: {
43
42
  startAdornment: ((0, jsx_runtime_1.jsx)(material_1.InputAdornment, { position: "start", sx: { marginRight: '30px' }, children: (0, jsx_runtime_1.jsx)(HtmlTooltip, { arrow: true, placement: "bottom-start", title: (0, jsx_runtime_1.jsxs)(react_1.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { children: t('TaskScheduler.Help.Crontime') }), (0, jsx_runtime_1.jsxs)("p", { children: [(0, jsx_runtime_1.jsxs)("span", { children: ["[", t('Common.Minute'), "]"] }), (0, jsx_runtime_1.jsxs)("span", { children: ["_[", t('Common.Hour'), "]"] }), (0, jsx_runtime_1.jsxs)("span", { children: ["_[", t('Common.Day'), "]"] }), (0, jsx_runtime_1.jsxs)("span", { children: ["_[", t('Common.Month'), "]"] }), (0, jsx_runtime_1.jsxs)("span", { children: ["_[", t('Common.DayOfWeek'), "]"] })] }), (0, jsx_runtime_1.jsx)("table", { children: (0, jsx_runtime_1.jsxs)("tbody", { children: [(0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsxs)("th", { children: [t('Common.Minute'), ":"] }), (0, jsx_runtime_1.jsx)("td", { children: "0 - 59" })] }), (0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsxs)("th", { children: [t('Common.Hour'), ":"] }), (0, jsx_runtime_1.jsx)("td", { children: "0 - 23" })] }), (0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsxs)("th", { children: [t('Common.Day'), ":"] }), (0, jsx_runtime_1.jsx)("td", { children: "1 - 31" })] }), (0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsxs)("th", { children: [t('Common.Month'), ":"] }), (0, jsx_runtime_1.jsx)("td", { children: "1 - 12" })] }), (0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsxs)("th", { children: [t('Common.DayOfWeek'), ":"] }), (0, jsx_runtime_1.jsx)("td", { children: "0 - 6" })] }), (0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsx)("th", { children: "*" }), (0, jsx_runtime_1.jsx)("td", { children: t('TaskScheduler.Help.*') })] }), (0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsx)("th", { children: "," }), (0, jsx_runtime_1.jsx)("td", { children: t('TaskScheduler.Help.,') })] }), (0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsx)("th", { children: "-" }), (0, jsx_runtime_1.jsx)("td", { children: t('TaskScheduler.Help.-') })] }), (0, jsx_runtime_1.jsxs)("tr", { children: [(0, jsx_runtime_1.jsx)("th", { children: "/" }), (0, jsx_runtime_1.jsx)("td", { children: t('TaskScheduler.Help./') })] })] }) })] }), children: (0, jsx_runtime_1.jsx)(icons_material_1.HelpOutline, { fontSize: "small", color: "action", style: { position: 'absolute', left: '0' } }) }) })),
44
43
  } }) }));
45
44
  };
package/lib/AWING/ButtonSelect/index.js CHANGED
@@ -59,9 +59,9 @@ var ButtonSelect = function (props) {
59
59
  var handleClose = function () {
60
60
  setAnchorEl(null);
61
61
  };
62
- return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(material_1.Button, __assign({ id: "".concat(elementId, "-button-select"), "aria-controls": "".concat(elementId, "-menu"), "aria-haspopup": "true", "aria-expanded": open ? "true" : undefined, onClick: handleClick, endIcon: (0, jsx_runtime_1.jsx)(KeyboardArrowDown_1.default, {}), style: {
62
+ return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, __assign({ id: "".concat(elementId, "-button-select"), "aria-controls": "".concat(elementId, "-menu"), "aria-haspopup": "true", "aria-expanded": open ? "true" : undefined, onClick: handleClick, endIcon: (0, jsx_runtime_1.jsx)(KeyboardArrowDown_1.default, {}), sx: {
63
63
  textTransform: "none",
64
- color: "white",
64
+ color: function (theme) { return theme.palette.text.primary; },
65
65
  fontWeight: "normal",
66
66
  } }, other)), (0, jsx_runtime_1.jsx)(material_1.Menu, { id: "".concat(elementId, "-menu"), anchorEl: anchorEl, open: open, onClose: handleClose, MenuListProps: {
67
67
  "aria-labelledby": "".concat(elementId, "-button-select"),
package/lib/AWING/LogicExpression/script.js CHANGED
@@ -470,7 +470,6 @@ var validateExpression = function (oc, f, functionList, expression) {
470
470
  console.log("Look bad the expression is boolean: ".concat(expression));
471
471
  return false;
472
472
  }
473
- debugger;
474
473
  var elements = expression.trim();
475
474
  var rootNode = (0, exports.getNewNode)();
476
475
  var currentNode = rootNode;
package/lib/AWING/ultis/validation.js CHANGED
@@ -96,7 +96,7 @@ exports.logicExpressionValid = logicExpressionValid;
96
96
  var textValidation = function (str, length, required, pattern, invertRegex) {
97
97
  if (length === void 0) { length = 50; }
98
98
  if (required === void 0) { required = true; }
99
- if (pattern === void 0) { pattern = /^[a-zA-Z0-9\/\-_.()\[\] ]+$/g; }
99
+ if (pattern === void 0) { pattern = /^[a-zA-Z0-9đĐ\/\-_.()\[\] \u0080-\uFFFF]+$/g; }
100
100
  var validRes = {
101
101
  valid: true,
102
102
  message: [],
@@ -106,18 +106,11 @@ var textValidation = function (str, length, required, pattern, invertRegex) {
106
106
  validRes.valid = false;
107
107
  validRes.message.push(i18n_1.default.t('Common.Required'));
108
108
  }
109
- var textTransform = String(str)
110
- .normalize('NFD')
111
- .toLowerCase()
112
- .replace(/\s\s+/g, ' ')
113
- .replace(/[\u0300-\u036f]/g, '')
114
- .replace(/đ/g, 'd')
115
- .trim();
116
- if (textTransform && pattern && !pattern.test(textTransform)) {
109
+ if (str && pattern && !pattern.test(str)) {
117
110
  validRes.valid = false;
118
111
  if (invertRegex !== false) {
119
112
  var invertedRegex = invertRegex || new RegExp("[^".concat(pattern.source.replace(/[*+?^${}|]/g, ''), "]").replace(/\[\[|\]\]/g, ']'), 'g');
120
- validRes.message.push("".concat(i18n_1.default.t('Common.InvalidChars'), ": ").concat(Array.from(new Set(textTransform.match(invertedRegex))).join(' ')));
113
+ validRes.message.push("".concat(i18n_1.default.t('Common.InvalidChars'), ": ").concat(Array.from(new Set(str.match(invertedRegex))).join(' ')));
121
114
  }
122
115
  }
123
116
  var byteSize = new Blob([str]).size;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "awing-library",
3
- "version": "2.1.98-beta",
3
+ "version": "2.1.100-beta",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",