Merge branch 'hotfix/compatible-enum-without-options'

Author: chenquincy

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.3.2](https://github.com/chenquincy/vue-dynamic-form-component/compare/v2.3.1...v2.3.2) (2019-10-28)
+
+
+### Bug Fixes
+
+* compatible enum type without descriptor.options ([5833ddf](https://github.com/chenquincy/vue-dynamic-form-component/commit/5833ddf))
+
+
+
 ## [2.3.1](https://github.com/chenquincy/vue-dynamic-form-component/compare/v2.3.0...v2.3.1) (2019-09-23)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-dynamic-form-component",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "license": "MIT",
   "author": {
     "email": "mail@quincychen.cn",

packages/dynamic-input/input.vue

@@ -76,12 +76,13 @@ export default {
       }
     },
     _options () {
-      if (this.descriptor && this.descriptor.options instanceof Array) {
-        return this.descriptor.options.map(item => {
-          if (typeof item === 'string') {
-            return { label: item, value: item }
-          } else {
+      if (this.descriptor.enum || this.descriptor.options) {
+        const data = this.descriptor.options instanceof Array ? this.descriptor.options : this.descriptor.enum
+        return data.map(item => {
+          if (typeof item === 'object') {
             return item
+          } else {
+            return { label: item, value: item }
           }
         })
       } else {