Skip to content

Commit dbeadbb

Browse files
feature/uniapp (#4066)
* feat: add uniapp * chore: update project config * chore: update typo * chore: update typo * chore: remove useless deps and update script * chore: add app package * chore: update init script * chore: remove useless script * chore: update release:script * chore: update pnpm-workspace * chore: update uniapp config * chore: update license * chore: test * ci: update ci * ci: update ci * ci: update ci * ci: update ci * chore: update script * ci: update compress ci * ci: update compress ci * ci: update compress ci * ci: update compress ci * ci: update compress ci * ci: update compress ci * ci: update compress ci * ci: update compress ci * refactor: update uniapp structure * chore: update typo-config * chore: add uniapp examples * chore: update snapshot --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 64badc1 commit dbeadbb

File tree

1,580 files changed

+131431
-35
lines changed

Some content is hidden

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

1,580 files changed

+131431
-35
lines changed

.github/workflows/pr-compressed-size.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,22 @@ jobs:
1616
repo-token: '${{ secrets.GITHUB_TOKEN }}'
1717
install-script: 'npm install --force'
1818
pattern: './packages/tdesign-miniprogram/miniprogram_dist/**/*.{js,wxs,wxml,json}'
19+
comment-key: miniprogram
20+
21+
- name: Install pnpm
22+
run: npm install -g pnpm@9
23+
24+
- name: Install dependencies
25+
run: pnpm install
26+
27+
- uses: preactjs/compressed-size-action@v2
28+
with:
29+
repo-token: '${{ secrets.GITHUB_TOKEN }}'
30+
pattern: './packages/tdesign-uniapp/npm_dist/**/*.{js,ts,vue,less,css}'
31+
comment-key: uniapp
32+
33+
- uses: preactjs/compressed-size-action@v2
34+
with:
35+
repo-token: '${{ secrets.GITHUB_TOKEN }}'
36+
pattern: './packages/tdesign-uniapp-chat/npm_dist/**/*.{js,ts,vue,less,css}'
37+
comment-key: uniapp-chat

.github/workflows/typos-config.toml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,12 @@ nd = "nd"
99
loosing = "loosing"
1010

1111
[files]
12-
extend-exclude = ["CHANGELOG*.md", "changelog.json", "echarts.js"]
12+
extend-exclude = [
13+
"CHANGELOG*.md",
14+
"changelog.json",
15+
"echarts.js",
16+
"packages/uniapp-components/npm/**/*",
17+
"packages/uniapp-pro-components/chat/npm/**/*",
18+
"packages/tdesign-uniapp/app/common/uni.css",
19+
"packages/tdesign-uniapp/app/uni_modules/**/*",
20+
]

.gitignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ _wechatide
66
_example
77
!packages/components/**/_example/
88
!packages/pro-components/**/_example/
9+
!packages/uniapp-components/**/_example/
10+
!packages/uniapp-pro-components/**/_example/
911

1012
packages/tdesign-miniprogram/example/pages/*
1113
!packages/tdesign-miniprogram/example/pages/gulp-error
@@ -15,6 +17,22 @@ packages/tdesign-miniprogram/test/e2e
1517
packages/tdesign-miniprogram/test/unit
1618
packages/tdesign-miniprogram/test/unit-virtualHost
1719

20+
# about uniapp
21+
packages/tdesign-uniapp/example/src/_tdesign
22+
packages/tdesign-uniapp/example/src/_tdesign-raw/
23+
packages/tdesign-uniapp/example/src/pages-more/
24+
packages/tdesign-uniapp/npm_dist/
25+
packages/tdesign-uniapp-chat/npm_dist/
26+
27+
# about app of uniapp
28+
packages/tdesign-uniapp/app/uni_modules/tdesign-uniapp*/
29+
packages/tdesign-uniapp/app/unpackage/
30+
packages/tdesign-uniapp/app/pages-more/
31+
packages/tdesign-uniapp/app/pages/
32+
packages/tdesign-uniapp/app/components/
33+
packages/tdesign-uniapp/app/tdesign-uniapp-raw/
34+
35+
1836
.DS_Store
1937
node_modules
2038
package-lock.json

.vscode/settings.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,10 @@
4646
"[typescript]": {
4747
"editor.defaultFormatter": "esbenp.prettier-vscode"
4848
},
49-
"cSpell.words": ["stylelint", "cascader"]
49+
"cSpell.words": [
50+
"stylelint",
51+
"cascader",
52+
"tdesign",
53+
"uniapp",
54+
]
5055
}

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"scripts": {
1414
"start": "npm run dev",
1515
"dev": "cross-env NODE_ENV=development gulp dev --gulpfile script/gulpfile.js --cwd ./",
16+
"uniapp": "pnpm -C packages/tdesign-uniapp",
17+
"uniapp:chat": "pnpm -C packages/tdesign-uniapp-chat",
1618
"build": "cross-env NODE_ENV=production gulp build --gulpfile script/gulpfile.js --cwd ./",
1719
"build:dist": "gulp --gulpfile script/gulpfile.dist.js --cwd ./",
1820
"build:example": "gulp --gulpfile script/gulpfile.example.js --cwd ./",
@@ -41,6 +43,8 @@
4143
"changelog": "node script/generate-changelog.js",
4244
"robot": "publish-cli robot-msg",
4345
"qrcode": "pnpm -C packages/tdesign-miniprogram/site qrcode",
46+
"build:uniapp": "pnpm -C packages/tdesign-uniapp run release:prepare",
47+
"build:uniapp:chat": "pnpm -C packages/tdesign-uniapp run release:prepare",
4448
"snippet": "node snippets/generate-demo-snippet.mjs"
4549
},
4650
"author": "tdesign",

