Merge branch 'main' of github.com:openapi-ui/openapi-ts-request

Author: rookie-luochao

pnpm-lock.yaml

@@ -75,6 +75,7 @@ import {
   getLastRefName,
   getRefName,
   handleDuplicateTypeNames,
+  isAllNumber,
   isAllNumeric,
   isArraySchemaObject,
   isBinaryArraySchemaObject,
@@ -1077,8 +1078,10 @@ export default class ServiceGenerator {
     let enumStr = '';
     let enumLabelTypeStr = '';
 
-    if (numberEnum.includes(schemaObject.type) || isAllNumeric(enumArray)) {
+    if (numberEnum.includes(schemaObject.type) || isAllNumber(enumArray)) {
       enumStr = `{${map(enumArray, (value) => `"NUMBER_${value}"=${Number(value)}`).join(',')}}`;
+    } else if (isAllNumeric(enumArray)) {
+      enumStr = `{${map(enumArray, (value) => `"STRING_NUMBER_${value}"="${value}"`).join(',')}}`;
     } else {
       enumStr = `{${map(enumArray, (value) => `${value}="${value}"`).join(',')}}`;
     }
@@ -1097,8 +1100,10 @@ export default class ServiceGenerator {
         return `${value}:"${enumLabel}"`;
       }).join(',')}}`;
     } else {
-      if (numberEnum.includes(schemaObject.type) || isAllNumeric(enumArray)) {
+      if (numberEnum.includes(schemaObject.type) || isAllNumber(enumArray)) {
         enumLabelTypeStr = `{${map(enumArray, (value) => `"NUMBER_${value}":${Number(value)}`).join(',')}}`;
+      } else if (isAllNumeric(enumArray)) {
+        enumLabelTypeStr = `{${map(enumArray, (value) => `"STRING_NUMBER_${value}":"${value}"`).join(',')}}`;
       } else {
         enumLabelTypeStr = `{${map(enumArray, (value) => `${value}:"${value}"`).join(',')}}`;
       }

src/generator/serviceGenarator.ts

@@ -8,6 +8,7 @@ import {
   isBoolean,
   isEmpty,
   isNull,
+  isNumber,
   isObject,
   isString,
   isUndefined,
@@ -483,3 +484,8 @@ export function resolveRefs(obj: OpenAPIObject, fields: string[]) {
 export function isAllNumeric(arr) {
   return every(arr, (item) => isString(item) && /^-?[0-9]+$/.test(item));
 }
+
+// 检查数组每一项是否都是数字
+export function isAllNumber(arr) {
+  return every(arr, (item) => isNumber(item));
+}