@@ -75,6 +75,7 @@ import {
7575 getLastRefName ,
7676 getRefName ,
7777 handleDuplicateTypeNames ,
78+ isAllNumeric ,
7879 isArraySchemaObject ,
7980 isBinaryArraySchemaObject ,
8081 isNonArraySchemaObject ,
@@ -984,10 +985,10 @@ export default class ServiceGenerator {
984985 let enumStr = '' ;
985986 let enumLabelTypeStr = '' ;
986987
987- if ( ! numberEnum . includes ( schemaObject . type ) ) {
988- enumStr = `{${ map ( enumArray , ( value ) => `${ value } =" ${ value } " ` ) . join ( ',' ) } }` ;
988+ if ( numberEnum . includes ( schemaObject . type ) || isAllNumeric ( enumArray ) ) {
989+ enumStr = `{${ map ( enumArray , ( value ) => `NUMBER_ ${ value } =${ Number ( value ) } ` ) . join ( ',' ) } }` ;
989990 } else {
990- enumStr = `{${ map ( enumArray , ( value ) => `NUMBER_ ${ value } =${ value } ` ) . join ( ',' ) } }` ;
991+ enumStr = `{${ map ( enumArray , ( value ) => `${ value } =" ${ value } " ` ) . join ( ',' ) } }` ;
991992 }
992993
993994 // 翻译枚举
@@ -1004,10 +1005,10 @@ export default class ServiceGenerator {
10041005 return `${ value } :"${ enumLabel } "` ;
10051006 } ) . join ( ',' ) } }`;
10061007 } else {
1007- if ( ! numberEnum . includes ( schemaObject . type ) ) {
1008- enumLabelTypeStr = `{${ map ( enumArray , ( value ) => `${ value } :" ${ value } " ` ) . join ( ',' ) } }` ;
1008+ if ( numberEnum . includes ( schemaObject . type ) || isAllNumeric ( enumArray ) ) {
1009+ enumLabelTypeStr = `{${ map ( enumArray , ( value ) => `NUMBER_ ${ value } :${ Number ( value ) } ` ) . join ( ',' ) } }` ;
10091010 } else {
1010- enumLabelTypeStr = `{${ map ( enumArray , ( value ) => `NUMBER_ ${ value } :${ value } ` ) . join ( ',' ) } }` ;
1011+ enumLabelTypeStr = `{${ map ( enumArray , ( value ) => `${ value } :" ${ value } " ` ) . join ( ',' ) } }` ;
10111012 }
10121013 }
10131014
0 commit comments