|
@@ -61,9 +61,7 @@
|
|
|
>
|
|
>
|
|
|
<template slot-scope="scope" >
|
|
<template slot-scope="scope" >
|
|
|
<!--mapping属性-->
|
|
<!--mapping属性-->
|
|
|
- <span v-if="sub.stype == 'mapping'">{{
|
|
|
|
|
- mapping(scope.row, sub)
|
|
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ <span v-if="sub.stype == 'mapping'" v-html="mapping(scope.row, sub)"></span>
|
|
|
<span v-else-if="sub.stype === 'custom'">
|
|
<span v-else-if="sub.stype === 'custom'">
|
|
|
<component :is="sub.cellComp" :item="sub" :rowData="scope.row" @eventBus="cellCompEvent(scope.row,sub)"/>
|
|
<component :is="sub.cellComp" :item="sub" :rowData="scope.row" @eventBus="cellCompEvent(scope.row,sub)"/>
|
|
|
</span>
|
|
</span>
|
|
@@ -132,7 +130,7 @@
|
|
|
:disabled="opt.hasOwnProperty('disabled') ? opt.disabled : false"
|
|
:disabled="opt.hasOwnProperty('disabled') ? opt.disabled : false"
|
|
|
@click="optCellData(scope.row, opt)"
|
|
@click="optCellData(scope.row, opt)"
|
|
|
>
|
|
>
|
|
|
- {{ opt.name }}
|
|
|
|
|
|
|
+ <span v-html="opt.name"></span>
|
|
|
</el-button>
|
|
</el-button>
|
|
|
</template>
|
|
</template>
|
|
|
<span v-else-if="item.stype === 'slot'">
|
|
<span v-else-if="item.stype === 'slot'">
|
|
@@ -464,9 +462,7 @@
|
|
|
>
|
|
>
|
|
|
</span>
|
|
</span>
|
|
|
<!--mapping属性-->
|
|
<!--mapping属性-->
|
|
|
- <span v-else-if="item.stype == 'mapping'">{{
|
|
|
|
|
- mapping(scope.row, item)
|
|
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ <span v-else-if="item.stype == 'mapping'" v-html="mapping(scope.row, item)"></span>
|
|
|
<!--rate属性-->
|
|
<!--rate属性-->
|
|
|
<span v-else-if="item.stype == 'rate'">
|
|
<span v-else-if="item.stype == 'rate'">
|
|
|
<el-rate
|
|
<el-rate
|