Skip to content

Commit 21282d1

Browse files
zuiaiwanqianzuiaiwanqian
committed
Merge branch 'develop' into feature/dark-hotfix
2 parents dd38916 + cf6a593 commit 21282d1

File tree

145 files changed

+324
-239
lines changed

Some content is hidden

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

145 files changed

+324
-239
lines changed

‎src/action-sheet/action-sheet.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon",
56
"t-popup": "../popup/popup",

‎src/avatar-group/avatar-group.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-avatar": "../avatar/avatar"
56
}

‎src/avatar/avatar.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon",
56
"t-badge": "../badge/badge",

‎src/avatar/avatar.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const name = `${prefix}-avatar`;
1010
export default class Avatar extends SuperComponent {
1111
options: WechatMiniprogram.Component.ComponentOptions = {
1212
multipleSlots: true,
13-
styleIsolation: 'apply-shared',
1413
};
1514

1615
externalClasses = [

‎src/back-top/back-top.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon"
56
}

‎src/badge/_example/base/index.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
Component({
2-
options: {
3-
styleIsolation: 'apply-shared',
4-
},
5-
});
1+
Component({});

‎src/badge/_example/base/index.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-badge": "tdesign-miniprogram/badge/badge",
56
"t-icon": "tdesign-miniprogram/icon/icon",

‎src/badge/_example/size/index.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
Component({
2-
options: {
3-
styleIsolation: 'apply-shared',
4-
},
5-
});
1+
Component({});

‎src/badge/_example/size/index.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-badge": "tdesign-miniprogram/badge/badge",
56
"t-avatar": "tdesign-miniprogram/avatar/avatar"

‎src/badge/_example/theme/index.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
Component({
2-
options: {
3-
styleIsolation: 'apply-shared',
4-
},
5-
});
1+
Component({});

‎src/badge/_example/theme/index.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-badge": "tdesign-miniprogram/badge/badge",
56
"t-cell": "tdesign-miniprogram/cell/cell",

‎src/badge/badge.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {}
45
}
5-

‎src/button/button.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon",
56
"t-loading": "../loading/loading"

