Fix/inputnumber compare (#784)

* chore(inputNumber): add unit test * chore: ci add unit test * fix: string and number equal
Tencent · Aug 30, 2022 · c7678fd · c7678fd
1 parent 939e1fd
commit c7678fd
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 14 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -34,6 +34,7 @@ jobs:
             ${{ runner.os }}-
       - run: npm install
       - run: npm run lint
+      - run: npm run test      
 
   modify:
     runs-on: ubuntu-latest

diff --git a/js/input-number/large-number.ts b/js/input-number/large-number.ts
@@ -138,11 +138,10 @@ function compareLargeDecimalNumber(num1: string, num2: string) {
 /**
  * 比较两个大数的大小
  */
-export function compareLargeNumber(num1: string | number, num2: string | number): 1 | -1 | 0 {
-  if (typeof num1 === 'number' || typeof num2 === 'number') {
-    if (num1 === num2) return 0;
-    return num1 > num2 ? 1 : -1;
-  }
+export function compareLargeNumber(
+  num1: string,
+  num2: string,
+): 1 | -1 | 0 {
   const [integer1, decimal1] = num1.split('.');
   const [integer2, decimal2] = num2.split('.');
   const result = compareLargeIntegerNumber(integer1.replace('-', ''), integer2.replace('-', ''));
@@ -160,6 +159,28 @@ export function compareLargeNumber(num1: string | number, num2: string | number)
   return result;
 }
 
+// 确认是否是大数
+export function isSafeNumber(num: string | number) {
+  return Number(num) < Number.MAX_SAFE_INTEGER && Number(num) > Number.MIN_SAFE_INTEGER;
+}
+
+/**
+ * 比较两个数的大小
+ */
+export function compareNumber(
+  num1: string | number,
+  num2: string | number,
+  largeNumber?: boolean,
+) {
+  if (isSafeNumber(num1) && isSafeNumber(num2) && !largeNumber) {
+    // 比较两个非大数的大小
+    if (Number(num1) === Number(num2)) return 0;
+    return Number(num1) > Number(num2) ? 1 : -1;
+  }
+  // 比较两个大数的大小
+  return compareLargeNumber(String(num1), String(num2));
+}
+
 /**
  * 大数减法，仅支持整数
  * @param num1 被减数
@@ -209,7 +230,7 @@ export function largeIntegerNumberSubtract(
  */
 export function largePositiveNumberSubtract(num1: string, num2: string): string {
   if (num1 === num2) return '0';
-  const isFirstLarger = compareLargeNumber(num1, num2) > 0;
+  const isFirstLarger = compareNumber(num1, num2, true) > 0;
   const maxNumber = isFirstLarger ? num1 : num2;
   const minNumber = isFirstLarger ? num2 : num1;
   // 整数部分和小数部分分开处理

diff --git a/js/input-number/number.ts b/js/input-number/number.ts
@@ -2,7 +2,7 @@
 import isString from 'lodash/isString';
 import isNumber from 'lodash/isNumber';
 import {
-  compareLargeNumber,
+  compareNumber,
   formatENumber,
   largeNumberToFixed,
   isInputNumber,
@@ -23,7 +23,7 @@ export function canAddNumber(
 ): boolean {
   if (!num) return true;
   if (largeNumber && isString(num)) {
-    return compareLargeNumber(num, max) < 0;
+    return compareNumber(num, max, largeNumber) < 0;
   }
   return num < max;
 }
@@ -36,7 +36,7 @@ export function canReduceNumber(
 ): boolean {
   if (!num) return true;
   if (largeNumber && isString(num)) {
-    return compareLargeNumber(num, min) > 0;
+    return compareNumber(num, min, largeNumber) > 0;
   }
   return num > min;
 }
@@ -89,8 +89,8 @@ export function putInRangeNumber(
   const { max, min, lastValue, largeNumber } = params;
   if (!isInputNumber(val)) return lastValue;
   if (largeNumber && (isString(max) || max === Infinity) && (isString(min) || min === -Infinity)) {
-    if (compareLargeNumber(max, val) < 0) return max;
-    if (compareLargeNumber(min, val) > 0) return min;
+    if (compareNumber(max, val, largeNumber) < 0) return max;
+    if (compareNumber(min, val, largeNumber) > 0) return min;
     return val;
   }
   return Math.max(Number(min), Math.min(Number(max), Number(val)));
@@ -219,9 +219,9 @@ export function getMaxOrMinValidateResult(p: {
     log.warn('InputNumber', 'largeNumber value must be a string.');
   }
   let error: InputNumberErrorType;
-  if (compareLargeNumber(value, max) > 0) {
+  if (compareNumber(value, max, largeNumber) > 0) {
     error = 'exceed-maximum';
-  } else if (compareLargeNumber(value, min) < 0) {
+  } else if (compareNumber(value, min, largeNumber) < 0) {
     error = 'below-minimum';
   } else {
     error = undefined;

diff --git a/test/unit/input-number/compareLargeNumber.test.js b/test/unit/input-number/compareLargeNumber.test.js
@@ -1,4 +1,25 @@
-import { compareLargeNumber, isInputNumber, formatENumber } from '../../../js/input-number/large-number';
+import { compareNumber, compareLargeNumber, isInputNumber, formatENumber } from '../../../js/input-number/large-number';
+
+describe('compareNumber', () => {
+  it('number 2, string 2', () => {
+    expect(compareNumber('2', 2)).toBe(0);
+  });
+  it('string 1234567891234567890, string 1234567891234567891', () => {
+    expect(compareNumber('1234567891234567890', '1234567891234567891')).toBe(-1);
+  });
+
+  it('string 1234567891234567890, number 1234567891234567891', () => {
+    expect(compareNumber('1234567891234567890', 1234567891234567891)).toBe(-1);
+  });
+
+  it('number 1234567891234567891, string 1234567891234567890', () => {
+    expect(compareNumber(1234567891234567891, '1234567891234567890')).toBe(1);
+  });
+
+  it('number 1234567891234567891, string 1234567891234567890', () => {
+    expect(compareNumber(1234567891234567891, '1234567891234567890')).toBe(1);
+  });
+});
 
 describe('compareLargeNumber', () => {
   it('0.1, 0.2', () => {