From bfad693bd07c817d43ac66ff7db8076711416555 Mon Sep 17 00:00:00 2001 From: R2m1liA <15258427350@163.com> Date: Wed, 17 Sep 2025 14:47:56 +0800 Subject: [PATCH 1/8] =?UTF-8?q?chore(styles):=20=E4=B8=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=8F=91=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加Prettier、ESLint用于规范代码风格 - 添加Prettier配置文件 --- package.json | 5 +++-- pnpm-lock.yaml | 16 +++++++++++++--- prettier.config.mjs | 30 ++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 prettier.config.mjs diff --git a/package.json b/package.json index 065e018..3a72a44 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "@vueuse/nuxt": "^13.6.0", "dompurify": "^3.2.6", "element-plus": "^2.10.7", - "eslint": "^9.0.0", "markdown-it": "^14.1.0", "meilisearch": "^0.53.0", "nuxt": "^4.0.3", @@ -38,6 +37,8 @@ "@commitlint/cli": "^19.8.1", "@commitlint/config-conventional": "^19.8.1", "@element-plus/nuxt": "^1.1.4", - "husky": "^9.1.7" + "eslint": "^9.35.0", + "husky": "^9.1.7", + "prettier": "^3.6.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b731690..e31e227 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -50,9 +50,6 @@ importers: element-plus: specifier: ^2.10.7 version: 2.11.2(vue@3.5.21(typescript@5.9.2)) - eslint: - specifier: ^9.0.0 - version: 9.35.0(jiti@2.5.1) markdown-it: specifier: ^14.1.0 version: 14.1.0 @@ -84,9 +81,15 @@ importers: '@element-plus/nuxt': specifier: ^1.1.4 version: 1.1.4(@element-plus/icons-vue@2.3.2(vue@3.5.21(typescript@5.9.2)))(element-plus@2.11.2(vue@3.5.21(typescript@5.9.2)))(magicast@0.3.5) + eslint: + specifier: ^9.35.0 + version: 9.35.0(jiti@2.5.1) husky: specifier: ^9.1.7 version: 9.1.7 + prettier: + specifier: ^3.6.2 + version: 3.6.2 packages: @@ -4455,6 +4458,11 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} + prettier@3.6.2: + resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==} + engines: {node: '>=14'} + hasBin: true + pretty-bytes@7.0.1: resolution: {integrity: sha512-285/jRCYIbMGDciDdrw0KPNC4LKEEwz/bwErcYNxSJOi4CpGUuLpb9gQpg3XJP0XYj9ldSRluXxih4lX2YN8Xw==} engines: {node: '>=20'} @@ -10469,6 +10477,8 @@ snapshots: prelude-ls@1.2.1: {} + prettier@3.6.2: {} + pretty-bytes@7.0.1: {} process-nextick-args@2.0.1: {} diff --git a/prettier.config.mjs b/prettier.config.mjs new file mode 100644 index 0000000..1ecb88d --- /dev/null +++ b/prettier.config.mjs @@ -0,0 +1,30 @@ +/** + * @see https://prettier.io/docs/en/configuration.html + * @type {import("prettier").Config} + */ +export default { + // 打印宽度 + "printWidth": 80, + // 缩进空格数 + "tabWidth": 2, + // 使用制表符而不是空格缩进 + "useTabs": false, + // 句尾添加分号 + "semi": true, + // 使用单引号 + "singleQuote": true, + // 尾随逗号 + "trailingComma": "es5", + // 对象大括号内的空格 + "bracketSpacing": true, + // 箭头函数参数括号 + "arrowParens": "always", + // 括号行位置 + "bracketSameLine": true, + // 换行符使用 lf + "endOfLine": "lf", + // HTML 空格敏感度 + "htmlWhitespaceSensitivity": "css", + // Vue 文件脚本和样式缩进 + "vueIndentScriptAndStyle": true, +} \ No newline at end of file -- 2.49.0 From e94dbf29a3f5e472f7f0d15151c978e27818b5ed Mon Sep 17 00:00:00 2001 From: R2m1liA <15258427350@163.com> Date: Wed, 17 Sep 2025 15:23:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?chore(styles):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整prettier.config.mjs，强制css文件与scss文件使用双引号 --- prettier.config.mjs | 62 +++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/prettier.config.mjs b/prettier.config.mjs index 1ecb88d..f52b8fe 100644 --- a/prettier.config.mjs +++ b/prettier.config.mjs @@ -3,28 +3,40 @@ * @type {import("prettier").Config} */ export default { - // 打印宽度 - "printWidth": 80, - // 缩进空格数 - "tabWidth": 2, - // 使用制表符而不是空格缩进 - "useTabs": false, - // 句尾添加分号 - "semi": true, - // 使用单引号 - "singleQuote": true, - // 尾随逗号 - "trailingComma": "es5", - // 对象大括号内的空格 - "bracketSpacing": true, - // 箭头函数参数括号 - "arrowParens": "always", - // 括号行位置 - "bracketSameLine": true, - // 换行符使用 lf - "endOfLine": "lf", - // HTML 空格敏感度 - "htmlWhitespaceSensitivity": "css", - // Vue 文件脚本和样式缩进 - "vueIndentScriptAndStyle": true, -} \ No newline at end of file + // 打印宽度 + printWidth: 80, + // 缩进空格数 + tabWidth: 2, + // 使用制表符而不是空格缩进 + useTabs: false, + // 句尾添加分号 + semi: true, + // 使用单引号 + singleQuote: true, + // 尾随逗号 + trailingComma: "es5", + // 对象大括号内的空格 + bracketSpacing: true, + // 箭头函数参数括号 + arrowParens: "always", + // 括号行位置 + bracketSameLine: true, + // 换行符使用 lf + endOfLine: "lf", + // HTML 空格敏感度 + htmlWhitespaceSensitivity: "css", + // Vue 文件脚本和样式缩进 + vueIndentScriptAndStyle: true, + overrides: [ + { + // 对 CSS 文件使用双引号 + files: "*.css", + options: { singleQuote: false }, + }, + { + // 对 SCSS 文件使用双引号 + files: "*.scss", + options: { singleQuote: false }, + }, + ], +}; -- 2.49.0 From bb89721f1c1dc5c65db118c6e04a054f5b5f2148 Mon Sep 17 00:00:00 2001 From: R2m1liA <15258427350@163.com> Date: Wed, 17 Sep 2025 15:46:39 +0800 Subject: [PATCH 3/8] =?UTF-8?q?chore(styles):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改prettier.config.mjs: 标签换行 - 修改eslint.config.mjs: 允许自闭合标签（如
） --- eslint.config.mjs | 9 +++++++++ prettier.config.mjs | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 934c3a1..03981be 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -3,4 +3,13 @@ import withNuxt from './.nuxt/eslint.config.mjs' export default withNuxt( // Your custom configs here + { + rules: { + "vue/html-self-closing": ["warn", { + "html": { + "void": "any", + } + }] + } + } ) diff --git a/prettier.config.mjs b/prettier.config.mjs index f52b8fe..e10251b 100644 --- a/prettier.config.mjs +++ b/prettier.config.mjs @@ -20,7 +20,7 @@ export default { // 箭头函数参数括号 arrowParens: "always", // 括号行位置 - bracketSameLine: true, + bracketSameLine: false, // 换行符使用 lf endOfLine: "lf", // HTML 空格敏感度 @@ -37,6 +37,6 @@ export default { // 对 SCSS 文件使用双引号 files: "*.scss", options: { singleQuote: false }, - }, + } ], }; -- 2.49.0 From 359aaec8a9d87867881e40e8c678cef2b8d9a249 Mon Sep 17 00:00:00 2001 From: R2m1liA <15258427350@163.com> Date: Wed, 17 Sep 2025 15:50:29 +0800 Subject: [PATCH 4/8] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 根据prettier配置格式化整个项目的代码 --- README.md | 34 +- app/app.vue | 40 +-- app/assets/css/fonts.css | 48 ++- app/assets/scss/element/dark.scss | 6 +- app/assets/scss/element/index.scss | 28 +- app/assets/scss/index.scss | 5 +- app/components/DocumentList.vue | 72 ++-- app/components/JinshenFooter.vue | 368 +++++++++---------- app/components/JinshenHeader.vue | 192 +++++----- app/components/MarkdownRenderer.vue | 100 +++--- app/components/ProductionCard.vue | 116 +++--- app/components/QuestionList.vue | 76 ++-- app/components/SolutionCard.vue | 104 +++--- app/components/SpecTable.vue | 32 +- app/components/SupportTabs.vue | 78 ++-- app/composables/useLocalizations.ts | 16 +- app/composables/useMeilisearch.ts | 16 +- app/layouts/default.vue | 36 +- app/pages/[...all].vue | 6 +- app/pages/about/index.vue | 146 ++++---- app/pages/index.vue | 304 ++++++++-------- app/pages/productions/[...slug].vue | 292 +++++++-------- app/pages/productions/index.vue | 194 +++++----- app/pages/search.vue | 539 ++++++++++++++-------------- app/pages/solutions/[...slug].vue | 148 ++++---- app/pages/solutions/index.vue | 144 ++++---- app/pages/support/contact-us.vue | 98 ++--- app/pages/support/documents.vue | 92 ++--- app/pages/support/faq.vue | 84 ++--- app/pages/support/index.vue | 166 ++++----- app/types/strapi/index.ts | 10 +- app/types/strapi/production.ts | 8 +- app/types/strapi/question.ts | 2 +- app/types/strapi/solution.ts | 2 +- app/utils/file.ts | 2 +- app/utils/markdown.ts | 8 +- commitlint.config.mjs | 4 +- eslint.config.mjs | 19 +- i18n.config.ts | 4 +- i18n/i18n.config.ts | 9 +- nuxt.config.ts | 97 +++-- prettier.config.mjs | 14 +- uno.config.ts | 19 +- 43 files changed, 1900 insertions(+), 1878 deletions(-) diff --git a/README.md b/README.md index 7e8b174..ae7c747 100644 --- a/README.md +++ b/README.md @@ -5,20 +5,19 @@ ## 站点内容 - 首页 - - 首页Banner - - 推荐产品 + - 首页Banner + - 推荐产品 - 产品展示 - - 产品列表分类展示 - - 产品详情页 + - 产品列表分类展示 + - 产品详情页 - 解决方案 - - 以Markdown形式渲染解决方案文章 + - 以Markdown形式渲染解决方案文章 - 服务支持 - - 常见问题列表 - - 文档资料列表 - - 联系信息 + - 常见问题列表 + - 文档资料列表 + - 联系信息 - 关于我们 - - 公司基本信息 - + - 公司基本信息 ## 安装与设置 @@ -27,25 +26,25 @@ 1. 克隆项目仓库： -``` bash +```bash git clone http://192.168.84.125/remilia/jinshen-website.git ``` 2. 进入项目目录： -``` bash +```bash cd jinshen-website ``` 3. 安装依赖 -``` bash +```bash pnpm install ``` 4. 运行开发环境 -``` bash +```bash pnpm run dev ``` @@ -65,15 +64,18 @@ pnpm run dev 1. 构建生产版本 项目构建 -``` bash + +```bash pnpm run build ``` 预览构建版本 + ```bash pnpm run preview ``` 2. 部署 -部署构建后的项目并推送到文件服务器中，具体步骤视服务器配置而定 \ No newline at end of file +部署构建后的项目并推送到文件服务器中，具体步骤视服务器配置而定 + diff --git a/app/app.vue b/app/app.vue index a45597f..c6553da 100644 --- a/app/app.vue +++ b/app/app.vue @@ -9,28 +9,28 @@ diff --git a/app/assets/css/fonts.css b/app/assets/css/fonts.css index 029e9e3..142e7fb 100644 --- a/app/assets/css/fonts.css +++ b/app/assets/css/fonts.css @@ -1,26 +1,36 @@ @font-face { - font-family: "Source Han Sans CN"; - src: url("/fonts/source-han-sans/SourceHanSansCN-Regular-Alphabetic.woff2") format("woff2"), - url("/fonts/source-han-sans/SourceHanSansCN-Regular-Alphabetic.woff") format("woff"); - font-weight: 400; - font-style: normal; - font-display: swap; + font-family: "Source Han Sans CN"; + src: + url("/fonts/source-han-sans/SourceHanSansCN-Regular-Alphabetic.woff2") + format("woff2"), + url("/fonts/source-han-sans/SourceHanSansCN-Regular-Alphabetic.woff") + format("woff"); + font-weight: 400; + font-style: normal; + font-display: swap; } @font-face { - font-family: "Source Han Sans CN"; - src: url("/fonts/source-han-sans/SourceHanSansCN-Bold-Alphabetic.woff2") format("woff2"), - url("/fonts/source-han-sans/SourceHanSansCN-Bold-Alphabetic.woff") format("woff"); - font-weight: 700; - font-style: normal; - font-display: swap; + font-family: "Source Han Sans CN"; + src: + url("/fonts/source-han-sans/SourceHanSansCN-Bold-Alphabetic.woff2") + format("woff2"), + url("/fonts/source-han-sans/SourceHanSansCN-Bold-Alphabetic.woff") + format("woff"); + + font-weight: 700; + font-style: normal; + font-display: swap; } @font-face { - font-family: "Source Han Sans CN"; - src: url("/fonts/source-han-sans/SourceHanSansCN-Light-Alphabetic.woff2") format("woff2"), - url("/fonts/source-han-sans/SourceHanSansCN-Light-Alphabetic.woff") format("woff"); - font-weight: 300; - font-style: normal; - font-display: swap; -} \ No newline at end of file + font-family: "Source Han Sans CN"; + src: + url("/fonts/source-han-sans/SourceHanSansCN-Light-Alphabetic.woff2") + format("woff2"), + url("/fonts/source-han-sans/SourceHanSansCN-Light-Alphabetic.woff") + format("woff"); + font-weight: 300; + font-style: normal; + font-display: swap; +} diff --git a/app/assets/scss/element/dark.scss b/app/assets/scss/element/dark.scss index 93bf00c..741cae4 100644 --- a/app/assets/scss/element/dark.scss +++ b/app/assets/scss/element/dark.scss @@ -1,6 +1,6 @@ -@forward 'element-plus/theme-chalk/src/dark/var.scss' with ( +@forward "element-plus/theme-chalk/src/dark/var.scss" with ( $bg-color: ( - 'page': #0a0a0a, - 'overlay': #1d1e1f, + "page": #0a0a0a, + "overlay": #1d1e1f, ) ); diff --git a/app/assets/scss/element/index.scss b/app/assets/scss/element/index.scss index 002ec4f..4285909 100644 --- a/app/assets/scss/element/index.scss +++ b/app/assets/scss/element/index.scss @@ -1,26 +1,26 @@ $-colors: ( - 'primary': ( - 'base': #177ee5, + "primary": ( + "base": #177ee5, ), - 'success': ( - 'base': green, + "success": ( + "base": green, ), - 'warning': ( - 'base': #f9a23c, + "warning": ( + "base": #f9a23c, ), - 'danger': ( - 'base': #ff3300, + "danger": ( + "base": #ff3300, ), - 'error': ( - 'base': #f56c6c, + "error": ( + "base": #f56c6c, ), - 'info': ( - 'base': #909399, + "info": ( + "base": #909399, ), ); -@forward 'element-plus/theme-chalk/src/common/var.scss' with ( +@forward "element-plus/theme-chalk/src/common/var.scss" with ( $colors: $-colors ); -@use './dark.scss'; \ No newline at end of file +@use "./dark.scss"; diff --git a/app/assets/scss/index.scss b/app/assets/scss/index.scss index 18852e2..4e52518 100644 --- a/app/assets/scss/index.scss +++ b/app/assets/scss/index.scss @@ -17,5 +17,6 @@ a { } :root { - --font-main: "Source Han Sans CN", "Noto Sans CJK SC", "Noto Sans CJK", sans-serif; -} \ No newline at end of file + --font-main: + "Source Han Sans CN", "Noto Sans CJK SC", "Noto Sans CJK", sans-serif; +} diff --git a/app/components/DocumentList.vue b/app/components/DocumentList.vue index 68f6ec6..c30953a 100644 --- a/app/components/DocumentList.vue +++ b/app/components/DocumentList.vue @@ -28,48 +28,48 @@ diff --git a/app/components/JinshenFooter.vue b/app/components/JinshenFooter.vue index 39bd602..66a42e0 100644 --- a/app/components/JinshenFooter.vue +++ b/app/components/JinshenFooter.vue @@ -4,39 +4,39 @@

- {{ $t("company-description") }} + {{ $t('company-description') }}

-

{{ $t("quick-links") }}

+

{{ $t('quick-links') }}

@@ -44,24 +44,24 @@
-

{{ $t("contact-info") }}

+

{{ $t('contact-info') }}

- {{ $t("telephone") }}: 0573-88187988 + {{ $t('telephone') }}: 0573-88187988
- {{ $t("email") }}: jinshen@wzjinshen.com + {{ $t('email') }}: jinshen@wzjinshen.com
- {{ $t("address") }}: {{ $t("company-address") }} + {{ $t('address') }}: {{ $t('company-address') }}
-

{{ $t("follow-us") }}

+

{{ $t('follow-us') }}

@@ -62,119 +62,119 @@ diff --git a/app/components/MarkdownRenderer.vue b/app/components/MarkdownRenderer.vue index 339cd55..78367da 100644 --- a/app/components/MarkdownRenderer.vue +++ b/app/components/MarkdownRenderer.vue @@ -5,68 +5,68 @@ diff --git a/app/components/ProductionCard.vue b/app/components/ProductionCard.vue index b2fd1de..bdfa568 100644 --- a/app/components/ProductionCard.vue +++ b/app/components/ProductionCard.vue @@ -17,70 +17,70 @@ diff --git a/app/components/QuestionList.vue b/app/components/QuestionList.vue index 592bf16..6c30e8a 100644 --- a/app/components/QuestionList.vue +++ b/app/components/QuestionList.vue @@ -14,48 +14,48 @@ diff --git a/app/components/SolutionCard.vue b/app/components/SolutionCard.vue index ffc9078..867b168 100644 --- a/app/components/SolutionCard.vue +++ b/app/components/SolutionCard.vue @@ -21,65 +21,65 @@ diff --git a/app/components/SpecTable.vue b/app/components/SpecTable.vue index bfccd6c..1f392c9 100644 --- a/app/components/SpecTable.vue +++ b/app/components/SpecTable.vue @@ -22,24 +22,24 @@ diff --git a/app/components/SupportTabs.vue b/app/components/SupportTabs.vue index e03120c..347198d 100644 --- a/app/components/SupportTabs.vue +++ b/app/components/SupportTabs.vue @@ -12,53 +12,53 @@ diff --git a/app/composables/useLocalizations.ts b/app/composables/useLocalizations.ts index cd3aeab..35debd2 100644 --- a/app/composables/useLocalizations.ts +++ b/app/composables/useLocalizations.ts @@ -1,12 +1,12 @@ -import type { StrapiLocale } from "@nuxtjs/strapi"; -import type { Language as ElementLanguage } from "element-plus/es/locale"; -import zhCn from "element-plus/es/locale/lang/zh-cn"; -import en from "element-plus/es/locale/lang/en"; +import type { StrapiLocale } from '@nuxtjs/strapi'; +import type { Language as ElementLanguage } from 'element-plus/es/locale'; +import zhCn from 'element-plus/es/locale/lang/zh-cn'; +import en from 'element-plus/es/locale/lang/en'; // Strapi本地化映射 export const strapiLocales: Record = { - zh: "zh-CN", - en: "en", + zh: 'zh-CN', + en: 'en', }; // Element Plus本地化映射 @@ -21,14 +21,14 @@ export const useLocalizations = () => { // 获取Strapi本地化代码 const getStrapiLocale = (nuxtLocale?: string): StrapiLocale => { const currentLocale = nuxtLocale || locale.value; - return strapiLocales[currentLocale] || "zh-Hans"; + return strapiLocales[currentLocale] || 'zh-Hans'; }; // 获取Element Plus本地化 const getElementPlusLocale = (nuxtLocale?: string) => { const currentLocale = nuxtLocale || locale.value; const elementPlusLocale = - elementPlusLocales[currentLocale] || elementPlusLocales["zh"]; + elementPlusLocales[currentLocale] || elementPlusLocales['zh']; return elementPlusLocale; }; diff --git a/app/composables/useMeilisearch.ts b/app/composables/useMeilisearch.ts index bcdce46..1667e5d 100644 --- a/app/composables/useMeilisearch.ts +++ b/app/composables/useMeilisearch.ts @@ -1,5 +1,5 @@ -import { MeiliSearch } from "meilisearch"; -import type { SearchParams, SearchResponse } from "meilisearch"; +import { MeiliSearch } from 'meilisearch'; +import type { SearchParams, SearchResponse } from 'meilisearch'; interface RawSearchSection { indexUid: string; @@ -26,7 +26,7 @@ const parseIndexes = (indexes: string | string[] | undefined): string[] => { return indexes.map((item) => item.trim()).filter(Boolean); } return indexes - .split(",") + .split(',') .map((item) => item.trim()) .filter(Boolean); }; @@ -45,7 +45,7 @@ export const useMeilisearch = () => { const host = runtimeConfig.public?.meili?.host; if (!host) { - console.warn("Meilisearch host is not configured."); + console.warn('Meilisearch host is not configured.'); return null; } const apiKey = runtimeConfig.public?.meili?.searchKey; @@ -72,7 +72,7 @@ export const useMeilisearch = () => { const activeIndexes = indexes.value; if (!activeIndexes.length) { - console.warn("No Meilisearch indexes configured."); + console.warn('No Meilisearch indexes configured.'); return []; } @@ -101,14 +101,14 @@ export const useMeilisearch = () => { settled .filter( (result): result is PromiseRejectedResult => - result.status === "rejected" + result.status === 'rejected' ) .forEach((result) => { - console.error("Meilisearch query failed", result.reason); + console.error('Meilisearch query failed', result.reason); }); return settled - .filter((result) => result.status === "fulfilled") + .filter((result) => result.status === 'fulfilled') .map((result) => { const fulfilled = result as PromiseFulfilledResult; return { diff --git a/app/layouts/default.vue b/app/layouts/default.vue index f749ebb..63a2fcc 100644 --- a/app/layouts/default.vue +++ b/app/layouts/default.vue @@ -13,25 +13,25 @@ diff --git a/app/pages/[...all].vue b/app/pages/[...all].vue index f6751f7..5568d64 100644 --- a/app/pages/[...all].vue +++ b/app/pages/[...all].vue @@ -3,15 +3,15 @@
-
{{ $t("not-found") }}
+
{{ $t('not-found') }}
diff --git a/app/pages/about/index.vue b/app/pages/about/index.vue index 4fe86fa..4b6b0d0 100644 --- a/app/pages/about/index.vue +++ b/app/pages/about/index.vue @@ -4,12 +4,12 @@ - {{ $t("navigation.home") }} + {{ $t('navigation.home') }} - {{ $t("navigation.about-us") }} + {{ $t('navigation.about-us') }} @@ -25,7 +25,7 @@ -
+
联系信息 @@ -38,92 +38,92 @@ diff --git a/app/pages/index.vue b/app/pages/index.vue index 9e6e90f..6ff12aa 100644 --- a/app/pages/index.vue +++ b/app/pages/index.vue @@ -129,185 +129,185 @@ diff --git a/app/pages/productions/[...slug].vue b/app/pages/productions/[...slug].vue index b350a84..e5be376 100644 --- a/app/pages/productions/[...slug].vue +++ b/app/pages/productions/[...slug].vue @@ -5,12 +5,12 @@ {{ - $t("navigation.home") + $t('navigation.home') }} {{ - $t("navigation.productions") + $t('navigation.productions') }} {{ @@ -102,7 +102,7 @@ > @@ -111,166 +111,166 @@ diff --git a/app/pages/productions/index.vue b/app/pages/productions/index.vue index d535bf5..976b7d3 100644 --- a/app/pages/productions/index.vue +++ b/app/pages/productions/index.vue @@ -1,16 +1,16 @@ diff --git a/app/pages/search.vue b/app/pages/search.vue index 0dc2fb2..8414096 100644 --- a/app/pages/search.vue +++ b/app/pages/search.vue @@ -1,7 +1,7 @@ diff --git a/app/pages/solutions/[...slug].vue b/app/pages/solutions/[...slug].vue index ae2113f..6803705 100644 --- a/app/pages/solutions/[...slug].vue +++ b/app/pages/solutions/[...slug].vue @@ -5,12 +5,12 @@ {{ - $t("navigation.home") + $t('navigation.home') }} {{ - $t("navigation.solutions") + $t('navigation.solutions') }} {{ @@ -40,91 +40,91 @@ diff --git a/app/pages/solutions/index.vue b/app/pages/solutions/index.vue index 87050aa..79ec909 100644 --- a/app/pages/solutions/index.vue +++ b/app/pages/solutions/index.vue @@ -1,16 +1,16 @@ diff --git a/app/pages/support/contact-us.vue b/app/pages/support/contact-us.vue index 955f799..e804639 100644 --- a/app/pages/support/contact-us.vue +++ b/app/pages/support/contact-us.vue @@ -3,21 +3,21 @@
-

{{ $t("navigation.contact-info") }}

+

{{ $t('navigation.contact-info') }}

- {{ $t("navigation.home") }} + {{ $t('navigation.home') }} - {{ $t("navigation.support") }} + {{ $t('navigation.support') }} - {{ $t("navigation.contact-info") }} + {{ $t('navigation.contact-info') }} @@ -34,62 +34,62 @@ diff --git a/app/pages/support/documents.vue b/app/pages/support/documents.vue index eb1b697..ad3c11f 100644 --- a/app/pages/support/documents.vue +++ b/app/pages/support/documents.vue @@ -6,21 +6,21 @@
-

{{ $t("navigation.documents") }}

+

{{ $t('navigation.documents') }}

{{ - $t("navigation.home") + $t('navigation.home') }} {{ - $t("navigation.support") + $t('navigation.support') }} {{ - $t("navigation.documents") + $t('navigation.documents') }} @@ -33,57 +33,57 @@ diff --git a/app/pages/support/faq.vue b/app/pages/support/faq.vue index 3bf8094..bde1d29 100644 --- a/app/pages/support/faq.vue +++ b/app/pages/support/faq.vue @@ -6,21 +6,21 @@
-

{{ $t("navigation.faq") }}

+

{{ $t('navigation.faq') }}

{{ - $t("navigation.home") + $t('navigation.home') }} {{ - $t("navigation.support") + $t('navigation.support') }} {{ - $t("navigation.faq") + $t('navigation.faq') }} @@ -33,53 +33,53 @@ diff --git a/app/pages/support/index.vue b/app/pages/support/index.vue index 06414ad..654caf7 100644 --- a/app/pages/support/index.vue +++ b/app/pages/support/index.vue @@ -3,16 +3,16 @@
-

{{ $t("navigation.support") }}

+

{{ $t('navigation.support') }}

{{ - $t("navigation.home") + $t('navigation.home') }} {{ - $t("navigation.support") + $t('navigation.support') }} @@ -32,7 +32,7 @@
- {{ $t("navigation.faq") }} + {{ $t('navigation.faq') }}
@@ -58,7 +58,7 @@
- {{ $t("navigation.documents") }} + {{ $t('navigation.documents') }}
@@ -84,7 +84,7 @@
- {{ $t("navigation.contact-info") }} + {{ $t('navigation.contact-info') }}
@@ -112,97 +112,97 @@ diff --git a/app/types/strapi/index.ts b/app/types/strapi/index.ts index e61a83a..cbbf316 100644 --- a/app/types/strapi/index.ts +++ b/app/types/strapi/index.ts @@ -1,5 +1,5 @@ -export * from "./common"; -export * from "./production"; -export * from "./singleTypes"; -export * from "./solution"; -export * from "./question"; +export * from './common'; +export * from './production'; +export * from './singleTypes'; +export * from './solution'; +export * from './question'; diff --git a/app/types/strapi/production.ts b/app/types/strapi/production.ts index b82ae9e..b14afb3 100644 --- a/app/types/strapi/production.ts +++ b/app/types/strapi/production.ts @@ -3,7 +3,7 @@ import type { StrapiImage, StrapiMedia, StrapiRelation, -} from "./common"; +} from './common'; export interface ProductionType extends StrapiEntity { type: string; @@ -29,13 +29,13 @@ export interface Production extends StrapiEntity { production_specs: ProductionSpecGroup[]; production_documents: StrapiRelation< ProductionDocument, - "related_productions" + 'related_productions' >[]; - questions: StrapiRelation[]; + questions: StrapiRelation[]; show_in_production_list: boolean; } export interface ProductionDocument extends StrapiEntity { document: StrapiMedia; - related_productions: StrapiRelation[]; + related_productions: StrapiRelation[]; } diff --git a/app/types/strapi/question.ts b/app/types/strapi/question.ts index ec741be..1014eeb 100644 --- a/app/types/strapi/question.ts +++ b/app/types/strapi/question.ts @@ -1,5 +1,5 @@ export interface Question extends StrapiEntity { title: string; content: string; - related_productions: StrapiRelation[]; + related_productions: StrapiRelation[]; } diff --git a/app/types/strapi/solution.ts b/app/types/strapi/solution.ts index f99fd65..b03f10a 100644 --- a/app/types/strapi/solution.ts +++ b/app/types/strapi/solution.ts @@ -1,4 +1,4 @@ -import type { StrapiEntity, StrapiImage } from "./common"; +import type { StrapiEntity, StrapiImage } from './common'; export interface SolutionType extends StrapiEntity { type: string; diff --git a/app/utils/file.ts b/app/utils/file.ts index 79e3acf..a79aad5 100644 --- a/app/utils/file.ts +++ b/app/utils/file.ts @@ -8,5 +8,5 @@ export function formatFileSize(sizeInKB: number): string { } export function formatFileExtension(ext: string): string { - return ext.startsWith(".") ? ext.slice(1).toUpperCase() : ext.toUpperCase(); + return ext.startsWith('.') ? ext.slice(1).toUpperCase() : ext.toUpperCase(); } diff --git a/app/utils/markdown.ts b/app/utils/markdown.ts index ea7406c..ef16266 100644 --- a/app/utils/markdown.ts +++ b/app/utils/markdown.ts @@ -1,4 +1,4 @@ -import MarkdownIt from "markdown-it"; +import MarkdownIt from 'markdown-it'; const md = new MarkdownIt({ html: true, @@ -10,8 +10,8 @@ const md = new MarkdownIt({ export function renderMarkdown(content: string): string { const dirtyHtml = md.render(content); - if (typeof window !== "undefined") { - import("dompurify").then((DOMPurify) => { + if (typeof window !== 'undefined') { + import('dompurify').then((DOMPurify) => { return DOMPurify.default.sanitize(dirtyHtml); }); } @@ -23,7 +23,7 @@ export function convertMedia(content: string): string { // 通过正则表达式替换Markdown中的图片链接 // ![alt text](image-url) -> ![alt text](strapiMedia(image-url)) - if (!content) return ""; + if (!content) return ''; const contentWithAbsoluteUrls = content.replace( /!\[([^\]]*)\]\((\/uploads\/[^)]+)\)/g, diff --git a/commitlint.config.mjs b/commitlint.config.mjs index bc608f5..0616fb9 100644 --- a/commitlint.config.mjs +++ b/commitlint.config.mjs @@ -1,3 +1,3 @@ export default { - extends: ['@commitlint/config-conventional'] -}; \ No newline at end of file + extends: ['@commitlint/config-conventional'], +}; diff --git a/eslint.config.mjs b/eslint.config.mjs index 03981be..410eb6a 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,15 +1,18 @@ // @ts-check -import withNuxt from './.nuxt/eslint.config.mjs' +import withNuxt from './.nuxt/eslint.config.mjs'; export default withNuxt( // Your custom configs here { rules: { - "vue/html-self-closing": ["warn", { - "html": { - "void": "any", - } - }] - } + 'vue/html-self-closing': [ + 'warn', + { + html: { + void: 'any', + }, + }, + ], + }, } -) +); diff --git a/i18n.config.ts b/i18n.config.ts index 2486bd1..3078ca2 100644 --- a/i18n.config.ts +++ b/i18n.config.ts @@ -2,5 +2,5 @@ export default defineI18nConfig(() => ({ legacy: false, locale: 'zh', - fallbackLocale: 'zh' -})) + fallbackLocale: 'zh', +})); diff --git a/i18n/i18n.config.ts b/i18n/i18n.config.ts index 7aa410a..e68f748 100644 --- a/i18n/i18n.config.ts +++ b/i18n/i18n.config.ts @@ -1,5 +1,6 @@ export default defineI18nConfig(() => ({ - legacy: false, - locale: 'zh', - fallbackLocale: 'zh', -})) \ No newline at end of file + legacy: false, + locale: 'zh', + fallbackLocale: 'zh', +})); + diff --git a/nuxt.config.ts b/nuxt.config.ts index 5b14344..ef7f4cf 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -1,33 +1,33 @@ // https://nuxt.com/docs/api/configuration/nuxt-config export default defineNuxtConfig({ - compatibilityDate: "2025-07-15", + compatibilityDate: '2025-07-15', devtools: { enabled: true }, app: { // head head: { - title: "金申机械制造有限公司", + title: '金申机械制造有限公司', meta: [ - { name: "viewport", content: "width=device-width, initial-scale=1" }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, { - name: "description", - content: "Jinshen Website", + name: 'description', + content: 'Jinshen Website', }, ], - link: [{ rel: "icon", type: "image/x-icon", href: "/favicon.ico" }], + link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }], }, }, runtimeConfig: { public: { meili: { - host: process.env.MEILI_HOST || "http://localhost:7700", - searchKey: process.env.MEILI_SEARCH_KEY || "", + host: process.env.MEILI_HOST || 'http://localhost:7700', + searchKey: process.env.MEILI_SEARCH_KEY || '', indexes: process.env.MEILI_SEARCH_INDEXES - ? (typeof process.env.MEILI_SEARCH_INDEXES === "string" - ? process.env.MEILI_SEARCH_INDEXES.split(",").map(i => i.trim()) - : process.env.MEILI_SEARCH_INDEXES) - : ["production", "solution"], + ? typeof process.env.MEILI_SEARCH_INDEXES === 'string' + ? process.env.MEILI_SEARCH_INDEXES.split(',').map((i) => i.trim()) + : process.env.MEILI_SEARCH_INDEXES + : ['production', 'solution'], }, }, }, @@ -38,22 +38,22 @@ export default defineNuxtConfig({ // css css: [ - "@unocss/reset/tailwind.css", - "~/assets/scss/index.scss", - "~/assets/css/fonts.css", - "@mdi/font/css/materialdesignicons.min.css", + '@unocss/reset/tailwind.css', + '~/assets/scss/index.scss', + '~/assets/css/fonts.css', + '@mdi/font/css/materialdesignicons.min.css', ], nitro: { esbuild: { options: { - target: "esnext", + target: 'esnext', }, }, prerender: { crawlLinks: false, - routes: ["/"], - ignore: ["/hi"], + routes: ['/'], + ignore: ['/hi'], }, }, @@ -66,60 +66,59 @@ export default defineNuxtConfig({ }, }, }, - + devServer: { port: 3000, host: '0.0.0.0', }, elementPlus: { - icon: "ElIcon", - importStyle: "scss", - themes: ["dark"], + icon: 'ElIcon', + importStyle: 'scss', + themes: ['dark'], }, i18n: { detectBrowserLanguage: { useCookie: true, - cookieKey: "i18n_redirected", - redirectOn: "root", - alwaysRedirect: true + cookieKey: 'i18n_redirected', + redirectOn: 'root', + alwaysRedirect: true, }, locales: [ - { code: "en", language: "en-US", name: "English", file: "en.json" }, - { code: "zh", language: "zh-CN", name: "简体中文", file: "zh.json" }, + { code: 'en', language: 'en-US', name: 'English', file: 'en.json' }, + { code: 'zh', language: 'zh-CN', name: '简体中文', file: 'zh.json' }, ], - defaultLocale: "zh", - strategy: "prefix_except_default", - langDir: "locales", + defaultLocale: 'zh', + strategy: 'prefix_except_default', + langDir: 'locales', }, strapi: { - url: process.env.STRAPI_URL || "http://localhost:1337", + url: process.env.STRAPI_URL || 'http://localhost:1337', token: process.env.STRAPI_TOKEN || undefined, - prefix: "/api", - admin: "/admin", - version: "v5", + prefix: '/api', + admin: '/admin', + version: 'v5', cookie: {}, - cookieName: "strapi_jwt", + cookieName: 'strapi_jwt', }, imports: { - dirs: ['types/**'] + dirs: ['types/**'], }, - modules: [ - "@nuxt/eslint", - "@nuxt/fonts", - "@nuxt/icon", - "@nuxt/image", - "@nuxt/test-utils", - "@vueuse/nuxt", - "@pinia/nuxt", - "@unocss/nuxt", - "@element-plus/nuxt", - "@nuxtjs/i18n", - "@nuxtjs/strapi", + '@nuxt/eslint', + '@nuxt/fonts', + '@nuxt/icon', + '@nuxt/image', + '@nuxt/test-utils', + '@vueuse/nuxt', + '@pinia/nuxt', + '@unocss/nuxt', + '@element-plus/nuxt', + '@nuxtjs/i18n', + '@nuxtjs/strapi', ], }); diff --git a/prettier.config.mjs b/prettier.config.mjs index e10251b..17a9f7d 100644 --- a/prettier.config.mjs +++ b/prettier.config.mjs @@ -14,29 +14,29 @@ export default { // 使用单引号 singleQuote: true, // 尾随逗号 - trailingComma: "es5", + trailingComma: 'es5', // 对象大括号内的空格 bracketSpacing: true, // 箭头函数参数括号 - arrowParens: "always", + arrowParens: 'always', // 括号行位置 bracketSameLine: false, // 换行符使用 lf - endOfLine: "lf", + endOfLine: 'lf', // HTML 空格敏感度 - htmlWhitespaceSensitivity: "css", + htmlWhitespaceSensitivity: 'css', // Vue 文件脚本和样式缩进 vueIndentScriptAndStyle: true, overrides: [ { // 对 CSS 文件使用双引号 - files: "*.css", + files: '*.css', options: { singleQuote: false }, }, { // 对 SCSS 文件使用双引号 - files: "*.scss", + files: '*.scss', options: { singleQuote: false }, - } + }, ], }; diff --git a/uno.config.ts b/uno.config.ts index b4ab86b..0ecaa24 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -7,12 +7,18 @@ import { // presetWebFonts, transformerDirectives, transformerVariantGroup, -} from 'unocss' +} from 'unocss'; export default defineConfig({ shortcuts: [ - ['btn', 'px-4 py-1 rounded inline-block bg-teal-600 text-white cursor-pointer hover:bg-teal-700 disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50'], - ['icon-btn', 'inline-block cursor-pointer select-none opacity-75 transition duration-200 ease-in-out hover:opacity-100 hover:text-teal-600'], + [ + 'btn', + 'px-4 py-1 rounded inline-block bg-teal-600 text-white cursor-pointer hover:bg-teal-700 disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50', + ], + [ + 'icon-btn', + 'inline-block cursor-pointer select-none opacity-75 transition duration-200 ease-in-out hover:opacity-100 hover:text-teal-600', + ], ], presets: [ presetUno(), @@ -30,8 +36,5 @@ export default defineConfig({ // }, // }), ], - transformers: [ - transformerDirectives(), - transformerVariantGroup(), - ], -}) + transformers: [transformerDirectives(), transformerVariantGroup()], +}); -- 2.49.0 From ba168795943658d04e2d101ed5e056635022eaa5 Mon Sep 17 00:00:00 2001 From: R2m1liA <15258427350@163.com> Date: Wed, 17 Sep 2025 16:05:14 +0800 Subject: [PATCH 5/8] =?UTF-8?q?chore(styles):=20=E4=B8=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=8F=91=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加lint-staged用于创建pre-commithook --- .husky/pre-commit | 1 + lint-staged.config.mjs | 8 ++ package.json | 1 + pnpm-lock.yaml | 189 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+) create mode 100644 lint-staged.config.mjs diff --git a/.husky/pre-commit b/.husky/pre-commit index e69de29..0d4e3a9 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -0,0 +1 @@ +pnpm dlx lint-staged \ No newline at end of file diff --git a/lint-staged.config.mjs b/lint-staged.config.mjs new file mode 100644 index 0000000..b68d5d1 --- /dev/null +++ b/lint-staged.config.mjs @@ -0,0 +1,8 @@ +/** + * @filename: lint-staged.config.mjs + * @type {import('lint-staged').Configuration} + */ +export default { + '*.{js,jsx,mjs,ts,tsx}': ['prettier --write'], + '*.{json,md,css,scss,html}': ['prettier --write'], +}; diff --git a/package.json b/package.json index 3a72a44..12d5ce2 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "@element-plus/nuxt": "^1.1.4", "eslint": "^9.35.0", "husky": "^9.1.7", + "lint-staged": "^16.1.6", "prettier": "^3.6.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e31e227..aefb60f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -87,6 +87,9 @@ importers: husky: specifier: ^9.1.7 version: 9.1.7 + lint-staged: + specifier: ^16.1.6 + version: 16.1.6 prettier: specifier: ^3.6.2 version: 3.6.2 @@ -2338,6 +2341,10 @@ packages: alien-signals@2.0.7: resolution: {integrity: sha512-wE7y3jmYeb0+h6mr5BOovuqhFv22O/MV9j5p0ndJsa7z1zJNPGQ4ph5pQk/kTTCWRC3xsA4SmtwmkzQO+7NCNg==} + ansi-escapes@7.1.0: + resolution: {integrity: sha512-YdhtCd19sKRKfAAUsrcC1wzm4JuzJoiX4pOJqIoW2qmKj5WzG/dL8uUJ0361zaXtHqK7gEhOwtAtz7t3Yq3X5g==} + engines: {node: '>=18'} + ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -2590,6 +2597,14 @@ packages: resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==} engines: {node: '>=4'} + cli-cursor@5.0.0: + resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==} + engines: {node: '>=18'} + + cli-truncate@5.1.0: + resolution: {integrity: sha512-7JDGG+4Zp0CsknDCedl0DYdaeOhc46QNpXi3NLQblkZpXXgA6LncLDUUyvrjSvZeF3VRQa+KiMGomazQrC1V8g==} + engines: {node: '>=20'} + clipboardy@4.0.0: resolution: {integrity: sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==} engines: {node: '>=18'} @@ -2630,6 +2645,10 @@ packages: resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==} engines: {node: '>=16'} + commander@14.0.1: + resolution: {integrity: sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==} + engines: {node: '>=20'} + commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} @@ -2960,6 +2979,9 @@ packages: peerDependencies: vue: ^3.2.0 + emoji-regex@10.5.0: + resolution: {integrity: sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==} + emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -2985,6 +3007,10 @@ packages: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} + environment@1.1.0: + resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==} + engines: {node: '>=18'} + error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} @@ -3196,6 +3222,9 @@ packages: resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==} engines: {node: '>=6'} + eventemitter3@5.0.1: + resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==} + events@3.3.0: resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} engines: {node: '>=0.8.x'} @@ -3319,6 +3348,10 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} + get-east-asian-width@1.4.0: + resolution: {integrity: sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==} + engines: {node: '>=18'} + get-intrinsic@1.3.0: resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} engines: {node: '>= 0.4'} @@ -3554,6 +3587,10 @@ packages: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} + is-fullwidth-code-point@5.1.0: + resolution: {integrity: sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==} + engines: {node: '>=18'} + is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} @@ -3738,10 +3775,19 @@ packages: linkify-it@5.0.0: resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==} + lint-staged@16.1.6: + resolution: {integrity: sha512-U4kuulU3CKIytlkLlaHcGgKscNfJPNTiDF2avIUGFCv7K95/DCYQ7Ra62ydeRWmgQGg9zJYw2dzdbztwJlqrow==} + engines: {node: '>=20.17'} + hasBin: true + listhen@1.9.0: resolution: {integrity: sha512-I8oW2+QL5KJo8zXNWX046M134WchxsXC7SawLPvRQpogCbkyQIaFxPE89A2HiwR7vAK2Dm2ERBAmyjTYGYEpBg==} hasBin: true + listr2@9.0.4: + resolution: {integrity: sha512-1wd/kpAdKRLwv7/3OKC8zZ5U8e/fajCfWMxacUvB79S5nLrYGPtUI/8chMQhn3LQjsRVErTb9i1ECAwW0ZIHnQ==} + engines: {node: '>=20.0.0'} + load-tsconfig@0.2.5: resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -3811,6 +3857,10 @@ packages: lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + log-update@6.1.0: + resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==} + engines: {node: '>=18'} + lru-cache@10.4.3: resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} @@ -3905,6 +3955,10 @@ packages: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} + mimic-function@5.0.1: + resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==} + engines: {node: '>=18'} + mimic-response@3.1.0: resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==} engines: {node: '>=10'} @@ -3962,6 +4016,10 @@ packages: muggle-string@0.4.1: resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==} + nano-spawn@1.0.3: + resolution: {integrity: sha512-jtpsQDetTnvS2Ts1fiRdci5rx0VYws5jGyC+4IYOTnIQ/wwdf6JdomlHBwqC3bJYOvaKu0C2GSZ1A60anrYpaA==} + engines: {node: '>=20.17'} + nanoid@3.3.11: resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -4108,6 +4166,10 @@ packages: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} engines: {node: '>=12'} + onetime@7.0.0: + resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==} + engines: {node: '>=18'} + open@10.2.0: resolution: {integrity: sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==} engines: {node: '>=18'} @@ -4253,6 +4315,11 @@ packages: resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} engines: {node: '>=12'} + pidtree@0.6.0: + resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} + engines: {node: '>=0.10'} + hasBin: true + pinia@3.0.3: resolution: {integrity: sha512-ttXO/InUULUXkMHpTdp9Fj4hLpD/2AoJdmAbAeW2yu1iy1k+pkFekQXw5VpC0/5p51IOR/jDaDRfRWRnMMsGOA==} peerDependencies: @@ -4589,6 +4656,10 @@ packages: engines: {node: '>= 0.4'} hasBin: true + restore-cursor@5.1.0: + resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==} + engines: {node: '>=18'} + restructure@3.0.2: resolution: {integrity: sha512-gSfoiOEA0VPE6Tukkrr7I0RBdE0s7H1eFCDBk05l1KIQT1UIKNc5JZy6jdyW6eYH3aR3g5b3PuL77rq0hvwtAw==} @@ -4738,6 +4809,10 @@ packages: resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==} engines: {node: '>=14.16'} + slice-ansi@7.1.2: + resolution: {integrity: sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==} + engines: {node: '>=18'} + smob@1.5.0: resolution: {integrity: sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==} @@ -4794,6 +4869,10 @@ packages: streamx@2.22.1: resolution: {integrity: sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==} + string-argv@0.3.2: + resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==} + engines: {node: '>=0.6.19'} + string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} @@ -4802,6 +4881,14 @@ packages: resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} engines: {node: '>=12'} + string-width@7.2.0: + resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==} + engines: {node: '>=18'} + + string-width@8.1.0: + resolution: {integrity: sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==} + engines: {node: '>=20'} + string_decoder@1.1.1: resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} @@ -5380,6 +5467,10 @@ packages: resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} engines: {node: '>=12'} + wrap-ansi@9.0.2: + resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==} + engines: {node: '>=18'} + wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} @@ -8065,6 +8156,10 @@ snapshots: alien-signals@2.0.7: {} + ansi-escapes@7.1.0: + dependencies: + environment: 1.1.0 + ansi-regex@5.0.1: {} ansi-regex@6.2.2: {} @@ -8332,6 +8427,15 @@ snapshots: dependencies: escape-string-regexp: 1.0.5 + cli-cursor@5.0.0: + dependencies: + restore-cursor: 5.1.0 + + cli-truncate@5.1.0: + dependencies: + slice-ansi: 7.1.2 + string-width: 8.1.0 + clipboardy@4.0.0: dependencies: execa: 8.0.1 @@ -8370,6 +8474,8 @@ snapshots: commander@11.1.0: {} + commander@14.0.1: {} + commander@2.20.3: {} commander@7.2.0: @@ -8683,6 +8789,8 @@ snapshots: transitivePeerDependencies: - '@vue/composition-api' + emoji-regex@10.5.0: {} + emoji-regex@8.0.0: {} emoji-regex@9.2.2: {} @@ -8703,6 +8811,8 @@ snapshots: env-paths@2.2.1: {} + environment@1.1.0: {} + error-ex@1.3.2: dependencies: is-arrayish: 0.2.1 @@ -8980,6 +9090,8 @@ snapshots: event-target-shim@5.0.1: {} + eventemitter3@5.0.1: {} + events@3.3.0: {} execa@8.0.1: @@ -9107,6 +9219,8 @@ snapshots: get-caller-file@2.0.5: {} + get-east-asian-width@1.4.0: {} + get-intrinsic@1.3.0: dependencies: call-bind-apply-helpers: 1.0.2 @@ -9381,6 +9495,10 @@ snapshots: is-fullwidth-code-point@3.0.0: {} + is-fullwidth-code-point@5.1.0: + dependencies: + get-east-asian-width: 1.4.0 + is-glob@4.0.3: dependencies: is-extglob: 2.1.1 @@ -9530,6 +9648,21 @@ snapshots: dependencies: uc.micro: 2.1.0 + lint-staged@16.1.6: + dependencies: + chalk: 5.6.2 + commander: 14.0.1 + debug: 4.4.3 + lilconfig: 3.1.3 + listr2: 9.0.4 + micromatch: 4.0.8 + nano-spawn: 1.0.3 + pidtree: 0.6.0 + string-argv: 0.3.2 + yaml: 2.8.1 + transitivePeerDependencies: + - supports-color + listhen@1.9.0: dependencies: '@parcel/watcher': 2.5.1 @@ -9551,6 +9684,15 @@ snapshots: untun: 0.1.3 uqr: 0.1.2 + listr2@9.0.4: + dependencies: + cli-truncate: 5.1.0 + colorette: 2.0.20 + eventemitter3: 5.0.1 + log-update: 6.1.0 + rfdc: 1.4.1 + wrap-ansi: 9.0.2 + load-tsconfig@0.2.5: {} loader-runner@4.3.0: {} @@ -9603,6 +9745,14 @@ snapshots: lodash@4.17.21: {} + log-update@6.1.0: + dependencies: + ansi-escapes: 7.1.0 + cli-cursor: 5.0.0 + slice-ansi: 7.1.2 + strip-ansi: 7.1.2 + wrap-ansi: 9.0.2 + lru-cache@10.4.3: {} lru-cache@5.1.1: @@ -9690,6 +9840,8 @@ snapshots: mimic-fn@4.0.0: {} + mimic-function@5.0.1: {} + mimic-response@3.1.0: optional: true @@ -9739,6 +9891,8 @@ snapshots: muggle-string@0.4.1: {} + nano-spawn@1.0.3: {} + nanoid@3.3.11: {} nanoid@5.1.5: {} @@ -10061,6 +10215,10 @@ snapshots: dependencies: mimic-fn: 4.0.0 + onetime@7.0.0: + dependencies: + mimic-function: 5.0.1 + open@10.2.0: dependencies: default-browser: 5.2.1 @@ -10271,6 +10429,8 @@ snapshots: picomatch@4.0.3: {} + pidtree@0.6.0: {} + pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)): dependencies: '@vue/devtools-api': 7.7.7 @@ -10603,6 +10763,11 @@ snapshots: path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 + restore-cursor@5.1.0: + dependencies: + onetime: 7.0.0 + signal-exit: 4.1.0 + restructure@3.0.2: {} reusify@1.1.0: {} @@ -10833,6 +10998,11 @@ snapshots: slash@5.1.0: {} + slice-ansi@7.1.2: + dependencies: + ansi-styles: 6.2.3 + is-fullwidth-code-point: 5.1.0 + smob@1.5.0: {} source-map-js@1.2.1: {} @@ -10878,6 +11048,8 @@ snapshots: transitivePeerDependencies: - react-native-b4a + string-argv@0.3.2: {} + string-width@4.2.3: dependencies: emoji-regex: 8.0.0 @@ -10890,6 +11062,17 @@ snapshots: emoji-regex: 9.2.2 strip-ansi: 7.1.2 + string-width@7.2.0: + dependencies: + emoji-regex: 10.5.0 + get-east-asian-width: 1.4.0 + strip-ansi: 7.1.2 + + string-width@8.1.0: + dependencies: + get-east-asian-width: 1.4.0 + strip-ansi: 7.1.2 + string_decoder@1.1.1: dependencies: safe-buffer: 5.1.2 @@ -11556,6 +11739,12 @@ snapshots: string-width: 5.1.2 strip-ansi: 7.1.2 + wrap-ansi@9.0.2: + dependencies: + ansi-styles: 6.2.3 + string-width: 7.2.0 + strip-ansi: 7.1.2 + wrappy@1.0.2: optional: true -- 2.49.0 From 04a57044ebbb8526bbb53a42f26721bee01491d1 Mon Sep 17 00:00:00 2001 From: R2m1liA <15258427350@163.com> Date: Wed, 17 Sep 2025 16:10:28 +0800 Subject: [PATCH 6/8] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9git=20hook?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将git hook的调用工具调整为npx --- .husky/commit-msg | 27 ++++++--------------------- .husky/pre-commit | 2 +- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/.husky/commit-msg b/.husky/commit-msg index 78758de..8b85bc4 100644 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -56,26 +56,11 @@ print_debug "Shell: $SHELL" print_debug "PATH: $PATH" print_debug "当前进程ID: $" -# 检查 bunx 是否可用 -print_section "检查工具可用性..." -print_info "尝试导入用户环境变量..." -export PATH="$HOME/.bun/bin:$PATH" -if command -v bunx >/dev/null 2>&1; then - BUNX_PATH=$(command -v bunx) - print_success "bunx 可用: $BUNX_PATH" - print_debug "bunx 版本信息:" - print_debug "$(bunx --version 2>&1 || echo 'bunx --version 失败')" -else - print_error "bunx 不可用" - print_info "PATH 内容: $PATH" - exit 1 -fi - # 检查 commitlint 是否可用 print_section "检查 commitlint..." -if bunx commitlint --version >/dev/null 2>&1; then - COMMITLINT_VERSION=$(bunx commitlint --version) +if npx commitlint --version >/dev/null 2>&1; then + COMMITLINT_VERSION=$(npx commitlint --version) print_success "commitlint 可用: $COMMITLINT_VERSION" else print_error "commitlint 不可用或配置有误" @@ -132,15 +117,15 @@ fi # 运行 commitlint echo print_section "执行 commitlint 检查..." -print_command "执行命令: bunx commitlint --edit \"$1\"" +print_command "执行命令: npx commitlint --edit \"$1\"" # 显示详细的执行过程 if [ "$DEBUG" = "true" ]; then print_debug "详细执行过程:" - bunx commitlint --edit "$1" --verbose + npx commitlint --edit "$1" --verbose RESULT=$? else - bunx commitlint --edit "$1" + npx commitlint --edit "$1" RESULT=$? fi @@ -156,7 +141,7 @@ else echo "1. 检查提交消息是否符合约定式提交格式" echo "2. 确认 commitlint 配置是否正确" echo "3. 运行 'DEBUG=true git commit' 查看详细调试信息" - echo "4. 手动测试: bunx commitlint --edit .git/COMMIT_EDITMSG" + echo "4. 手动测试: npx commitlint --edit .git/COMMIT_EDITMSG" echo print_debug "Hook 执行失败，退出代码: $RESULT" fi diff --git a/.husky/pre-commit b/.husky/pre-commit index 0d4e3a9..d0a7784 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1 +1 @@ -pnpm dlx lint-staged \ No newline at end of file +npx lint-staged \ No newline at end of file -- 2.49.0 From 444fa4ff9b3d88f517b621a64267e9ada618fc1c Mon Sep 17 00:00:00 2001 From: R2m1liA <15258427350@163.com> Date: Wed, 17 Sep 2025 16:20:04 +0800 Subject: [PATCH 7/8] =?UTF-8?q?docs:=20=E5=88=9B=E5=BB=BA=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/PULL_REQUEST_TEMPLATE.yaml | 69 +++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 .gitea/PULL_REQUEST_TEMPLATE.yaml diff --git a/.gitea/PULL_REQUEST_TEMPLATE.yaml b/.gitea/PULL_REQUEST_TEMPLATE.yaml new file mode 100644 index 0000000..73942a3 --- /dev/null +++ b/.gitea/PULL_REQUEST_TEMPLATE.yaml @@ -0,0 +1,69 @@ +name: "Standard PR 模板" +about: "用于提交新功能/修复bug/改进重构等合并请求" +title: "[PR] " # 新开 PR 时默认加的前缀 +ref: "main" # 默认目标分支，可根据你们主分支改为 master／develop 等 + +body: + - type: markdown + attributes: + value: | + 请在下方填写合并请求描述，包括变更目的、主要内容及相关上下文。 + - type: input + id: issue + attributes: + label: "关联Issue" + description: "比如: Fixes #123 / Closes #456 / 如果没有可以留空" + placeholder: "输入关联 issue 编号" + validations: + required: false + - type: textarea + id: changes + attributes: + label: "更改内容/What Changed" + description: "列出本次 PR 的主要变更项，便于 Review" + placeholder: "-xxx\n-yyy\n-zzz" + value: "" + validations: + required: true + - type: textarea + id: test + attributes: + label: "测试步骤/How To Test" + description: "提供复现／验证更改的步骤，含环境／命令／预期结果等" + placeholder: "1. ...\n2. ...\n3. ..." + value: "" + validations: + required: true + - type: checkboxes + id: checklist + attributes: + label: "检查表/Checklist" + description: "提交前，请确认以下事项" + options: + - label: 代码格式符合团队规范 + required: true + - label: 已添加或更新单元测试/集成测试 + required: true + - label: 文档/README 已更新（如有必要） + required: false + - label: 所有测试通过 + required: true + - label: 分支命名正确(feature/xxx 或 fix/xxx 等) + required: false + - label: 回归风险已评估 + required: false + validations: + required: true + - type: textarea + id: impact + attributes: + label: "影响评估/Risk & Rollback" + description: "评估变更是否有破坏性风险，以及如何回滚／缓解" + placeholder: "例如：数据库迁移、依赖变动、兼容性问题等" + value: "" + validations: + required: false + - type: markdown + attributes: + value: | + **可选：截图或 Demo(如界面/UI 有变化)** \ No newline at end of file -- 2.49.0 From e395e08102c52cb75525c43066eb9a411704fe60 Mon Sep 17 00:00:00 2001 From: R2m1liA <15258427350@163.com> Date: Wed, 17 Sep 2025 16:43:26 +0800 Subject: [PATCH 8/8] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9PR=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整表单验证项 - 修改默认分支 --- .gitea/PULL_REQUEST_TEMPLATE.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/PULL_REQUEST_TEMPLATE.yaml b/.gitea/PULL_REQUEST_TEMPLATE.yaml index 73942a3..b2bd9f8 100644 --- a/.gitea/PULL_REQUEST_TEMPLATE.yaml +++ b/.gitea/PULL_REQUEST_TEMPLATE.yaml @@ -1,18 +1,18 @@ name: "Standard PR 模板" about: "用于提交新功能/修复bug/改进重构等合并请求" title: "[PR] " # 新开 PR 时默认加的前缀 -ref: "main" # 默认目标分支，可根据你们主分支改为 master／develop 等 +ref: "master" # 默认目标分支，可根据你们主分支改为 master/develop 等 body: - type: markdown attributes: value: | 请在下方填写合并请求描述，包括变更目的、主要内容及相关上下文。 - - type: input + - type: textarea id: issue attributes: label: "关联Issue" - description: "比如: Fixes #123 / Closes #456 / 如果没有可以留空" + description: "比如: Fixes #123/Closes #456/如果没有可以留空" placeholder: "输入关联 issue 编号" validations: required: false @@ -21,7 +21,7 @@ body: attributes: label: "更改内容/What Changed" description: "列出本次 PR 的主要变更项，便于 Review" - placeholder: "-xxx\n-yyy\n-zzz" + placeholder: "输入更改内容" value: "" validations: required: true @@ -29,11 +29,11 @@ body: id: test attributes: label: "测试步骤/How To Test" - description: "提供复现／验证更改的步骤，含环境／命令／预期结果等" - placeholder: "1. ...\n2. ...\n3. ..." + description: "提供复现/验证更改的步骤，含环境/命令/预期结果等" + placeholder: "输入测试步骤" value: "" validations: - required: true + required: false - type: checkboxes id: checklist attributes: @@ -48,7 +48,7 @@ body: required: false - label: 所有测试通过 required: true - - label: 分支命名正确(feature/xxx 或 fix/xxx 等) + - label: 分支命名正确(feature/xxx或fix/xxx 等) required: false - label: 回归风险已评估 required: false @@ -58,7 +58,7 @@ body: id: impact attributes: label: "影响评估/Risk & Rollback" - description: "评估变更是否有破坏性风险，以及如何回滚／缓解" + description: "评估变更是否有破坏性风险，以及如何回滚/缓解" placeholder: "例如：数据库迁移、依赖变动、兼容性问题等" value: "" validations: -- 2.49.0