drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#958

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/routers/table.vue
View file

@ -11,7 +11,7 @@
data () { data () {
return { return {
data1: 1, data1: 1,
// self: this, self: this,
columns7: [ columns7: [
{ {
title: '姓名', title: '姓名',
@ -42,9 +42,9 @@
key: 'action', key: 'action',
width: 150, width: 150,
align: 'center', align: 'center',
render (row, column, index) { // 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>`; // return `<i-button type="primary" size="small" @click="show(${index})">查看</i-button> <i-button type="error" size="small" @click="remove(${index})">删除</i-button>`;
} // }
} }
], ],
data6: [ data6: [

6
src/components/form/form.vue
View file

@ -1,7 +1,5 @@
<template> <template>
<form :class="classes" @submit="formSubmit"> <form :class="classes" @submit="formSubmit"><slot></slot></form>
<slot></slot>
</form>
</template> </template>
<script> <script>
// https://github.com/ElemeFE/element/blob/dev/packages/form/src/form.vue // https://github.com/ElemeFE/element/blob/dev/packages/form/src/form.vue
@ -78,7 +76,7 @@
field.validate('', cb); field.validate('', cb);
}, },
formSubmit(event){ formSubmit (event) {
event.preventDefault(); event.preventDefault();
} }
}, },

11
src/components/table/cell.vue
View file

@ -10,6 +10,7 @@
<script> <script>
import Vue from 'vue'; import Vue from 'vue';
import Checkbox from '../checkbox/checkbox.vue'; import Checkbox from '../checkbox/checkbox.vue';
import { findComponentUpward } from '../../utils/assist';
export default { export default {
name: 'TableCell', name: 'TableCell',
@ -49,13 +50,9 @@
compile () { compile () {
if (this.column.render) { if (this.column.render) {
// 兼容真 Render，后期废弃旧用法 // 兼容真 Render，后期废弃旧用法
let isRealRender = false; let isRealRender = true;
try { const Table = findComponentUpward(this, 'Table');
this.column.render(this.row, this.column, this.index); if (Table.context) isRealRender = false;
}
catch (err) {
isRealRender = true;
}
if (isRealRender) { if (isRealRender) {
const component = new Vue({ const component = new Vue({