From a358e0c717825c917e2299892fc14990c0a95f25 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Thu, 15 Jun 2017 14:40:35 +0800
Subject: [PATCH] fixed #1171

---
 examples/routers/form.vue | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 package-lock.json         |  12 +++++-------
 package.json              |   2 +-
 3 files changed, 90 insertions(+), 25 deletions(-)

diff --git a/examples/routers/form.vue b/examples/routers/form.vue
index b4b3a82..3eeb355 100644
--- a/examples/routers/form.vue
+++ b/examples/routers/form.vue
@@ -1,30 +1,97 @@
 <template>
-    <div style="width: 300px;">
-        <i-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
-            <Form-item label="爱好" prop="interest">
-                <Input v-model="formValidate.interest" number></Input>
-            </Form-item>
-            <Form-item>
-                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
-                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
-            </Form-item>
-        </i-form>
-    </div>
+    <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
+        <Form-item label="姓名" prop="name">
+            <Input v-model="formValidate.name" placeholder="请输入姓名"></Input>
+        </Form-item>
+        <Form-item label="邮箱" prop="mail">
+            <Input v-model="formValidate.mail" placeholder="请输入邮箱"></Input>
+        </Form-item>
+        <Form-item label="城市" prop="city">
+            <Select v-model="formValidate.city" placeholder="请选择所在地">
+                <Option value="beijing">北京市</Option>
+                <Option value="shanghai">上海市</Option>
+                <Option value="shenzhen">深圳市</Option>
+            </Select>
+        </Form-item>
+        <Form-item label="选择日期">
+            <Row>
+                <Col span="11">
+                <Form-item prop="date">
+                    <Date-picker type="date" placeholder="选择日期" v-model="formValidate.date"></Date-picker>
+                </Form-item>
+                </Col>
+                <Col span="2" style="text-align: center">-</Col>
+                <Col span="11">
+                <Form-item prop="time">
+                    <Time-picker type="time" placeholder="选择时间" v-model="formValidate.time"></Time-picker>
+                </Form-item>
+                </Col>
+            </Row>
+        </Form-item>
+        <Form-item label="性别" prop="gender">
+            <Radio-group v-model="formValidate.gender">
+                <Radio label="male">男</Radio>
+                <Radio label="female">女</Radio>
+            </Radio-group>
+        </Form-item>
+        <Form-item label="爱好" prop="interest">
+            <Checkbox-group v-model="formValidate.interest">
+                <Checkbox label="吃饭"></Checkbox>
+                <Checkbox label="睡觉"></Checkbox>
+                <Checkbox label="跑步"></Checkbox>
+                <Checkbox label="看电影"></Checkbox>
+            </Checkbox-group>
+        </Form-item>
+        <Form-item label="介绍" prop="desc">
+            <Input v-model="formValidate.desc" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入..."></Input>
+        </Form-item>
+        <Form-item>
+            <Button type="primary" @click="handleSubmit('formValidate')">提交</Button>
+            <Button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</Button>
+        </Form-item>
+    </Form>
 </template>
 <script>
     export default {
         data () {
             return {
                 formValidate: {
-                    interest: ''
+                    name: '',
+                    mail: '',
+                    city: '',
+                    gender: '',
+                    interest: [],
+                    date: '',
+                    time: '',
+                    desc: ''
                 },
                 ruleValidate: {
+                    name: [
+                        { required: true, message: '姓名不能为空', trigger: 'blur' }
+                    ],
+                    mail: [
+                        { required: true, message: '邮箱不能为空', trigger: 'blur' },
+                        { type: 'email', message: '邮箱格式不正确', trigger: 'blur' }
+                    ],
+                    city: [
+                        { required: true, message: '请选择城市', trigger: 'change' }
+                    ],
+                    gender: [
+                        { required: true, message: '请选择性别', trigger: 'change' }
+                    ],
                     interest: [
-                        {
-                            required: true,
-                            type: 'number',
-                            trigger: 'change'
-                        }
+                        { required: true, type: 'array', min: 1, message: '至少选择一个爱好', trigger: 'change' },
+                        { type: 'array', max: 2, message: '最多选择两个爱好', trigger: 'change' }
+                    ],
+                    date: [
+                        { required: true, type: 'date', message: '请选择日期', trigger: 'change' }
+                    ],
+                    time: [
+                        { required: true, type: 'date', message: '请选择时间', trigger: 'change' }
+                    ],
+                    desc: [
+                        { required: true, message: '请输入个人介绍', trigger: 'blur' },
+                        { type: 'string', min: 20, message: '介绍不能少于20字', trigger: 'blur' }
                     ]
                 }
             }
diff --git a/package-lock.json b/package-lock.json
index e854fff..a829685 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "iview",
-  "version": "2.0.0-rc.16",
+  "version": "2.0.0-rc.17",
   "lockfileVersion": 1,
   "dependencies": {
     "async-validator": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.6.8.tgz",
-      "integrity": "sha1-+6qpACtBBm/fO6IdikyosRea02s="
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.7.1.tgz",
+      "integrity": "sha1-idPXo4TKXQXg8Hv1F1TVkeLP7GE="
     },
     "autoprefixer-loader": {
       "version": "2.1.0",
@@ -2960,13 +2960,11 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
       "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
-      "dev": true,
       "dependencies": {
         "regenerator-runtime": {
           "version": "0.10.3",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz",
-          "integrity": "sha1-jENnqQS1HqYqkIrDEL+Z/5CoKj4=",
-          "dev": true
+          "integrity": "sha1-jENnqQS1HqYqkIrDEL+Z/5CoKj4="
         }
       }
     },
diff --git a/package.json b/package.json
index 76447c8..f019a24 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "url": "https://github.com/iview/iview/issues"
   },
   "dependencies": {
-    "async-validator": "^1.6.7",
+    "async-validator": "^1.7.1",
     "core-js": "^2.4.1",
     "deepmerge": "^1.3.1",
     "popper.js": "^0.6.4"
--
libgit2 0.21.4