Merge branch 'fix/DEFECT-1536' into 'main_dev'

fix: DEFECT-1536 物模型为设置取值范围时输入框验证默认取值范围

See merge request yunteng/thingskit-front!860

@@ -12,6 +12,23 @@ export interface BasicCreateFormParams {
 
 
 useComponentRegister('JSONEditor', JSONEditor);
 useComponentRegister('JSONEditor', JSONEditor);
 
 
+const validateDouble = (
+  value: number,
+  type: DataTypeEnum,
+  min?: number | string,
+  max?: number | string
+) => {
+  min =
+    Number(min) || type === DataTypeEnum.IS_NUMBER_INT ? Number.MIN_SAFE_INTEGER : Number.MIN_VALUE;
+  max =
+    Number(max) || type === DataTypeEnum.IS_NUMBER_INT ? Number.MAX_SAFE_INTEGER : Number.MAX_VALUE;
+
+  return {
+    flag: value < min || value > max,
+    message: `取值范围在${min}~${max}之间`,
+  };
+};
+
 export const useGenDynamicForm = () => {
 export const useGenDynamicForm = () => {
   const createInputNumber = ({
   const createInputNumber = ({
     identifier,
     identifier,
@@ -30,19 +47,19 @@ export const useGenDynamicForm = () => {
           type: 'number',
           type: 'number',
           trigger: 'change',
           trigger: 'change',
           validator: (_rule, value) => {
           validator: (_rule, value) => {
-            if (
-              value < (min ?? Number.MIN_SAFE_INTEGER) ||
-              value > (max || Number.MAX_SAFE_INTEGER)
-            ) {
-              return Promise.reject(`${functionName}取值范围在${min}~${max}之间`);
+            const { flag, message } = validateDouble(value, type, min, max);
+            if (flag) {
+              return Promise.reject(`${functionName}${message}`);
             }
             }
             return Promise.resolve(value);
             return Promise.resolve(value);
           },
           },
         },
         },
       ],
       ],
       componentProps: {
       componentProps: {
-        max: max ?? Number.MAX_SAFE_INTEGER,
-        min: min ?? Number.MIN_SAFE_INTEGER,
+        max:
+          max ?? type === DataTypeEnum.IS_NUMBER_INT ? Number.MAX_SAFE_INTEGER : Number.MAX_VALUE,
+        min:
+          min ?? type === DataTypeEnum.IS_NUMBER_INT ? Number.MIN_SAFE_INTEGER : Number.MIN_VALUE,
         step,
         step,
         placeholder: `请输入${functionName}`,
         placeholder: `请输入${functionName}`,
         precision: type === DataTypeEnum.IS_NUMBER_INT ? 0 : 2,
         precision: type === DataTypeEnum.IS_NUMBER_INT ? 0 : 2,
@@ -136,7 +153,7 @@ export const useGenDynamicForm = () => {
     fieldTypeMap.clear();
     fieldTypeMap.clear();
     const formSchema = schemas.map((item) => {
     const formSchema = schemas.map((item) => {
       const { functionName, identifier, dataType } = item;
       const { functionName, identifier, dataType } = item;
-      console.log(item, 'item');
+
       const { type } = dataType || {};
       const { type } = dataType || {};
 
 
       fieldTypeMap.set(identifier!, dataType!.type);
       fieldTypeMap.set(identifier!, dataType!.type);