Skip to content

Commit e06331b

Browse files
committed
Merge branch 'main' into git-pages
2 parents 9a2d5a9 + 60fe177 commit e06331b

34 files changed

+561
-227
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Additional context**
24+
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Custom issue template
3+
about: Describe this issue template's purpose here.
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
## PR 标题
2+
3+
简要描述本次 Pull Request 的目的或变更内容。
4+
5+
## 变更类型
6+
7+
请勾选本次 PR 属于以下哪种类型(可多选):
8+
9+
- [ ] Bug 修复(修复现有问题)
10+
- [ ] 新功能(添加新功能或特性)
11+
- [ ] 文档更新(仅更改文档)
12+
- [ ] 性能优化(提升性能或代码质量)
13+
- [ ] 测试添加(增加或完善测试用例)
14+
- [ ] 重构代码(不影响功能的代码优化)
15+
16+
## 相关问题
17+
18+
请关联相关的 Issue 编号(如适用):
19+
20+
- 关联问题:#123
21+
22+
## 变更内容描述
23+
24+
详细描述本次变更的内容:
25+
26+
1. 添加/更新的功能或逻辑。
27+
2. 影响的模块或文件。
28+
3. 其他说明信息。
29+
30+
## Checklist
31+
32+
在提交前,请确保已完成以下事项:
33+
34+
- [ ] 我的代码遵循项目的编码规范。
35+
- [ ] 我已对代码进行了自测,并确保功能正常。
36+
- [ ] 我的变更不影响现有功能或测试通过。
37+
- [ ] 文档已更新(如适用)。
38+
39+
## 其他说明
40+
41+
其他需要告知审阅者的信息:
42+
43+
- 示例:兼容性注意事项、已知问题等。

.github/workflows/auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ jobs:
4646
- name: Repository Dispatch
4747
uses: peter-evans/repository-dispatch@v3
4848
with:
49-
event-type: git-pages-deploy
49+
event-type: git-pages-deploy
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Lint and type checking
2+
on:
3+
pull_request:
4+
branches:
5+
- main
6+
7+
jobs:
8+
lint-and-type-checking:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v4
13+
with:
14+
fetch-depth: 0
15+
16+
- name: Setup pnpm
17+
uses: pnpm/action-setup@v4
18+
19+
- name: Setup Node.js
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: '22'
23+
cache: pnpm
24+
25+
- name: Install dependencies
26+
run: pnpm install
27+
28+
- name: Run lint check
29+
run: npm run lint:eslint
30+
31+
- name: Run type check
32+
run: npm run type:check

CHANGELOG.md

Lines changed: 167 additions & 143 deletions
Large diffs are not rendered by default.

Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM nginx:latest
2+
3+
LABEL description="Nginx vue-xs-admin"
4+
5+
COPY dist /usr/share/nginx/html
6+
7+
COPY default.conf /etc/nginx/conf.d/
8+
9+
CMD [ "nginx", "-g", "daemon off;" ]
10+

README.EN.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Password: admin123
2323
- [github site](https://jsxiaosi.github.io/vue-xs-admin-docs/)
2424
- [gitee site](https://jsxiaosi.gitee.io/vue-xs-admin-docs)
2525

26+
## Simple version
27+
28+
- [mini-xs-admin](https://github.com/jsxiaosi/mini-xs-admin)
29+
2630
## Electron Edition
2731

2832
- [electron-xs-admin](https://github.com/jsxiaosi/electron-xs-admin)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
## 简易版
2727

28-
- [min-xs-admin](https://github.com/jsxiaosi/min-xs-admin)
28+
- [mini-xs-admin](https://github.com/jsxiaosi/mini-xs-admin)
2929

3030
## Electron 版
3131

0 commit comments

Comments
 (0)