npm - diginet-core-ui - Versions diffs - 1.4.57-beta.1 → 1.4.57-beta.3 - Mend

diginet-core-ui 1.4.57-beta.1 → 1.4.57-beta.3

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 (4) hide show

package/assets/images/menu/dhr/MHRP29N0035.svg +13 -0
package/assets/images/menu/dhr/MHRP29N0036.svg +14 -0
package/components/form-control/number-input/index2.js +21 -11
package/package.json +1 -1

package/assets/images/menu/dhr/MHRP29N0035.svg ADDED Viewed

@@ -0,0 +1,13 @@
+<svg width="39" height="39" viewBox="0 0 39 39" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2445_39)">
+<path d="M27.9999 32.8V26C27.9999 24.9 27.0999 24 25.9999 24H12.9999C11.8999 24 10.9999 24.9 10.9999 26V32.8C9.19988 32.2 7.89988 30.4 8.19988 28.4L9.09988 22.4C9.39988 20.5 11.0999 19 13.0999 19H25.8999C27.8999 19 29.5999 20.4 29.8999 22.4L30.7999 28.4C31.0999 30.4 29.7999 32.3 27.9999 32.8Z" fill="#2680EB"/>
+<path d="M19.5002 17.8C22.4002 17.8 24.8002 15.4 24.8002 12.4C24.8002 9.4 22.4002 7 19.5002 7C16.6002 7 14.2002 9.5 14.2002 12.4C14.2002 15.4 16.6002 17.8 19.5002 17.8Z" fill="#2680EB"/>
+<path d="M26 25H13C12.5 25 12 25.5 12 26V34C12 34.5 12.5 35 13 35H26C26.5 35 27 34.5 27 34V26C27 25.5 26.5 25 26 25ZM19.5 31.5C18.7 31.5 18 30.8 18 30C18 29.2 18.7 28.5 19.5 28.5C20.3 28.5 21 29.2 21 30C21 30.8 20.3 31.5 19.5 31.5Z" fill="#FF8C00"/>
+<path d="M37.8 13.4L21.9 0.700024C20.8 -0.199976 19.1 -0.199976 18 0.700024L11.3 5.80002V4.20002C11.3 3.00002 10.3 2.00002 9.1 2.00002H6.1C4.9 2.00002 3.9 3.00002 3.9 4.20002V11.1C3.9 11.2 3.9 11.2 3.9 11.3L1.2 13.3C0.5 14 0 15 0 16V35.8C0 37.5 1.4 39 3.2 39H35.8C37.6 39 39 37.5 39 35.8V15.9C39 14.9 38.6 14 37.8 13.4ZM6.4 4.40002H8.9V7.50002L6.4 9.50002V4.40002ZM36.5 35.8C36.5 36.2 36.2 36.6 35.8 36.6H3.2C2.8 36.6 2.5 36.3 2.5 35.8V16C2.5 15.8 2.6 15.5 2.8 15.4L5.6 13.3L8.7 10.9L8.9 10.7L11.4 8.80002L19.5 2.60002C19.6 2.50002 19.8 2.50002 19.9 2.50002C20.1 2.50002 20.2 2.50002 20.4 2.70002L36.3 15.4C36.5 15.5 36.6 15.8 36.6 16V35.8H36.5Z" fill="#2680EB"/>
+</g>
+<defs>
+<clipPath id="clip0_2445_39">
+<rect width="39" height="39" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/assets/images/menu/dhr/MHRP29N0036.svg ADDED Viewed

