sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
Former-commit-id: cf18925b4ed71fb959c3b57a11f24968b82c7748 [formerly 89dc321115f9eee73b6b4ae793d113948ece49e5] [formerly cf18925b4ed71fb959c3b57a11f24968b82c7748 [formerly 89dc321115f9eee73b6b4ae793d113948ece49e5] [formerly cf18925b4ed71fb959c3b57a11f24968b82c7748 [formerly 89dc321115f9eee73b6b4ae793d113948ece49e5] [formerly 89dc321115f9eee73b6b4ae793d113948ece49e5 [formerly 05c181530e4c5c621ccd74dbf0c3e11fcd8049d9 [formerly e812237df20881f11d9fa8e800f82b58c2fd2c74]]]]]
Former-commit-id: 088ce0e957a356b7349b9148126158cebe5fffd3
Former-commit-id: fd2e47f2d2dcb4c40477cb9b914616ac1f72f4af
Former-commit-id: 7fdd1c177646f43839d388b3ad129624cd934fdb [formerly 925a5e5e01c04fb62d00d617aece570f3bb09d9d]
Former-commit-id: 74c1edce6d352f3b8056f077b4ee5d3bec0b448e
Former-commit-id: b06f5304f3d9edb44200b416a8da6c4d5654d73d
Former-commit-id: b5ea1068ca8a4ba130559540a2cc3142e38a6756
Former-commit-id: 821e4abfe6e1bbc0d5f39fa848e6b216f3ffd4a3
Former-commit-id: 48335cba8c5acd98af7ffe693bfe087fa1b71acc
This commit is contained in:
liyang
2019-03-22 22:49:52 +08:00
parent 28ae1a3692 8bddd8f5d4
commit 0fc0d5ff41
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "d2-admin",
"version": "1.6.17",
"version": "1.6.18",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",

8
src/components/d2-container/index.js
View File

@@ -38,11 +38,9 @@ export default {
}
},
render (h) {
const slots = [
h('div', this.$slots.default)
]
if (this.$slots.header) slots.push(h('div', { slot: 'header' }, [ this.$slots.header ]))
if (this.$slots.footer) slots.push(h('div', { slot: 'footer' }, [ this.$slots.footer ]))
const slots = [ this.$slots.default ]
if (this.$slots.header) slots.push(h('template', { slot: 'header' }, [ this.$slots.header ]))
if (this.$slots.footer) slots.push(h('template', { slot: 'footer' }, [ this.$slots.footer ]))
return h('div', {
ref: 'container',
class: 'container-component'