Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
m0_68066342
uni-app
提交
863dca44
U
uni-app
项目概览
m0_68066342
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
863dca44
编写于
12月 30, 2022
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(mp-weixin): template with array length #1827
上级
c4087589
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
99 addition
and
12 deletion
+99
-12
packages/uni-template-compiler/__tests__/compiler-extra.spec.js
...es/uni-template-compiler/__tests__/compiler-extra.spec.js
+12
-12
packages/uni-template-compiler/__tests__/compiler-mp-alipay.spec.js
...ni-template-compiler/__tests__/compiler-mp-alipay.spec.js
+6
-0
packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
...ni-template-compiler/__tests__/compiler-mp-weixin.spec.js
+48
-0
packages/uni-template-compiler/lib/script/traverse/visitor.js
...ages/uni-template-compiler/lib/script/traverse/visitor.js
+5
-0
packages/uni-template-compiler/lib/util.js
packages/uni-template-compiler/lib/util.js
+28
-0
未找到文件。
packages/uni-template-compiler/__tests__/compiler-extra.spec.js
浏览文件 @
863dca44
...
...
@@ -850,19 +850,19 @@ describe('mp:compiler-extra', () => {
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var m0=item?getValue(item):null;return{$orig:$orig,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
)
assertCodegen
(
'
<view v-for="(item,index) in list" :key="index"><view v-if="item.
length
">{{getValue(item)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.$orig.
length
}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var m0=item.
length
?getValue(item):null;return{$orig:$orig,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
'
<view v-for="(item,index) in list" :key="index"><view v-if="item.
num
">{{getValue(item)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.$orig.
num
}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var m0=item.
num
?getValue(item):null;return{$orig:$orig,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
)
assertCodegen
(
'
<view v-for="(item,index) in list" :key="index"><view v-if="item.
length
>0">{{getValue(item)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.$orig.
length
>0}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var m0=item.
length
>0?getValue(item):null;return{$orig:$orig,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
'
<view v-for="(item,index) in list" :key="index"><view v-if="item.
num
>0">{{getValue(item)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.$orig.
num
>0}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var m0=item.
num
>0?getValue(item):null;return{$orig:$orig,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
)
assertCodegen
(
'
<view v-for="(item,index) in list" :key="index"><view v-if="item.
length
>0">{{test(
\'
item
\'
)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.$orig.
length
>0}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var m0=item.
length
>0?test("item"):null;return{$orig:$orig,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
'
<view v-for="(item,index) in list" :key="index"><view v-if="item.
num
>0">{{test(
\'
item
\'
)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.$orig.
num
>0}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var m0=item.
num
>0?test("item"):null;return{$orig:$orig,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
)
assertCodegen
(
'
<view v-for="(item,index) in list" :key="index"><view v-if="test(item)">{{test(
\'
item
\'
)}}</view></view>
'
,
...
...
@@ -875,9 +875,9 @@ describe('mp:compiler-extra', () => {
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var m0=test(item.id);var m1=m0?test(item.type):null;var m2=m0&&m1?test("item"):null;return{$orig:$orig,m0:m0,m1:m1,m2:m2}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
)
assertCodegen
(
'
<view v-for="(item,index) in list" :key="index"><view v-if="Object.values(item.list)
.length
">{{test(item.list)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.g0
.length
}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var g0=Object.values(item.list);var m0=g0
.length
?test(item.list):null;return{$orig:$orig,g0:g0,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
'
<view v-for="(item,index) in list" :key="index"><view v-if="Object.values(item.list)
[0]
">{{test(item.list)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.g0
[0]
}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var g0=Object.values(item.list);var m0=g0
[0]
?test(item.list):null;return{$orig:$orig,g0:g0,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
)
})
})
packages/uni-template-compiler/__tests__/compiler-mp-alipay.spec.js
浏览文件 @
863dca44
...
...
@@ -288,4 +288,10 @@ describe('mp:compiler-mp-alipay', () => {
'
<life-follow data-event-opts="{{[[
\'
close
\'
,[[
\'
close
\'
,[
\'
$event
\'
]]]]]}}" onClose="__e"></life-follow>
'
)
})
it
(
'
template with array length
'
,
()
=>
{
assertCodegen
(
'
<view>{{array.length}}</view>
'
,
'
<view>{{array.length}}</view>
'
)
})
})
packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
浏览文件 @
863dca44
...
...
@@ -359,4 +359,52 @@ describe('mp:compiler-mp-weixin', () => {
'
<test data-custom-hidden="{{!(shown)}}" vue-id="551070e6-1" bind:__l="__l" vue-slots="{{[
\'
default
\'
]}}">hello world</test>
'
)
})
it
(
'
template with array length
'
,
()
=>
{
assertCodegen
(
'
<view>{{array.length}}</view>
'
,
'
<view>{{$root.g0}}</view>
'
,
'
with(this){var g0=array.length;$mp.data=Object.assign({},{$root:{g0:g0}})}
'
)
assertCodegen
(
'
<view>{{array[
\'
length
\'
]}}</view>
'
,
'
<view>{{$root.g0}}</view>
'
,
'
with(this){var g0=array["length"];$mp.data=Object.assign({},{$root:{g0:g0}})}
'
)
assertCodegen
(
'
<button :disabled="array.length===0">hello world</button>
'
,
'
<button disabled="{{$root.g0===0}}">hello world</button>
'
,
'
with(this){var g0=array.length;$mp.data=Object.assign({},{$root:{g0:g0}})}
'
)
assertCodegen
(
'
<view :class="
\'
c
\'
+array.length">hello world</view>
'
,
'
<view class="{{[
\'
c
\'
+$root.g0]}}">hello world</view>
'
,
'
with(this){var g0=array.length;$mp.data=Object.assign({},{$root:{g0:g0}})}
'
)
assertCodegen
(
'
<view :style="array.length===0?
\'
height:30px;
\'
:
\'
height:10px;
\'
">hello world</view>
'
,
'
<view style="{{($root.g0===0?
\'
height:30px;
\'
:
\'
height:10px;
\'
)}}">hello world</view>
'
,
'
with(this){var g0=array.length;$mp.data=Object.assign({},{$root:{g0:g0}})}
'
)
assertCodegen
(
'
<view v-if="array.length">hello</view>
'
,
'
<block wx:if="{{$root.g0}}"><view>hello</view></block>
'
,
'
with(this){var g0=array.length;$mp.data=Object.assign({},{$root:{g0:g0}})}
'
)
assertCodegen
(
'
<view v-show="array.length">hello</view>
'
,
'
<view hidden="{{!($root.g0)}}">hello</view>
'
,
'
with(this){var g0=array.length;$mp.data=Object.assign({},{$root:{g0:g0}})}
'
)
assertCodegen
(
'
<view v-for="(item,index) in list" :key="index"><view v-if="item.length">{{getValue(item)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.g0}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var g0=item.length;var m0=g0?getValue(item):null;return{$orig:$orig,g0:g0,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
)
assertCodegen
(
'
<view v-for="(item,index) in list" :key="index"><view v-if="Object.values(item.list).length">{{test(item.list)}}</view></view>
'
,
'
<block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:if="{{item.g0}}"><view>{{item.m0}}</view></block></view></block>
'
,
'
with(this){var l0=__map(list,function(item,index){var $orig=__get_orig(item);var g0=Object.values(item.list).length;var m0=g0?test(item.list):null;return{$orig:$orig,g0:g0,m0:m0}});$mp.data=Object.assign({},{$root:{l0:l0}})}
'
)
})
})
packages/uni-template-compiler/lib/script/traverse/visitor.js
浏览文件 @
863dca44
...
...
@@ -25,6 +25,7 @@ const {
traverseFilter
,
getComponentName
,
hasEscapeQuote
,
hasLengthProperty
,
isRootElement
}
=
require
(
'
../../util
'
)
...
...
@@ -148,6 +149,10 @@ module.exports = {
)
{
path
.
skip
()
}
// 微信小程序平台无法观测 Array length 访问:https://developers.weixin.qq.com/community/develop/doc/000c8ee47d87a0d5b6685a8cb57000
if
(
this
.
options
.
platform
.
name
===
'
mp-weixin
'
&&
hasLengthProperty
(
path
))
{
path
.
replaceWith
(
getMemberExpr
(
path
,
IDENTIFIER_GLOBAL
,
path
.
node
,
this
))
}
},
CallExpression
(
path
)
{
const
callee
=
path
.
node
.
callee
...
...
packages/uni-template-compiler/lib/util.js
浏览文件 @
863dca44
...
...
@@ -270,6 +270,33 @@ function hasEscapeQuote (path) {
}
return
has
}
/**
* 是否包含属性 length 访问
* @param {*} path
* @returns {boolean}
*/
function
hasLengthProperty
(
path
)
{
let
has
=
false
function
hasLengthProperty
(
node
)
{
const
property
=
node
.
property
// 暂不考虑动态拼接和模板字符串
return
t
.
isIdentifier
(
property
,
{
name
:
'
length
'
})
||
t
.
isStringLiteral
(
property
,
{
value
:
'
length
'
})
}
if
(
path
.
isMemberExpression
())
{
return
hasLengthProperty
(
path
.
node
)
}
else
{
path
.
traverse
({
noScope
:
true
,
MemberExpression
(
path
)
{
if
(
hasLengthProperty
(
path
.
node
))
{
has
=
true
path
.
stop
()
}
}
})
}
return
has
}
function
isRootElement
(
path
)
{
const
result
=
path
.
findParent
(
path
=>
(
path
.
isCallExpression
()
&&
path
.
get
(
'
callee
'
).
isIdentifier
({
name
:
METHOD_CREATE_ELEMENT
}))
||
path
.
isReturnStatement
())
...
...
@@ -308,5 +335,6 @@ module.exports = {
getForIndexIdentifier
,
isSimpleObjectExpression
,
hasEscapeQuote
,
hasLengthProperty
,
isRootElement
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录