From 644c37b3b358e975d15a157d0be3a1b5cf5c92cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Tue, 14 Mar 2017 10:47:02 +0800
Subject: [PATCH] update License
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

不想为这些事发生争执，我只想做开源
---
 CHANGE.md                           |   4 +-
 LICENSE                             |  24 +++-
 README.md                           |   8 ++
 examples/routers/select.vue         |   2 +-
 examples/routers/table.vue          | 168 ++++++++++++++++++++++------
 src/components/table/table-head.vue |   4 +-
 6 files changed, 168 insertions(+), 42 deletions(-)

diff --git a/CHANGE.md b/CHANGE.md
index 8e982948..ad7ddc85 100644
--- a/CHANGE.md
+++ b/CHANGE.md
@@ -55,4 +55,6 @@ visible 改为 value，使用 v-model，style 改为 styles，$Modal 的关闭
 i-table 改为 Table
 ### Message
 notice.vue 的 key 改为了 name，style 改为 styles
-notification.vue 的 key 改为了 name，style 改为 styles
\ No newline at end of file
+notification.vue 的 key 改为了 name，style 改为 styles
+## Popper 
+移除了 visible，使用 value 受控，可能涉及到的组件：Poptip、Tooltip
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 5449fc81..f4bc5362 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 iview
+Copyright (c) 2016 iView
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,25 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+The MIT License (MIT)
+
+Copyright (c) 2016 ElemeFE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index 93322e50..73918863 100644
--- a/README.md
+++ b/README.md
@@ -82,3 +82,11 @@ Normal browsers and Internet Explorer 9+.
 - [Webpack](https://github.com/webpack/webpack)
 - [ionicons](https://github.com/driftyco/ionicons)
 - [Ant Design](https://github.com/ant-design/ant-design)
+
+## Related open source projects
+In iView, Some of the components and style codes refer to the following projects:
+- [AntDesign](https://github.com/ant-design/ant-design)
+- [Element](https://github.com/ElemeFE/element)
+- [vue-antd](https://github.com/okoala/vue-antd)
+- [vue-beauty](https://github.com/FE-Driver/vue-beauty)
+- [Vux](https://github.com/airyland/vux)
\ No newline at end of file
diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 1da0d740..cae1cf27 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -210,7 +210,7 @@
             </i-col>
             <i-col span="12">
                 <Select v-model="model12" filterable multiple>
-                    <i-option v-for="item in cityList" :value="item.value">{{ item.label }}</i-option>
+                    <i-option v-for="item in cityList" :key="item" :value="item.value">{{ item.label }}</i-option>
                 </Select>
             </i-col>
         </Row>
diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 374504c6..3eac9b52 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,75 +1,169 @@
+<!--<template>-->
+    <!--<Card>-->
+        <!--<Table border :content="self" :columns="columns7" :data="data6"></Table>-->
+    <!--</Card>-->
+<!--</template>-->
+<!--<script>-->
+    <!--export default {-->
+        <!--data () {-->
+            <!--return {-->
+                <!--self: this,-->
+                <!--columns7: [-->
+                    <!--{-->
+                        <!--title: '姓名',-->
+                        <!--key: 'name',-->
+                        <!--render (row, column, index) {-->
+                            <!--return `<Icon type="person"></Icon> <strong>${row.name}</strong>`;-->
+                        <!--}-->
+                    <!--},-->
+                    <!--{-->
+                        <!--title: '年龄',-->
+                        <!--key: 'age'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--title: '地址',-->
+                        <!--key: 'address'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--title: '操作',-->
+                        <!--key: 'action',-->
+                        <!--width: 150,-->
+                        <!--align: 'center',-->
+                        <!--render (row, column, index) {-->
+                            <!--return `<i-button type="primary" size="small" @click.native="show(${index})">查看</i-button> <i-button type="error" size="small" @click.native="remove(${index})">删除</i-button>`;-->
+                        <!--}-->
+                    <!--}-->
+                <!--],-->
+                <!--data6: [-->
+                    <!--{-->
+                        <!--name: '王小明',-->
+                        <!--age: 18,-->
+                        <!--address: '北京市朝阳区芍药居'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--name: '张小刚',-->
+                        <!--age: 25,-->
+                        <!--address: '北京市海淀区西二旗'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--name: '李小红',-->
+                        <!--age: 30,-->
+                        <!--address: '上海市浦东新区世纪大道'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--name: '周小伟',-->
+                        <!--age: 26,-->
+                        <!--address: '深圳市南山区深南大道'-->
+                    <!--}-->
+                <!--]-->
+            <!--}-->
+        <!--},-->
+        <!--methods: {-->
+            <!--show (index) {-->
+                <!--console.log(`姓名：${this.data6[index].name}<br>年龄：${this.data6[index].age}<br>地址：${this.data6[index].address}`)-->
+            <!--},-->
+            <!--remove (index) {-->
+                <!--this.data6.splice(index, 1);-->
+            <!--}-->
+        <!--},-->
+        <!--mounted () {-->
+            <!--setTimeout(() => {-->
+<!--//                this.data6.splice(2, 1);-->
+            <!--}, 3000)-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
+
+
 <template>
-    <Card>
-        <Table border :content="self" :columns="columns7" :data="data6"></Table>
-    </Card>
+    <div>
+        <i-table border :columns="columns6" :data="data5"></i-table>
+    </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                self: this,
-                columns7: [
+                columns6: [
+                    {
+                        title: '日期',
+                        key: 'date'
+                    },
                     {
                         title: '姓名',
-                        key: 'name',
-                        render (row, column, index) {
-                            return `<Icon type="person"></Icon> <strong>${row.name}</strong>`;
-                        }
+                        key: 'name'
                     },
                     {
                         title: '年龄',
-                        key: 'age'
+                        key: 'age',
+                        filters: [
+                            {
+                                label: '大于25岁',
+                                value: 1
+                            },
+                            {
+                                label: '小于25岁',
+                                value: 2
+                            }
+                        ],
+                        filterMultiple: false,
+                        filterMethod (value, row) {
+                            if (value === 1) {
+                                return row.age > 25;
+                            } else if (value === 2) {
+                                return row.age < 25;
+                            }
+                        }
                     },
                     {
                         title: '地址',
-                        key: 'address'
-                    },
-                    {
-                        title: '操作',
-                        key: 'action',
-                        width: 150,
-                        align: 'center',
-                        render (row, column, index) {
-                            return `<i-button type="primary" size="small" @click.native="show(${index})">查看</i-button> <i-button type="error" size="small" @click.native="remove(${index})">删除</i-button>`;
+                        key: 'address',
+                        filters: [
+                            {
+                                label: '北京',
+                                value: '北京'
+                            },
+                            {
+                                label: '上海',
+                                value: '上海'
+                            },
+                            {
+                                label: '深圳',
+                                value: '深圳'
+                            }
+                        ],
+                        filterMethod (value, row) {
+                            return row.address.indexOf(value) > -1;
                         }
                     }
                 ],
-                data6: [
+                data5: [
                     {
                         name: '王小明',
                         age: 18,
-                        address: '北京市朝阳区芍药居'
+                        address: '北京市朝阳区芍药居',
+                        date: '2016-10-03'
                     },
                     {
                         name: '张小刚',
                         age: 25,
-                        address: '北京市海淀区西二旗'
+                        address: '北京市海淀区西二旗',
+                        date: '2016-10-01'
                     },
                     {
                         name: '李小红',
                         age: 30,
-                        address: '上海市浦东新区世纪大道'
+                        address: '上海市浦东新区世纪大道',
+                        date: '2016-10-02'
                     },
                     {
                         name: '周小伟',
                         age: 26,
-                        address: '深圳市南山区深南大道'
+                        address: '深圳市南山区深南大道',
+                        date: '2016-10-04'
                     }
                 ]
             }
-        },
-        methods: {
-            show (index) {
-                console.log(`姓名：${this.data6[index].name}<br>年龄：${this.data6[index].age}<br>地址：${this.data6[index].address}`)
-            },
-            remove (index) {
-                this.data6.splice(index, 1);
-            }
-        },
-        mounted () {
-            setTimeout(() => {
-//                this.data6.splice(2, 1);
-            }, 3000)
         }
     }
 </script>
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 4ac5465c..72bb50dd 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -16,7 +16,7 @@
                             </span>
                             <Poptip
                                 v-if="isPopperShow(column)"
-                                :visible="column._filterVisible"
+                                v-model="column._filterVisible"
                                 placement="bottom"
                                 @on-popper-hide="handleFilterHide(index)">
                                 <span :class="[prefixCls + '-filter']">
@@ -25,7 +25,7 @@
                                 <div slot="content" :class="[prefixCls + '-filter-list']" v-if="column._filterMultiple">
                                     <div :class="[prefixCls + '-filter-list-item']">
                                         <checkbox-group v-model="column._filterChecked">
-                                            <checkbox v-for="item in column.filters" :value="item.value">{{ item.label }}</checkbox>
+                                            <checkbox v-for="item in column.filters" :key="item" :label="item.value">{{ item.label }}</checkbox>
                                         </checkbox-group>
                                     </div>
                                     <div :class="[prefixCls + '-filter-footer']">