Skip to content

Commit 8ad0bef

Browse files
KevinAndrewDongKevinAndrewDong
committed
Merge branch 'dev' of https://github.com/opentiny/tiny-vue into andrewdong/feat-select-docs
* 'dev' of https://github.com/opentiny/tiny-vue: (152 commits) feat: add triggering conditions (opentiny#3922) fix:修复初始化tab内容无法加载问题 (opentiny#3920) fix(modal): 修复 modal 组件在 alert, confirm 的弹窗场景下标题图标没有垂直局中的问题 (opentiny#3917) fix(dropdown): add aria information to the dropdown component (opentiny#3913) feat:下拉树支持懒加载 (opentiny#3915) docs: update introduce doc (opentiny#3914) feat:select-wrapper多端示例以及文档 (opentiny#3882) feat:select-wrapper多端 (opentiny#3881) fix(transfer): fix it works when item data receive empty object (opentiny#3912) feat(switch): add width property to support custom switch width (opentiny#3879) fix: optimize the training ground (opentiny#3911) fix(e2e): fix e2e error caused by select refactor (opentiny#3905) feat: automatically trigger updates to the docs document (opentiny#3906) feat: add auto-build-main-module-docs yml (opentiny#3910) fix(split): add saas style (opentiny#3908) fix(grid): fix visible columns change wloud delete insert row (opentiny#3897) chore: add svg icon-layout-vertical (opentiny#3904) fix(saas-icon): add lost icon (opentiny#3903) fix: 修复saas-common 构建报错 (opentiny#3901) fix(grid): add border-top when set border is true (opentiny#3896) ...
2 parents 6b4a7e1 + 894f3d4 commit 8ad0bef

File tree

4,031 files changed

+57150
-16967
lines changed

Some content is hidden

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

4,031 files changed

+57150
-16967
lines changed

‎.all-contributorsrc‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,24 @@
717717
"contributions": [
718718
"code"
719719
]
720+
},
721+
{
722+
"login": "gausszhou",
723+
"name": "Gauss Zhou",
724+
"avatar_url": "https://avatars.githubusercontent.com/u/46297500?v=4",
725+
"profile": "https://gausszhou.github.io/",
726+
"contributions": [
727+
"code"
728+
]
729+
},
730+
{
731+
"login": "liangguanhui0117",
732+
"name": "LiangGuanhui",
733+
"avatar_url": "https://avatars.githubusercontent.com/u/28801619?v=4",
734+
"profile": "https://github.com/liangguanhui0117",
735+
"contributions": [
736+
"code"
737+
]
720738
}
721739
],
722740
"contributorsPerLine": 8,

‎.github/workflows/auto-build-main-module-docs.yml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: Auto Build Main Module Docs
2+
3+
on:
4+
pull_request:
5+
branches: [dev]
6+
paths:
7+
- 'examples/sites/demos/pc/webdoc/**'
8+
push:
9+
branches: [dev]
10+
paths:
11+
- 'examples/sites/demos/pc/webdoc/**'
12+
13+
jobs:
14+
verify-main-build:
15+
runs-on: ubuntu-latest
16+
permissions:
17+
contents: read
18+
pull-requests: write
19+
20+
steps:
21+
- uses: webfactory/ssh-agent@v0.8.0
22+
with:
23+
ssh-private-key: ${{ secrets.SUBMODULE_SSH_KEY_PRIVATE }}
24+
- name: Checkout submodule repo
25+
uses: actions/checkout@v4
26+
with:
27+
fetch-depth: 0
28+
token: ${{ secrets.PAT_TOKEN }}
29+
30+
- name: Checkout main repository
31+
run: |
32+
# 克隆主仓库
33+
git clone https://github.com/opentiny/docs.git docs
34+
cd docs
35+
36+
# 更新子模块到PR分支的版本
37+
git submodule sync --recursive
38+
git submodule update --init --recursive
39+
40+
41+
# 获取PR分支的最新提交
42+
cd ./tiny-vue
43+
BRANCH_NAME="${{ github.head_ref }}"
44+
git fetch origin $BRANCH_NAME
45+
git checkout $BRANCH_NAME
46+
47+
# 回到主仓库根目录
48+
cd ../
49+
50+
- name: Setup pnpm
51+
uses: pnpm/action-setup@v3
52+
with:
53+
version: 9
54+
55+
- name: Run main repo build
56+
id: build
57+
working-directory: ./docs
58+
run: |
59+
pnpm i
60+
# 如果使用VitePress
61+
pnpm build
62+
63+
- name: Update PR status
64+
if: always()
65+
run: |
66+
# 检查构建是否成功
67+
if [ ${{ steps.build.outcome }} == 'success' ]; then
68+
echo "✅ 主仓库构建成功"
69+
else
70+
echo "❌ 主仓库构建失败"
71+
exit 1
72+
fi

