awing-library 2.1.99-beta → 2.1.100-beta

package/lib/ACM-AXN/TaskScheduler/Components/CornJobInput.js

@@ -32,14 +32,13 @@ var react_1 = __importDefault(require("react"));
 var react_i18next_1 = require("react-i18next");
 var BasicInput_1 = __importDefault(require("./BasicInput"));
 var validation_1 = require("../../../AWING/ultis/validation");
-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+)?$/;
 var CornJobInput = function (_a) {
     var jobModel = _a.jobModel, handleChange = _a.handleChange;
     var t = (0, react_i18next_1.useTranslation)().t;
     return ((0, jsx_runtime_1.jsx)(material_1.Box, { sx: { position: 'relative' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, sx: {
                 marginTop: function (t) { return t.spacing(1); },
                 marginBottom: function (t) { return t.spacing(1); },
-            }, 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: {
+            }, 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: {
                 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' } }) }) })),
             } }) }));
 };

package/lib/AWING/ultis/validation.js

@@ -96,7 +96,7 @@ exports.logicExpressionValid = logicExpressionValid;
 var textValidation = function (str, length, required, pattern, invertRegex) {
     if (length === void 0) { length = 50; }
     if (required === void 0) { required = true; }
-    if (pattern === void 0) { pattern = /^[a-zA-Z0-9\/\-_.()\[\] ]+$/g; }
+    if (pattern === void 0) { pattern = /^[a-zA-Z0-9đĐ\/\-_.()\[\] \u0080-\uFFFF]+$/g; }
     var validRes = {
         valid: true,
         message: [],
@@ -106,18 +106,11 @@ var textValidation = function (str, length, required, pattern, invertRegex) {
         validRes.valid = false;
         validRes.message.push(i18n_1.default.t('Common.Required'));
     }
-    var textTransform = String(str)
-        .normalize('NFD')
-        .toLowerCase()
-        .replace(/\s\s+/g, ' ')
-        .replace(/[\u0300-\u036f]/g, '')
-        .replace(/đ/g, 'd')
-        .trim();
-    if (textTransform && pattern && !pattern.test(textTransform)) {
+    if (str && pattern && !pattern.test(str)) {
         validRes.valid = false;
         if (invertRegex !== false) {
             var invertedRegex = invertRegex || new RegExp("[^".concat(pattern.source.replace(/[*+?^${}|]/g, ''), "]").replace(/\[\[|\]\]/g, ']'), 'g');
-            validRes.message.push("".concat(i18n_1.default.t('Common.InvalidChars'), ": ").concat(Array.from(new Set(textTransform.match(invertedRegex))).join(' ')));
+            validRes.message.push("".concat(i18n_1.default.t('Common.InvalidChars'), ": ").concat(Array.from(new Set(str.match(invertedRegex))).join(' ')));
         }
     }
     var byteSize = new Blob([str]).size;

package/package.json

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