Movatterモバイル変換

[0]ホーム
URL:

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
forked fromvuejs/vue

Commit2e0f6d5

Browse files
committed
refactor: reuse v-for parsing logic
1 parent1dd6b6f commit2e0f6d5

File tree

2 files changed

+46
-38
lines changed

2 files changed

+46
-38
lines changed

‎src/compiler/parser/index.js

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import he from 'he'
44
import{parseHTML}from'./html-parser'
55
import{parseText}from'./text-parser'
66
import{parseFilters}from'./filter-parser'
7-
import{cached,no,camelize}from'shared/util'
87
import{genAssignmentCode}from'../directives/model'
8+
import{extend,cached,no,camelize}from'shared/util'
99
import{isIE,isEdge,isServerRendering}from'core/util/env'
1010

1111
import{
@@ -23,7 +23,7 @@ export const onRE = /^@|^v-on:/
2323
exportconstdirRE=/^v-|^@|^:/
2424
exportconstforAliasRE=/(.*?)\s+(?:in|of)\s+(.*)/
2525
exportconstforIteratorRE=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/
26-
exportconststripParensRE=/^\(|\)$/g
26+
conststripParensRE=/^\(|\)$/g
2727

2828
constargRE=/:(.*)$/
2929
exportconstbindRE=/^:|^v-bind:/
@@ -355,26 +355,34 @@ function processRef (el) {
355355
exportfunctionprocessFor(el:ASTElement){
356356
letexp
357357
if((exp=getAndRemoveAttr(el,'v-for'))){
358-
constinMatch=exp.match(forAliasRE)
359-
if(!inMatch){
360-
process.env.NODE_ENV!=='production'&&warn(
358+
constres=parseFor(exp)
359+
if(res){
360+
extend(el,res)
361+
}elseif(process.env.NODE_ENV!=='production'){
362+
warn(
361363
`Invalid v-for expression:${exp}`
362364
)
363-
return
364365
}
365-
el.for=inMatch[2].trim()
366-
constalias=inMatch[1].trim().replace(stripParensRE,'')
367-
constiteratorMatch=alias.match(forIteratorRE)
368-
if(iteratorMatch){
369-
el.alias=alias.replace(forIteratorRE,'')
370-
el.iterator1=iteratorMatch[1].trim()
371-
if(iteratorMatch[2]){
372-
el.iterator2=iteratorMatch[2].trim()
373-
}
374-
}else{
375-
el.alias=alias
366+
}
367+
}
368+
369+
exportfunctionparseFor(exp:string): ?Object{
370+
constinMatch=exp.match(forAliasRE)
371+
if(!inMatch)return
372+
constres={}
373+
res.for=inMatch[2].trim()
374+
constalias=inMatch[1].trim().replace(stripParensRE,'')
375+
constiteratorMatch=alias.match(forIteratorRE)
376+
if(iteratorMatch){
377+
res.alias=alias.replace(forIteratorRE,'')
378+
res.iterator1=iteratorMatch[1].trim()
379+
if(iteratorMatch[2]){
380+
res.iterator2=iteratorMatch[2].trim()
376381
}
382+
}else{
383+
res.alias=alias
377384
}
385+
returnres
378386
}
379387

380388
functionprocessIf(el){
Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
/*@flow */
22

3-
import{forAliasRE,forIteratorRE,stripParensRE}from'compiler/parser/index'
3+
import{parseFor}from'compiler/parser/index'
44
import{getAndRemoveAttr,addRawAttr}from'compiler/helpers'
55

66
exportfunctionpreTransformVFor(el:ASTElement,options:WeexCompilerOptions){
77
constexp=getAndRemoveAttr(el,'v-for')
88
if(!exp){
99
return
1010
}
11-
constinMatch=exp.match(forAliasRE)
12-
if(inMatch){
13-
constalias=inMatch[1].trim().replace(stripParensRE,'')
14-
constdesc:Object={
15-
'@expression':inMatch[2].trim(),
16-
'@alias':alias
17-
}
18-
constiteratorMatch=alias.match(forIteratorRE)
19-
if(iteratorMatch){
20-
desc['@alias']=alias.replace(forIteratorRE,'')
21-
if(iteratorMatch[2]){
22-
desc['@key']=iteratorMatch[1].trim()
23-
desc['@index']=iteratorMatch[2].trim()
24-
}else{
25-
desc['@index']=iteratorMatch[1].trim()
26-
}
11+
12+
constres=parseFor(exp)
13+
if(!res){
14+
if(process.env.NODE_ENV!=='production'&&options.warn){
15+
options.warn(`Invalid v-for expression:${exp}`)
2716
}
28-
deleteel.attrsMap['v-for']
29-
addRawAttr(el,'[[repeat]]',desc)
30-
}elseif(process.env.NODE_ENV!=='production'&&options.warn){
31-
options.warn(`Invalid v-for expression:${exp}`)
17+
return
3218
}
19+
20+
constdesc:Object={
21+
'@expression':res.for,
22+
'@alias':res.alias
23+
}
24+
if(res.iterator2){
25+
desc['@key']=res.iterator1
26+
desc['@index']=res.iterator2
27+
}else{
28+
desc['@index']=res.iterator1
29+
}
30+
31+
deleteel.attrsMap['v-for']
32+
addRawAttr(el,'[[repeat]]',desc)
3333
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp