diff --git a/.vscode/settings.json b/.vscode/settings.json index a5af7cf..a272d24 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -42,6 +42,7 @@ "commitlint", "dcloudio", "iconfont", + "oxlint", "qrcode", "refresherrefresh", "scrolltolower", diff --git a/package.json b/package.json index de6ac90..6d876cb 100644 --- a/package.json +++ b/package.json @@ -73,13 +73,14 @@ "build:quickapp-webview-union": "uni build -p quickapp-webview-union", "type-check": "vue-tsc --noEmit", "openapi-ts-request": "openapi-ts", - "prepare": "git init && husky" + "prepare": "git init && husky", + "lint:oxlint": "oxlint src/**/*.{ts,js,vue}" }, "lint-staged": { - "**/*.{vue,html,cjs,json,md,scss,css,txt}": [ + "**/*.{html,cjs,json,md,scss,css,txt}": [ "prettier --write --cache" ], - "**/*.{js,ts}": [ + "**/*.{js,ts,vue}": [ "oxlint --fix", "prettier --write --cache" ], @@ -145,7 +146,7 @@ "husky": "^9.1.7", "lint-staged": "^15.2.10", "openapi-ts-request": "^1.1.2", - "oxlint": "^1.1.0", + "oxlint": "1.0.0", "postcss": "^8.4.49", "postcss-html": "^1.7.0", "postcss-scss": "^4.0.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ff7b2c3..e3127f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -175,8 +175,8 @@ importers: specifier: ^1.1.2 version: 1.1.2(@types/node@20.17.9)(@vue/compiler-sfc@3.5.15)(chokidar@3.6.0)(typescript@5.7.2) oxlint: - specifier: ^1.1.0 - version: 1.1.0 + specifier: 1.0.0 + version: 1.0.0 postcss: specifier: ^8.4.49 version: 8.4.49 @@ -2004,8 +2004,47 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@oxlint/win32-x64@1.1.0': - resolution: {integrity: sha512-x6r5yvM3wEty93Bx0NuNK+kutUyS/K55itkUrxdExoK6GcmVDboGGuhju9HyU2cM/IWLEWO8RHcXSyaxr9GR5g==} + '@oxlint/darwin-arm64@1.0.0': + resolution: {integrity: sha512-Ei8wLh65Th/si5EY6mfQIXVpdXbJWOoh56FaxxPgVxTeJaj3NHUIlxICHkvTZ5dz8bnOFcbS/+9MaW8Qkzfm9g==} + cpu: [arm64] + os: [darwin] + + '@oxlint/darwin-x64@1.0.0': + resolution: {integrity: sha512-dbdtQ+rJTUb4jFKTzV+j08yYcR8lZssLF10n7MggK/jI7pBtoQN04cupzYdkxOWSy6uDXjDmWYFDIqlTqV7zOg==} + cpu: [x64] + os: [darwin] + + '@oxlint/linux-arm64-gnu@1.0.0': + resolution: {integrity: sha512-71wy9zMxsAeRhCFQjUkDLT8N5tm10L5FxNxsUcEsezgM187X9tPGP1gwlFpYig7F+bg2X1dijFuTA/FSe0YpKg==} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@oxlint/linux-arm64-musl@1.0.0': + resolution: {integrity: sha512-UbD4+2k7aGZOFtKK/yeESX7Fv0w9gQbcjrjr1HGY7QOYg7XlFlqzycZdPS6XbAuKA5oOXFpafaYOD4AyX3p2AA==} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@oxlint/linux-x64-gnu@1.0.0': + resolution: {integrity: sha512-0NXWqsm65I3VaLgADW4y9r7Pwurqgs2fr1lqoTyTIlidD18LQ3UMAWp8NzBPMCYzw8c/rTgOzsFf0gLtxzMtwg==} + cpu: [x64] + os: [linux] + libc: [glibc] + + '@oxlint/linux-x64-musl@1.0.0': + resolution: {integrity: sha512-AY1NLnVQI+tBeuaB8KCriWfiD6O1zZFAQHphRDcZiqSz4mauNq9FFuffW0N9RSR9hYttGr0UVdQ6eK72RhzOYg==} + cpu: [x64] + os: [linux] + libc: [musl] + + '@oxlint/win32-arm64@1.0.0': + resolution: {integrity: sha512-X9y2KAdoqT/jy/sITGDZNMJHJAmhDhofItBnCf2DWS1HPakdtCAKGX9KMx6SivTbtPn1+JpZgfHn4Y7rNMvujQ==} + cpu: [arm64] + os: [win32] + + '@oxlint/win32-x64@1.0.0': + resolution: {integrity: sha512-x2eQwZCfRUi6GG0lhRuC54O6TK2uW7UbIvERh83vPi0ftd+rtGUuJauNdyC+pPx+iwFToFVet43/5MBMu4bMWg==} cpu: [x64] os: [win32] @@ -4921,8 +4960,8 @@ packages: resolution: {integrity: sha512-Sv0OvhPiMutICiwORAUefv02DCPb62IelBmo8ZsSrRHyI3FStqIWZvjqDkvtjU+lcujo7UNir+dCwKSqlEQ/5w==} engines: {node: '>=10', yarn: ^1.22.4} - oxlint@1.1.0: - resolution: {integrity: sha512-OVNpaoaQCUHHhCv5sYMPJ7Ts5k7ziw0QteH1gBSwF3elf/8GAew2Uh/0S7HsU1iGtjhlFy80+A8nwIb3Tq6m1w==} + oxlint@1.0.0: + resolution: {integrity: sha512-yyeryHnd21wPBLBEF4Uf8hvzJlftrIGHxyUaqFaP2JYiZ9cbiColygZhrezvv/Z/aThCmYu3j6iJMxlVPxNt6g==} engines: {node: '>=8.*'} hasBin: true @@ -8892,7 +8931,28 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - '@oxlint/win32-x64@1.1.0': + '@oxlint/darwin-arm64@1.0.0': + optional: true + + '@oxlint/darwin-x64@1.0.0': + optional: true + + '@oxlint/linux-arm64-gnu@1.0.0': + optional: true + + '@oxlint/linux-arm64-musl@1.0.0': + optional: true + + '@oxlint/linux-x64-gnu@1.0.0': + optional: true + + '@oxlint/linux-x64-musl@1.0.0': + optional: true + + '@oxlint/win32-arm64@1.0.0': + optional: true + + '@oxlint/win32-x64@1.0.0': optional: true '@polka/url@1.0.0-next.29': {} @@ -12433,9 +12493,16 @@ snapshots: dependencies: lcid: 3.1.1 - oxlint@1.1.0: + oxlint@1.0.0: optionalDependencies: - '@oxlint/win32-x64': 1.1.0 + '@oxlint/darwin-arm64': 1.0.0 + '@oxlint/darwin-x64': 1.0.0 + '@oxlint/linux-arm64-gnu': 1.0.0 + '@oxlint/linux-arm64-musl': 1.0.0 + '@oxlint/linux-x64-gnu': 1.0.0 + '@oxlint/linux-x64-musl': 1.0.0 + '@oxlint/win32-arm64': 1.0.0 + '@oxlint/win32-x64': 1.0.0 p-cancelable@2.1.1: {} diff --git a/src/hooks/useUpload.ts b/src/hooks/useUpload.ts index d5e39cb..d0936de 100644 --- a/src/hooks/useUpload.ts +++ b/src/hooks/useUpload.ts @@ -1,4 +1,4 @@ -import { ref, Ref } from 'vue' +import { ref } from 'vue' import { getEnvBaseUploadUrl } from '@/utils' const VITE_UPLOAD_BASEURL = `${getEnvBaseUploadUrl()}` @@ -20,7 +20,7 @@ export default function useUpload(options: TOptions = {} const { formData = {}, maxSize = 5 * 1024 * 1024, - accept = ['*'], + // accept = ['*'], fileType = 'image', success, error: onError, diff --git a/src/utils/index.ts b/src/utils/index.ts index 3d6380d..d021ce3 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -101,14 +101,13 @@ export const getUrlObj = (url: string) => { */ export const getAllPages = (key = 'needLogin') => { // 这里处理主包 - const mainPages = [ - ...pages - .filter((page) => !key || page[key]) - .map((page) => ({ - ...page, - path: `/${page.path}`, - })), - ] + const mainPages = pages + .filter((page) => !key || page[key]) + .map((page) => ({ + ...page, + path: `/${page.path}`, + })) + // 这里处理分包 const subPages: any[] = [] subPackages.forEach((subPageObj) => {