fix: numeric enum keys are always prefixed with KEY_; relates to Ma…

…nweill#65
vilyus · Sep 21, 2020 · ef97984 · ef97984
1 parent bdfc8e8
commit ef97984
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/src/componentsCodegen/createDefinitionEnum.ts b/src/componentsCodegen/createDefinitionEnum.ts
@@ -7,15 +7,12 @@ import { IEnumDef } from "../baseInterfaces";
  * @param type 枚举的类型
  */
 export function createDefinitionEnum(className: string, enumArray: any[], type: string): IEnumDef {
-  let result = ''
-  if (type === 'string') {
-    result = enumArray.map(item => `'${item}'='${item}'`).join(',')
-  }
-  else {
-    result = type === 'string' ?
-      enumArray.map(item => `'${item}'`).join('|') :
-      enumArray.join('|')
-  }
-
+  const result = type === 'string'
+    ? enumArray
+      .map(item => Number.isNaN(item)
+        ? `'${item}'='${item}'`
+        : `'KEY_${item}'='${item}'`)
+      .join(',')
+    : enumArray.join('|')
   return { name: className, enumProps: result, type: type }
 }
diff --git a/src/componentsCodegen/propTrueType.ts b/src/componentsCodegen/propTrueType.ts
@@ -53,7 +53,12 @@ export function propTrueType(v: IDefinitionProperty): {
   // 是枚举 并且是字符串类型
   else if (v.enum && v.type === 'string') {
     result.isEnum = true
-    result.propType = getEnums(v.enum).map(item => `'${item}'='${item}'`).join(',')
+    result.propType = getEnums(v.enum)
+      .map(item =>
+        isNaN(item)
+          ? `'${item}'='${item}'`
+          : `'KEY_${item}'='${item}'`)
+      .join(',')
   }
   else if (v.enum) {
     result.isType = true

diff --git a/src/definitionCodegen/createDefinitionEnum.ts b/src/definitionCodegen/createDefinitionEnum.ts
@@ -7,15 +7,12 @@ import { IEnumDef } from "../baseInterfaces";
  * @param type 枚举的类型
  */
 export function createDefinitionEnum(className: string, enumArray: any[], type: string): IEnumDef {
-  let result = ''
-  if (type === 'string') {
-    result = enumArray.map(item => `'${item}'='${item}'`).join(',')
-  }
-  else {
-    result = type === 'string' ?
-      enumArray.map(item => `'${item}'`).join('|') :
-      enumArray.join('|')
-  }
-
+  const result = type === 'string'
+    ? enumArray
+      .map(item => Number.isNaN(item)
+        ? `'${item}'='${item}'`
+        : `'KEY_${item}'='${item}'`)
+      .join(',')
+    : enumArray.join('|')
   return { name: className, enumProps: result, type: type }
 }
diff --git a/src/definitionCodegen/propTrueType.ts b/src/definitionCodegen/propTrueType.ts
@@ -39,12 +39,12 @@ export function propTrueType(v: IDefinitionProperty): {
   // 是枚举 并且是字符串类型
   else if (v.enum && v.type === 'string') {
     result.isEnum = true
-    result.propType = getEnums(v.enum).map(item => {
-      if (isNaN(item)){
-        return `'${item}'='${item}'`;
-      }
-      return  `'KEY_${item}'='${item}'`;
-      }).join(',')
+    result.propType = getEnums(v.enum)
+      .map(item =>
+        isNaN(item)
+          ? `'${item}'='${item}'`
+          : `'KEY_${item}'='${item}'`)
+      .join(',')
   }
   else if (v.enum) {
     result.isType = true