From 257f80f1c2a84b8edffeb3b2e69d9d1fa9b18e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 8 Mar 2017 15:31:59 +0800
Subject: [PATCH] support Form

support Form
---
 README.md                         |  2 +-
 examples/app.vue                  |  1 +
 examples/main.js                  | 14 +++++----
 examples/routers/form.vue         | 49 +++++++++++++++----------------
 src/components/form/form-item.vue | 13 +++++---
 src/components/form/form.vue      | 10 +++----
 src/index.js                      |  6 ++--
 7 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 2824bc35..b1d1bc83 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@
 - [x] InputNumber
 - [x] Rate
 - [x] Upload
-- [ ] Form
+- [x] Form
 - [x] Alert
 - [x] Card
 - [ ] Message
diff --git a/examples/app.vue b/examples/app.vue
index 9d305756..60183faf 100644
--- a/examples/app.vue
+++ b/examples/app.vue
@@ -48,6 +48,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
                 <li><router-link to="/page">Page</router-link></li>
                 <li><router-link to="/transfer">Transfer</router-link></li>
                 <li><router-link to="/date">Date</router-link></li>
+                <li><router-link to="/form">Form</router-link></li>
             </ul>
         </nav>
         <router-view></router-view>
diff --git a/examples/main.js b/examples/main.js
index c77659b3..99f08700 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -42,12 +42,12 @@ const router = new VueRouter({
             component: require('./routers/checkbox.vue')
         },
         {
-          path: '/steps',
-          component: require('./routers/steps.vue')
+            path: '/steps',
+            component: require('./routers/steps.vue')
         },
         {
-          path: '/timeline',
-          component: require('./routers/timeline.vue')
+            path: '/timeline',
+            component: require('./routers/timeline.vue')
         },
         {
             path: '/switch',
@@ -156,7 +156,11 @@ const router = new VueRouter({
         {
             path: '/date',
             component: require('./routers/date.vue')
-        }
+        },
+        {
+            path: '/form',
+            component: require('./routers/form.vue')
+        },
     ]
 });
 
diff --git a/examples/routers/form.vue b/examples/routers/form.vue
index ba1484e1..472b44ec 100644
--- a/examples/routers/form.vue
+++ b/examples/routers/form.vue
@@ -1,21 +1,17 @@
 <template>
-    <i-form v-ref:form-validate :model="formValidate" :rules="ruleValidate" :label-width="100">
-        <Form-item label="输入框" prop="input">
-            <i-input :value.sync="formValidate.input" placeholder="请输入"></i-input>
+    <i-form ref="formInline" :model="formInline" :rules="ruleInline" inline>
+        <Form-item prop="user">
+            <Input type="text" v-model="formInline.user" placeholder="Username">
+                <Icon type="ios-person-outline" slot="prepend"></Icon>
+            </Input>
         </Form-item>
-        <Form-item label="Ajax：" prop="ajax">
-            <div slot="label">
-                <span>Ajax</span>
-                <Tooltip content="基于 axios">
-                    <Icon type="ios-help" size="14" color="#3399ff"></Icon>
-                </Tooltip>
-                <span>：</span>
-            </div>
-            <Switch :checked.sync="formValidate.ajax"></Switch>
+        <Form-item prop="password">
+            <Input type="password" v-model="formInline.password" placeholder="Password">
+                <Icon type="ios-locked-outline" slot="prepend"></Icon>
+            </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>
+            <Button type="primary" @click.native="handleSubmit('formInline')">登录</Button>
         </Form-item>
     </i-form>
 </template>
