From 4aa98b7e388ae183305fafafbbb656c693ef411c Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Tue, 5 Mar 2019 18:19:43 +0800
Subject: [PATCH] update

---
 src/components/TreeTable/index.vue            | 18 +++++++-----------
 src/views/table/treeTable/customTreeTable.vue | 13 +++----------
 src/views/table/treeTable/treeTable.vue       |  4 ++--
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 35c3b287..197355af 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-table :data="tableData" :row-style="showRow" v-bind="$attrs">
+  <el-table :data="tableData" :row-style="showRow" v-bind="$attrs" v-on="$listeners" >
     <slot name="selection" />
     <slot name="pre-column" />
     <el-table-column
@@ -12,7 +12,7 @@
       <template slot-scope="scope">
         <slot :scope="scope" :name="item.key">
           <template v-if="item.expand">
-            <span :style="{'padding-left':+scope.row._level*spreadOffset + 'px'} "/>
+            <span :style="{'padding-left':+scope.row._level*indent + 'px'} "/>
             <span v-show="showSperadIcon(scope.row)" class="tree-ctrl" @click="toggleExpanded(scope.$index)">
               <i v-if="!scope.row._expand" class="el-icon-plus" />
               <i v-else class="el-icon-minus" />
@@ -21,13 +21,13 @@
           <template v-if="item.checkbox">
             <el-checkbox
               v-if="scope.row[defaultChildren]&&scope.row[defaultChildren].length>0"
-              :style="{'padding-left':+scope.row._level*checkboxOffset + 'px'} "
+              :style="{'padding-left':+scope.row._level*indent + 'px'} "
               :indeterminate="scope.row._select"
               v-model="scope.row._select"
               @change="handleCheckAllChange(scope.row)" />
             <el-checkbox
               v-else
-              :style="{'padding-left':+scope.row._level*checkboxOffset + 'px'} "
+              :style="{'padding-left':+scope.row._level*indent + 'px'} "
               v-model="scope.row._select"
               @change="handleCheckAllChange(scope.row)" />
           </template>
@@ -53,7 +53,6 @@ export default {
       type: Array,
       default: () => []
     },
-    /* eslint-enable */
     defaultExpandAll: {
       type: Boolean,
       default: false
@@ -62,11 +61,7 @@ export default {
       type: String,
       default: 'children'
     },
-    spreadOffset: {
-      type: Number,
-      default: 50
-    },
-    checkboxOffset: {
+    indent: {
       type: Number,
       default: 50
     }
@@ -85,7 +80,8 @@ export default {
   watch: {
     data: {
       // deep watch，监听树表的数据的增删，如果仅仅是展示，可以不用deep watch
-      handler(val) {
+      handler(newVal, oldVal) {
+        const val = JSON.parse(JSON.stringify(newVal))
         if (val.length === 0) {
           this.tableData = []
           return
diff --git a/src/views/table/treeTable/customTreeTable.vue b/src/views/table/treeTable/customTreeTable.vue
index 78a94d4a..82df2043 100644
--- a/src/views/table/treeTable/customTreeTable.vue
+++ b/src/views/table/treeTable/customTreeTable.vue
@@ -15,6 +15,7 @@
         :columns="columns"
         border
         default-children="children"
+        @selection-change	="selectChange"
       >
 
         <template slot="selection">
@@ -90,11 +91,6 @@ export default {
       tempItem: {},
       dialogFormVisible: false,
       columns: [
-        // {
-        //   label: '',
-        //   // key: '__sperad'
-
-        // },
         {
           label: 'Name',
           key: 'name',
@@ -123,9 +119,6 @@ export default {
         }
       ]
     }
-  },
-  computed: {
-
   },
   created() {
     this.getData()
@@ -165,8 +158,8 @@ export default {
     deleteItem(row) {
       this.$refs.TreeTable.delete(row)
     },
-    updateMenuItem(menuItem) {
-
+    selectChange(val) {
+      console.log(val)
     }
   }
 }
diff --git a/src/views/table/treeTable/treeTable.vue b/src/views/table/treeTable/treeTable.vue
index 4eb3d953..3785dd5e 100644
--- a/src/views/table/treeTable/treeTable.vue
+++ b/src/views/table/treeTable/treeTable.vue
@@ -8,7 +8,7 @@
       </el-button>
 
       <div class="option-item">
-        <el-tag>默认展开所有</el-tag>
+        <el-tag>Expand All</el-tag>
         <el-switch
           v-model="defaultExpandAll"
           active-color="#13ce66"
@@ -17,7 +17,7 @@
       </div>
 
       <div class="option-item">
-        <el-tag>显示Checkbox</el-tag>
+        <el-tag>Show Checkbox</el-tag>
         <el-switch
           v-model="showCheckbox"
           active-color="#13ce66"