packages/components/common/style/theme/_font.less

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,32 @@ page,
5151
--td-font-link-small: var(--td-font-size-link-small) / var(--td-line-height-link-small) var(--td-font-family);
5252
--td-font-link-medium: var(--td-font-size-link-medium) / var(--td-line-height-link-medium) var(--td-font-family);
5353
--td-font-link-large: var(--td-font-size-link-large) / var(--td-line-height-link-large) var(--td-font-family);
54-
--td-font-mark-extraSmall: 600 var(--td-font-size-mark-extraSmall) / var(--td-line-height-mark-extraSmall) var(--td-font-family);
54+
--td-font-mark-extraSmall: 600 var(--td-font-size-mark-extraSmall) / var(--td-line-height-mark-extraSmall)
55+
var(--td-font-family);
5556
--td-font-mark-small: 600 var(--td-font-size-mark-small) / var(--td-line-height-mark-small) var(--td-font-family);
5657
--td-font-mark-medium: 600 var(--td-font-size-mark-medium) / var(--td-line-height-mark-medium) var(--td-font-family);
5758
--td-font-mark-large: 600 var(--td-font-size-mark-large) / var(--td-line-height-mark-large) var(--td-font-family);
58-
--td-font-body-extraSmall: var(--td-font-size-body-extraSmall) / var(--td-line-height-body-extraSmall) var(--td-font-family);
59+
--td-font-body-extraSmall: var(--td-font-size-body-extraSmall) / var(--td-line-height-body-extraSmall)
60+
var(--td-font-family);
5961
--td-font-body-small: var(--td-font-size-body-small) / var(--td-line-height-body-small) var(--td-font-family);
6062
--td-font-body-medium: var(--td-font-size-body-medium) / var(--td-line-height-body-medium) var(--td-font-family);
6163
--td-font-body-large: var(--td-font-size-body-large) / var(--td-line-height-body-large) var(--td-font-family);
6264
--td-font-title-small: 600 var(--td-font-size-title-small) / var(--td-line-height-title-small) var(--td-font-family);
63-
--td-font-title-medium: 600 var(--td-font-size-title-medium) / var(--td-line-height-title-medium) var(--td-font-family);
65+
--td-font-title-medium: 600 var(--td-font-size-title-medium) / var(--td-line-height-title-medium)
66+
var(--td-font-family);
6467
--td-font-title-large: 600 var(--td-font-size-title-large) / var(--td-line-height-title-large) var(--td-font-family);
65-
--td-font-title-extraLarge: 600 var(--td-font-size-title-extraLarge) / var(--td-line-height-title-extraLarge) var(--td-font-family);
66-
--td-font-headline-small: 600 var(--td-font-size-headline-small) / var(--td-line-height-headline-small) var(--td-font-family);
67-
--td-font-headline-medium: 600 var(--td-font-size-headline-medium) / var(--td-line-height-headline-medium) var(--td-font-family);
68-
--td-font-headline-large: 600 var(--td-font-size-headline-large) / var(--td-line-height-headline-large) var(--td-font-family);
69-
--td-font-display-medium: 600 var(--td-font-size-display-medium) / var(--td-line-height-display-medium) var(--td-font-family);
70-
--td-font-display-large: 600 var(--td-font-size-display-large) / var(--td-line-height-display-large) var(--td-font-family);
68+
--td-font-title-extraLarge: 600 var(--td-font-size-title-extraLarge) / var(--td-line-height-title-extraLarge)
69+
var(--td-font-family);
70+
--td-font-headline-small: 600 var(--td-font-size-headline-small) / var(--td-line-height-headline-small)
71+
var(--td-font-family);
72+
--td-font-headline-medium: 600 var(--td-font-size-headline-medium) / var(--td-line-height-headline-medium)
73+
var(--td-font-family);
74+
--td-font-headline-large: 600 var(--td-font-size-headline-large) / var(--td-line-height-headline-large)
75+
var(--td-font-family);
76+
--td-font-display-medium: 600 var(--td-font-size-display-medium) / var(--td-line-height-display-medium)
77+
var(--td-font-family);
78+
--td-font-display-large: 600 var(--td-font-size-display-large) / var(--td-line-height-display-large)
79+
var(--td-font-family);
7180

