Merge pull request #120 from QingWei-Li/next

Table: Fix static render fail

examples/docs/pagination.md

@@ -58,6 +58,19 @@
 ```
 :::
 
+<script>
+  export default {
+    methods: {
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+      }
+    }
+  }
+</script>
+
 ### Attributes
 | 参数               | 说明                                                     | 类型              | 可选值      | 默认值 |
 |--------------------|----------------------------------------------------------|-------------------|-------------|--------|

examples/docs/tooltip.md

@@ -134,14 +134,14 @@ Tooltip 组件提供了两个不同的主题：`dark`和`light`。
 
 如果需要关闭`tooltip`功能，`disabled`属性可以满足这个需求，它接受一个`Boolean`，设置为`true`即可。
 
-事实上，这是基于[Vue-popper](https://github.com/element-component/vue-popper)的扩展，你可以自定义任意 Vue-popper 中允许定义的字段。
+事实上，这是基于 [Vue-popper](https://github.com/element-component/vue-popper) 的扩展，你可以自定义任意 Vue-popper 中允许定义的字段。
 
 当然，Tooltip 组件实际上十分强大，文末的API文档会做一一说明。
 
 :::demo
 ```html
 <template>
-  <el-tooltip :disabled="disabled" content="点击关闭 tooltip 功能" transition="slide-fade" placement="bottom" effect="light">
+  <el-tooltip :disabled="disabled" content="点击关闭 tooltip 功能" placement="bottom" effect="light">
     <el-button @click.native="disabled=true">点击关闭 tooltip 功能</el-button>
   </el-tooltip>
 </template>

packages/table/src/table-column.js

@@ -94,11 +94,16 @@ export default {
   data() {
     return {
       isChildColumn: false,
-      columns: [],
-      row: {}
+      columns: []
     };
   },
 
+  beforeCreate() {
+    this.row = {};
+    this.column = {};
+    this.$index = 0;
+  },
+
   components: {
     ElCheckbox,
     ElTag
@@ -137,8 +142,8 @@ export default {
 
     let property = this.property;
     if (property) {
-      template = function(h, { row }) {
-        return <span>{ this.$getPropertyText(row, property, columnId) }</span>;
+      template = function(h, { row }, parent) {
+        return <span>{ parent.$getPropertyText(row, property, columnId) }</span>;
       };
     }
 
@@ -161,12 +166,13 @@ export default {
 
     let renderColumn = column.template;
     let _self = this;
+
     column.template = function(h, data) {
       if (_self.$vnode.data.inlineTemplate) {
-        let costomRender = _self.$options.render;
+        let customRender = _self.$options.render;
 
-        renderColumn = function(_h) {
-          return costomRender.call(data, _h);
+        renderColumn = function() {
+          return customRender.call(objectAssign(_self, data));
         };
       };
 
@@ -176,10 +182,10 @@ export default {
             effect={ this.effect }
             placement="top"
             disabled={ this.tooltipDisabled }>
-            <div class="cell">{ renderColumn.call(this._renderProxy, h, data) }</div>
-            <span slot="content">{ renderColumn.call(this._renderProxy, h, data) }</span>
+            <div class="cell">{ renderColumn(h, data, this._renderProxy) }</div>
+            <span slot="content">{ renderColumn(h, data, this._renderProxy) }</span>
           </el-tooltip>
-        : <div class="cell">{ renderColumn.call(this._renderProxy, h, data) }</div>;
+        : <div class="cell">{ renderColumn(h, data, this._renderProxy) }</div>;
     };
 
     this.columnConfig = column;

packages/tree/src/transition.js

@@ -64,9 +64,6 @@ export default {
   functional: true,
   render(h, { children }) {
     const data = {
-      props: {
-        appear: true
-      },
       on: new Transition()
     };
 

packages/tree/src/tree-node.vue

@@ -6,13 +6,12 @@
       <span class="el-tree-node__expand-icon"
         :class="{ 'is-leaf': node.isLeaf, expanded: !node.isLeaf && expanded }"
         ></span>
-      <el-checkbox v-if="showCheckbox" :indeterminate="node.indeterminate" v-model="node.checked" :true-label="true" :false-label="false" @change="handleCheckChange"></el-checkbox>
+      <el-checkbox v-if="showCheckbox" :indeterminate="node.indeterminate" v-model="node.checked" @change="handleCheckChange"></el-checkbox>
       <!--<span class="el-tree-node__icon {{ node.icon }} {{ node.loading ? 'el-icon-loading' : '' }}" v-if="node.icon"></span>-->
       <span class="el-tree-node__label">{{ node.label }}</span>
     </div>
     <collapse-transition>
       <div class="el-tree-node__children"
-        v-if="childrenRendered"
         v-show="expanded">
         <el-tree-node v-for="child in node.children" :node="child"></el-tree-node>
       </div>