This commit is contained in:
Aresn 2017-05-22 10:49:46 +08:00
parent 3f17939d8e
commit 1e20ac5cf4
3 changed files with 10 additions and 15 deletions

View file

@ -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: [

View file

@ -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();
}
},

View file

@ -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({