‎src/calendar/_example/without-popup/index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
Component({
2-
options: {
3-
styleIsolation: 'apply-shared',
4-
},
52
methods: {
63
handleSelect(e) {
74
const { value, entireValue } = e.detail;

‎src/calendar/_example/without-popup/index.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-calendar": "tdesign-miniprogram/calendar/calendar"
56
}

‎src/calendar/calendar.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export default class Calendar extends SuperComponent {
1515

1616
options: WechatMiniprogram.Component.ComponentOptions = {
1717
multipleSlots: true,
18-
styleIsolation: 'apply-shared',
1918
};
2019

2120
properties = props;

‎src/cascader/cascader.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon",
56
"t-popup": "../popup/popup",

‎src/cell-group/cell-group.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"component": true
2+
"component": true,
3+
"styleIsolation": "apply-shared"
34
}

‎src/cell/cell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon",
56
"t-image": "../image/image"

‎src/check-tag/check-tag.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon"
56
}

‎src/checkbox-group/checkbox-group.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-checkbox": "../checkbox/checkbox"
56
}

‎src/checkbox/_example/special/index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
Component({
2-
options: {
3-
styleIsolation: 'apply-shared',
4-
},
52
data: {
63
value: [0, 1],
74
value1: [0, 1],

‎src/checkbox/_example/special/index.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-checkbox-group": "tdesign-miniprogram/checkbox-group/checkbox-group",
56
"t-checkbox": "tdesign-miniprogram/checkbox/checkbox",

‎src/checkbox/checkbox.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon"
56
}

‎src/checkbox/checkbox.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export default class CheckBox extends SuperComponent {
4848

4949
options: ComponentsOptionsType = {
5050
multipleSlots: true,
51-
// styleIsolation: 'shared',
5251
};
5352

5453
properties = {

‎src/col/col.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {}
45
}

‎src/collapse-panel/collapse-panel.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-cell": "../cell/cell"
56
}

‎src/collapse/collapse.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"component": true
2+
"component": true,
3+
"styleIsolation": "apply-shared"
34
}

‎src/count-down/count-down.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon"
56
}

‎src/date-time-picker/_example/time/index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
Component({
2-
options: {
3-
styleIsolation: 'apply-shared',
4-
},
52
data: {
63
mode: '',
74
second: '10:00:00',

‎src/date-time-picker/_example/time/index.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"styleIsolation": "apply-shared",
23
"usingComponents": {
34
"t-cell": "tdesign-miniprogram/cell/cell",
45
"t-date-time-picker": "tdesign-miniprogram/date-time-picker/date-time-picker"

‎src/date-time-picker/date-time-picker.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-picker": "../picker/picker",
56
"t-picker-item": "../picker-item/picker-item"

‎src/dialog/README.md

Lines changed: 1 addition & 1 deletion

‎src/dialog/_example/status/index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
Component({
2-
options: {
3-
styleIsolation: 'apply-shared',
4-
},
52
data: {
63
confirmBtn: { content: '确定', variant: 'base' },
74
dialogKey: '',

‎src/dialog/_example/status/index.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-button": "tdesign-miniprogram/button/button",
56
"t-dialog": "tdesign-miniprogram/dialog/dialog"

‎src/dialog/dialog.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-popup": "../popup/popup",
56
"t-icon": "../icon/icon",

‎src/divider/divider.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"component": true
2+
"component": true,
3+
"styleIsolation": "apply-shared"
34
}

‎src/drawer/drawer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-popup": "../popup/popup",
56
"t-icon": "../icon/icon"

‎src/dropdown-item/dropdown-item.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-button": "../button/button",
56
"t-radio": "../radio/radio",

‎src/dropdown-menu/dropdown-menu.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon"
56
}

‎src/empty/empty.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon",
56
"t-image": "../image/image"

‎src/fab/fab.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-button": "../button/button",
56
"t-draggable": "./draggable/draggable"

‎src/footer/footer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-image": "../image/image"
56
}

‎src/grid-item/grid-item.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-image": "../image/image",
56
"t-icon": "../icon/icon",

‎src/grid/grid.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {}
45
}

‎src/icon/icon.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {}
45
}

‎src/image-viewer/image-viewer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-image": "../image/image",
56
"t-icon": "../icon/icon"

‎src/image/image.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-loading": "../loading/loading",
56
"t-icon": "../icon/icon"

‎src/indexes-anchor/indexes-anchor.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"component": true
2+
"component": true,
3+
"styleIsolation": "apply-shared"
34
}

‎src/indexes/indexes.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon",
56
"t-cell": "../cell/cell",

‎src/input/input.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon"
56
}

‎src/link/link.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {
45
"t-icon": "../icon/icon"
56
}

‎src/loading/_example/size/index.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
Component({
2-
options: {
3-
styleIsolation: 'apply-shared',
4-
},
5-
});
1+
Component({});

‎src/loading/loading.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"component": true,
3+
"styleIsolation": "apply-shared",
34
"usingComponents": {}
45
}

‎src/message/message-item/index.ts renamed to ‎src/message-item/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { MessageType, MessageProps } from '../message.interface';
2-
import { getInstance } from '../../common/utils';
1+
import { MessageType, MessageProps } from '../message/message.interface';
2+
import { getInstance } from '../common/utils';
33

44
type Context = WechatMiniprogram.Page.TrivialInstance | WechatMiniprogram.Component.TrivialInstance;
55

‎src/message-item/message-item.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"component": true,
3+
"styleIsolation": "apply-shared",
4+
"usingComponents": {
5+
"t-icon": "../icon/icon",
6+
"t-link": "../link/link"
7+
}
8+
}

0 commit comments

Comments
 (0)