From ebcfca0bef70ee14c1996a6543ffe9c6182a7f64 Mon Sep 17 00:00:00 2001
From: liwei <liwei4@xsyxsc.com>
Date: Fri, 17 Sep 2021 09:20:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=91=E5=B8=831.2.1=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/components/el-checkbox/index.js  |   5 +-
 src/packages/components/el-radio/index.js     |   5 +-
 src/packages/components/el-select/index.js    |   5 +-
 src/packages/components/index.js              |   4 +-
 src/packages/components/object/index.js       |  17 +--
 src/packages/components/utils.js              |  45 ++++---
 src/packages/index.vue                        |  19 +--
 .../components/example/base/demo1.vue         |  17 ++-
 .../components/example/base/demo2.vue         |  19 +--
 .../components/example/base/demo3.vue         |  57 +++++++++
 .../components/example/dialog/demo.vue        | 121 ------------------
 .../components/example/dialog/demo1.vue       |  11 +-
 .../components/example/dialog/demo3.vue       |  77 +++++++++++
 .../components/example/showcase/demo1.vue     |   2 +-
 vuepressdocs/guide/base.md                    |  10 ++
 vuepressdocs/guide/dialog.md                  |  14 +-
 vuepressdocs/guide/feature.md                 |   2 +-
 17 files changed, 230 insertions(+), 200 deletions(-)
 create mode 100644 vuepressdocs/.vuepress/components/example/base/demo3.vue
 delete mode 100644 vuepressdocs/.vuepress/components/example/dialog/demo.vue
 create mode 100644 vuepressdocs/.vuepress/components/example/dialog/demo3.vue