‎.github/workflows/auto-deploy-docs.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Auto Deploy Docs
2+
3+
on:
4+
push:
5+
branches: [dev]
6+
paths:
7+
- 'examples/sites/demos/pc/webdoc/**'
8+
9+
jobs:
10+
notify:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Trigger main repo workflow
14+
env:
15+
PAT: ${{ secrets.PAT_TOKEN }}
16+
run: |
17+
curl -X POST \
18+
-H "Authorization: token $PAT" \
19+
-H "Accept: application/vnd.github.v3+json" \
20+
https://api.github.com/repos/opentiny/docs/dispatches \
21+
-d '{"event_type":"submodule-updated"}'

‎.github/workflows/deploy-obs-saas.yml‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
name: Deploy to Huawei OBS SaaS
2+
3+
on:
4+
push:
5+
branches: [dev]
6+
paths:
7+
- 'examples/sites/**'
8+
- '!examples/sites/**/*.spec.ts'
9+
10+
workflow_dispatch:
11+
inputs:
12+
version:
13+
description: 输入您将要发布的版本号（默认使用 examples/sites/package.json 中的版本号），例如：`3.x.x`。
14+
required: false
15+
type: string
16+
17+
env:
18+
# 在 GitHub 项目源码仓库 → 项目的 Settings → Secrets(Actions 里的 Repository secrets) 里提前建好以下变量
19+
HUAWEI_CLOUD_AK: ${{ secrets.HUAWEI_CLOUD_AK }}
20+
HUAWEI_CLOUD_SK: ${{ secrets.HUAWEI_CLOUD_SK }}
21+
HUAWEI_CLOUD_ENDPOINT: ${{ secrets.HUAWEI_CLOUD_ENDPOINT }}
22+
HUAWEI_CLOUD_BUCKET: ${{ secrets.HUAWEI_CLOUD_BUCKET }}
23+
24+
permissions:
25+
contents: read
26+
pages: write
27+
id-token: write
28+
29+
jobs:
30+
# Build job
31+
build:
32+
runs-on: ubuntu-latest
33+
outputs:
34+
version: ${{ steps.ver.outputs.value }}
35+
steps:
36+
- name: Checkout
37+
uses: actions/checkout@v4
38+
- name: Setup pnpm
39+
uses: pnpm/action-setup@v3
40+
with:
41+
version: 9
42+
- name: Install deps
43+
run: pnpm i --no-frozen-lockfile
44+
- name: Get version
45+
id: ver
46+
run: |
47+
# 优先用手动输入的版本号
48+
if [ -n "${{ inputs.version }}" ]; then
49+
VERSION="${{ inputs.version }}"
50+
else
51+
VERSION="$(node -p "require('./examples/sites/package.json').version")"
52+
fi
53+
echo "Home version: $VERSION"
54+
echo "value=$VERSION" >> $GITHUB_OUTPUT
55+
- name: Build site
56+
run: |
57+
export NODE_OPTIONS="--max-old-space-size=8192"
58+
pnpm -F @opentiny/vue-docs build:saas
59+
env:
60+
VITE_CONTEXT: /tiny-vue-saas/
61+
VITE_PLAYGROUND_URL: /vue-saas-playground
62+
VITE_APP_BUILD_BASE_URL: //res-static.opentiny.design/tiny-vue-saas/${{ steps.ver.outputs.value }}/
63+
- name: Copy files
64+
run: |
65+
cp ./examples/sites/dist/index.html ./examples/sites/dist/404.html
66+
- name: Upload build artifact
67+
uses: actions/upload-artifact@v4
68+
with:
69+
name: dist-artifact
70+
path: ./examples/sites/dist/
71+
# Deploy job
72+
deploy:
73+
needs: build
74+
runs-on: ubuntu-latest
75+
steps:
76+
- name: Download build artifact
77+
uses: actions/download-artifact@v4
78+
with:
79+
name: dist-artifact
80+
path: ./examples/sites/dist/
81+
- name: Show version
82+
run: |
83+
echo "Deploying version: ${{ needs.build.outputs.version }}"
84+
# ===== 下载 obsutil =====
85+
- name: Install obsutil
86+
run: |
87+
curl -o obsutil.tar.gz https://obs-community.obs.cn-north-1.myhuaweicloud.com/obsutil/current/obsutil_linux_amd64.tar.gz
88+
tar -xzf obsutil.tar.gz
89+
chmod +x obsutil_linux_amd64_*/obsutil
90+
sudo mv obsutil_linux_amd64_*/obsutil /usr/local/bin/obsutil
91+
92+
# ===== 配置并上传 =====
93+
- name: Upload to OBS
94+
run: |
95+
# 一次性配置 AK/SK/endpoint
96+
obsutil config -i=${{ env.HUAWEI_CLOUD_AK }} \
97+
-k=${{ env.HUAWEI_CLOUD_SK }} \
98+
-e=${{ env.HUAWEI_CLOUD_ENDPOINT }}
99+
100+
# 把本地 dist/ 目录整站同步到桶根目录
101+
echo "needs.build.outputs.version: ${{ needs.build.outputs.version }}"
102+
mv examples/sites/dist ${{ needs.build.outputs.version }}
103+
obsutil cp ${{ needs.build.outputs.version }} obs://${{ env.HUAWEI_CLOUD_BUCKET }}/tiny-vue-saas/ -r -f

