Merge branch '2.0' of https://github.com/iview/iview into 2.0

梁灏
2 parents 2919aa36 ae835d65
Showing 2 changed files with 13 additions and 4 deletions Show diff stats
examples/routers/table.vue
src/components/table/table.vue
 <template>
-    <Table border :columns="columns5" :data="data5"></Table>
+    <Table border :columns="columns5" :data="data5" @on-select="onSelect(true)" @on-select-cancel="onSelect(false)"></Table>
 </template>
 <script>
     import etable from '../components/table.vue';
@@ -9,6 +9,11 @@
             return {
                 columns5: [
                     {
+                        type: 'selection',
+                        width: 60,
+                        align: 'center'
+                    },
+                    {
                         type: 'expand',
                         render: (h) => {
                             console.log('______hover______');
@@ -73,6 +78,12 @@
                     },
                 ]
             }
+        },
+
+        methods: {
+            onSelect (value) {
+                window.alert(value);
+            }
         }
     }
 </script>
@@ -404,9 +404,7 @@
                 this.objData[_index]._isChecked = status;
  
                 const selection = this.getSelection();
-                if (status) {
-                    this.$emit('on-select', selection, JSON.parse(JSON.stringify(this.data[_index])));
-                }
+                this.$emit(status ? 'on-select' : 'on-select-cancel', selection, JSON.parse(JSON.stringify(this.data[_index])));
                 this.$emit('on-selection-change', selection);
             },
             toggleExpand (_index) {