Skip to content

Commit 75fd49b

Browse files
committed
Add SSR, props.title support HTML
1 parent 6cf882b commit 75fd49b

13 files changed

+2296
-2144
lines changed

dist/example.js

Lines changed: 1665 additions & 1556 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/example.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-upload-component.js

Lines changed: 591 additions & 539 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-upload-component.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-upload-component.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-upload-component.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/App.vue

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1+
<template>
2+
<div id="app">
3+
<header id="header">
4+
<h1>Upload test</h1>
5+
<nav>
6+
<h2>Navigation</h2>
7+
<h3>Please click on the navigation</h3>
8+
<ul>
9+
<li><router-link to="/">Home</router-link></li>
10+
<li><router-link to="/multi">Multi components</router-link></li>
11+
<li><router-link to="/cross-router">Cross router</router-link></li>
12+
<li><router-link to="/vuex">Vuex</router-link></li>
13+
</ul>
14+
</nav>
15+
</header>
16+
<router-view id="main"></router-view>
17+
<footer id="footer">
18+
<div>Powered by:<a href="//www.lianyue.org">LianYue</a></div>
19+
</footer>
20+
</div>
21+
</template>
122
<style>
223
nav {
324
margin-bottom: 1em
425
}
526
</style>
627
<script>
728
export default {
8-
render(h) {
9-
return (
10-
<div id="app">
11-
<header id="header">
12-
<h1>Upload test</h1>
13-
<nav>
14-
<h2>Navigation</h2>
15-
<h3>Please click on the navigation</h3>
16-
<ul>
17-
<li><router-link to="/">Home</router-link></li>
18-
<li><router-link to="/multi">Multi components</router-link></li>
19-
<li><router-link to="/cross-router">Cross router</router-link></li>
20-
<li><router-link to="/vuex">Vuex</router-link></li>
21-
</ul>
22-
</nav>
23-
</header>
24-
<router-view id="main"></router-view>
25-
<footer id="footer">
26-
<div>Powered by:<a href="//www.lianyue.org">LianYue</a></div>
27-
</footer>
28-
</div>
29-
)
30-
}
3129
}
3230
</script>

example/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,5 @@ const router = new VueRouter({
7171
new Vue({
7272
router,
7373
store,
74-
render(h) {
75-
return h(App)
76-
}
74+
...App
7775
}).$mount('#app')

package.json

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333
"dependencies": {},
3434
"devDependencies": {
3535
"babel-core": "^6.0.0",
36-
"babel-helper-vue-jsx-merge-props": "^2.0.2",
3736
"babel-loader": "^6.0.0",
38-
"babel-plugin-syntax-jsx": "^6.18.0",
3937
"babel-plugin-transform-runtime": "^6.0.0",
40-
"babel-plugin-transform-vue-jsx": "^3.3.0",
4138
"babel-preset-es2015": "^6.0.0",
4239
"babel-preset-stage-0": "^6.5.0",
4340
"babel-runtime": "^6.0.0",
@@ -47,13 +44,12 @@
4744
"file-loader": "^0.8.4",
4845
"json-loader": "^0.5.4",
4946
"url-loader": "^0.5.7",
50-
"vue": "^2.2.1",
51-
"vue-hot-reload-api": "^1.2.0",
52-
"vue-html-loader": "^1.0.0",
53-
"vue-loader": "^9.5.0",
54-
"vue-router": "^2.3.0",
55-
"vue-style-loader": "^1.0.0",
56-
"vuex": "^2.2.1",
47+
"vue": "^2.2.6",
48+
"vue-hot-reload-api": "^1.3.3",
49+
"vue-loader": "^11.1.4",
50+
"vue-router": "^2.4.0",
51+
"vue-template-compiler": "^2.2.6",
52+
"vuex": "^2.3.1",
5753
"webpack": "^1.12.2",
5854
"webpack-dev-server": "^1.12.0"
5955
}

src/FileUpload.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<label class="file-uploads" :class="mode === 'html5' ? 'file-uploads-html5' : 'file-uploads-html4'">
3-
<span>{{title}}</span>
3+
<span class="file-uploads-title" v-html="title"></span>
44
<slot></slot>
55
<input-file></input-file>
66
</label>
@@ -125,6 +125,7 @@ export default {
125125
126126
// 挂载后
127127
mounted() {
128+
return
128129
var input = document.createElement('input');
129130
input.type = 'file';
130131
if (window.FormData && input.files) {
@@ -398,7 +399,7 @@ export default {
398399
399400
var inputFile = new Component({
400401
parent: this,
401-
el: el,
402+
el: el.parentNode,
402403
});
403404
},
404405

0 commit comments

Comments
 (0)