github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Table: fix render fail in vue-loader 9.9.0 (#1018)

pull/1008/head
cinwell.li 2016-11-13 11:44:29 +08:00 committed by FuryBean
parent 19ba77d7d2
commit cfafd3d191
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -112,7 +112,7 @@
"uppercamelcase": "^1.1.0", "uppercamelcase": "^1.1.0",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"vue": "^2.0.5", "vue": "^2.0.5",
"vue-loader": "^9.8.0", "vue-loader": "^9.9.0",
"vue-markdown-loader": "^0.5.1", "vue-markdown-loader": "^0.5.1",
"vue-router": "^2.0.0", "vue-router": "^2.0.0",
"webpack": "^1.13.2", "webpack": "^1.13.2",

13
packages/table/src/table-column.js
View File

@ -209,12 +209,13 @@ export default {
column.renderCell = function(h, data) { column.renderCell = function(h, data) {
if (_self.$vnode.data.inlineTemplate) { if (_self.$vnode.data.inlineTemplate) {
renderCell = function() { renderCell = function() {
data._staticTrees = _self._staticTrees; if (Object.prototype.toString.call(data._self) === '[object Object]') {
data.$options = {}; for (let prop in data._self) {
data.$options.staticRenderFns = _self.$options.staticRenderFns; if (!data.hasOwnProperty(prop)) {
data._renderProxy = _self._renderProxy; data[prop] = data._self[prop];
data._m = _self._m; }
}
}
return _self.customRender.call(data); return _self.customRender.call(data);
}; };
} }