7281
// 字体大小 token
7382
--td-font-size: 20rpx;

packages/components/date-time-picker/__test__/__snapshots__/index.test.js.snap

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ exports[`date-time-picker :base 1`] = `
6969
>
7070
<wx-view
7171
class="t-picker-item__wrapper"
72-
style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, -240px, 0); padding: 80px 0"
72+
style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, -200px, 0); padding: 80px 0"
7373
>
7474
<wx-view
7575
class="t-picker-item__item"
@@ -80,7 +80,7 @@ exports[`date-time-picker :base 1`] = `
8080
<wx-text
8181
class="t-picker-item__item-label"
8282
>
83-
2015年
83+
2016年
8484
</wx-text>
8585
</wx-view>
8686
<wx-view
@@ -92,7 +92,7 @@ exports[`date-time-picker :base 1`] = `
9292
<wx-text
9393
class="t-picker-item__item-label"
9494
>
95-
2016年
95+
2017年
9696
</wx-text>
9797
</wx-view>
9898
<wx-view
@@ -104,7 +104,7 @@ exports[`date-time-picker :base 1`] = `
104104
<wx-text
105105
class="t-picker-item__item-label"
106106
>
107-
2017年
107+
2018年
108108
</wx-text>
109109
</wx-view>
110110
<wx-view
@@ -116,7 +116,7 @@ exports[`date-time-picker :base 1`] = `
116116
<wx-text
117117
class="t-picker-item__item-label"
118118
>
119-
2018年
119+
2019年
120120
</wx-text>
121121
</wx-view>
122122
<wx-view
@@ -128,31 +128,31 @@ exports[`date-time-picker :base 1`] = `
128128
<wx-text
129129
class="t-picker-item__item-label"
130130
>
131-
2019年
131+
2020年
132132
</wx-text>
133133
</wx-view>
134134
<wx-view
135-
class="t-picker-item__item"
135+
class="t-picker-item__item t-picker-item__item--active"
136136
data-index="{{5}}"
137137
style="height: 40px"
138138
bind:tap="onClickItem"
139139
>
140140
<wx-text
141141
class="t-picker-item__item-label"
142142
>
143-
2020年
143+
2021年
144144
</wx-text>
145145
</wx-view>
146146
<wx-view
147-
class="t-picker-item__item t-picker-item__item--active"
147+
class="t-picker-item__item"
148148
data-index="{{6}}"
149149
style="height: 40px"
150150
bind:tap="onClickItem"
151151
>
152152
<wx-text
153153
class="t-picker-item__item-label"
154154
>
155-
2021年
155+
2022年
156156
</wx-text>
157157
</wx-view>
158158
<wx-view
@@ -164,7 +164,7 @@ exports[`date-time-picker :base 1`] = `
164164
<wx-text
165165
class="t-picker-item__item-label"
166166
>
167-
2022年
167+
2023年
168168
</wx-text>
169169
</wx-view>
170170
<wx-view
@@ -176,7 +176,7 @@ exports[`date-time-picker :base 1`] = `
176176
<wx-text
177177
class="t-picker-item__item-label"
178178
>
179-
2023年
179+
2024年
180180
</wx-text>
181181
</wx-view>
182182
<wx-view
@@ -188,7 +188,7 @@ exports[`date-time-picker :base 1`] = `
188188
<wx-text
189189
class="t-picker-item__item-label"
190190
>
191-
2024年
191+
2025年
192192
</wx-text>
193193
</wx-view>
194194
<wx-view
@@ -200,7 +200,7 @@ exports[`date-time-picker :base 1`] = `
200200
<wx-text
201201
class="t-picker-item__item-label"
202202
>
203-
2025年
203+
2026年
204204
</wx-text>
205205
</wx-view>
206206
<wx-view
@@ -212,7 +212,7 @@ exports[`date-time-picker :base 1`] = `
212212
<wx-text
213213
class="t-picker-item__item-label"
214214
>
215-
2026年
215+
2027年
216216
</wx-text>
217217
</wx-view>
218218
<wx-view
@@ -224,7 +224,7 @@ exports[`date-time-picker :base 1`] = `
224224
<wx-text
225225
class="t-picker-item__item-label"
226226
>
227-
2027年
227+
2028年
228228
</wx-text>
229229
</wx-view>
230230
<wx-view
@@ -236,7 +236,7 @@ exports[`date-time-picker :base 1`] = `
236236
<wx-text
237237
class="t-picker-item__item-label"
238238
>
239-
2028年
239+
2029年
240240
</wx-text>
241241
</wx-view>
242242
<wx-view
@@ -248,7 +248,7 @@ exports[`date-time-picker :base 1`] = `
248248
<wx-text
249249
class="t-picker-item__item-label"
250250
>
251-
2029年
251+
2030年
252252
</wx-text>
253253
</wx-view>
254254
<wx-view
@@ -260,7 +260,7 @@ exports[`date-time-picker :base 1`] = `
260260
<wx-text
261261
class="t-picker-item__item-label"
262262
>
263-
2030年
263+
2031年
264264
</wx-text>
265265
</wx-view>
266266
<wx-view
@@ -272,7 +272,7 @@ exports[`date-time-picker :base 1`] = `
272272
<wx-text
273273
class="t-picker-item__item-label"
274274
>
275-
2031年
275+
2032年
276276
</wx-text>
277277
</wx-view>
278278
<wx-view
@@ -284,7 +284,7 @@ exports[`date-time-picker :base 1`] = `
284284
<wx-text
285285
class="t-picker-item__item-label"
286286
>
287-
2032年
287+
2033年
288288
</wx-text>
289289
</wx-view>
290290
<wx-view
@@ -296,7 +296,7 @@ exports[`date-time-picker :base 1`] = `
296296
<wx-text
297297
class="t-picker-item__item-label"
298298
>
299-
2033年
299+
2034年
300300
</wx-text>
301301
</wx-view>
302302
<wx-view
@@ -308,7 +308,7 @@ exports[`date-time-picker :base 1`] = `
308308
<wx-text
309309
class="t-picker-item__item-label"
310310
>
311-
2034年
311+
2035年
312312
</wx-text>
313313
</wx-view>
314314
<wx-view
@@ -320,7 +320,7 @@ exports[`date-time-picker :base 1`] = `
320320
<wx-text
321321
class="t-picker-item__item-label"
322322
>
323-
2035年
323+
2036年
324324
</wx-text>
325325
</wx-view>
326326
</wx-view>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
unpackage
2+
node_modules/
3+
coverage
4+
static/common/*
5+
6+
dist/
7+
/log/
8+
!.vuepress
9+
10+
uni_modules/
11+
miniprogram_npm/
12+
packages/tdesign/npm/
13+
packages/tdesign-uniapp-chat/npm/
14+
packages/tdesign-uniapp-chat/chat-list/_example/ec-canvas/echarts.js
15+
16+
*.html
17+
!.stylelintrc.js
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
module.exports = {
2+
root: true,
3+
extends: ['eslint-config-light-vue3'],
4+
globals: {
5+
getCurrentPages: true,
6+
uni: true,
7+
globalThis: true,
8+
qq: true,
9+
weex: true,
10+
plus: true,
11+
getApp: true,
12+
},
13+
parserOptions: {
14+
project: 'tsconfig.eslint.json',
15+
// https://stackoverflow.com/questions/77792745/fatalerror-error-ts6046-argument-for-moduleresolution-option-must-be-nod
16+
tsconfigRootDir: __dirname,
17+
18+
ecmaVersion: 'latest',
19+
extraFileExtensions: ['.vue'],
20+
},
21+
rules: {
22+
'vue/no-v-text-v-html-on-component': 0,
23+
},
24+
};

0 commit comments

Comments
 (0)