Skip to content

Commit e783419

Browse files
authored
Merge branch 'develop' into codex/fab-auto-collapse
2 parents 8d48e8f + 4a0c594 commit e783419

137 files changed

Lines changed: 6494 additions & 251 deletions

File tree

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
node: [20, 22, 24, 25]
14+
node: [22, 24, 26]
1515
os: [ubuntu-latest, windows-latest]
1616

1717
runs-on: ${{ matrix.os }}

.github/workflows/pkg-pr-new.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,4 @@ jobs:
2323

2424
- run: pnpm exec run-p build 'uniapp build:npm'
2525

26-
- uses: actions/setup-node@v6
27-
with:
28-
node-version: 20
29-
3026
- run: pnpm dlx pkg-pr-new publish 'packages/tdesign-miniprogram' 'packages/tdesign-uniapp' 'packages/tdesign-uniapp-chat'

.github/workflows/typos-config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ ded = "ded"
77
destory ="destory"
88
nd = "nd"
99
loosing = "loosing"
10+
ba = "ba"
11+
Impossibile = "Impossibile"
1012

1113
[files]
1214
extend-exclude = [

.vscode/settings.json

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,29 @@
4646
"[typescript]": {
4747
"editor.defaultFormatter": "esbenp.prettier-vscode"
4848
},
49-
"cSpell.words": [
50-
"stylelint",
51-
"cascader",
52-
"tdesign",
53-
"uniapp",
54-
"backtop",
55-
"miniprogram"
56-
]
49+
"cSpell.words": ["stylelint", "cascader", "tdesign", "uniapp", "backtop", "miniprogram"],
50+
"terminal.integrated.profiles.linux": {
51+
"bash": {
52+
"path": "bash",
53+
"icon": "terminal-bash"
54+
},
55+
"zsh": {
56+
"path": "zsh"
57+
},
58+
"fish": {
59+
"path": "fish"
60+
},
61+
"tmux": {
62+
"path": "tmux",
63+
"icon": "terminal-tmux"
64+
},
65+
"pwsh": {
66+
"path": "pwsh",
67+
"icon": "terminal-powershell"
68+
},
69+
"supercode-sh": {
70+
"path": "/bin/zsh",
71+
"args": ["-l"]
72+
}
73+
}
5774
}

README.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,18 @@ npm run dev
8585

8686
有任何问题,建议通过 [Github issues](https://github.com/Tencent/tdesign-miniprogram/issues) 反馈或扫码加入用户微信群。
8787

88-
<img src="https://raw.githubusercontent.com/Tencent/tdesign/main/packages/site-components/src/images/groups/wx-group.png" width="200" />
88+
<table>
89+
<tr>
90+
<td align="center">
91+
<img src="https://raw.githubusercontent.com/Tencent/tdesign/main/packages/site-components/src/images/groups/wx-group.png" width="200" /><br />
92+
微信小程序
93+
</td>
94+
<td align="center">
95+
<img src="https://raw.githubusercontent.com/Tencent/tdesign/main/packages/site-components/src/images/groups/uniapp-group.png" width="200" /><br />
96+
Uniapp
97+
</td>
98+
</tr>
99+
</table>
89100

90101
## 开源协议
91102

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tdesign-miniprogram-mono",
33
"private": true,
4-
"packageManager": "pnpm@10.27.0",
4+
"packageManager": "pnpm@11.20.0",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/Tencent/tdesign-miniprogram"
@@ -132,4 +132,4 @@
132132
"eslint --fix"
133133
]
134134
}
135-
}
135+
}

packages/common

Submodule common updated 56 files

packages/components/cell-group/cell-group.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default class CellGroup extends SuperComponent {
1111

1212
relations: RelationsOptions = {
1313
'../cell/cell': {
14-
type: 'child',
14+
type: 'descendant',
1515
linked() {
1616
this.updateLastChid();
1717
},

packages/components/cell/cell.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default class Cell extends SuperComponent {
2424

2525
relations: RelationsOptions = {
2626
'../cell-group/cell-group': {
27-
type: 'parent',
27+
type: 'ancestor',
2828
},
2929
};
3030

packages/components/col/col.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default class Col extends SuperComponent {
1818

1919
relations: RelationsOptions = {
2020
'../row/row': {
21-
type: 'parent',
21+
type: 'ancestor',
2222
},
2323
};
2424
}

0 commit comments

Comments
 (0)