Skip to content

Commit

Permalink
Merge branch 'develop' into fix/search_1227
Browse files Browse the repository at this point in the history
  • Loading branch information
anlyyao committed Jun 27, 2024
2 parents 72543bd + af398d3 commit 09fa8e1
Show file tree
Hide file tree
Showing 989 changed files with 11,793 additions and 8,847 deletions.
18 changes: 11 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,16 @@ module.exports = {
plugins: ['@typescript-eslint', 'prettier', 'import'],
// add your custom rules here
rules: {
'import/order': ['error', {
groups: [
'builtin', // Built-in types are first
'external', // Then the index file
'internal',
]
}],
'import/order': [
'error',
{
groups: [
'builtin', // Built-in types are first
'external', // Then the index file
'internal',
],
},
],
// 非开发模式禁用debugger
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
// 允许调用首字母大写的函数时没有 new 操作符
Expand Down Expand Up @@ -100,6 +103,7 @@ module.exports = {
rules: {
// node 环境下支持 require
'@typescript-eslint/no-require-imports': 'off',
'no-console': 0,
},
},
{
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @anlyyao @jarmywang
4 changes: 2 additions & 2 deletions .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- run: echo "The head of this PR starts with 'release/'"
- uses: actions/checkout@v3
- uses: 94dreamer/auto-release@develop
- uses: TDesignOteam/tdesign-changelog-action@main
id: changelog
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
BODY: ${{ github.event.comment.body }}
run: |
txt=$(cat CHANGELOG.md)
echo "${txt%%##*} $BODY ${txt##*---}" > CHANGELOG.md
echo "${txt%%##*}$BODY${txt##*---}" > CHANGELOG.md
git add .
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/pr-spelling.template.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: pr-spell-check
on: [pull_request]

jobs:
run:
name: Spell Check with Typos
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Check spelling
uses: crate-ci/typos@master
with:
config: .github/workflows/typos-config.toml
10 changes: 10 additions & 0 deletions .github/workflows/typos-config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
default.check-filename = true

[default.extend-words]
actived = "actived"
Colum = "Colum"
ded = "ded"
destory ="destory"

[files]
extend-exclude = ["CHANGELOG.md"]
325 changes: 240 additions & 85 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ npm run dev

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

<img src="https://oteam-tdesign-1258344706.cos.ap-guangzhou.myqcloud.com/qrcode/miniprogram-wecom.jpg" width="200" />
<img src="https://raw.githubusercontent.com/Tencent/tdesign/main/packages/components/src/images/groups/wx-group.png" width="200" />

## 开源协议

Expand Down
77 changes: 0 additions & 77 deletions USED.md

This file was deleted.

71 changes: 60 additions & 11 deletions example/app.json
Original file line number Diff line number Diff line change
@@ -1,56 +1,92 @@
{
"darkmode": true,
"pages": [
"pages/home/home",
"pages/button/button",
"pages/button/skyline/button",
"pages/tabs/tabs",
"pages/icon/icon",
"pages/icon/skyline/icon",
"pages/loading/loading",
"pages/loading/skyline/loading",
"pages/progress/progress",
"pages/progress/skyline/progress",
"pages/cascader/cascader",
"pages/cell/cell",
"pages/cell/skyline/cell",
"pages/cell-group/cell-group",
"pages/collapse/collapse",
"pages/collapse/skyline/collapse",
"pages/input/input",
"pages/input/skyline/input",
"pages/badge/badge",
"pages/badge/skyline/badge",
"pages/textarea/textarea",
"pages/textarea/skyline/textarea",
"pages/message/message",
"pages/toast/toast",
"pages/toast/skyline/toast",
"pages/stepper/stepper",
"pages/stepper/skyline/stepper",
"pages/slider/slider",
"pages/slider/skyline/slider",
"pages/radio/radio",
"pages/radio/skyline/radio",
"pages/switch/switch",
"pages/sticky/sticky",
"pages/tag/tag",
"pages/tag/skyline/tag",
"pages/checkbox/checkbox",
"pages/checkbox/skyline/checkbox",
"pages/gulp-error/index",
"pages/fab/fab",
"pages/fab/skyline/fab",
"pages/tab-bar/tab-bar",
"pages/tab-bar/skyline/tab-bar",
"pages/transition/transition",
"pages/popup/popup",
"pages/popup/skyline/popup",
"pages/steps/steps",
"pages/steps/skyline/steps",
"pages/dropdown-menu/dropdown-menu",
"pages/drawer/drawer",
"pages/drawer/skyline/drawer",
"pages/pull-down-refresh/pull-down-refresh",
"pages/pull-down-refresh/skyline/pull-down-refresh",
"pages/skeleton/skeleton",
"pages/skeleton/skyline/skeleton",
"pages/footer/footer",
"pages/footer/skyline/footer",
"pages/divider/divider",
"pages/divider/skyline/divider",
"pages/empty/empty",
"pages/empty/skyline/empty",
"pages/back-top/back-top",
"pages/back-top/skyline/back-top",
"pages/grid/grid",
"pages/upload/upload",
"pages/count-down/count-down",
"pages/count-down/skyline/count-down",
"pages/overlay/overlay",
"pages/overlay/skyline/overlay",
"pages/image/image",
"pages/image/skyline/image",
"pages/search/search",
"pages/home/navigateFail/navigateFail",
"pages/navbar/navbar",
"pages/navbar/skyline/navbar",
"pages/date-time-picker/date-time-picker",
"pages/date-time-picker/skyline/date-time-picker",
"pages/notice-bar/notice-bar",
"pages/image-viewer/image-viewer",
"pages/image-viewer/skyline/image-viewer",
"pages/result/result",
"pages/result/skyline/result",
"pages/result/result-page",
"pages/link/link",
"pages/col/col"
"pages/link/skyline/link",
"pages/col/col",
"pages/col/skyline/col"
],
"subpackages": [
{
Expand All @@ -63,27 +99,27 @@
},
{
"root": "pages/avatar/",
"pages": ["avatar"]
"pages": ["avatar", "skyline/avatar"]
},
{
"root": "pages/calendar/",
"pages": ["calendar"]
},
{
"root": "pages/dialog/",
"pages": ["dialog"]
"pages": ["dialog", "skyline/dialog"]
},
{
"root": "pages/picker/",
"pages": ["picker"]
"pages": ["picker", "skyline/picker"]
},
{
"root": "pages/rate/",
"pages": ["rate"]
},
{
"root": "pages/swiper/",
"pages": ["swiper"]
"pages": ["swiper", "skyline/swiper"]
},
{
"root": "pages/swipe-cell/",
Expand All @@ -98,17 +134,30 @@
"pages": ["indexes", "base/index", "custom/index"]
}
],
"themeLocation": "theme.json",
"usingComponents": {
"t-demo": "./components/demo-block/index",
"t-button": "tdesign-miniprogram/button/button",
"t-icon": "tdesign-miniprogram/icon/icon"
"t-icon": "tdesign-miniprogram/icon/icon",
"t-navbar": "tdesign-miniprogram/navbar/navbar"
},
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#f6f6f6",
"backgroundColor": "#f6f6f6",
"navigationBarTitleText": "TDesign",
"navigationBarTextStyle": "black"
"navigationStyle": "custom",
"navigationBarTextStyle": "@navTxtStyle"
},
"sitemapLocation": "sitemap.json"
"resolveAlias": {
"@behaviors/*": "behaviors/*"
},
"sitemapLocation": "sitemap.json",
"lazyCodeLoading": "requiredComponents",
"rendererOptions": {
"skyline": {
"disableABTest": true,
"defaultDisplayBlock": true,
"defaultContentBox": true,
"sdkVersionBegin": "3.4.3",
"sdkVersionEnd": "15.255.255"
}
}
}
Loading

0 comments on commit 09fa8e1

Please sign in to comment.