Skip to content

Commit dc4a16a

Browse files
committed
feat(oss-licenses): 增加开源项目仓库链接并优化展示内容
- 在 oss-licenses 页面中添加 repoLink 字段,用于显示项目仓库链接 - 修改 oss-licenses-menu 页面,增加项目出版者信息的显示 -优化 oss-licenses 页面布局,调整滚动视图和文本显示方式
1 parent c4460ed commit dc4a16a

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

source/pages/oss-licenses-menu/oss-licenses-menu.wxml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@ See the Mulan PubL v2 for more details.
2020

2121
<scroll-view class="overflow-y-auto" enhanced scroll-y style="height:{{heightRecycle+'px'}};"
2222
type="list">
23-
<t-cell arrow bind:tap="licenseMpClick" description="{{item.description}}" hover wx:for="{{licenseMp}}"
24-
wx:key="{{index}}" data-index="{{index}}">
23+
<t-cell arrow bind:tap="licenseMpClick" data-index="{{index}}" description="{{item.description}}" hover
24+
wx:for="{{licenseMp}}" wx:key="{{index}}">
2525
<view slot="title">
26-
<text>{{item.name}}</text>
26+
<text class="inline">{{item.name + (item.publisher !== '' ? (' (' + item.publisher + ')') : '')}}</text>
2727
<t-tag class="ml-16rpx inline-block vertical-bottom" size="small" theme="default" variant="light">
2828
{{'v' + item.version}}
2929
</t-tag>
3030
</view>
31-
<t-tag class="ml-12rpx" size="medium" slot="note" theme="primary" variant="light">
31+
<t-tag class="ml-16rpx" size="medium" slot="note" theme="primary" variant="light">
3232
{{item.licenses}}
3333
</t-tag>
3434
</t-cell>
3535

36-
<t-cell arrow bind:tap="licenseBuildClick" description="{{item.description}}" hover wx:for="{{licenseBuild}}"
37-
wx:key="{{index}}" data-index="{{index}}">
36+
<t-cell arrow bind:tap="licenseBuildClick" data-index="{{index}}" description="{{item.description}}" hover
37+
wx:for="{{licenseBuild}}" wx:key="{{index}}">
3838
<view slot="title">
39-
<text class="inline">{{item.name}}</text>
39+
<text class="inline">{{item.name + (item.publisher !== '' ? (' (' + item.publisher + ')') : '')}}</text>
4040
<t-tag class="ml-16rpx inline-block vertical-bottom" size="small" theme="default" variant="light">
4141
{{'v' + item.version}}
4242
</t-tag>
4343
</view>
44-
<t-tag class="ml-12rpx" size="medium" slot="note" theme="primary" variant="light">
44+
<t-tag class="ml-16rpx" size="medium" slot="note" theme="primary" variant="light">
4545
{{item.licenses}}
4646
</t-tag>
4747
</t-cell>

source/pages/oss-licenses/oss-licenses.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Page({
2121
* 页面的初始数据
2222
*/
2323
data: {
24-
licensesMp: [], licensesBuild: [], title: "", licenseBody: ""
24+
licensesMp: [], licensesBuild: [], title: "", licenseBody: "", repoLink: ""
2525
},
2626

2727
/**
@@ -31,9 +31,15 @@ Page({
3131
const type = options.type
3232
const index = options.index
3333
if (type === "mp") this.setData({
34-
licenseMp: licensesMp, title: licensesMp[index].name, licenseBody: licensesMp[index].licenseText
34+
licenseMp: licensesMp,
35+
title: licensesMp[index].name,
36+
licenseBody: licensesMp[index].licenseText,
37+
repoLink: licensesMp[index].repository
3538
}); else if (type === "build") this.setData({
36-
licenseBuild: licensesBuild, title: licensesBuild[index].name, licenseBody: licensesBuild[index].licenseText
39+
licenseBuild: licensesBuild,
40+
title: licensesBuild[index].name,
41+
licenseBody: licensesBuild[index].licenseText,
42+
repoLink: licensesBuild[index].repository
3743
})
3844
},
3945

source/pages/oss-licenses/oss-licenses.wxml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ See the Mulan PubL v2 for more details.
1818
</t-navbar>
1919
</view>
2020

21-
<scroll-view class="overflow-y-auto" enhanced scroll-y style="height:{{heightRecycle+'px'}};"
22-
type="list">
21+
<scroll-view class="overflow-y-auto" enhanced scroll-y style="height:{{heightRecycle+'px'}};" type="list">
2322
<view class="p-32rpx">
24-
<text user-select>{{licenseBody}}</text>
23+
<text user-select>{{(repoLink !== '' ? repoLink + '\n\n' : '') + licenseBody}}</text>
2524
</view>
2625
</scroll-view>

0 commit comments

Comments
 (0)