fix(components): support multi prop type, closes #1414

vuejs · May 6, 2021 · 27e7e50 · 27e7e50
1 parent 59c6641
commit 27e7e50
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/packages/app-backend-vue2/src/components/data.ts b/packages/app-backend-vue2/src/components/data.ts
@@ -150,6 +150,9 @@ const fnTypeRE = /^(?:function|class) (\w+)/
  * Convert prop type constructor to string.
  */
 function getPropType (type) {
+  if (Array.isArray(type)) {
+    return type.map(t => getPropType(t)).join(' or ')
+  }
   const match = type.toString().match(fnTypeRE)
   return typeof type === 'function'
     ? (match && match[1]) || 'any'

diff --git a/packages/app-backend-vue3/src/components/data.ts b/packages/app-backend-vue3/src/components/data.ts
@@ -67,6 +67,9 @@ const fnTypeRE = /^(?:function|class) (\w+)/
  * Convert prop type constructor to string.
  */
 function getPropType (type) {
+  if (Array.isArray(type)) {
+    return type.map(t => getPropType(t)).join(' or ')
+  }
   const match = type.toString().match(fnTypeRE)
   return typeof type === 'function'
     ? (match && match[1]) || 'any'

diff --git a/packages/shell-dev-vue3/src/NativeTypes.vue b/packages/shell-dev-vue3/src/NativeTypes.vue
@@ -76,6 +76,13 @@ export default {
     }
   },
 
+  props: {
+    multiTypeProp: {
+      type: [Date, Boolean],
+      default: false
+    }
+  },
+
   data () {
     return {
       localDate: new Date(),