Skip to content

Commit 10d0a64

Browse files
xxxBWxxxBW
committed
feat: adapt glass-easel
1 parent 8b97b8c commit 10d0a64

File tree

97 files changed

+54
-3591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+54
-3591
lines changed

‎miniprogram/app.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,9 @@
222222
"pages/share-element/card/index",
223223
"pages/half-page/scale-page/index",
224224
"pages/half-page/half-page/index",
225-
"pages/address-book/index",
226225
"pages/half-screen/index",
227-
"pages/tabs/index",
228-
"pages/album/index",
229-
"pages/preview/index",
230226
"pages/custom-route/index",
231-
"pages/custom-route/detail",
232-
"pages/scroll-view/index"
227+
"pages/custom-route/detail"
233228
]
234229
},
235230
{

‎miniprogram/component/navigation-bar/navigation-bar.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Component({
22
options: {
3-
multipleSlots: true, // 在组件定义时的选项中启用多slot支持
4-
addGlobalClass: true
3+
multipleSlots: true // 在组件定义时的选项中启用多slot支持
54
},
65
/**
76
* 组件的属性列表

‎miniprogram/component/navigation-bar/navigation-bar.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"component": true,
33
"usingComponents": {},
4-
"renderer": "skyline"
4+
"componentFramework": "glass-easel",
5+
"renderer": "skyline",
6+
"addGlobalClass": true
57
}

‎miniprogram/components/navigation-bar/index.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
33
"usingComponents": {},
4+
"componentFramework": "glass-easel",
45
"renderer": "skyline"
56
}

‎miniprogram/components/page-scroll/index.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
33
"usingComponents": {},
4+
"componentFramework": "glass-easel",
45
"renderer": "skyline"
56
}

‎miniprogram/packageComponent/pages/canvas/canvas-2d/canvas-2d.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "canvas 2d",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/content/text/text.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "text",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/form/button/button.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "button",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/form/input/input.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "input",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/form/picker/picker.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"navigationBarTitleText": "picker",
3-
"renderer": "skyline",
3+
"componentFramework": "glass-easel",
4+
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"
67
}

‎miniprogram/packageComponent/pages/map/map/map.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "map",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/media/camera/camera.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "camera",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/media/image/image.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "image",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/media/video/video.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"navigationBarTitleText": "video",
3-
"renderer": "skyline",
3+
"componentFramework": "glass-easel",
4+
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"
67
}

‎miniprogram/packageComponent/pages/nav/navigator/navigate.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "navigatePage",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/nav/navigator/navigator.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "navigator",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/nav/navigator/redirect.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "redirectPage",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/view/scroll-view/scroll-view.wxml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</scroll-view>
102102

103103

104-
<wxs module="refresh">
104+
<wxs module="refresh"> // 先不切 glass-easel
105105

106106
module.exports = {
107107
onPulling: function(evt, instance) {

‎miniprogram/packageComponent/pages/view/swiper/swiper.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "swiper",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageComponent/pages/view/view/view.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navigationBarTitleText": "view",
3+
"componentFramework": "glass-easel",
34
"renderer": "skyline",
45
"disableScroll": true,
56
"navigationStyle": "custom"

‎miniprogram/packageExtend/components/checkbox-group/checkbox-group.wxml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<checkbox-group class="{{extClass}}" wx-if="{{multi}}" bindchange="checkedChange">
1+
<checkbox-group class="{{extClass}}" wx:if="{{multi}}" bindchange="checkedChange">
22
<slot></slot>
33
</checkbox-group>
4-
<radio-group class="{{extClass}}" wx-else bindchange="checkedChange">
4+
<radio-group class="{{extClass}}" wx:else bindchange="checkedChange">
55
<slot></slot>
66
</radio-group>

‎miniprogram/packageExtend/components/emoji/emoji.js

-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ module.exports =
387387
})
388388
Component({
389389
options: {
390-
styleIsolation: 'page-shared',
391390
addGlobalClass: true,
392391
pureDataPattern: /^_/
393392
},

‎miniprogram/packageExtend/components/emoji/emoji.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"component": true,
3-
"usingComponents": {}
3+
"usingComponents": {},
4+
"styleIsolation": "page-shared"
45
}

‎miniprogram/packageExtend/components/slideview/slideview.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ module.exports =
144144
updateRight() {
145145
// 获取右侧滑动显示区域的宽度
146146
const data = this.data
147-
const query = wx.createSelectorQuery().in(this)
147+
const query = this.createSelectorQuery()
148148
query.select('.left').boundingClientRect(res => {
149-
const btnQuery = wx.createSelectorQuery().in(this)
149+
const btnQuery = this.createSelectorQuery()
150150
btnQuery.selectAll('.btn').boundingClientRect(rects => {
151151
this.setData({
152152
size: {

‎miniprogram/packageSkyline/components/address-book/index.json

-4
This file was deleted.

‎miniprogram/packageSkyline/components/address-book/index.less

-181
This file was deleted.

0 commit comments

Comments
 (0)