update License

不想为这些事发生争执，我只想做开源

update License
不想为这些事发生争执，我只想做开源
梁灏
1 parent a9131058
Showing 6 changed files with 168 additions and 42 deletions Show diff stats
CHANGE.md
LICENSE
README.md
examples/routers/select.vue
examples/routers/table.vue
src/components/table/table-head.vue
@@ -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
 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
@@ -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
@@ -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>
+<!--<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>
@@ -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']">