update to standard .gitignore

This commit is contained in:
陆柯 2022-12-10 19:13:06 +08:00
parent 74826d0ac6
commit f45e3988e8
2 changed files with 68 additions and 44 deletions

105
.gitignore vendored
View File

@ -1,63 +1,88 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
node_modules/
/test/unit/coverage/
/test/e2e/reports/
### 目录 #################################################################
# 通用
.svn/
.deploy_git/
.idea/
.sass-cache/
.deploy_git/
/test/unit/coverage/
/test/e2e/reports/
node_modules/
*.apk
*.min.js
*.min.css
*.min.html
*.iml
*.njsproj
*.ntvs*
*.sw*
*.sln
*.suo
.gitattributes
_desktop.ini
.DS_Store
.thumbnails
Thumbs.db
thumbs.db
.umi
.umi-production
npm-debug.log*
yarn-debug.log*
yarn-error.log*
yarn.lock
selenium-debug.log
package-lock.json
*.iml
*.njsproj
*.ntvs*
*.sln
*.suo
._*
.$*
~$*
Thumbs.db
thumbs.db
_desktop.ini
.bashrc_custom
# vue-cli 项目
/dist/
# 来自 vue-cli 创建项目的 .gitignore
.project
# hexo
db.json
/public/
# 客户端 uniapp 项目
/unpackage/*
!/unpackage/res/
# Hardhat
/artifacts/
/cache/
# seafile 临时文件
._*
.$*
# office 暂存文件
~$*
# 用户shell配置脚本
.bashrc_custom
# 苹果系统临时文件
.DS_Store
# 安卓缓存文件夹
.thumbnails
# local env files
.env.local
.env.*.local
# hexo
/db.json
# wo
envar-*.gitignore.js
# 服务端
/_archive/*
/_datastore/*
/_logstore/*
/_filestore/*
/_logstore/*
/_webroot/*
/dist/
*.apk
*.min.js
*.min.css
*.min.html
/pages4loader.json5
envar-web-custom.js
envar-deploy-secret.js
# hexo 项目
public/
# 服务端(server or uniapp-uniCloud)项目
envar-base-custom.js
envar-base-dynamic.js
envar-base-secret.js
/_ssl/*
# uniapp 客户端
/unpackage/*
!/unpackage/res/
package-lock.json
pages4loader.json5
# 保留
!.gitkeep

View File

@ -327,7 +327,7 @@ export default {
if (data?._state === 'SUCCESS' && data?.path) {
return { _state: 'SUCCESS', fileUrl: this.makeServerUrl(data.path), filePath: data.path, ...data }
} else {
return { _state: 'CLIENT_FAIL_UPLOAD_FILE', errorUpload }
return { _state: 'CLIENT_FAIL_UPLOAD_FILE', error: errorUpload }
}
} else {
return { _state: 'CLIENT_FAIL_CHOOSE_FILE' }
@ -417,11 +417,10 @@ export default {
name = 'file',
} = {}) {
if (/^UNICLOUD/.test(baseType)) {
const resultCloud = await this.pickupFile2Cloud({ mediaType, count, sizeType, sourceType, maxDuration })
return await this.pickupFile2Cloud({ mediaType, count, sizeType, sourceType, maxDuration })
return resultCloud
} else if (baseType === 'SERVER') {
const resultServer = await this.pickupFile2Server({ mediaType, count, sizeType, sourceType, maxDuration, url, header, formData, name })
return resultServer
return await this.pickupFile2Server({ mediaType, count, sizeType, sourceType, maxDuration, url, header, formData, name })
} else {
return { _state: 'CLEINT_FAIL_UNKNOWN_WOBASE_TYPE', baseType }
}