Skip to content

feat: Adapt to the new version of SSO #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 41 commits into from
May 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
46a1479
chore: router vaild limit
Wesley-0808 May 1, 2025
d48f858
feat: sso update
Wesley-0808 May 7, 2025
fdd4df8
fix: typo
Wesley-0808 May 7, 2025
62fa219
Update CODEOWNERS
Wesley-0808 May 7, 2025
95dfa67
feat: menu dropdown
Wesley-0808 May 8, 2025
172b23f
fix: permissions
Wesley-0808 May 8, 2025
4dc223a
fix: index animation & taskList & add components
Wesley-0808 May 10, 2025
a9b1264
chore: CHANGELOG
Wesley-0808 May 10, 2025
28d3869
fix: rate v-model
Wesley-0808 May 10, 2025
7995cce
chore: fileName & path
Wesley-0808 May 10, 2025
7035fea
chore: prop limit & router icon
Wesley-0808 May 10, 2025
1aece0d
feat: recordList filter
Wesley-0808 May 11, 2025
038dfca
fix: path
Wesley-0808 May 11, 2025
879c6ce
fix: path
Wesley-0808 May 11, 2025
045addc
chore: ci & deps & remove LICENSE
Wesley-0808 May 17, 2025
decdd3e
chore: typescript & check token
Wesley-0808 May 17, 2025
06713e5
chore: system name
Wesley-0808 May 17, 2025
e88c534
feat: auditManage UI
Wesley-0808 May 17, 2025
88bcb8f
feat: auditPost 1/3
Wesley-0808 May 20, 2025
d97f0fb
feat: auditPost 2/3
Wesley-0808 May 21, 2025
d425cb9
feat: auditPost 3/3
Wesley-0808 May 21, 2025
67099cb
feat: auditProgress 1/3
Wesley-0808 May 21, 2025
b2f5abd
feat: auditProgress 2/3
Wesley-0808 May 22, 2025
11714eb
chore: taskManage optimize
Wesley-0808 May 22, 2025
e93e925
chore: optimize: config & menu & breadcrumb
Wesley-0808 May 22, 2025
61d6ae3
feat: auditProgress 3/3
Wesley-0808 May 23, 2025
14e95a6
chore(config): remove permissions
Wesley-0808 May 25, 2025
0c710d4
chore: utils
Wesley-0808 May 25, 2025
4583be0
feat: taskManage with audit
Wesley-0808 May 25, 2025
981ed64
chore: components & previewTimeline
Wesley-0808 May 25, 2025
59c285f
chore: remove mixed & add comment
Wesley-0808 May 25, 2025
c091b38
feat: lend with audit
Wesley-0808 May 26, 2025
ad3f83f
chore: common & copyright & types & router utils
Wesley-0808 May 26, 2025
2c84992
feat: audit 100%
Wesley-0808 May 26, 2025
a10fb4d
fix: lint
Wesley-0808 May 26, 2025
bda6074
chore: copyright
Wesley-0808 May 26, 2025
d580298
chore: optimize path
Wesley-0808 May 26, 2025
6c98b72
feat: internet code
Wesley-0808 May 27, 2025
4e9a824
fix: lint
Wesley-0808 May 27, 2025
6701ba2
chore: title
Wesley-0808 May 27, 2025
80373d5
chore: empty content
Wesley-0808 May 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @Wesley-0808 @WesleyWork-bot @minghua1016 @DDoS-LING
* @Wesley-0808 @WesleyWork-bot @minghua1016 @DDoS-LING @ZHF0208
20 changes: 19 additions & 1 deletion .github/workflows/preview-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,30 @@ jobs:
id: pr
run: echo "id=$(<pr-id.txt)" >> $GITHUB_OUTPUT

- name: download preview site artifact
uses: dawidd6/action-download-artifact@v6
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
run_id: ${{ github.event.workflow_run.id }}
name: preview site
- run: |
unzip preview.zip

- name: Upload surge service and generate preview URL
id: deploy
run: |
repository=${{github.repository}}
export DEPLOY_DOMAIN=https://preview-pr-${{ steps.pr.outputs.id }}-mtb-oa.surge.sh
npx surge --project dist --domain $DEPLOY_DOMAIN --token ${{ secrets.SURGE_TOKEN }}
echo the preview URL is $DEPLOY_DOMAIN
echo "url=$DEPLOY_DOMAIN" >> $GITHUB_OUTPUT

