From ed98307da40529383dc93439016f07bdaf1b7527 Mon Sep 17 00:00:00 2001 From: LOG1997 <2694233102@qq.com> Date: Tue, 30 Dec 2025 17:30:46 +0800 Subject: [PATCH] Feature action (#150) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ci: 👷 整合github action配置文件 * docs: 📝 贡献文档修改 * style: 💄 更新版本 * style: 💄 cargo.lock版本更新 * feat(husky): 增强Git标签版本校验脚本 添加了对Git标签指向提交与release分支一致性的校验功能。 脚本现在会检查tag指向的提交是否与当前或任何release分支的最新提交一致, 确保发布流程的准确性。如果当前在release分支上,直接比较分支HEAD与tag指向的提交; 如果不在release分支上,则遍历所有release分支查找匹配的提交。 * feat: ✨ 国际化 * fix: 🐛 修复国际化问题;修复字体大小未生效问题 * fix: 🐛 修复部分问题 * docs: 📝 update readme --- .github/workflows/release.yml | 11 +- README.md | 6 +- src/locales/modules/table.ts | 7 +- .../Global/FaceConfig/parts/DataSetting.vue | 2 +- .../Global/FaceConfig/parts/TextSetting.vue | 6 +- .../Config/Global/FaceConfig/useViewModel.ts | 427 +++++++++--------- src/views/Config/Global/ImageConfig/index.vue | 2 +- .../Person/PersonAll/importExcel.worker.ts | 2 +- .../Config/Person/PersonAll/useViewModel.ts | 8 + vite.config.ts | 4 +- 10 files changed, 251 insertions(+), 224 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a712fc..940a0a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,6 @@ jobs: - name: Prepare directories run: | mv dist dist-prod - mv dist-prod/index.html dist-prod/404.html - name: Create production build archive run: | @@ -63,6 +62,16 @@ jobs: name: github-pages path: dist-gh-pages + - name: Prepare GitHub Pages artifact + run: | + cp -r dist-prod dist-gh-pages + + - name: Upload GitHub Pages artifact + uses: actions/upload-artifact@v4 + with: + name: github-pages + path: dist-gh-pages + publish-tauri: permissions: contents: write diff --git a/README.md b/README.md index e42ab36..513e49c 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ log-lottery是一个可配置可定制化的抽奖应用,炫酷3D球体,可用于年会抽奖等活动,支持奖品、人员、界面、图片音乐配置。 > 如果进入网站遇到图片无法显示或有报错的情况,请先到【全局配置】-【界面配置】菜单中点击【重置所有数据】按钮清除数据后进行更新。 -> 该项目将在近期进行**内部代码重构**及**开发新功能**,预计元旦节前三天上线新版本。 ## 要求 @@ -24,12 +23,15 @@ log-lottery是一个可配置可定制化的抽奖应用,炫酷3D球体,可 访问地址: - + or +开发仓促,若以上网站内容存在bug还请宽容。 +如果想要访问2025年12月31日前的版本,请前往: + ## TODO - [x] 🕍 炫酷3D球体,年会抽奖必备,开箱即用 diff --git a/src/locales/modules/table.ts b/src/locales/modules/table.ts index 9c0be03..20b1412 100644 --- a/src/locales/modules/table.ts +++ b/src/locales/modules/table.ts @@ -47,6 +47,9 @@ export const tableEn = { timedStop: 'Timed Stop', playWinMusic: 'Play Win Music', resetAllData: 'Reset All Data', + globalFont: 'Global Font', + titleFont: 'Title Font', + syncGlobalFont: 'Sync Global Font', } export const tableZhCn = { @@ -95,7 +98,9 @@ export const tableZhCn = { timedStop: '定时停止', playWinMusic: '播放中奖音乐', resetAllData: '重置数据', - + globalFont: '全局字体', + titleFont: '标题字体', + syncGlobalFont: '同步全局字体', } export const table = { diff --git a/src/views/Config/Global/FaceConfig/parts/DataSetting.vue b/src/views/Config/Global/FaceConfig/parts/DataSetting.vue index 8af79f8..22350ff 100644 --- a/src/views/Config/Global/FaceConfig/parts/DataSetting.vue +++ b/src/views/Config/Global/FaceConfig/parts/DataSetting.vue @@ -19,7 +19,7 @@ const uploadVisible = ref(false)