From f69515952ba09bcd2005611469475640b7b43dcb Mon Sep 17 00:00:00 2001 From: Jinliang Date: Sat, 8 Jun 2024 15:56:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=BC=BA=20useRequest=20?= =?UTF-8?q?=E9=92=A9=E5=AD=90=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E5=92=8C=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=20-=20?= =?UTF-8?q?=E5=9C=A8=20`run`=20=E5=87=BD=E6=95=B0=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20`return=20func()`=EF=BC=8C=E7=A1=AE=E4=BF=9D=20`run?= =?UTF-8?q?`=20=E5=87=BD=E6=95=B0=E8=BF=94=E5=9B=9E=20Promise=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E4=BE=BF=E8=B0=83=E7=94=A8=E8=80=85=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=AD=89=E5=BE=85=E5=85=B6=E5=AE=8C=E6=88=90=E3=80=82=20-=20?= =?UTF-8?q?=E5=9C=A8=20`run`=20=E5=87=BD=E6=95=B0=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20`return=20data.value`=EF=BC=8C=E4=BB=A5=E4=BE=BF?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=88=90=E5=8A=9F=E6=97=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E6=95=B0=E6=8D=AE=E3=80=82=20-=20=E5=9C=A8?= =?UTF-8?q?=20`run`=20=E5=87=BD=E6=95=B0=E4=B8=AD=E6=B7=BB=E5=8A=A0=20`thr?= =?UTF-8?q?ow=20err`=EF=BC=8C=E4=BB=A5=E4=BE=BF=E8=AF=B7=E6=B1=82=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=97=B6=E6=8A=9B=E5=87=BA=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 这些更改允许调用者直接访问请求结果，并使用 `try...catch` 来处理错误，不必监听data和error处理数据或者错误，从而提高 `useRequest` 钩子的可用性和健壮性。 使用示例： const { run } = useRequest(fetchData, { immediate: false }) try { const result = await run() console.log('成功:', result) } catch (err) { console.error('失败:', err) } --- src/hooks/useRequest.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hooks/useRequest.ts b/src/hooks/useRequest.ts index 0559276..9d1c5a7 100644 --- a/src/hooks/useRequest.ts +++ b/src/hooks/useRequest.ts @@ -24,13 +24,15 @@ export default function useRequest( const data = ref(options.initialData) const run = async () => { loading.value = true - func() + return func() .then((res) => { data.value = res.data as UnwrapRef error.value = false + return data.value }) .catch((err) => { error.value = err + throw err }) .finally(() => { loading.value = false From 457186c391424636963a92a8bf00bb1bdff74976 Mon Sep 17 00:00:00 2001 From: Jinliang Date: Sat, 8 Jun 2024 15:59:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?refine(hooks):=20=E4=BC=98=E5=8C=96=20useRe?= =?UTF-8?q?quest=20=E7=AB=8B=E5=8D=B3=E6=89=A7=E8=A1=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?=20-=20immediate=20=E9=80=89=E9=A1=B9=E7=94=B1=E9=BB=98?= =?UTF-8?q?=E8=AE=A4true=20=E6=94=B9=E4=B8=BAfalse=20-=20=E7=AB=8B?= =?UTF-8?q?=E5=8D=B3=E6=89=A7=E8=A1=8C=E7=94=B1=E5=9C=A8=20onLoad=20?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=94=B9=E4=B8=BA=E5=9C=A8=E9=92=A9=E5=AD=90?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=9C=9F=E9=97=B4=E7=AB=8B=E5=8D=B3=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=20BREAKING=20CHANGE:=20immediate=20=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E7=94=B1=E9=BB=98=E8=AE=A4=20true=20=E6=94=B9=E4=B8=BA=20false?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useRequest.ts | 10 ++++------ src/pages/about/components/request.vue | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/hooks/useRequest.ts b/src/hooks/useRequest.ts index 9d1c5a7..9a0c8e5 100644 --- a/src/hooks/useRequest.ts +++ b/src/hooks/useRequest.ts @@ -1,7 +1,7 @@ import { UnwrapRef } from 'vue' type IUseRequestOptions = { - /** 是否立即执行，如果是则在onLoad执行 */ + /** 是否立即执行 */ immediate?: boolean /** 初始化数据 */ initialData?: T @@ -11,13 +11,13 @@ type IUseRequestOptions = { * useRequest是一个定制化的请求钩子，用于处理异步请求和响应。 * @param func 一个执行异步请求的函数，返回一个包含响应数据的Promise。 * @param options 包含请求选项的对象 {immediate, initialData}。 - * @param options.immediate 是否立即执行请求，默认为true。 + * @param options.immediate 是否立即执行请求，默认为false。 * @param options.initialData 初始化数据，默认为undefined。 * @returns 返回一个对象{loading, error, data, run}，包含请求的加载状态、错误信息、响应数据和手动触发请求的函数。 */ export default function useRequest( func: () => Promise>, - options: IUseRequestOptions = { immediate: true }, + options: IUseRequestOptions = { immediate: false }, ) { const loading = ref(false) const error = ref(false) @@ -39,8 +39,6 @@ export default function useRequest( }) } - onLoad(() => { - options.immediate && run() - }) + options.immediate && run() return { loading, error, data, run } } diff --git a/src/pages/about/components/request.vue b/src/pages/about/components/request.vue index a8bf509..89a656d 100644 --- a/src/pages/about/components/request.vue +++ b/src/pages/about/components/request.vue @@ -47,6 +47,7 @@ const recommendUrl = ref('http://laf.run/signup?code=ohaOgIX') const initialData = undefined // 适合少部分全局性的接口————多个页面都需要的请求接口，额外编写一个 Service 层 const { loading, error, data, run } = useRequest(() => getFooAPI('菲鸽'), { + immediate: true, initialData, }) const reset = () => { From 931c4a3bc606a2fae55c7fd2ae1506b72ed98c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <65991901+codercup@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:59:59 +0800 Subject: [PATCH 3/6] Merge pull request #109 from handongccc/main MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(commitlintrc): 优化git提交方式|修改文件折叠显示 --- .commitlintrc.cjs | 106 ++++++++++++++++++++++++++++++++++++++++++ .vscode/settings.json | 15 +++++- commitlint.config.cjs | 51 -------------------- package.json | 4 +- 4 files changed, 123 insertions(+), 53 deletions(-) create mode 100644 .commitlintrc.cjs delete mode 100644 commitlint.config.cjs diff --git a/.commitlintrc.cjs b/.commitlintrc.cjs new file mode 100644 index 0000000..dd736e1 --- /dev/null +++ b/.commitlintrc.cjs @@ -0,0 +1,106 @@ +const fs = require('fs') +const path = require('path') +const { execSync } = require('child_process') + +const scopes = fs + .readdirSync(path.resolve(__dirname, 'src'), { withFileTypes: true }) + .filter((dirent) => dirent.isDirectory()) + .map((dirent) => dirent.name.replace(/s$/, '')) + +// precomputed scope +const scopeComplete = execSync('git status --porcelain || true') + .toString() + .trim() + .split('\n') + .find((r) => ~r.indexOf('M src')) + ?.replace(/(\/)/g, '%%') + ?.match(/src%%((\w|-)*)/)?.[1] + ?.replace(/s$/, '') + +module.exports = { + ignores: [(commit) => commit.includes('init')], + extends: ['@commitlint/config-conventional'], + rules: { + 'body-leading-blank': [2, 'always'], + 'footer-leading-blank': [1, 'always'], + 'header-max-length': [2, 'always', 108], + 'subject-empty': [2, 'never'], + 'type-empty': [2, 'never'], + 'subject-case': [0], + 'type-enum': [ + 2, + 'always', + [ + 'feat', + 'fix', + 'perf', + 'style', + 'docs', + 'test', + 'refactor', + 'build', + 'ci', + 'chore', + 'revert', + 'wip', + 'workflow', + 'types', + 'release', + ], + ], + }, + prompt: { + /** @use `pnpm commit :f` */ + alias: { + f: 'docs: fix typos', + r: 'docs: update README', + s: 'style: update code format', + b: 'build: bump dependencies', + c: 'chore: update config', + }, + customScopesAlign: !scopeComplete ? 'top' : 'bottom', + defaultScope: scopeComplete, + scopes: [...scopes, 'mock'], + allowEmptyIssuePrefixs: false, + allowCustomIssuePrefixs: false, + + // English + typesAppend: [ + { value: 'wip', name: 'wip: work in process' }, + { value: 'workflow', name: 'workflow: workflow improvements' }, + { value: 'types', name: 'types: type definition file changes' }, + ], + + // 中英文对照版 + // messages: { + // type: '选择你要提交的类型 :', + // scope: '选择一个提交范围 (可选):', + // customScope: '请输入自定义的提交范围 :', + // subject: '填写简短精炼的变更描述 :\n', + // body: '填写更加详细的变更描述 (可选)。使用 "|" 换行 :\n', + // breaking: '列举非兼容性重大的变更 (可选)。使用 "|" 换行 :\n', + // footerPrefixsSelect: '选择关联issue前缀 (可选):', + // customFooterPrefixs: '输入自定义issue前缀 :', + // footer: '列举关联issue (可选) 例如: #31, #I3244 :\n', + // confirmCommit: '是否提交或修改commit ?', + // }, + // types: [ + // { value: 'feat', name: 'feat: 新增功能' }, + // { value: 'fix', name: 'fix: 修复缺陷' }, + // { value: 'docs', name: 'docs: 文档变更' }, + // { value: 'style', name: 'style: 代码格式' }, + // { value: 'refactor', name: 'refactor: 代码重构' }, + // { value: 'perf', name: 'perf: 性能优化' }, + // { value: 'test', name: 'test: 添加疏漏测试或已有测试改动' }, + // { value: 'build', name: 'build: 构建流程、外部依赖变更 (如升级 npm 包、修改打包配置等)' }, + // { value: 'ci', name: 'ci: 修改 CI 配置、脚本' }, + // { value: 'revert', name: 'revert: 回滚 commit' }, + // { value: 'chore', name: 'chore: 对构建过程或辅助工具和库的更改 (不影响源文件、测试用例)' }, + // { value: 'wip', name: 'wip: 正在开发中' }, + // { value: 'workflow', name: 'workflow: 工作流程改进' }, + // { value: 'types', name: 'types: 类型定义文件修改' }, + // ], + // emptyScopesAlias: 'empty: 不填写', + // customScopesAlias: 'custom: 自定义', + }, +} diff --git a/.vscode/settings.json b/.vscode/settings.json index aa5e6f4..8d38134 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -48,5 +48,18 @@ "uvui", "WechatMiniprogram" ], - "typescript.tsdk": "node_modules\\typescript\\lib" + "typescript.tsdk": "node_modules\\typescript\\lib", + // 控制相关文件嵌套展示 + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.expand": false, + "explorer.fileNesting.patterns": { + "*.ts": "$(capture).test.ts, $(capture).test.tsx", + "*.tsx": "$(capture).test.ts, $(capture).test.tsx", + "*.env": "$(capture).env.*", + "CHANGELOG.md": "CHANGELOG*", + "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc", + ".eslintrc.cjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,.stylelintrc.*,.eslintrc-auto-import.json,.editorconfig,.commitlint.cjs", + "vite.config.ts": "tsconfig.*.json,uno.config.ts,tsconfig.json,uni-pages.d.ts", + "manifest.config.ts": "manifest.config.ts,pages.config.ts" + } } diff --git a/commitlint.config.cjs b/commitlint.config.cjs deleted file mode 100644 index d5c73ce..0000000 --- a/commitlint.config.cjs +++ /dev/null @@ -1,51 +0,0 @@ -// commitlint.config.cjs - -module.exports = { - extends: ['@commitlint/config-conventional'], - rules: { - // 'body-leading-blank': [2, 'always'], // 主体前有空行，默认就是 always - // 'footer-leading-blank': [2, 'always'], // 末行前有空行，默认就是 always - // 'header-max-length': [2, 'always', 108], // 首行最大长度，默认就是 always,72 - // 'subject-empty': [2, 'never'], // 标题不可为空，默认就是 never - // 'type-empty': [2, 'never'], // 类型不可为空，默认就是 never - - // 允许的类型 - 'type-enum': [ - 2, - 'always', - [ - 'build', // 构造工具、外部依赖（webpack、npm） - 'chore', // 不涉及 src、test 的其他修改（构建过程或辅助工具的变更） - 'ci', // 修改项目继续集成流程（Travis，Jenkins，GitLab CI，Circle等） - 'docs', // 文档 - 'feat', // 新增功能 - 'fix', // bug 修复 - 'perf', // 性能优化 - 'refactor', // 重构 - 'revert', // 回退 - 'style', // 代码风格（不影响代码含义） - 'test', // 测试 - - // 下面几个是自定义新增的 - 'wip', // 开发中 - 'refine', // 小优化，没有到 refactor 的程度 - ], - ], - }, -} - -// @see https://commitlint.js.org/#/reference-rules?id=type-enum -// 默认值为： -// [ -// 'build', -// 'chore', -// 'ci', -// 'docs', -// 'feat', -// 'fix', -// 'perf', -// 'refactor', -// 'revert', -// 'style', -// 'test', -// ]; diff --git a/package.json b/package.json index c397b41..6e764d1 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,8 @@ "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei", "build:quickapp-webview-union": "uni build -p quickapp-webview-union", "prepare": "git init && husky install ", - "type-check": "vue-tsc --noEmit" + "type-check": "vue-tsc --noEmit", + "cz": "czg" }, "lint-staged": { "**/*.{html,vue,ts,cjs,json,md}": [ @@ -93,6 +94,7 @@ "@dcloudio/uni-mp-weixin": "3.0.0-4010420240430001", "@dcloudio/uni-mp-xhs": "3.0.0-4010420240430001", "@dcloudio/uni-quickapp-webview": "3.0.0-4010420240430001", + "czg": "^1.9.2", "dayjs": "1.11.10", "pinia": "2.0.36", "pinia-plugin-persistedstate": "3.2.1", From 66faff861462855cdea9cffbdf1706a21bde8122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Tue, 11 Jun 2024 11:22:24 +0800 Subject: [PATCH 4/6] chore(pnpm-lock.yaml): pnpm i --- pnpm-lock.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f42523c..50d2045 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -50,6 +50,9 @@ dependencies: '@dcloudio/uni-quickapp-webview': specifier: 3.0.0-4010420240430001 version: 3.0.0-4010420240430001(postcss@8.4.38)(vue@3.4.26) + czg: + specifier: ^1.9.2 + version: 1.9.2 dayjs: specifier: 1.11.10 version: 1.11.10 @@ -5528,6 +5531,12 @@ packages: /csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + /czg@1.9.2: + resolution: {integrity: sha512-uPSKTIsAhZp1Tu7DRO7K68qPixVFyheRKlOGhuKXo2wdlpcE0hoCmTQAwsUTerKtjcFRnhRTpJ5j0bC6SOj01Q==} + engines: {node: '>=v12.20.0'} + hasBin: true + dev: false + /dargs@7.0.0: resolution: {integrity: sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==} engines: {node: '>=8'} From 81e660877eca2a92ef9cccddb3fbff61f20bc160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Tue, 11 Jun 2024 13:29:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix(utils):=20getUrlObj=20=E5=81=A5?= =?UTF-8?q?=E5=A3=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/index.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index 14ef106..f416727 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -50,12 +50,18 @@ const ensureDecodeURIComponent = (url: string) => { */ export const getUrlObj = (url: string) => { const [path, queryStr] = url.split('?') - console.log(path, queryStr) + // console.log(path, queryStr) + if (!queryStr) { + return { + path, + query: {}, + } + } const query: Record = {} queryStr.split('&').forEach((item) => { const [key, value] = item.split('=') - console.log(key, value) + // console.log(key, value) query[key] = ensureDecodeURIComponent(value) // 这里需要统一 decodeURIComponent 一下，可以兼容h5和微信y }) return { path, query } From b2c740425ea74858c3d3f7c6f839920d37e7f319 Mon Sep 17 00:00:00 2001 From: wyl86 Date: Thu, 13 Jun 2024 12:03:09 +0800 Subject: [PATCH 6/6] =?UTF-8?q?build(types):=20=E5=88=A0=E9=99=A4=E6=97=A7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A3=B0=E6=98=8E=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除 @uni-helper/vite-plugin-uni-pages 旧类型声明文件 --- uni-pages.d.ts | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 uni-pages.d.ts diff --git a/uni-pages.d.ts b/uni-pages.d.ts deleted file mode 100644 index 70b5e83..0000000 --- a/uni-pages.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* eslint-disable */ -/* prettier-ignore */ -// @ts-nocheck -// Generated by vite-plugin-uni-pages - -interface NavigateToOptions { - url: "/pages/index/index" | - "/pages/index/about" | - "/pages/index/request" | - "/pages/index/request2" | - "/pages/index/upload" | - "/pages/index/upload2" | - "/pages-sub/demo/index"; -} -interface RedirectToOptions extends NavigateToOptions {} - -interface SwitchTabOptions { - url: "/pages/index/index" | "/pages/index/about" -} - -type ReLaunchOptions = NavigateToOptions | SwitchTabOptions; - -declare interface Uni { - navigateTo(options: UniNamespace.NavigateToOptions & NavigateToOptions): void; - redirectTo(options: UniNamespace.RedirectToOptions & RedirectToOptions): void; - switchTab(options: UniNamespace.SwitchTabOptions & SwitchTabOptions): void; - reLaunch(options: UniNamespace.ReLaunchOptions & ReLaunchOptions): void; -}