@@ -0,0 +1,14 @@
+<svg width="39" height="39" viewBox="0 0 39 39" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2445_40)">
+<path d="M21.8 20.7C20.5 21.8 19.4 23.3 18.8 25C18.8 25.1 18.8 25.1 18.7 25.2H9.90003C8.90003 25.2 8.10003 26 8.10003 27V33.0999C6.40003 32.5999 5.30003 30.9 5.60003 29.1L6.40003 23.7C6.70003 21.9 8.20003 20.7 9.90003 20.7H21.3C21.5 20.7 21.7 20.7 21.8 20.7Z" fill="#2680EB"/>
+<path d="M15.6999 19.6C18.2999 19.6 20.3999 17.4 20.3999 14.8C20.3999 12.1 18.2999 10 15.5999 10C12.9999 10 10.8999 12.2 10.8999 14.8C10.8999 17.5 13.0999 19.7 15.6999 19.6Z" fill="#2680EB"/>
+<path d="M18 29C18 28 18.1 27 18.4 26.1H9.9C9.4 26.1 9 26.5 9 27V34.1C9 34.6 9.4 35 9.9 35H19.8C18.7 33.3 18 31.2 18 29ZM15.7 31.9C15 31.9 14.4 31.3 14.4 30.6C14.4 29.8 15 29.3 15.7 29.3C16.4 29.3 17 29.9 17 30.6C17 31.3 16.4 31.9 15.7 31.9Z" fill="#FF8C00"/>
+<path d="M37.8 13.4L21.9 0.700024C20.8 -0.199976 19.1 -0.199976 18 0.700024L11.3 5.80002V4.20002C11.3 3.00002 10.3 2.00002 9.1 2.00002H6.1C5 2.00002 4 3.00002 4 4.20002V11.1C4 11.2 4 11.3 4 11.3L1.3 13.3C0.5 14 0 15 0 16V35.8C0 37.6 1.4 39 3.2 39H24.4C23.1 38.4 21.9 37.6 21 36.5H3.2C2.8 36.5 2.5 36.2 2.5 35.7V16C2.5 15.7 2.6 15.5 2.8 15.4L5.6 13.3L8.7 10.9L8.9 10.7L11.4 8.80002L19.6 2.60002C19.7 2.50002 19.9 2.40002 20 2.40002C20.2 2.40002 20.3 2.50002 20.5 2.60002L36.4 15.3C36.6 15.4 36.7 15.7 36.7 15.9V20.9C37.7 21.9 38.6 23.1 39.2 24.3V15.8C39 14.9 38.6 14 37.8 13.4ZM8.9 7.60002L6.4 9.50002V4.50002H8.9V7.60002Z" fill="#2680EB"/>
+<path d="M34.4 20.6C32.8 19.6 31 19 29 19C28.5 19 28.1 19 27.7 19.1C26.9 19.2 26 19.4 25.3 19.7C24.9 19.9 24.4 20.1 24 20.3C22 21.4 20.5 23.2 19.7 25.3C19.2 26.5 19 27.7 19 29C19 34.5 23.5 39 29 39C34.5 39 39 34.5 39 29C39 25.5 37.1 22.3 34.4 20.6ZM35.2 25.8L29.3 33.8C29 34.3 28.4 34.6 27.8 34.6H27.7C27.2 34.6 26.6 34.4 26.3 34L22.8 30.2C22.3 29.6 22.3 28.7 22.9 28.1C23.2 27.8 23.5 27.7 23.9 27.7C24.3 27.7 24.7 27.9 25 28.2L27.5 30.9L27.6 31C27.7 31 27.7 31 27.7 30.9L32.7 24.1C33 23.7 33.4 23.5 33.9 23.5C34.2 23.5 34.5 23.6 34.8 23.8C35.6 24.2 35.7 25.1 35.2 25.8Z" fill="#1CA261"/>
+</g>
+<defs>
+<clipPath id="clip0_2445_40">
+<rect width="39" height="39" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/components/form-control/number-input/index2.js CHANGED Viewed