‎.github/workflows/deploy-obs.yml‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
name: Deploy to Huawei OBS
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*'
7+
paths:
8+
- 'examples/sites/**'
9+
- '!examples/sites/**/*.spec.ts'
10+
11+
workflow_dispatch:
12+
inputs:
13+
version:
14+
description: 输入您将要发布的版本号（默认使用 examples/sites/package.json 中的版本号），例如：`3.x.x`。
15+
required: false
16+
type: string
17+
18+
env:
19+
# 在 GitHub 项目源码仓库 → 项目的 Settings → Secrets(Actions 里的 Repository secrets) 里提前建好以下变量
20+
HUAWEI_CLOUD_AK: ${{ secrets.HUAWEI_CLOUD_AK }}
21+
HUAWEI_CLOUD_SK: ${{ secrets.HUAWEI_CLOUD_SK }}
22+
HUAWEI_CLOUD_ENDPOINT: ${{ secrets.HUAWEI_CLOUD_ENDPOINT }}
23+
HUAWEI_CLOUD_BUCKET: ${{ secrets.HUAWEI_CLOUD_BUCKET }}
24+
25+
permissions:
26+
contents: read
27+
pages: write
28+
id-token: write
29+
30+
jobs:
31+
# Build job
32+
build:
33+
runs-on: ubuntu-latest
34+
outputs:
35+
version: ${{ steps.ver.outputs.value }}
36+
steps:
37+
- name: Checkout
38+
uses: actions/checkout@v4
39+
- name: Setup pnpm
40+
uses: pnpm/action-setup@v3
41+
with:
42+
version: 9
43+
- name: Install deps
44+
run: pnpm i --no-frozen-lockfile
45+
- name: Get version
46+
id: ver
47+
run: |
48+
# 优先用手动输入的版本号
49+
if [ -n "${{ inputs.version }}" ]; then
50+
VERSION="${{ inputs.version }}"
51+
else
52+
VERSION="$(node -p "require('./examples/sites/package.json').version")"
53+
fi
54+
echo "Home version: $VERSION"
55+
echo "value=$VERSION" >> $GITHUB_OUTPUT
56+
- name: Build site
57+
run: |
58+
export NODE_OPTIONS="--max-old-space-size=8192"
59+
pnpm build:site
60+
env:
61+
VITE_APP_BUILD_BASE_URL: //res-static.opentiny.design/tiny-vue-web-doc/${{ steps.ver.outputs.value }}/
62+
VITE_PLAYGROUND_URL: /vue-playground
63+
- name: Copy files
64+
run: |
65+
cp ./examples/sites/dist/index.html ./examples/sites/dist/404.html
66+
- name: Upload build artifact
67+
uses: actions/upload-artifact@v4
68+
with:
69+
name: dist-artifact
70+
path: ./examples/sites/dist/
71+
# Deploy job
72+
deploy:
73+
needs: build
74+
runs-on: ubuntu-latest
75+
steps:
76+
- name: Download build artifact
77+
uses: actions/download-artifact@v4
78+
with:
79+
name: dist-artifact
80+
path: ./examples/sites/dist/
81+
- name: Show version
82+
run: |
83+
echo "Deploying version: ${{ needs.build.outputs.version }}"
84+
# ===== 下载 obsutil =====
85+
- name: Install obsutil
86+
run: |
87+
curl -o obsutil.tar.gz https://obs-community.obs.cn-north-1.myhuaweicloud.com/obsutil/current/obsutil_linux_amd64.tar.gz
88+
tar -xzf obsutil.tar.gz
89+
chmod +x obsutil_linux_amd64_*/obsutil
90+
sudo mv obsutil_linux_amd64_*/obsutil /usr/local/bin/obsutil
91+
92+
# ===== 配置并上传 =====
93+
- name: Upload to OBS
94+
run: |
95+
# 一次性配置 AK/SK/endpoint
96+
obsutil config -i=${{ env.HUAWEI_CLOUD_AK }} \
97+
-k=${{ env.HUAWEI_CLOUD_SK }} \
98+
-e=${{ env.HUAWEI_CLOUD_ENDPOINT }}
99+
100+
# 把本地 dist/ 目录整站同步到桶根目录
101+
echo "needs.build.outputs.version: ${{ needs.build.outputs.version }}"
102+
mv examples/sites/dist ${{ needs.build.outputs.version }}
103+
obsutil cp ${{ needs.build.outputs.version }} obs://${{ env.HUAWEI_CLOUD_BUCKET }}/tiny-vue-web-doc/ -r -f

