Skip to content

Commit 96e4c13

Browse files
xxxBWxxxBW
authored
Merge pull request #105 from SgLy/feat-obsolete-add-global-class
Obsoleting `addGlobalClass` with `styleIsolation`
2 parents 686a76e + 2209ba2 commit 96e4c13

Some content is hidden

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

51 files changed

+95
-96
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"usingComponents": {},
44
"componentFramework": "glass-easel",
55
"renderer": "skyline",
6-
"addGlobalClass": true
6+
"styleIsolation": "apply-shared"
77
}

‎miniprogram/packageExtend/components/actionsheet/actionsheet.js

-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ module.exports =
9191
options: {
9292
multipleSlots: true,
9393
// 在组件定义时的选项中启用多slot支持
94-
addGlobalClass: true
9594
},
9695
properties: {
9796
title: {

‎miniprogram/packageExtend/components/actionsheet/actionsheet.json

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

‎miniprogram/packageExtend/components/badge/badge.js

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
Component({
44
options: {
5-
addGlobalClass: true
65
},
76
properties: {
87
extClass: {

‎miniprogram/packageExtend/components/badge/badge.json

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

‎miniprogram/packageExtend/components/cell/cell.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true,
9392
multipleSlots: true
9493
},
9594
properties: {

‎miniprogram/packageExtend/components/cell/cell.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"component": true,
3-
"usingComponents": {
4-
"mp-cells": "../cells/cells"
5-
}
6-
}
2+
"component": true,
3+
"usingComponents": {
4+
"mp-cells": "../cells/cells"
5+
},
6+
"styleIsolation": "apply-shared"
7+
}

‎miniprogram/packageExtend/components/cells/cells.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true,
9392
multipleSlots: true
9493
},
9594
properties: {

‎miniprogram/packageExtend/components/cells/cells.json

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

‎miniprogram/packageExtend/components/checkbox/checkbox.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true,
9392
multipleSlots: true
9493
},
9594
properties: {

‎miniprogram/packageExtend/components/checkbox/checkbox.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"component": true,
3-
"usingComponents": {
4-
"mp-cell": "../cell/cell",
5-
"mp-checkbox-group": "../checkbox-group/checkbox-group"
6-
}
2+
"component": true,
3+
"usingComponents": {
4+
"mp-cell": "../cell/cell",
5+
"mp-checkbox-group": "../checkbox-group/checkbox-group"
6+
},
7+
"styleIsolation": "apply-shared"
78
}

‎miniprogram/packageExtend/components/dialog/dialog.js

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ module.exports =
9090
Component({
9191
options: {
9292
multipleSlots: true,
93-
addGlobalClass: true
9493
},
9594
properties: {
9695
title: {

‎miniprogram/packageExtend/components/dialog/dialog.json

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

‎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-
addGlobalClass: true,
391390
pureDataPattern: /^_/
392391
},
393392
properties: {

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

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

‎miniprogram/packageExtend/components/form-page/form-page.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true,
9392
multipleSlots: true
9493
},
9594
properties: {

‎miniprogram/packageExtend/components/form-page/form-page.json

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

‎miniprogram/packageExtend/components/gallery/gallery.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true
9392
},
9493
properties: {
9594
imgUrls: {

‎miniprogram/packageExtend/components/gallery/gallery.json

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

‎miniprogram/packageExtend/components/grids/grids.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true,
9392
pureDataPattern: /^_/
9493
},
9594
properties: {

‎miniprogram/packageExtend/components/grids/grids.json

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

‎miniprogram/packageExtend/components/icon/icon.js

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎miniprogram/packageExtend/components/icon/icon.json

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

‎miniprogram/packageExtend/components/index-list/index-list.js

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ const throttle = function throttle(func, wait, options) {
3333
Component({
3434
behaviors: [],
3535
options: {
36-
addGlobalClass: true,
3736
pureDataPattern: /^_/
3837
},
3938
properties: {

‎miniprogram/packageExtend/components/index-list/index-list.json

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

‎miniprogram/packageExtend/components/loading/loading.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true
9392
},
9493
properties: {
9594
extClass: {

‎miniprogram/packageExtend/components/loading/loading.json

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

‎miniprogram/packageExtend/components/msg/msg.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true,
9392
multipleSlots: true
9493
},
9594
properties: {

‎miniprogram/packageExtend/components/msg/msg.json

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

‎miniprogram/packageExtend/components/navigation-bar/navigation-bar.js

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ module.exports =
9090
Component({
9191
options: {
9292
multipleSlots: true,
93-
addGlobalClass: true
9493
},
9594
properties: {
9695
extClass: {

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

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

‎miniprogram/packageExtend/components/searchbar/searchbar.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true
9392
},
9493
properties: {
9594
extClass: {

‎miniprogram/packageExtend/components/searchbar/searchbar.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"component": true,
3-
"usingComponents": {
4-
"mp-cells": "../cells/cells",
5-
"mp-cell": "../cell/cell"
6-
}
7-
}
2+
"component": true,
3+
"usingComponents": {
4+
"mp-cells": "../cells/cells",
5+
"mp-cell": "../cell/cell"
6+
},
7+
"styleIsolation": "apply-shared"
8+
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true,
9392
multipleSlots: true
9493
},
9594
properties: {

‎miniprogram/packageExtend/components/slideview/slideview.json

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

‎miniprogram/packageExtend/components/sticky/sticky.js

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ module.exports =
9292

9393
Component({
9494
options: {
95-
addGlobalClass: true,
9695
pureDataPattern: /^_/,
9796
multipleSlots: true
9897
},

‎miniprogram/packageExtend/components/sticky/sticky.json

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

‎miniprogram/packageExtend/components/tabbar/tabbar.js

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports =
8989
/***/ (function (module, exports, __webpack_require__) {
9090
Component({
9191
options: {
92-
addGlobalClass: true
9392
},
9493
properties: {
9594
extClass: {

‎miniprogram/packageExtend/components/tabbar/tabbar.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"component": true,
3-
"usingComponents": {
4-
"mp-badge": "../badge/badge"
5-
}
6-
}
2+
"component": true,
3+
"usingComponents": {
4+
"mp-badge": "../badge/badge"
5+
},
6+
"styleIsolation": "apply-shared"
7+
}

‎miniprogram/packageExtend/components/tabs/tabs.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
Component({
33
options: {
4-
addGlobalClass: true,
54
pureDataPattern: /^_/,
65
multipleSlots: true
76
},

‎miniprogram/packageExtend/components/tabs/tabs.json

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

‎miniprogram/packageExtend/components/toptips/toptips.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
Component({
33
options: {
4-
addGlobalClass: true
54
},
65
properties: {
76
type: {

‎miniprogram/packageExtend/components/toptips/toptips.json

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

‎miniprogram/packageExtend/components/uploader/uploader.js

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ module.exports =
9090
console.log(module, exports)
9191
Component({
9292
options: {
93-
addGlobalClass: true
9493
},
9594
properties: {
9695
title: {

0 commit comments

Comments
 (0)