Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 0acf806

Browse files
更新2.24
2 parents 8921977 + 9d7aaf9 commit 0acf806

File tree

9 files changed

+47
-43
lines changed

9 files changed

+47
-43
lines changed

‎src/v2/guide/components.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,18 @@ Vue.component(
10111011
)
10121012
```
10131013

1014+
When using [local registration](https://vuejs.org/v2/guide/components.html#Local-Registration), you can also directly provide a function that returns a `Promise`:
1015+
1016+
``` js
1017+
new Vue({
1018+
// ...
1019+
components: {
1020+
'my-component': () => import('./my-async-component')
1021+
}
1022+
})
1023+
```
1024+
1025+
10141026
<p class="tip">如果你是需要使用异步组件的 <strong>Browserify</strong> 用户,可能就无法使用异步组件了,它的作者已经[明确表示](https://github.com/substack/node-browserify/issues/58#issuecomment-21978224)很不幸 Browserify 是不支持异步加载的。Browserify 社区找到了 [一些解决方法](https://github.com/vuejs/vuejs.org/issues/620),这可能对现有的和复杂的应用程序有所帮助。对于所有其他场景,我们推荐简单地使用 Webpack 所内置的一流异步支持。</p>
10151027

10161028
### 组件命名约定

‎themes/vue/layout/index.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
<div id="hero">
88
<div class="inner">
99
<div class="left">
10-
<img class="hero-logo" src="/images/logo.png">
10+
<img class="hero-logo" src="<%- url_for("/images/logo.png") %>">
1111
</div><div class="right">
1212
<h2 class="vue">Vue.js</h2>
1313
<h1>
1414
渐进式<br>JavaScript 框架
1515
</h1>
1616
<p>
17-
<a class="button" href="/v2/guide/">起步</a>
17+
<a class="button" href="<%- url_for("/v2/guide/") %>">起步</a>
1818
<a class="button white" href="https://github.com/vuejs/vue" target="_blank">GITHUB</a>
1919
</p>
2020
</div>
@@ -51,7 +51,7 @@
5151
<h3>赞助者</h3>
5252
<%- partial('partials/sponsors') %>
5353
<br>
54-
<a class="become-sponsor button white" href="/support-vuejs/">成为赞助者</a>
54+
<a class="become-sponsor button white" href="<%- url_for("/support-vuejs/") %>">成为赞助者</a>
5555
</div>
5656
</div>
5757

‎themes/vue/layout/layout.ejs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
<meta property="og:type" content="article">
1010
<meta property="og:title" content="<%- page.title ? page.title + ' — ' : '' %>Vue.js">
1111
<meta property="og:description" content="<%- theme.site_description %>">
12-
<meta property="og:image" content="https://<%- theme.root_domain %>/images/logo.png">
12+
<meta property="og:image" content="https://<%- theme.root_domain %>/<%- url_for("/images/logo.png") %>">
1313

1414
<meta name="twitter:card" content="summary">
1515
<meta name="twitter:title" content="<%- page.title ? page.title + ' — ' : '' %>Vue.js">
1616
<meta name="twitter:description" content="<%- theme.site_description %>">
1717
<meta name="twitter:image" content="https://<%- theme.root_domain %>/images/logo.png">
1818

19-
<link rel="icon" href="/images/logo.png" type="image/x-icon">
19+
<link rel="icon" href="<%- url_for("/images/logo.png") %>" type="image/x-icon">
2020

2121
<!-- main page styles -->
2222
<%- css(isIndex ? 'css/index' : 'css/page') %>
2323

2424
<!-- this needs to be loaded before guide's inline scripts -->
25-
<script src="/js/vue.js"></script>
25+
<script src="<%- url_for("/js/vue.js") %>"></script>
2626
<script>window.PAGE_TYPE = "<%- page.type %>"</script>
2727
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
2828
<script>
@@ -50,14 +50,14 @@
5050
<%- body %>
5151
<% } %>
5252
</div>
53-
<script src="/js/smooth-scroll.min.js"></script>
53+
<script src="<%- url_for("/js/smooth-scroll.min.js") %>"></script>
5454
<% } else { %>
5555
<%- body %>
5656
<% } %>
5757

5858
<!-- main custom script for sidebars, version selects etc. -->
59-
<script src="/js/css.escape.js"></script>
60-
<script src="/js/common.js"></script>
59+
<script src="<%- url_for("/js/css.escape.js") %>"></script>
60+
<script src="<%- url_for("/js/common.js") %>"></script>
6161

6262
<!-- search -->
6363
<link href="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" rel='stylesheet' type='text/css'>

‎themes/vue/layout/partials/header.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div id="header">
2-
<a id="logo" href="/">
3-
<img src="/images/logo.png">
4-
<span>Vue.js <span style="font-size: 12px;">(2017.02.20更新,合并vuejs.org更新!)</span></span>
2+
<a id="logo" href="<%- url_for("/") %>">
3+
<img src="<%- url_for("/images/logo.png") %>">
4+
<span>Vue.js <span style="font-size: 12px;">(2017.02.24更新,合并vuejs.org更新!)</span></span>
55
</a>
66
<a style="
77
position: absolute;

‎themes/vue/layout/partials/main_menu.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<input type="text" id="search-query-<%- context %>" class="search-query st-default-search-input">
44
</form>
55
</li>
6-
<li><a href="/v2/guide/" class="nav-link<%- page.path.match(/guide/) ? ' current' : '' %>">教程</a></li>
7-
<li><a href="/v2/api/" class="nav-link<%- page.path.match(/api/) ? ' current' : '' %>">API</a></li>
8-
<li><a href="/v2/examples/" class="nav-link<%- page.path.match(/examples/) ? ' current' : '' %>">示例</a></li>
6+
<li><a href="<%- url_for("/v2/guide/") %>" class="nav-link<%- page.path.match(/guide/) ? ' current' : '' %>">教程</a></li>
7+
<li><a href="<%- url_for("/v2/api/") %>" class="nav-link<%- page.path.match(/api/) ? ' current' : '' %>">API</a></li>
8+
<li><a href="<%- url_for("/v2/examples/") %>" class="nav-link<%- page.path.match(/examples/) ? ' current' : '' %>">示例</a></li>
99
<%- partial('partials/about_dropdown') %>
1010
<%- partial('partials/ecosystem_dropdown') %>
1111
<%- partial('partials/community_dropdown') %>

‎themes/vue/layout/partials/sidebar.ejs‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,9 @@
33
<%- partial('partials/main_menu', { context: 'sidebar' }) %>
44
</ul>
55
<div class="list">
6-
<!-- <div class="main-sponsor">
7-
<span>赞助者</span><br>
8-
<a href="http://www.thedifferenceengine.io/" target="_blank"
9-
style="background-color: #f3f3f3; padding: 10px 0">
10-
<img src="/images/tde.png">
11-
</a>
12-
</div>
13-
<a class="become-backer" href="/support-vuejs">
6+
<a class="become-backer" href="<%- url_for("/support-vuejs") %>">
147
成为赞助者
15-
</a> -->
16-
8+
</a>
179
<h2>
1810
<% titles = {api: 'API', examples: '示例', guide: '教程'} %>
1911
<% if (type !== 'cookbook') { %>
@@ -49,7 +41,7 @@
4941
<!-- at least one recipe -->
5042
<% } %>
5143
<li>
52-
<a href="/<%- p.path %>" class="sidebar-link<%- page.title === p.title ? ' current' : '' %><%- p.is_new ? ' new' : '' %>"><%- p.title %></a>
44+
<a href="<%- url_for(p.path) %>" class="sidebar-link<%- page.title === p.title ? ' current' : '' %><%- p.is_new ? ' new' : '' %>"><%- p.title %></a>
5345
</li>
5446
<% }) %>
5547
<% if (type === 'cookbook') { %>
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
<a class="vip" href="http://www.thedifferenceengine.io/" target="_blank">
2-
<img src="/images/tde.png">
2+
<img src="<%- url_for("/images/tde.png") %>">
33
</a>
44
<a href="https://jsfiddle.net/" target="_blank">
5-
<img src="/images/jsfiddle.png">
5+
<img src="<%- url_for("/images/jsfiddle.png") %>">
66
</a>
77
<a href="https://laravel.com/" target="_blank">
8-
<img src="/images/laravel.png">
8+
<img src="<%- url_for("/images/laravel.png") %>">
99
</a>
1010
<a href="https://chaitin.cn" target="_blank" style="top:-1px">
11-
<img src="/images/chaitin.png">
11+
<img src="<%- url_for("/images/chaitin.png") %>">
1212
</a>
1313
<a href="https://htmlburger.com" target="_blank">
14-
<img src="/images/htmlburger.png">
14+
<img src="<%- url_for("/images/htmlburger.png") %>">
1515
</a>
1616
<a href="https://starter.someline.com/" target="_blank" style="top:-2px">
17-
<img src="/images/someline.png">
17+
<img src="<%- url_for("/images/someline.png") %>">
1818
</a>
1919
<a href="http://monterail.com/" target="_blank">
20-
<img src="/images/monterail.png">
20+
<img src="<%- url_for("/images/monterail.png") %>">
2121
</a>
2222
<a href="https://www.trisoft.ro/" target="_blank" style="width:80px;top:-2px">
23-
<img src="/images/trisoft.png" style="width:80px">
23+
<img src="<%- url_for("/images/trisoft.png") %>" style="width:80px">
2424
</a>
2525
<a href="http://actualize.co/" target="_blank" style="width:144px;">
26-
<img src="/images/actualize.png" style="width:144px">
26+
<img src="<%- url_for("/images/actualize.png") %>" style="width:144px">
2727
</a>
2828
<a href="https://www.2mhost.com/" target="_blank" style="width:90px">
29-
<img src="/images/2mhost.png" style="width:90px">
29+
<img src="<%- url_for("/images/2mhost.png") %>" style="width:90px">
3030
</a>
3131
<a href="https://vuejobs.com/?ref=vuejs" target="_blank" style="width:90px;top:5px">
32-
<img src="/images/vuejobs.png" style="width:90px">
32+
<img src="<%- url_for("/images/vuejobs.png") %>" style="width:90px">
3333
</a>
3434
<a href="https://leanpub.com/vuejs2" target="_blank">
35-
<img src="/images/tmvuejs2.png">
35+
<img src="<%- url_for("/images/tmvuejs2.png") %>">
3636
</a>
3737
<a href="https://stdlib.com/" target="_blank" style="width:80px">
38-
<img src="/images/stdlib.png">
39-
</a>
38+
<img src="<%- url_for("/images/stdlib.png") %>">
39+
</a>

‎themes/vue/layout/post.ejs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<div class="list">
66
<h2>
77
Recent Posts
8-
<a href="/atom.xml" target="_blank" style="vertical-align: middle; margin-left: 5px">
9-
<img src="/images/feed.png" style="width:15px;height:15px">
8+
<a href="<%- url_for("/atom.xml") %>" target="_blank" style="vertical-align: middle; margin-left: 5px">
9+
<img src="<%- url_for("/images/feed.png") %>" style="width:15px;height:15px">
1010
</a>
1111
</h2>
1212
<ul style="padding:0">

‎themes/vue/source/css/_header.styl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ body.docs
4747
border-radius 15px
4848
margin-right 10px
4949
transition border-color .2s ease
50-
background #fff url(/images/search.png) 8px 5px no-repeat
50+
background #fff url(../images/search.png) 8px 5px no-repeat
5151
background-size 20px
5252
vertical-align middle !important
5353
&:focus

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /