From 1e20ac5cf4f5058834743404a30700b08d3d8cd0 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Mon, 22 May 2017 10:49:46 +0800
Subject: [PATCH] #958

---
 examples/routers/table.vue    |  8 ++++----
 src/components/form/form.vue  |  6 ++----
 src/components/table/cell.vue | 11 ++++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 0dc7340..1481548 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -11,7 +11,7 @@
         data () {
             return {
                 data1: 1,
-//                self: this,
+                self: this,
                 columns7: [
                     {
                         title: '姓名',
@@ -42,9 +42,9 @@
                         key: 'action',
                         width: 150,
                         align: 'center',
-                        render (row, column, index) {
-                            return `<i-button type="primary" size="small" @click="show(${index})">查看</i-button> <i-button type="error" size="small" @click="remove(${index})">删除</i-button>`;
-                        }
+//                        render (row, column, index) {
+//                            return `<i-button type="primary" size="small" @click="show(${index})">查看</i-button> <i-button type="error" size="small" @click="remove(${index})">删除</i-button>`;
+//                        }
                     }
                 ],
                 data6: [
diff --git a/src/components/form/form.vue b/src/components/form/form.vue
index cdc8342..13a880e 100644
--- a/src/components/form/form.vue
+++ b/src/components/form/form.vue
@@ -1,7 +1,5 @@
 <template>
-    <form :class="classes" @submit="formSubmit">
-        <slot></slot>
-    </form>
+    <form :class="classes" @submit="formSubmit"><slot></slot></form>
 </template>
 <script>
     // https://github.com/ElemeFE/element/blob/dev/packages/form/src/form.vue
@@ -78,7 +76,7 @@
 
                 field.validate('', cb);
             },
-            formSubmit(event){
+            formSubmit (event) {
                 event.preventDefault();
             }
         },
diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 5c034bd..d6cc78f 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -10,6 +10,7 @@
 <script>
     import Vue from 'vue';
     import Checkbox from '../checkbox/checkbox.vue';
+    import { findComponentUpward } from '../../utils/assist';
 
     export default {
         name: 'TableCell',
@@ -49,13 +50,9 @@
             compile () {
                 if (this.column.render) {
                     // 兼容真 Render，后期废弃旧用法
-                    let isRealRender = false;
-                    try {
-                        this.column.render(this.row, this.column, this.index);
-                    }
-                    catch (err) {
-                        isRealRender = true;
-                    }
+                    let isRealRender = true;
+                    const Table = findComponentUpward(this, 'Table');
+                    if (Table.context) isRealRender = false;
 
                     if (isRealRender) {
                         const component = new Vue({
--
libgit2 0.21.4