‎.gitignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ packages/**/runtime
99
coverage/
1010
test-results
1111

12-
/packages/vue/index.ts
13-
/packages/vue/pc.ts
14-
/packages/vue/mobile.ts
15-
/packages/vue/mobile-first.ts
16-
/packages/vue/app.ts
17-
/packages/vue-icon-saas/src
18-
/packages/vue-icon-saas/index.ts
1912

2013
/packages/vue-runtime/pc.ts
2114
/packages/vue-runtime/mobile.ts

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
<p align="center">An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.</p>
88

9+
[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/opentiny/tiny-vue)
10+
911
English | [简体中文](README.zh-CN.md)
1012

1113
🌈 Features:
@@ -182,6 +184,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
182184
<td align="center" valign="top" width="12.5%"><a href="https://github.com/sakurajiajia"><img src="https://avatars.githubusercontent.com/u/37933037?v=4?s=100" width="100px;" alt="木斯佳"/><br /><sub><b>木斯佳</b></sub></a><br /><a href="https://github.com/opentiny/tiny-vue/commits?author=sakurajiajia" title="Documentation">📖</a></td>
183185
<td align="center" valign="top" width="12.5%"><a href="https://github.com/552847957"><img src="https://avatars.githubusercontent.com/u/8729901?v=4?s=100" width="100px;" alt="552847957"/><br /><sub><b>552847957</b></sub></a><br /><a href="https://github.com/opentiny/tiny-vue/commits?author=552847957" title="Documentation">📖</a></td>
184186
<td align="center" valign="top" width="12.5%"><a href="https://github.com/Lingchen111"><img src="https://avatars.githubusercontent.com/u/123021749?v=4?s=100" width="100px;" alt="Lingchen111"/><br /><sub><b>Lingchen111</b></sub></a><br /><a href="https://github.com/opentiny/tiny-vue/commits?author=Lingchen111" title="Code">💻</a></td>
187+
<td align="center" valign="top" width="12.5%"><a href="https://gausszhou.github.io/"><img src="https://avatars.githubusercontent.com/u/46297500?v=4?s=100" width="100px;" alt="Gauss Zhou"/><br /><sub><b>Gauss Zhou</b></sub></a><br /><a href="https://github.com/opentiny/tiny-vue/commits?author=gausszhou" title="Code">💻</a></td>
188+
</tr>
189+
<tr>
190+
<td align="center" valign="top" width="12.5%"><a href="https://github.com/liangguanhui0117"><img src="https://avatars.githubusercontent.com/u/28801619?v=4?s=100" width="100px;" alt="LiangGuanhui"/><br /><sub><b>LiangGuanhui</b></sub></a><br /><a href="https://github.com/opentiny/tiny-vue/commits?author=liangguanhui0117" title="Code">💻</a></td>
185191
</tr>
186192
</tbody>
187193
</table>

‎README.zh-CN.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
<p align="center">一套跨端、跨框架的企业级 UI 组件库，支持 Vue 2 和 Vue 3，支持 PC 端和移动端。</p>
88

9+
[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/opentiny/tiny-vue)
10+
911
[English](README.md) | 简体中文
1012

1113
🌈 特性：

‎examples/docs/newsrc/utils/componentsDoc.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
export const apis = import.meta.glob('../../../sites/demos/apis/*.js', { eager: false })
22

33
export const getPath = (path) => {
4-
if (path.startsWith('grid-')) {
4+
if (path === 'grid-select') {
5+
return 'grid-select'
6+
} else if (path.startsWith('grid-')) {
57
return 'grid'
68
} else if (path.startsWith('chart-')) {
79
return 'chart'
10+
} else {
11+
return path
812
}
9-
return path
1013
}
1114

1215
export const getApisConfig = async (component, mode) => {

0 commit comments

Comments
 (0)