Skip to content

Commit 1640fef

Browse files
bailin0824v_guanglwen
andauthored
fix: Swiper component modifies skyline rendering mode (#162)
* feat: swiper change skyline * fix: components change skyline * fix: appjson add pages * fix: Update code format and appid * fix: Delete cover-image * fix: update code format * fix: delete useless function --------- Co-authored-by: v_guanglwen <[email protected]>
1 parent ab95823 commit 1640fef

39 files changed

+585
-152
lines changed

miniprogram/app.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,14 @@
4444
"pages/view/sticky/sticky-section/sticky-section",
4545
"pages/view/movable-view/movable-view",
4646
"pages/view/cover-view/cover-view",
47+
"pages/view/match-media/match-media",
48+
"pages/view/page-container/page-container",
4749
"pages/view/sticky/sticky",
4850
"pages/content/text/text",
4951
"pages/content/icon/icon",
5052
"pages/content/progress/progress",
5153
"pages/content/rich-text/rich-text",
54+
"pages/content/selection/selection",
5255
"pages/form/button/button",
5356
"pages/form/checkbox/checkbox",
5457
"pages/form/form/form",

miniprogram/components/popup/index.wxss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ root-portal {
77
.popup {
88
position: absolute;
99
bottom: 0;
10+
top: 0;
1011
z-index: 5000;
1112
display: flex;
1213
flex-direction: row;
1314
justify-content: center;
1415
align-items: center;
1516
width: 100vw;
16-
height: 200px;
17+
/* height: 200px; */
1718
background: rgba(51, 51, 51, 0.65);
1819
opacity: 1;
1920
transform: scale3d(1, 1, 1);
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"navigationBarTitleText": "progress",
3-
"navigationStyle": "custom"
3+
"navigationStyle": "default",
4+
"renderer": "webview"
45
}

miniprogram/packageComponent/pages/content/progress/progress.wxml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
<view class="container page" data-weui-theme="{{theme}}">
55
<template is="head" data="{{title: 'progress'}}"/>
6-
76
<view class="page-body">
87
<view class="page-section page-section-gap">
98

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
22
"navigationBarTitleText": "rich-text",
3-
"renderer": "webview"
3+
"componentFramework": "glass-easel",
4+
"renderer": "skyline",
5+
"navigationStyle": "custom"
46
}

miniprogram/packageComponent/pages/content/rich-text/rich-text.wxml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<import src="../../../../common/head.wxml" />
22
<import src="../../../../common/foot.wxml" />
3-
3+
<mp-navigation-bar title="rich-text" back="{{true}}"></mp-navigation-bar>
4+
<scroll-view class="page-scroll-view" scroll-y type="list">
45
<view class="container page" data-weui-theme="{{theme}}">
56
<template is="head" data="{{title: 'rich-text'}}"/>
67

78
<view class="page-body">
89
<view class="page-section">
910
<view class="page-section-title">通过HTML String渲染</view>
1011
<view class="page-content">
11-
<scroll-view scroll-y>{{htmlSnip}}</scroll-view>
12+
<scroll-view class="page-scroll" scroll-y>{{htmlSnip}}</scroll-view>
1213
<button type="primary" bindtap="renderHtml">渲染HTML</button>
1314
<block wx:if="{{renderedByHtml}}">
1415
<rich-text nodes="{{htmlSnip}}"></rich-text>
@@ -19,7 +20,7 @@
1920
<view class="page-section">
2021
<view class="page-section-title">通过节点渲染</view>
2122
<view class="page-content">
22-
<scroll-view scroll-y>{{nodeSnip}}</scroll-view>
23+
<scroll-view class="page-scroll" scroll-y>{{nodeSnip}}</scroll-view>
2324
<button type="primary" bindtap="renderNode">渲染Node</button>
2425
<block wx:if="{{renderedByNode}}">
2526
<rich-text nodes="{{nodes}}"></rich-text>
@@ -30,3 +31,4 @@
3031

3132
<template is="foot" />
3233
</view>
34+
</scroll-view>

miniprogram/packageComponent/pages/content/rich-text/rich-text.wxss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import "../../../../common/reset.wxss";
12
.page-content {
23
width: auto;
34
margin: 15px 0;
@@ -25,7 +26,7 @@
2526
width: 5px;
2627
}
2728

28-
scroll-view {
29+
.page-scroll {
2930
height: 325px;
3031
border: 1px solid #1AAD19;
3132
white-space: pre;
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
const htmlSnip =
2+
`<div class="div_class">
3+
<h1>Title</h1>
4+
<p class="p">
5+
Life is&nbsp;<i>like</i>&nbsp;a box of
6+
<b>&nbsp;chocolates</b>.
7+
</p>
8+
</div>
9+
`
10+
Page({
11+
data: {
12+
theme: 'light',
13+
disableContextMenu: true,
14+
showBtn: false,
15+
btnX: 0,
16+
btnY: 0,
17+
selectedString: '',
18+
htmlSnip,
19+
},
20+
onShareAppMessage() {
21+
return {
22+
title: 'selection',
23+
path: 'packageComponent/pages/content/selection/selection'
24+
}
25+
},
26+
onUnload() {
27+
if (wx.offThemeChange) {
28+
wx.offThemeChange()
29+
}
30+
},
31+
onLoad() {
32+
this.setData({
33+
theme: wx.getSystemInfoSync().theme || 'light'
34+
})
35+
36+
if (wx.onThemeChange) {
37+
wx.onThemeChange(({theme}) => {
38+
this.setData({theme})
39+
})
40+
}
41+
},
42+
selectionChangeHandler(e) {
43+
const selection = e.detail
44+
if (selection.isCollapsed === false) {
45+
this.setData({
46+
showBtn: true,
47+
selectedString: e.detail.selectedString,
48+
btnX: e.detail.firstRangeRect.x,
49+
btnY: e.detail.firstRangeRect.y,
50+
})
51+
} else {
52+
this.setData({
53+
showBtn: false
54+
})
55+
}
56+
},
57+
copySelectedString() {
58+
wx.setClipboardData({
59+
data: this.data.selectedString,
60+
success() {
61+
wx.getClipboardData({
62+
success(res) {
63+
wx.showToast({
64+
title: `复制成功:${res.data}`
65+
})
66+
}
67+
})
68+
}
69+
})
70+
}
71+
})
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"navigationBarTitleText": "selection",
3+
"renderer": "webview"
4+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<import src="../../../../common/head.wxml" />
2+
<import src="../../../../common/foot.wxml" />
3+
<view class="container page" data-weui-theme="{{theme}}">
4+
<template is="head" data="{{title: 'selection'}}" />
5+
<view class="content">
6+
<scroll-view class="scroll-area" type="list">
7+
<text id="before-text" user-select="{{true}}">在 wx-selection 之前的 text</text>
8+
<selection bind:selectionchange="selectionChangeHandler" disable-context-menu="{{false}}">
9+
<text id="text-wrap" user-select="{{true}}">
10+
<text id="text-1">2011年1月,微信1.0发布。同年5月,微信2.0语音对讲发布</text>
11+
<text id="text-2">
12+
10月,微信3.0新增摇一摇功能
13+
<text id="text-3">2012年3月,微信用户突破1亿。4月份,微信4.0朋友圈发布</text>
14+
</text>
15+
<text id="text-4">同年7月,微信4.2发布公众平台。2013年8月,微信5.0发布微信支付。</text>
16+
</text>
17+
<text id="text-wrap2" user-select="{{true}}">2014年9月,企业号发布。同月,发布微信卡包</text>
18+
<text id="text-wrap3" user-select="{{false}}">
19+
<text id="text-31" user-select="{{true}}">2015年1月,微信第一条朋友圈广告</text>
20+
</text>
21+
<view>
22+
<text id="view-text" user-select="{{true}}">2016年1月,企业微信发布,2017年1月,小程序发布</text>
23+
</view>
24+
<rich-text id="rich-text-1" user-select="{{true}}">rich-text</rich-text>
25+
<rich-text id="rich-text-2" user-select="{{true}}" nodes="{{htmlSnip}}"></rich-text>
26+
</selection>
27+
<text id="before-text" user-select="{{true}}">在 selection 之后的 text</text>
28+
</scroll-view>
29+
</view>
30+
<view class="button" wx:if="{{showBtn}}" bind:tap="copySelectedString" style="top:{{btnY - 50}}px;left:{{btnX}}px">
31+
点我复制到系统
32+
</view>
33+
<template is="foot" />
34+
</view>

0 commit comments

Comments
 (0)