- name: update status comment
uses: actions-cool/maintain-one-comment@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
<a href="javascript:void(1)"><img height="96" alt="完成" src="https://user-images.githubusercontent.com/15634204/150816437-9f5bb788-cd67-4cbc-9897-b82d74e9aa65.png" /></a>
<a href="${{steps.deploy.outputs.url}}"><img height="96" alt="完成" src="https://user-images.githubusercontent.com/15634204/150816437-9f5bb788-cd67-4cbc-9897-b82d74e9aa65.png" /></a>
<!-- [工作流地址](${{github.server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}) -->
<!-- AUTO_PREVIEW_HOOK -->
number: ${{ steps.pr.outputs.id }}
Expand Down
20 changes: 14 additions & 6 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@ jobs:
# 运行代码 lint 检查
- run: pnpm run lint

# # 将测试报告上传到 Codecov
# - uses: codecov/codecov-action@v2
# with:
# # 使用 GitHub Secrets 中的 Codecov Token
# token: ${{ secrets.CODECOV_TOKEN }}

build:
# 在最新版本的 Ubuntu 环境中运行
runs-on: ubuntu-latest
Expand Down Expand Up @@ -105,3 +99,17 @@ jobs:
# 运行构建任务
- name: Build
run: pnpm run build

- run: |
zip -r preview.zip dist

# 上传站点文件作为构建产物
- name: upload preview site artifact
uses: actions/upload-artifact@v4
with:
# 产物名称
name: preview
# 产物路径
path: preview.zip
# 产物保留天数
retention-days: 5
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- `Index`:
- 修复切换动画时闪目标页面的问题 @Wesley-0808 ([#53](https://github.com/Wesley-Work/MTB-OA/pull/53))
- 修复网页图标无法正确加载的问题 @Wesley-0808 ([#53](https://github.com/Wesley-Work/MTB-OA/pull/53))
- `SuppleRecord`: 修复点击添加借出记录按钮无反馈的问题 @Wesley-0808
- `SuppleRecord`: 修复点击添加借出记录按钮无反馈的问题 @Wesley-0808 ([#55](https://github.com/Wesley-Work/MTB-OA/pull/55))
### 🚧 Others
- `EquipmentManage`: 更新设备列表不会改变分页内容 @Wesley-0808 ([#53](https://github.com/Wesley-Work/MTB-OA/pull/53))
- `UserManage`: 更新用户列表不会改变分页内容 @Wesley-0808 ([#53](https://github.com/Wesley-Work/MTB-OA/pull/53))
Expand Down
121 changes: 0 additions & 121 deletions LICENSE

This file was deleted.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="zh">
<head>
<meta charset="utf-8" />
<title>媒体部管理系统</title>
<title>媒体部信息化协作与管理系统</title>
<link rel="icon" type="image/png" href="./static/td.ico" />
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "vite",
"name": "mtb-oa",
"private": true,
"version": "3.3.3",
"type": "module",
Expand Down Expand Up @@ -32,7 +32,7 @@
"md5.js": "^1.3.5",
"nprogress": "^0.2.0",
"tdesign-icons-vue-next": "^0.3.6",
"tdesign-vue-next": "^1.12.0",
"tdesign-vue-next": "^1.13.0",
"vue": "^3.5.12",
"vue-router": "^4.4.5"
},
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added src/assets/cn-software-copyright.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions src/components/numberBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ export default defineComponent({
name: 'NumberInput',
props: {
value: {
type: Number,
default: 6,
type: String,
default: undefined,
},
},
setup(props) {
const { value } = toRefs(props);
const renderItem = () => {
const items = Array.from({ length: value.value }, (_, index) => (
<div class={['codeItem', value.value === index]}>{value.value[index]}</div>
const items = Array.from({ length: value.value?.length }, (_, index) => (
<div class={['codeItem', value.value?.length === index]}>{value.value[index]}</div>
));
return <>{items}</>;
};
Expand Down
Loading