lunanting/jmalcloud-view
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into recycle

Browse Source
This commit is contained in:
jmal 2024-07-07 12:43:47 +08:00
commit 123cbb6617
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/ShowFile/ShowFile.vue
View File

@ -2232,7 +2232,7 @@ export default {
if (searchPathIndex < 0) { if (searchPathIndex < 0) {
keywordQuery = '' keywordQuery = ''
} }
this.$router.push(`?vmode=${this.vmode}&path=${encodeURI(this.path)}${queryFolder ? '&folder=' + queryFolder : ''}${queryTagId}${basePath}${keywordQuery}${searchOpenFolder}`) this.$router.push(`?vmode=${this.vmode}&path=${encodeURI(this.path).replaceAll('#', '%23')}${queryFolder ? '&folder=' + queryFolder : ''}${queryTagId}${basePath}${keywordQuery}${searchOpenFolder}`)
} }
if (!unRefresh) { if (!unRefresh) {
this.pagination.pageIndex = 1 this.pagination.pageIndex = 1
@ -2468,13 +2468,11 @@ export default {
const queryTagId = this.$route.query.tagId const queryTagId = this.$route.query.tagId
? `&tagId=${this.$route.query.tagId}` ? `&tagId=${this.$route.query.tagId}`
: '' : ''
const basePath = this.getBasePath() const basePath = this.getBasePath().replaceAll('#', '%23')
const keyword = this.$route.query.keyword const keyword = this.$route.query.keyword ? `&keyword=${this.$route.query.keyword}` : ''
? `&keyword=${this.$route.query.keyword}`
: ''
const folder = this.$route.query.folder ? `&folder=${this.$route.query.folder}` : '' const folder = this.$route.query.folder ? `&folder=${this.$route.query.folder}` : ''
const searchOpenFolder = this.$route.query.searchOpenFolder ? `&searchOpenFolder=${this.$route.query.searchOpenFolder}` : '' const searchOpenFolder = this.$route.query.searchOpenFolder ? `&searchOpenFolder=${this.$route.query.searchOpenFolder}` : ''
this.$router.push(`?vmode=${this.vmode}&path=${this.path}${folder}${queryTagId}${basePath}${keyword}${searchOpenFolder}`) this.$router.push(`?vmode=${this.vmode}&path=${this.path.replaceAll('#', '%23')}${folder}${queryTagId}${basePath}${keyword}${searchOpenFolder}`)
// 改变拖拽目标 // 改变拖拽目标
this.rowDrop() this.rowDrop()
// 画矩形选取 // 画矩形选取
@ -2701,9 +2699,7 @@ export default {
const queryTagId = this.$route.query.tagId const queryTagId = this.$route.query.tagId
? `&tagId=${this.$route.query.tagId}` ? `&tagId=${this.$route.query.tagId}`
: '' : ''
const path = this.$route.query.path const path = this.$route.query.path ? `&path=${this.$route.query.path}`.replaceAll('#', '%23') : ''
? `&path=${this.$route.query.path}`
: ''
const keyword = this.$route.query.keyword const keyword = this.$route.query.keyword
? `&keyword=${this.$route.query.keyword}` ? `&keyword=${this.$route.query.keyword}`
: '' : ''
@ -4064,14 +4060,8 @@ export default {
this.path = this.path.replace(/\/\//g, '/') this.path = this.path.replace(/\/\//g, '/')
// 去掉this.path开头的this.basePath // 去掉this.path开头的this.basePath
this.path = this.path.replace(this.basePath, '/') this.path = this.path.replace(this.basePath, '/')
const path = encodeURI(this.path) const path = encodeURI(this.path).replaceAll('#', '%23')
// if (this.path) {
// this.path += "/" + row.name;
// } else {
// this.path = this.basePath + row.name;
// }
// // 去掉this.path开头的this.basePath
const item = { folder: row.name, shareBase: row.shareBase } const item = { folder: row.name, shareBase: row.shareBase }
this.pathList.push(item) this.pathList.push(item)
this.pagination.pageIndex = 1 this.pagination.pageIndex = 1

3
src/utils/file-config.js
View File

@ -40,7 +40,8 @@ export default {
} }
let baseUrl = serverUrl || this.baseUrl let baseUrl = serverUrl || this.baseUrl
let fileUrl = `${baseUrl}/file/${owner}${encodeURI(file.path)}${encodeURI(file.name)}` let fileUrl = `${baseUrl}/file/${owner}${encodeURI(file.path)}${encodeURI(file.name)}`
fileUrl = fileUrl.replace(/%5C/g, '/') fileUrl = fileUrl.replaceAll('#', '%23')
fileUrl = fileUrl.replaceAll(/%5C/g, '/')
if (token) { if (token) {
return `${fileUrl}?jmal-token=${token}&name=${username}` return `${fileUrl}?jmal-token=${token}&name=${username}`
} }

3
src/utils/file-type.js
View File

@ -8,7 +8,7 @@ export const suffix = {
'cmake','db','gradle','bat','conf','dart','plist' 'cmake','db','gradle','bat','conf','dart','plist'
], ],
compressedFile: [ compressedFile: [
'zip','tar','jar','tar.gz','tgz','tar.bz2' 'zip','tar','7z', 'rar', 'jar','tar.gz','tgz','tar.bz2'
], ],
} }
@ -65,6 +65,7 @@ iconClass.set('pdf','file-pdf')
iconClass.set('mind','file-mind') iconClass.set('mind','file-mind')
iconClass.set('zip','zip') iconClass.set('zip','zip')
iconClass.set('rar','zip') iconClass.set('rar','zip')
iconClass.set('7z','zip')
iconClass.set('iml','file-idea') iconClass.set('iml','file-idea')
iconClass.set('key','file-key') iconClass.set('key','file-key')
iconClass.set('pem','file-pem') iconClass.set('pem','file-pem')