@@ -23,27 +19,30 @@
     export default {
         data () {
             return {
-                formValidate: {
-                    input: '123',
-                    ajax: true
+                formInline: {
+                    user: '',
+                    password: ''
                 },
-                ruleValidate: {
-
+                ruleInline: {
+                    user: [
+                        { required: true, message: '请填写用户名', trigger: 'blur' }
+                    ],
+                    password: [
+                        { required: true, message: '请填写密码', trigger: 'blur' },
+                        { type: 'string', min: 6, message: '密码长度不能小于6位', trigger: 'blur' }
+                    ]
                 }
             }
         },
         methods: {
-            handleSubmit (name) {
+            handleSubmit(name) {
                 this.$refs[name].validate((valid) => {
                     if (valid) {
-                        this.$Message.success('提交成功!');
+                        console.log('success');
                     } else {
-                        this.$Message.error('表单验证失败!');
+                        console.log('fail')
                     }
                 })
-            },
-            handleReset (name) {
-                this.$refs[name].resetFields();
             }
         }
     }
diff --git a/src/components/form/form-item.vue b/src/components/form/form-item.vue
index bb44f6fc..d64c9b65 100644
--- a/src/components/form/form-item.vue
+++ b/src/components/form/form-item.vue
@@ -3,7 +3,9 @@
         <label :class="[prefixCls + '-label']" :style="labelStyles" v-if="label"><slot name="label">{{ label }}</slot></label>
         <div :class="[prefixCls + '-content']" :style="contentStyles">
             <slot></slot>
-            <div transition="fade" :class="[prefixCls + '-error-tip']" v-if="validateState === 'error' && showMessage && form.showMessage">{{ validateMessage }}</div>
+            <transition name="fade">
+                <div :class="[prefixCls + '-error-tip']" v-if="validateState === 'error' && showMessage && form.showMessage">{{ validateMessage }}</div>
+            </transition>
         </div>
     </div>
 </template>
@@ -11,6 +13,7 @@
     // https://github.com/ElemeFE/element/blob/dev/packages/form/src/form-item.vue
 
     import AsyncValidator from 'async-validator';
+    import Emitter from '../../mixins/emitter';
 
     const prefixCls = 'ivu-form-item';
 
@@ -38,6 +41,8 @@
     }
 
     export default {
+        name: 'FormItem',
+        mixins: [ Emitter ],
         props: {
             label: {
                 type: String,
@@ -206,9 +211,9 @@
                 this.validate('change');
             }
         },
-        ready () {
+        mounted () {
             if (this.prop) {
-                this.$dispatch('on-form-item-add', this);
+                this.dispatch('iForm', 'on-form-item-add', this);
 
                 Object.defineProperty(this, 'initialValue', {
                     value: this.fieldValue
@@ -229,7 +234,7 @@
             }
         },
         beforeDestroy () {
-            this.$dispatch('on-form-item-remove', this);
+            this.dispatch('iForm', 'on-form-item-remove', this);
         }
     };
 </script>
\ No newline at end of file
diff --git a/src/components/form/form.vue b/src/components/form/form.vue
index 65eeec8a..98f4614c 100644
--- a/src/components/form/form.vue
+++ b/src/components/form/form.vue
@@ -82,15 +82,15 @@
                 this.validate();
             }
         },
-        events: {
-            'on-form-item-add' (field) {
+        created () {
+            this.$on('on-form-item-add', (field) => {
                 if (field) this.fields.push(field);
                 return false;
-            },
-            'on-form-item-remove' (field) {
+            });
+            this.$on('on-form-item-remove', (field) => {
                 if (field.prop) this.fields.splice(this.fields.indexOf(field), 1);
                 return false;
-            }
+            });
         }
     };
 </script>
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 6e59fb02..5eab2e88 100644
--- a/src/index.js
+++ b/src/index.js
@@ -15,7 +15,7 @@ import Circle from './components/circle';
 import Collapse from './components/collapse';
 import DatePicker from './components/date-picker';
 import Dropdown from './components/dropdown';
-// import Form from './components/form';
+import Form from './components/form';
 import Icon from './components/icon';
 import Input from './components/input';
 import InputNumber from './components/input-number';
@@ -67,8 +67,8 @@ const iview = {
     Dropdown,
     DropdownItem: Dropdown.Item,
     DropdownMenu: Dropdown.Menu,
-    // iForm: Form,
-    // FormItem: Form.Item,
+    iForm: Form,
+    FormItem: Form.Item,
     iCol: Col,
     Collapse,
     Icon,