Skip to content

Commit 0560c91

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/develop'
2 parents e1b5415 + 45eac18 commit 0560c91

Some content is hidden

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

61 files changed

+4064
-995
lines changed

‎.github/workflows/typos-config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ actived = "actived"
55
colum = "colum"
66

77
[files]
8-
extend-exclude = ["CHANGELOG.md", "*.snap"]
8+
extend-exclude = ["CHANGELOG*.md", "*.snap"]

‎CHANGELOG.md‎

Lines changed: 20 additions & 941 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ app.use(TDesign);
5252

5353
# 贡献成员
5454

55-
<a href="https://github.com/tencent/tdesign-mobile-vue/graphs/contributors">
56-
<img src="https://contrib.rocks/image?repo=tencent/tdesign-mobile-vue" />
55+
<a href="https://openomy.app/github/tencent/tdesign-mobile-vue" target="_blank">
56+
<img src="https://openomy.app/svg?repo=tencent/tdesign-mobile-vue&chart=bubble&latestMonth=12" alt="Contribution Leaderboard" />
5757
</a>
5858

5959
# 参与贡献
@@ -68,4 +68,4 @@ TDesign 欢迎任何愿意参与贡献的参与者。如果需要本地运行代
6868

6969
# 开源协议
7070

71-
TDesign 遵循 [MIT 协议](https://github.com/Tencent/tdesign-vue/blob/main/LICENSE)。
71+
TDesign 遵循 [MIT 协议](https://github.com/Tencent/tdesign-mobile-vue/blob/main/LICENSE)。

‎changelogs/CHANGELOG-0.x.md‎

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tdesign-mobile-vue",
33
"purename": "tdesign",
4-
"version": "1.8.5",
4+
"version": "1.9.0",
55
"description": "tdesign-mobile-vue",
66
"author": "TDesign Group",
77
"homepage": "https://tdesign.tencent.com/mobile-vue/",
@@ -93,6 +93,7 @@
9393
"dayjs": "^1.10.7",
9494
"lodash-es": "^4.17.21",
9595
"tdesign-icons-vue-next": "^0.3.6",
96+
"tinycolor2": "^1.6.0",
9697
"validator": "^13.5.1"
9798
},
9899
"peerDependencies": {
@@ -120,6 +121,7 @@
120121
"@types/lodash-es": "^4.17.12",
121122
"@types/node": "18.8.0",
122123
"@types/prismjs": "^1.16.2",
124+
"@types/tinycolor2": "^1.4.6",
123125
"@types/validator": "^13.6.3",
124126
"@typescript-eslint/eslint-plugin": "^5.5.0",
125127
"@typescript-eslint/parser": "~5.34.0",

‎site/docs.config.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,14 @@ export const docs = [
216216
component: () => import('@/checkbox/checkbox.md'),
217217
componentEn: () => import('@/checkbox/checkbox.en-US.md'),
218218
},
219+
{
220+
title: 'ColorPicker 颜色选择器',
221+
titleEn: 'ColorPicker',
222+
name: 'color-picker',
223+
path: '/mobile-vue/components/color-picker',
224+
component: () => import('@/color-picker/color-picker.md'),
225+
componentEn: () => import('@/color-picker/color-picker.en-US.md'),
226+
},
219227
{
220228
title: 'Input 输入框',
221229
titleEn: 'Input',

‎site/mobile/main.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import router from './router';
77
// import tdesign style
88
import 'tdesign-mobile-vue/style/index.js';
99

10+
// @ts-ignore
1011
import TDesign from '@/index';
1112
import '@common/style/mobile/_reset.less';
1213
import '../styles/mobile/index.less';

‎site/web/main.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { createApp } from 'vue';
22

3+
// @ts-ignore
34
import TDesign from '@/index';
45
import 'tdesign-mobile-vue/style/index.js';
56

‎src/_common‎

‎src/cascader/__test__/__snapshots__/demo.test.jsx.snap‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ exports[`Cascader > Cascader baseVue demo works fine 1`] = `
8989
/>
9090
</svg>
9191
</div>
92+
<!---->
9293
<div
9394
class="t-cascader__content"
9495
>
@@ -123,6 +124,7 @@ exports[`Cascader > Cascader baseVue demo works fine 1`] = `
123124
124125
</div>
125126
<!---->
127+
<!---->
126128
<div
127129
class="t-cascader__options-container"
128130
style="width: 200vw; transform: translateX(-000vw);"
@@ -300,6 +302,7 @@ exports[`Cascader > Cascader checkStrictlyVue demo works fine 1`] = `
300302
</span>
301303
302304
</div>
305+
<!---->
303306
<div
304307
class="t-cascader__content"
305308
>
@@ -334,6 +337,7 @@ exports[`Cascader > Cascader checkStrictlyVue demo works fine 1`] = `
334337
335338
</div>
336339
<!---->
340+
<!---->
337341
<div
338342
class="t-cascader__options-container"
339343
style="width: 200vw; transform: translateX(-000vw);"
@@ -515,6 +519,7 @@ exports[`Cascader > Cascader keysVue demo works fine 1`] = `
515519
/>
516520
</svg>
517521
</div>
522+
<!---->
518523
<div
519524
class="t-cascader__content"
520525
>
@@ -549,6 +554,7 @@ exports[`Cascader > Cascader keysVue demo works fine 1`] = `
549554
550555
</div>
551556
<!---->
557+
<!---->
552558
<div
553559
class="t-cascader__options-container"
554560
style="width: 200vw; transform: translateX(-000vw);"
@@ -730,6 +736,7 @@ exports[`Cascader > Cascader lazyVue demo works fine 1`] = `
730736
/>
731737
</svg>
732738
</div>
739+
<!---->
733740
<div
734741
class="t-cascader__content"
735742
>
@@ -764,6 +771,7 @@ exports[`Cascader > Cascader lazyVue demo works fine 1`] = `
764771
765772
</div>
766773
<!---->
774+
<!---->
767775
<div
768776
class="t-cascader__options-container"
769777
style="width: 200vw; transform: translateX(-000vw);"
@@ -946,6 +954,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
946954
/>
947955
</svg>
948956
</div>
957+
<!---->
949958
<div
950959
class="t-cascader__content"
951960
>
@@ -980,6 +989,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
980989
981990
</div>
982991
<!---->
992+
<!---->
983993
<div
984994
class="t-cascader__options-container"
985995
style="width: 200vw; transform: translateX(-000vw);"
@@ -1174,9 +1184,11 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
11741184
/>
11751185
</svg>
11761186
</div>
1187+
<!---->
11771188
<div
11781189
class="t-cascader__content"
11791190
>
1191+
<!---->
11801192
<!---->
11811193
<!---->
11821194
<div
@@ -1377,6 +1389,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
13771389
/>
13781390
</svg>
13791391
</div>
1392+
<!---->
13801393
<div
13811394
class="t-cascader__content"
13821395
>
@@ -1411,6 +1424,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
14111424
14121425
</div>
14131426
<!---->
1427+
<!---->
14141428
<div
14151429
class="t-cascader__options-container"
14161430
style="width: 200vw; transform: translateX(-000vw);"
@@ -1605,6 +1619,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
16051619
/>
16061620
</svg>
16071621
</div>
1622+
<!---->
16081623
<div
16091624
class="t-cascader__content"
16101625
>
@@ -1639,6 +1654,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
16391654
16401655
</div>
16411656
<!---->
1657+
<!---->
16421658
<div
16431659
class="t-cascader__options-container"
16441660
style="width: 200vw; transform: translateX(-000vw);"
@@ -1833,6 +1849,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
18331849
/>
18341850
</svg>
18351851
</div>
1852+
<!---->
18361853
<div
18371854
class="t-cascader__content"
18381855
>
@@ -1866,6 +1883,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
18661883
</div>
18671884
18681885
</div>
1886+
<!---->
18691887
<div
18701888
class="t-cascader__options-title"
18711889
>
@@ -2065,6 +2083,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
20652083
/>
20662084
</svg>
20672085
</div>
2086+
<!---->
20682087
<div
20692088
class="t-cascader__content"
20702089
>
@@ -2099,6 +2118,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
20992118
21002119
</div>
21012120
<!---->
2121+
<!---->
21022122
<div
21032123
class="t-cascader__options-container"
21042124
style="width: 200vw; transform: translateX(-000vw);"
@@ -2259,6 +2279,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
22592279
</span>
22602280
22612281
</div>
2282+
<!---->
22622283
<div
22632284
class="t-cascader__content"
22642285
>
@@ -2293,6 +2314,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
22932314
22942315
</div>
22952316
<!---->
2317+
<!---->
22962318
<div
22972319
class="t-cascader__options-container"
22982320
style="width: 200vw; transform: translateX(-000vw);"
@@ -2477,9 +2499,11 @@ exports[`Cascader > Cascader themeTabVue demo works fine 1`] = `
24772499
/>
24782500
</svg>
24792501
</div>
2502+
<!---->
24802503
<div
24812504
class="t-cascader__content"
24822505
>
2506+
<!---->
24832507
<!---->
24842508
<!---->
24852509
<div
@@ -2663,6 +2687,7 @@ exports[`Cascader > Cascader withTitleVue demo works fine 1`] = `
26632687
/>
26642688
</svg>
26652689
</div>
2690+
<!---->
26662691
<div
26672692
class="t-cascader__content"
26682693
>
@@ -2696,6 +2721,7 @@ exports[`Cascader > Cascader withTitleVue demo works fine 1`] = `
26962721
</div>
26972722
26982723
</div>
2724+
<!---->
26992725
<div
27002726
class="t-cascader__options-title"
27012727
>
@@ -2882,6 +2908,7 @@ exports[`Cascader > Cascader withValueVue demo works fine 1`] = `
28822908
/>
28832909
</svg>
28842910
</div>
2911+
<!---->
28852912
<div
28862913
class="t-cascader__content"
28872914
>
@@ -2916,6 +2943,7 @@ exports[`Cascader > Cascader withValueVue demo works fine 1`] = `
29162943
29172944
</div>
29182945
<!---->
2946+
<!---->
29192947
<div
29202948
class="t-cascader__options-container"
29212949
style="width: 200vw; transform: translateX(-000vw);"

0 commit comments

Comments
 (0)