diff --git a/src/packages/components/el-checkbox/index.js b/src/packages/components/el-checkbox/index.js
index 2df1674..07ea164 100644
--- a/src/packages/components/el-checkbox/index.js
+++ b/src/packages/components/el-checkbox/index.js
@@ -1,4 +1,4 @@
-import { createElementBySlot, createTipComponent } from '../utils'
+import { createElementBySlot, createTipComponent, getOptionList } from '../utils'
 
 export default function(createElement, value, data) {
   const vm = this
@@ -9,12 +9,13 @@ export default function(createElement, value, data) {
     attrs = {},
     props = {},
     style = {},
-    items = [],
     name = '',
     keys = null,
     render = { before: null, after: null }
   } = data
 
+  const items = getOptionList(data)
+
   data.checkAll = data.checkAll || []
   data.checkAllDisabled = data.checkAllDisabled || false
   if (!this.inline) style.width = ''
diff --git a/src/packages/components/el-radio/index.js b/src/packages/components/el-radio/index.js
index ba7c929..5c27072 100644
--- a/src/packages/components/el-radio/index.js
+++ b/src/packages/components/el-radio/index.js
@@ -1,4 +1,4 @@
-import { createElementBySlot, createTipComponent } from '../utils'
+import { createElementBySlot, createTipComponent, getOptionList } from '../utils'
 
 export default function(createElement, value, data) {
   const {
@@ -6,10 +6,11 @@ export default function(createElement, value, data) {
     attrs = {},
     props = {},
     style = {},
-    items = [],
     keys = null
   } = data
 
+  const items = getOptionList(data)
+
   if (!this.inline) style.width = ''
 
   const nodes = [
diff --git a/src/packages/components/el-select/index.js b/src/packages/components/el-select/index.js
index 371bd5f..22ee4f4 100644
--- a/src/packages/components/el-select/index.js
+++ b/src/packages/components/el-select/index.js
@@ -1,4 +1,4 @@
-import { createElementBySlot, createTipComponent } from '../utils'
+import { createElementBySlot, createTipComponent, getOptionList } from '../utils'
 
 export default function(createElement, value, data) {
   const {
@@ -6,11 +6,12 @@ export default function(createElement, value, data) {
     attrs = {},
     props = {},
     style = {},
-    items = [],
     keys = null,
     scopedSlots = null
   } = data
 
+  const items = getOptionList(data)
+
   const nodes = [
     createElementBySlot.call(this, createElement, data, 'before'),
     createElement(
diff --git a/src/packages/components/index.js b/src/packages/components/index.js
index bce7c65..fccce31 100644
--- a/src/packages/components/index.js
+++ b/src/packages/components/index.js
@@ -183,8 +183,8 @@ export const Component = (createElement, vm, key, item) => {
   if (vifBool) {
     vm.validiteFieldSet.delete(name)
   } else if (!COMPFLEX_COMPONENTS.includes(item.tag)) {
-    // 修复联动 vif = false，清空数值
-    eval(`formValues.${name} = item.default || ''`)
+    // 修复联动 vif = false，清空重置组件（注意：el-input-number 组件默认值0，需要单独处理);
+    eval(`formValues.${name} = item.default || (item.tag === 'el-input-number' ? item.props.min || 0 : '')`)
     vm.validiteFieldSet.add(name)
     vm.$refs[vm.refName] && vm.$refs[vm.refName].clearValidate(key)
   } else if (COMPFLEX_COMPONENTS.includes(item.tag)) {
diff --git a/src/packages/components/object/index.js b/src/packages/components/object/index.js
index c428e1b..96316b9 100644
--- a/src/packages/components/object/index.js
+++ b/src/packages/components/object/index.js
@@ -21,16 +21,13 @@ export default function(createElement, value, data) {
     }
     this.$set(data.components[key], '$item', eval(`model.${data.name}`))
     const componentDataCopy = deepClone(data.components[key])
-    // 联动清除子组件的验证，array/table 做数组清空
-    if (!componentDataCopy.vif) {
-      // 复杂组件的情况
-      if (componentDataCopy.isInput) {
-        componentDataCopy.vif = data.vifBool
-      }
-      // 子组件不包含验证表达式
-      if (!componentDataCopy.requiredExpression && componentDataCopy.isInput && typeof data.vif === 'string') {
-        componentDataCopy.required = data.vifBool
-      }
+    // 复杂组件的情况
+    if (typeof componentDataCopy.vif !== 'string') {
+      componentDataCopy.vif = data.vifBool
+    }
+    // 子组件不包含验证表达式
+    if (!componentDataCopy.requiredExpression && componentDataCopy.hasOwnProperty('required') && componentDataCopy.isInput && typeof data.vif === 'string') {
+      componentDataCopy.required = data.vifBool
     }
     return Component(createElement, this, `${data.name}.${key}`, componentDataCopy)
   })
diff --git a/src/packages/components/utils.js b/src/packages/components/utils.js
index 09657d7..20cbbb1 100644
--- a/src/packages/components/utils.js
+++ b/src/packages/components/utils.js
@@ -199,8 +199,8 @@ const genUnique = function() {
 
 // 创建操作按钮
 const createActionButtons = function({ h, action, component, scope }) {
-  const { formValues } = this;
-  const $model = formValues;
+  const { formValues } = this
+  const $model = formValues
   return action.buttons.map(item => {
     const ifBool = item.if ? eval(item.if) : true
     const disabledBool = item.disabled ? eval(item.disabled) : false
@@ -231,16 +231,16 @@ const createActionButtons = function({ h, action, component, scope }) {
 
 // array/table 新增操作
 const addRow = function(data, formValues) {
-  if(data.on && data.on.add) {
+  if (data.on && data.on.add) {
     eval(
       `formValues.${data.name}.push(JSON.parse(JSON.stringify(data.keys)))`
     )
-    const list = eval(`formValues.${data.name}`);
+    const list = eval(`formValues.${data.name}`)
     data.on.add({
-      row: list[list.length-1],
-      $index: list.length-1,
+      row: list[list.length - 1],
+      $index: list.length - 1,
       $length: list.length
-    });
+    })
   } else {
     eval(
       `formValues.${data.name}.push(JSON.parse(JSON.stringify(data.keys)))`
@@ -250,44 +250,54 @@ const addRow = function(data, formValues) {
 
 // array 删除操作
 const delRowForArray = function(data, formValues, item, index) {
-  if(data.on && typeof data.on.delete === 'function') {
+  if (data.on && typeof data.on.delete === 'function') {
     data.on.delete({
       row: item,
       $index: index,
       $length: formValues.length
     }, done => {
-      if(done) {
-        eval(`(formValues.${data.name}).splice(${index}, 1)`);
+      if (done) {
+        eval(`(formValues.${data.name}).splice(${index}, 1)`)
       }
     })
   } else {
-    eval(`(formValues.${data.name}).splice(${index}, 1)`);
+    eval(`(formValues.${data.name}).splice(${index}, 1)`)
   }
 }
 
 // table 删除行操作
 const delRowForTable = function(data, scope, formValues) {
-  if(data.on && typeof data.on.delete === 'function') {
+  if (data.on && typeof data.on.delete === 'function') {
     data.on.delete(scope, done => {
-      if(done) {
+      if (done) {
         eval(`formValues.${data.name}.splice(scope.$index, 1)`)
       }
-    });
+    })
   } else {
     eval(`formValues.${data.name}.splice(scope.$index, 1)`)
   }
 }
 
 // data transform base64
-const utoa = function (data) {
+const utoa = function(data) {
   return btoa(unescape(encodeURIComponent(data)))
 }
 
 // base64 transform data
-const atou = function (base64) {
+const atou = function(base64) {
   return decodeURIComponent(escape(atob(base64)))
 }
 
+// 获取(el-select/el-radio/el-checkbox)数据
+const getOptionList = function(data) {
+  return Array.isArray(data.items) ? data.items.map(item => {
+    return (typeof item === 'string') ? { label: item, value: item } : item
+  }) : typeof data.items === 'object' ? Object.keys(data.items).reduce((prev, next) => {
+    prev.push({ label: data.items[next], value: next })
+    return prev
+  }, []) : []
+}
+
 export {
   isEqual,
   isEmpty,
@@ -305,5 +315,6 @@ export {
   CUSTOM_TAGS,
   addRow,
   delRowForArray,
-  delRowForTable
+  delRowForTable,
+  getOptionList
 }
diff --git a/src/packages/index.vue b/src/packages/index.vue
index 2dee8b2..f5cd2e1 100644
--- a/src/packages/index.vue
+++ b/src/packages/index.vue
@@ -216,9 +216,7 @@ export default {
       }, {})
       this.schemaValues = JSON.parse(JSON.stringify(values))
       this.formValues = { ...values, ...customData }
-      this.$nextTick(() => {
-        this.$emit('input', { ...this.formValues, ...this.model })
-      })
+      this.$emit('input', { ...this.formValues, ...this.model })
     },
     /**
 		 *  label/title/slot 模版字符串
@@ -311,17 +309,12 @@ export default {
       component.label = component.label || ''
       component.style = component.style || {}
       component.slot = component.slot || {}
+      component.items = component.items || []
       component.props = component.props || {}
       component.attrs = component.attrs || {}
       component.rules = component.rules || (component.required ? { required: true, message: '必填' } : null)
       // 监听config表达式的情况
       this.watchConfigExp(component, watchConfigExp)
-      if (component.items) {
-        const list = JSON.parse(JSON.stringify(component.items))
-        component.items = list.map(item => {
-          return (typeof item === 'string') ? { label: item, value: item } : item
-        })
-      }
       switch (component.tag) {
         case 'p':
         case 'a':
@@ -499,9 +492,7 @@ export default {
 		 * @description: 设置默认值
 		*/
     setDefaultValue(item) {
-      if (!isEmpty(item.initValue)) {
-        return item.initValue
-      } else if (!isEmpty(item.default)) {
+      if (!isEmpty(item.default)) {
         return item.default
       } else {
         return ''
@@ -591,10 +582,6 @@ export default {
         this.validiteFieldSet.clear()
         // 表单重置
         this.$refs[this.refName].resetFields()
-        // 解决 array/table 设置minLimit后 无法重置的bug
-        this.$nextTick(() => {
-          Object.assign(this.formValues, this.schemaValues)
-        })
       } catch (ex) {
         // 重置数组复杂对象会报以下的一个错误，暂时可以忽略，目前发现并不影响操作
         // Error: please transfer a valid prop path to form item!
diff --git a/vuepressdocs/.vuepress/components/example/base/demo1.vue b/vuepressdocs/.vuepress/components/example/base/demo1.vue
index 54468bb..2888a3e 100644
--- a/vuepressdocs/.vuepress/components/example/base/demo1.vue
+++ b/vuepressdocs/.vuepress/components/example/base/demo1.vue
@@ -1,4 +1,4 @@
-<template>
+  <template>
   <div>
     <p>{{ model }}</p>
     <el-form-schema
@@ -87,14 +87,8 @@ export default {
         select3: {
           tag: "el-select",
           label: "下拉框3（bool）",
-          default: true,
-          items:  [{
-            label: "是", 
-            value: true
-          },{
-            label:"否",
-            value: false
-          }]
+          default: "A",
+          items:  []
         },
         checkbox: {
           tag: "el-checkbox",
@@ -197,6 +191,11 @@ export default {
       });
       return { foo, bar };
     }
+  },
+  mounted() {
+    setTimeout(()=> { 
+      this.schema.select3.items = ["A", "B", "C"];
+    }, 5000)
   }
 };
 </script>
diff --git a/vuepressdocs/.vuepress/components/example/base/demo2.vue b/vuepressdocs/.vuepress/components/example/base/demo2.vue
index 0ac2288..37db0d3 100644
--- a/vuepressdocs/.vuepress/components/example/base/demo2.vue
+++ b/vuepressdocs/.vuepress/components/example/base/demo2.vue
@@ -30,15 +30,16 @@ export default {
         input: {
           tag: Input,
           required: true,
-          attrs: { placeholder: "自定义组件" },
-          slot: {
-            after: {
-              tag: 'el-checkbox',
-              vmodel: 'sel',
-              vif: '$model.input',
-              items: ["A", "B", "C"]
-            }
-          }
+          inline: true,
+          label: "自定义组件",
+          attrs: { placeholder: "自定义组件" }
+        },
+        sel: {
+          tag: 'el-checkbox',
+          vif: '$model.input',
+          inline: true,
+          items: ["A", "B", "C"],
+          style: { marginLeft: "10px" }
         },
         cascader: {
           tag: "el-cascader",
diff --git a/vuepressdocs/.vuepress/components/example/base/demo3.vue b/vuepressdocs/.vuepress/components/example/base/demo3.vue
new file mode 100644
index 0000000..ab3c97d
--- /dev/null
+++ b/vuepressdocs/.vuepress/components/example/base/demo3.vue
@@ -0,0 +1,57 @@
+<template>
+  <div>
+    <p>{{ model }}</p>
+    <el-form-schema
+      :schema="schema"
+      v-model="model"
+      label-width="150px"
+    >
+    </el-form-schema>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      schema: {
+        sel: {
+          tag: 'el-select',
+          label: "下拉框",
+          items: []
+        },
+        radio: {
+          tag: 'el-radio',
+          label: "单选框",
+          items: []
+        },
+        checkbox: {
+          tag: 'el-checkbox',
+          label: "复选框",
+          items: []
+        },
+      },
+      model: {}
+    };
+  },
+  mounted() {
+    setTimeout(() => {
+      // 第一种赋值
+      this.schema.sel.items = [{ 
+        label:"测试", 
+        value: 1 
+      }];
+      // 第二种赋值：对象数组
+      this.schema.radio.items = [
+        "A", 
+        "B", 
+        "C"
+      ];
+      // 第三种赋值：字符串数组
+      this.schema.checkbox.items = {
+         0: "测试1", 
+         1: '测试2' 
+      };
+    }, 3000);
+  }
+};
+</script>
diff --git a/vuepressdocs/.vuepress/components/example/dialog/demo.vue b/vuepressdocs/.vuepress/components/example/dialog/demo.vue
deleted file mode 100644
index a1c5afa..0000000
--- a/vuepressdocs/.vuepress/components/example/dialog/demo.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <div>
-    <el-button type="primary" @click="add">新增</el-button>
-    <el-button type="warning" @click="edit">编辑</el-button>
-    <el-dialog
-      :title="`${form.type==='add'?'新增':'编辑'}`"
-      :visible.sync="dialogVisible"
-      width="900px"
-      @closed="closedDialog">
-      {{form}}
-      <el-form-schema 
-        ref="efs"
-        :schema="schema" 
-        v-model="form" 
-        :inline="false" 
-        label-width="100px"
-        v-if="Object.keys(schema)"
-      >
-        <el-form-item>
-          <el-button @click="dialogVisible=false">取消</el-button>
-          <el-button type="primary" @click="submit">提交</el-button>
-        </el-form-item>
-      </el-form-schema>
-    </el-dialog>
-   
-  </div>
-</template>
-<script>
-export default  {
-  data () {
-    return {
-      dialogVisible: false,
-      schema: {},
-      form: { 
-        type: "",
-        id: 1,
-        input: "hello",
-        province: "A",
-        city: "B",
-        county: "C",
-        daterange: "2020-02-08"
-      }
-    }
-  },
-  methods: {
-    createSchema() {
-      return {
-        id: {
-          tag: 'text', 
-          label: 'ID',
-          vif: "$model.type === 'edit'"
-        },
-        input: {
-          tag: 'el-input', 
-          label: '输入框', 
-          required: true,
-          props: { disabled: "$model.type !== 'add'" }  
-        },
-        province: { 
-          tag: 'el-select', 
-          inline: true,  
-          label: '联动类型', 
-          items: ["A"], 
-          required: true,
-          props: { disabled: "$model.type !== 'add'", clearable: true  },
-          slot: { after: ' ' } 
-        },
-        city: { 
-          tag: 'el-select', 
-          inline: true, 
-          items: ["B"], 
-          slot: { after: ' ' },
-          required: true,
-          props: { disabled: "$model.type !== 'add'  || !$model.province", clearable: true }  
-        },
-        county: { 
-          tag: 'el-select', 
-          inline: true, 
-          items: ["C"],
-          required: true,
-          props: { disabled: "$model.type !== 'add' || !$model.city" }  
-        },
-        daterange: { 
-          tag: 'el-date-picker', 
-          label: '日期范围',
-          required: true,
-        },
-      };
-    },
-    add() {
-      this.dialogVisible = true;
-      this.schema = this.createSchema();
-      this.form.type = "add";
-    },
-    edit() {
-      this.dialogVisible = true;
-      this.$nextTick(()=> {
-        this.form.type = "edit";
-        Object.assign(this.form, {
-          id: 1,
-          input: "hello",
-          province: "A",
-          city: "B",
-          county: "C",
-          daterange: "2020-02-08"
-        })
-      });
-    },
-    closedDialog() {
-      this.$refs.efs.resetFields();
-    },
-    submit() {
-      this.$refs.efs.validate((valid)=>{
-        if (valid) {
-          alert("提交");
-        }
-      })
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/vuepressdocs/.vuepress/components/example/dialog/demo1.vue b/vuepressdocs/.vuepress/components/example/dialog/demo1.vue
index 585f147..f13c447 100644
--- a/vuepressdocs/.vuepress/components/example/dialog/demo1.vue
+++ b/vuepressdocs/.vuepress/components/example/dialog/demo1.vue
@@ -53,9 +53,10 @@ export default  {
         city: { 
           tag: 'el-select', 
           inline: true, 
-          items: ["B"], 
+          items: ["B", "O", "P"], 
           slot: { after: ' ' },
           required: true,
+          default: "O",
           props: { disabled: "$model.type !== 'add'  || !$model.province", clearable: true }  
         },
         county: { 
@@ -73,7 +74,7 @@ export default  {
       },
       form: { 
         type: "",
-        // input: "hello",
+        input: "hello",
         // province: "A",
         // city: "B",
         // county: "C",
@@ -85,10 +86,12 @@ export default  {
     add() {
       this.dialogVisible = true;
       this.form.type = "add";
+      this.$nextTick(()=> {
+        this.form.city = "P";
+      })
       Object.assign(this.form, {
-        input: "world",
+        // input: "world",
         province: "A",
-        city: "B",
         county: "C",
         daterange: "2020-09-10"
       })
diff --git a/vuepressdocs/.vuepress/components/example/dialog/demo3.vue b/vuepressdocs/.vuepress/components/example/dialog/demo3.vue
new file mode 100644
index 0000000..00a05e6
--- /dev/null
+++ b/vuepressdocs/.vuepress/components/example/dialog/demo3.vue
@@ -0,0 +1,77 @@
+<template>
+  <div>
+    <el-button type="primary" @click="showDialog">新增</el-button>
+    <el-dialog
+      title="测试"
+      :visible.sync="dialogVisible"
+      >
+      {{efsForm}}
+      <el-form-schema :schema="efsSchema" v-model="efsForm">
+      </el-form-schema>
+      <div slot="footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  data: () => ({
+    dialogVisible: false,
+    efsSchema: {
+      type: {
+        tag: "el-radio",
+        // label: "测试",
+        items: [{label: "类型1", value:1}, {label: "类型2", value:2}]
+      },
+      obj1: {
+        tag: "object",
+        type: "card",
+        title: "测试1",
+        vif: "$model.type === 1",
+        labelWidthComponents: "70px",
+        inline: true,
+        components: {
+          num: {
+            tag: "el-input-number",
+            label: "数量1",
+            props: { min: 40 }
+          },
+          input: {
+            tag: "el-input",
+            label: "输入框"
+          }
+        }
+      },
+      obj2: {
+        tag: "object",
+        type: "card",
+        title: "测试2",
+        vif: "$model.type === 2",
+        labelWidthComponents: "100px",
+        components: {
+          num: {
+            tag: "el-input-number",
+            label: "数量2",
+            default: 10,
+          },
+          input: {
+            tag: "el-input",
+            label: "输入框"
+          }
+        }
+      }
+    },
+    efsForm: {}
+  }),
+  methods: {
+    showDialog() {
+      this.dialogVisible =  true;
+    },
+    closeDialog() {
+      this.$refs.efs
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/vuepressdocs/.vuepress/components/example/showcase/demo1.vue b/vuepressdocs/.vuepress/components/example/showcase/demo1.vue
index 5299907..ea42b41 100644
--- a/vuepressdocs/.vuepress/components/example/showcase/demo1.vue
+++ b/vuepressdocs/.vuepress/components/example/showcase/demo1.vue
@@ -44,7 +44,7 @@ export default {
           tag: "el-checkbox",
           label: "复选框",
           inline: true,
-          rules: { required: true, type: "array", message: "必填" },
+          required: true,
           items: []
         },
         obj: {
diff --git a/vuepressdocs/guide/base.md b/vuepressdocs/guide/base.md
index 9bc9a71..4d89866 100644
--- a/vuepressdocs/guide/base.md
+++ b/vuepressdocs/guide/base.md
@@ -8,6 +8,16 @@ element-ui 表单组件演示: [表单组件](https://element.eleme.io/#/zh-CN/c
  <<< @/vuepressdocs/.vuepress/components/example/base/demo1.vue
 </demo-block>
 
+
+## items数据形式
+主要针对 el-select/el-radio/el-checkbox，items 值支持：对象数组、字符串数组、对象
+
+<demo-block>
+<example-base-demo3 slot="source"/>
+ <<< @/vuepressdocs/.vuepress/components/example/base/demo3.vue
+</demo-block>
+
+
 ## 自定义组件
   
 
diff --git a/vuepressdocs/guide/dialog.md b/vuepressdocs/guide/dialog.md
index c5b17fb..41a07a6 100644
--- a/vuepressdocs/guide/dialog.md
+++ b/vuepressdocs/guide/dialog.md
@@ -1,17 +1,23 @@
 # 弹框篇
 
-## 新增/编辑 (简单)
-element-ui 表单组件演示: [表单组件](https://element.eleme.io/#/zh-CN/component/radio)
+## 新增/编辑 (第一种)
 
 <demo-block>
 <example-dialog-demo1 slot="source"/>
  <<< @/vuepressdocs/.vuepress/components/example/dialog/demo1.vue
 </demo-block>
 
-## 新增/编辑 (动态schema)
-element-ui 表单组件演示: [表单组件](https://element.eleme.io/#/zh-CN/component/radio)
+## 新增/编辑 (第二种)
 
 <demo-block>
 <example-dialog-demo2 slot="source"/>
  <<< @/vuepressdocs/.vuepress/components/example/dialog/demo2.vue
+</demo-block>
+
+
+## 测试
+
+<demo-block>
+<example-dialog-demo3 slot="source"/>
+ <<< @/vuepressdocs/.vuepress/components/example/dialog/demo3.vue
 </demo-block>
\ No newline at end of file
diff --git a/vuepressdocs/guide/feature.md b/vuepressdocs/guide/feature.md
index 338f5ea..fce41d4 100644
--- a/vuepressdocs/guide/feature.md
+++ b/vuepressdocs/guide/feature.md
@@ -63,7 +63,7 @@ expand|展开/收起
 tag|组件名字|el-*(表单组件)、内置组件、自定义组件|-
 label|标签文本|string|-
 default|默认值|bool/string/number/object/array|-
-items|数据项（专门为el-select/el-radio/el-checkbox的属性）|string| []
+items|数据项（专门为el-select/el-radio/el-checkbox的属性）|array/object| []
 keys|字段映射（专门为el-select/el-radio/el-checkbox的属性）|object| {label:'label',value:'value'}
 inline|是否行内布局|boolean|false
 vif|是否显示|字符串表达式，比如: vif: "$model.id === 2" |-