Skip to content

Commit 0a7af8c

Browse files
author
feige996
committed
Merge branch 'main' of github.com:feige996/unibest
2 parents 3f6dcbc + ae01a4a commit 0a7af8c

5 files changed

Lines changed: 68 additions & 45 deletions

File tree

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"commitlint",
4343
"dcloudio",
4444
"iconfont",
45+
"oxlint",
4546
"qrcode",
4647
"refresherrefresh",
4748
"scrolltolower",

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "unibest",
33
"type": "commonjs",
4-
"version": "2.11.1",
4+
"version": "2.12.0",
55
"description": "unibest - 最好的 uniapp 开发模板",
66
"update-time": "2025-05-28",
77
"author": {
@@ -73,13 +73,14 @@
7373
"build:quickapp-webview-union": "uni build -p quickapp-webview-union",
7474
"type-check": "vue-tsc --noEmit",
7575
"openapi-ts-request": "openapi-ts",
76-
"prepare": "git init && husky"
76+
"prepare": "git init && husky",
77+
"lint:oxlint": "oxlint src/**/*.{ts,js,vue}"
7778
},
7879
"lint-staged": {
79-
"**/*.{vue,html,cjs,json,md,scss,css,txt}": [
80+
"**/*.{html,cjs,json,md,scss,css,txt}": [
8081
"prettier --write --cache"
8182
],
82-
"**/*.{js,ts}": [
83+
"**/*.{js,ts,vue}": [
8384
"oxlint --fix",
8485
"prettier --write --cache"
8586
],
@@ -145,7 +146,7 @@
145146
"husky": "^9.1.7",
146147
"lint-staged": "^15.2.10",
147148
"openapi-ts-request": "^1.1.2",
148-
"oxlint": "^0.1.0",
149+
"oxlint": "1.0.0",
149150
"postcss": "^8.4.49",
150151
"postcss-html": "^1.7.0",
151152
"postcss-scss": "^4.0.9",

pnpm-lock.yaml

Lines changed: 52 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/hooks/useUpload.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ref, Ref } from 'vue'
1+
import { ref } from 'vue'
22
import { getEnvBaseUploadUrl } from '@/utils'
33

44
const VITE_UPLOAD_BASEURL = `${getEnvBaseUploadUrl()}`
@@ -20,7 +20,7 @@ export default function useUpload<T extends TfileType>(options: TOptions<T> = {}
2020
const {
2121
formData = {},
2222
maxSize = 5 * 1024 * 1024,
23-
accept = ['*'],
23+
// accept = ['*'],
2424
fileType = 'image',
2525
success,
2626
error: onError,

src/utils/index.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,13 @@ export const getUrlObj = (url: string) => {
101101
*/
102102
export const getAllPages = (key = 'needLogin') => {
103103
// 这里处理主包
104-
const mainPages = [
105-
...pages
106-
.filter((page) => !key || page[key])
107-
.map((page) => ({
108-
...page,
109-
path: `/${page.path}`,
110-
})),
111-
]
104+
const mainPages = pages
105+
.filter((page) => !key || page[key])
106+
.map((page) => ({
107+
...page,
108+
path: `/${page.path}`,
109+
}))
110+
112111
// 这里处理分包
113112
const subPages: any[] = []
114113
subPackages.forEach((subPageObj) => {

0 commit comments

Comments
 (0)