@@ -169,23 +169,33 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     return number;
   }, [decimalSymbol]);
   const _onInput = useCallback((e, flag) => {
-    var _e$target$value, _limitValueT$toString, _limitValueT$toString2, _limitValueT$toString3, _limitValueT$toString4, _limitValueT$toString5, _limitValueT$toString6;
+    var _e$target$value;
     let valueT = (_e$target$value = e.target.value) !== null && _e$target$value !== void 0 ? _e$target$value : e.value;
-    // xóa các số "0" đứng trước giá trị ví dụ: 0100, 0200 để tránh lỗi Octal literals are not allowed in strict mode
-    let limitValueT = valueT.split(/([+\-*/])/).map(a => parseFloat(a) || a).join('');
-    if (disabledNegative && eval(((_limitValueT$toString = (_limitValueT$toString2 = limitValueT.toString().replaceAll(thousandSymbol, '')).replaceAll) === null || _limitValueT$toString === void 0 ? void 0 : _limitValueT$toString.call(_limitValueT$toString2, decimalSymbol, '.')) || 0) <= 0 || limitValueT.includes('-')) valueT = 0;
-    if ((min || min === 0) && eval((_limitValueT$toString3 = (_limitValueT$toString4 = limitValueT.toString().replaceAll(thousandSymbol, '')).replaceAll) === null || _limitValueT$toString3 === void 0 ? void 0 : _limitValueT$toString3.call(_limitValueT$toString4, decimalSymbol, '.')) <= min || min === 0 && limitValueT.includes('-')) valueT = min;
-    if ((max || max === 0) && eval((_limitValueT$toString5 = (_limitValueT$toString6 = limitValueT.toString().replaceAll(thousandSymbol, '')).replaceAll) === null || _limitValueT$toString5 === void 0 ? void 0 : _limitValueT$toString5.call(_limitValueT$toString6, decimalSymbol, '.')) >= max) valueT = max;
-    valueT = parseNumberToMoney(valueT);
+    let limitValueT = valueT;
+    // không chạy xử lý khi giá trị chỉ có dấu "-"
+    if (Number(!isNaN(limitValueT))) {
+      var _valueT$toString$repl, _valueT$toString$repl2;
+      // xóa các số "0" đứng trước giá trị ví dụ: 0100, 0200 để tránh lỗi Octal literals are not allowed in strict mode
+      limitValueT = (_valueT$toString$repl = (_valueT$toString$repl2 = valueT.toString().replaceAll(thousandSymbol, '')).replaceAll) === null || _valueT$toString$repl === void 0 ? void 0 : _valueT$toString$repl.call(_valueT$toString$repl2, decimalSymbol, '.').split(/([+\-*/])/).map(a => parseFloat(a) || a).join('');
+      if (disabledNegative && eval(limitValueT) <= 0) {
+        limitValueT = 0;
+      }
+      if ((min || min === 0) && eval(limitValueT) <= min) {
+        limitValueT = min;
+      }
+      if (max && eval(limitValueT) >= max) {
+        limitValueT = max;
+      }
+    }
+    valueT = parseNumberToMoney(limitValueT);
     const returnValue = convertMoneyToNumber(valueT);
     e.value = globalRef.current.value = !isNaN(parseFloat(returnValue)) ? parseFloat(returnValue) : null;
     // e.target.value = globalRef.current.valueString = valueT || '';
     // globalRef.current.returnValue = returnValue || '';
     e.target.value = globalRef.current.valueString = valueT || '';
-    e.value = valueT;
     globalRef.current.returnValue = returnValue || '';
     onInput === null || onInput === void 0 ? void 0 : onInput(e);
-    setValue(eval(valueT));
+    setValue(valueT);
     if (flag) _onChange(e);
   }, [min, max, decimalDigit]);
   const _onBlur = useCallback(e => {
@@ -213,7 +223,7 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     onBlur && onBlur(e);
   }, [min, max]);
   const _onKeyDown = e => {
-    var _value$split, _value$split$;
+    var _value$split, _value$split$, _value$toString;
     const {
       key,
       keyCode,
@@ -278,7 +288,7 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     // disabled negative
     // const disabled180 = (keyCode === 189 || keyCode === 109) && (disabledNegative || value.includes('-'));
-    const disabled180 = (keyCode === 189 || keyCode === 109) && (min === 0 || disabledNegative);
+    const disabled180 = (keyCode === 189 || keyCode === 109) && (min === 0 || disabledNegative) || ((_value$toString = value.toString()) === null || _value$toString === void 0 ? void 0 : _value$toString[0]) === '-' && (keyCode === 189 || keyCode === 109);
     // disabled max digit
     const isMaxDigit = maxDigit && (value === null || value === void 0 ? void 0 : value.replace(regexNumber, '').length) === maxDigit && (isNumber || key === thousandSymbol || key === decimalSymbol) && selectionStart === selectionEnd;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "diginet-core-ui",
-  "version": "1.4.57-beta.1",
+  "version": "1.4.57-beta.3",
   "description": "",
   "main": "index.js",
   "license": "UNLICENSED",