Skip to content

Commit 3b17522

Browse files
authored
Merge pull request #147 from wechat-miniprogram/fix-deprecated-wx-for-items
fix: deprecate `wx:for-items` WXML directive by `wx:for`
2 parents fd34c54 + e06be11 commit 3b17522

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

miniprogram/page/API/index.wxml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</view>
99
<view class="index-bd">
1010
<view class="kind-list">
11-
<block wx:for-items="{{list}}" wx:key="{{item.id}}">
11+
<block wx:for="{{list}}" wx:key="{{item.id}}">
1212
<view class="kind-list-item">
1313
<view id="{{item.id}}" class="kind-list-item-hd {{item.open ? 'kind-list-item-hd-show' : ''}}" bindtap="kindToggle">
1414
<view class="kind-list-text">{{item.name}}</view>
@@ -17,7 +17,7 @@
1717
</view>
1818
<view class="kind-list-item-bd {{item.open ? 'kind-list-item-bd-show' : ''}}">
1919
<view class="navigator-box {{item.open ? 'navigator-box-show' : ''}}">
20-
<block wx:for-items="{{item.pages}}" wx:for-item="page" wx:key="*item">
20+
<block wx:for="{{item.pages}}" wx:for-item="page" wx:key="*item">
2121
<view wx:if="{{page.url !== '@set-tab-bar'}}">
2222
<navigator url="../../packageAPI/pages/{{item.id}}/{{page.url}}" class="navigator {{index + 1 === item.pages.length ? '' : 'navigator-bottom-line'}}">{{page.zh}}</navigator>
2323
<view class="navigator-arrow"></view>

miniprogram/page/animation/index.wxml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
</view>
99
<view class="index-bd">
1010
<view class="kind-list">
11-
<block wx:for-items="{{list}}" wx:key="{{item.id}}">
11+
<block wx:for="{{list}}" wx:key="{{item.id}}">
1212
<view class="kind-list-item">
1313
<view id="{{item.id}}" class="kind-list-item-hd {{item.open ? 'kind-list-item-hd-show' : ''}}" bindtap="kindToggle">
1414
<view class="kind-list-text">{{item.name}}</view>
1515
</view>
1616
<view class="kind-list-item-bd {{item.open ? 'kind-list-item-bd-show' : ''}}">
1717
<view class="navigator-box {{item.open ? 'navigator-box-show' : ''}}">
18-
<block wx:for-items="{{item.pages}}" wx:for-item="page" wx:key="*item">
18+
<block wx:for="{{item.pages}}" wx:for-item="page" wx:key="*item">
1919
<view wx:if="{{page.appid}}">
2020
<navigator target="miniProgram" open-type="navigate" app-id="{{page.appid}}" path="" extra-data="" version="release" class="navigator {{index + 1 === item.pages.length ? '' : 'navigator-bottom-line'}}">{{page.name}}</navigator>
2121
<view class="navigator-arrow"></view>

miniprogram/page/cloud/index.wxml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</view>
99
<view class="index-bd">
1010
<view class="kind-list">
11-
<block wx:for-items="{{list}}" wx:key="{{item.id}}">
11+
<block wx:for="{{list}}" wx:key="{{item.id}}">
1212
<view class="kind-list-item">
1313
<view id="{{item.id}}" class="kind-list-item-hd {{item.open ? 'kind-list-item-hd-show' : ''}}" bindtap="kindToggle">
1414
<view class="kind-list-text">{{item.name}}</view>
@@ -17,7 +17,7 @@
1717
</view>
1818
<view class="kind-list-item-bd {{item.open ? 'kind-list-item-bd-show' : ''}}">
1919
<view class="navigator-box {{item.open ? 'navigator-box-show' : ''}}">
20-
<block wx:for-items="{{item.pages}}" wx:for-item="page" wx:key="*item">
20+
<block wx:for="{{item.pages}}" wx:for-item="page" wx:key="*item">
2121
<view>
2222
<navigator url="../../packageCloud/pages/{{item.id}}/{{page.url}}" class="navigator {{index + 1 === item.pages.length ? '' : 'navigator-bottom-line'}}">{{page.zh}}</navigator>
2323
<view class="navigator-arrow"></view>

miniprogram/page/component/index.wxml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</view>
99
<view class="index-bd">
1010
<view class="kind-list">
11-
<block wx:for-items="{{list}}" wx:key="{{item.id}}">
11+
<block wx:for="{{list}}" wx:key="{{item.id}}">
1212
<view class="kind-list-item">
1313
<view id="{{item.id}}" class="kind-list-item-hd {{item.open ? 'kind-list-item-hd-show' : ''}}" bindtap="kindToggle">
1414
<view class="kind-list-text">{{item.name}}</view>
@@ -17,7 +17,7 @@
1717
</view>
1818
<view class="kind-list-item-bd {{item.open ? 'kind-list-item-bd-show' : ''}}">
1919
<view class="navigator-box {{item.open ? 'navigator-box-show' : ''}}">
20-
<block wx:for-items="{{item.pages}}" wx:for-item="page" wx:key="*item">
20+
<block wx:for="{{item.pages}}" wx:for-item="page" wx:key="*item">
2121
<view wx:if="{{page.appid}}">
2222
<navigator target="miniProgram" open-type="navigate" app-id="{{page.appid}}" path="" extra-data="" version="release" class="navigator {{index + 1 === item.pages.length ? '' : 'navigator-bottom-line'}}">{{page.name}}</navigator>
2323
<view class="navigator-arrow"></view>

0 commit comments

Comments
 (0)