From fc8b8016dcddd57650691c15528d5100609400eb Mon Sep 17 00:00:00 2001 From: jmal Date: Fri, 10 Jan 2025 17:28:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=88=B6?= =?UTF-8?q?=E7=BA=A7=E7=9B=AE=E5=BD=95=E7=9A=84=E9=87=8D=E5=A4=8D=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ShareDialog/index.vue | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/components/ShareDialog/index.vue b/src/components/ShareDialog/index.vue index ad4be62..3f42ad1 100644 --- a/src/components/ShareDialog/index.vue +++ b/src/components/ShareDialog/index.vue @@ -108,7 +108,7 @@
- 取消分享 + 取消分享 创建分享 @@ -164,6 +164,7 @@ export default { audioCoverUrl: `${process.env.VUE_APP_BASE_API}/view/cover?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`, shareDialogVisible: false, generateShareLinkLoading: false, + cancelSharing: false, pickerOptions: { disabledDate(time) { const dateTime = new Date(); @@ -260,7 +261,7 @@ export default { this.showSharedPage(shareObject) }) } else { - this.showNotSharedPage() + this.showNotSharedPage(this.file) } } } @@ -293,14 +294,24 @@ export default { this.extractionCode = shareObject.extractionCode this.shareId = shareObject.shareId }, - showNotSharedPage() { + showNotSharedPage(file) { this.shareOptionConfig.shared = false this.shareOptionConfig.linkLabel = '选择有效期' this.shareOption.isPrivacy = false this.shareOption.expiresDate = null this.shareOption.expiresDateOption = 1 + if (file.isShare) { + this.shareOption.isPrivacy = file.isPrivacy + if (file.expiresAt > 253398735999000) { + this.shareOption.expiresDateOption = 1 + } else { + this.shareOption.expiresDate = file.expiresAt + this.shareOption.expiresDateOption = 2 + } + } }, shareDialogClose() { + this.cancelSharing = false this.shareOptionConfig.shared = false this.$emit('update:status', this.shareDialogVisible) }, @@ -328,6 +339,7 @@ export default { }, // 取消分享 cancelShare() { + this.cancelSharing = true let title = '确定要取消分享 "' + this.file.name + '" 吗?' this.$confirm(title, '提示', { confirmButtonText: '确定', @@ -341,7 +353,11 @@ export default { this.$emit('onCancelShare') this.shareDialogVisible = false this.shareDialogClose() + }).catch(() => { + this.cancelSharing = false }) + }).catch(() => { + this.cancelSharing = false }) }, submitShare() { From 7c562f4a66fd60582f4922e388914f8268d12a0b Mon Sep 17 00:00:00 2001 From: jmal Date: Sat, 11 Jan 2025 23:40:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E5=8F=96=E6=B6=88=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E5=89=8D=E6=8F=90=E7=A4=BA=E5=AD=90=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/file-api.js | 11 ++++++ src/components/ShareDialog/index.vue | 50 ++++++++++++++++-------- src/views/share/index.vue | 57 ++++++++++++++++++---------- 3 files changed, 83 insertions(+), 35 deletions(-) diff --git a/src/api/file-api.js b/src/api/file-api.js index bf40969..f4742ae 100644 --- a/src/api/file-api.js +++ b/src/api/file-api.js @@ -237,6 +237,17 @@ export default { params }) }, + // 检测是否含有子分享 + hasSubShare: function(params) { + return request({ + url: '/share/has-sub-share', + method: 'get', + params, + paramsSerializer: function(params) { + return qs.stringify(params, { arrayFormat: 'repeat' }) + } + }) + }, // 取消分享 cancelShareLink: function(params) { return request({ diff --git a/src/components/ShareDialog/index.vue b/src/components/ShareDialog/index.vue index 3f42ad1..ca6f787 100644 --- a/src/components/ShareDialog/index.vue +++ b/src/components/ShareDialog/index.vue @@ -340,22 +340,42 @@ export default { // 取消分享 cancelShare() { this.cancelSharing = true - let title = '确定要取消分享 "' + this.file.name + '" 吗?' - this.$confirm(title, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' + + api.hasSubShare({shareIds: [this.shareId]}).then(res => { + if (res.data) { + this.$confirm('选择的文件夹下存其他分享，取消分享后其下的所有分享链接都将被删除，是否继续？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.doCancelShareLink() + }).catch(() => { + this.cancelSharing = false + }) + } else { + let title = '确定要取消分享 "' + this.file.name + '" 吗?' + this.$confirm(title, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.doCancelShareLink() + }).catch(() => { + this.cancelSharing = false + }) + } + }).catch(() => { + this.cancelSharing = false + }) + }, + doCancelShareLink() { + api.cancelShareLink({ + userId: this.$store.state.user.userId, + shareId: [this.shareId] }).then(() => { - api.cancelShareLink({ - userId: this.$store.state.user.userId, - shareId: [this.shareId] - }).then(() => { - this.$emit('onCancelShare') - this.shareDialogVisible = false - this.shareDialogClose() - }).catch(() => { - this.cancelSharing = false - }) + this.$emit('onCancelShare') + this.shareDialogVisible = false + this.shareDialogClose() }).catch(() => { this.cancelSharing = false }) diff --git a/src/views/share/index.vue b/src/views/share/index.vue index 2b4fb8b..16add54 100644 --- a/src/views/share/index.vue +++ b/src/views/share/index.vue @@ -448,30 +448,47 @@ }, // 取消分享 cancelShare(row) { - let title = row === false ? '确定要取消选中的' + this.selectRowData.length + '项分享吗？' : '确定要取消分享 "' + row.fileName + '" 吗?' - this.$confirm(title, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - let shareIds = [] - if(row){ + + let shareIds = [] + if(row){ + shareIds.push(row.id) + } else { + this.selectRowData.forEach(row => { shareIds.push(row.id) + }) + } + + api.hasSubShare({shareIds: shareIds}).then(res => { + if (res.data) { + this.$confirm('选择的文件夹下存其他分享，取消分享后其下的所有分享链接都将被删除，是否继续？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.doCancelShare(shareIds) + }) } else { - this.selectRowData.forEach(row => { - shareIds.push(row.id) + let title = row === false ? '确定要取消选中的' + this.selectRowData.length + '项分享吗？' : '确定要取消分享 "' + row.fileName + '" 吗?' + this.$confirm(title, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.doCancelShare(shareIds) }) } - api.cancelShareLink({ - userId: this.$store.state.user.userId, - shareId: shareIds - }).then(() => { - if(shareIds.length === 1){ - this.fileList.splice(row.index,1) - }else{ - this.getFileList() - } - }) + }) + }, + doCancelShare(shareIds) { + api.cancelShareLink({ + userId: this.$store.state.user.userId, + shareId: shareIds + }).then(() => { + if(shareIds.length === 1){ + this.fileList.splice(row.index,1) + }else{ + this.getFileList() + } }) }, onCancelShare() { From e7c8fa63d9d1d600e043d6cc6d9cbe981d57e753 Mon Sep 17 00:00:00 2001 From: jmal Date: Sun, 12 Jan 2025 00:40:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=97=B6=E6=A3=80=E6=B5=8B=E6=98=AF=E5=90=A6=E5=90=AB=E6=9C=89?= =?UTF-8?q?=E5=AD=90=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/file-api.js | 10 +++++++++- src/components/ShareDialog/index.vue | 27 +++++++++++++++++++++++++-- src/views/share/index.vue | 3 ++- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/api/file-api.js b/src/api/file-api.js index f4742ae..6f729e7 100644 --- a/src/api/file-api.js +++ b/src/api/file-api.js @@ -237,7 +237,7 @@ export default { params }) }, - // 检测是否含有子分享 + // 检测分享文件下是否含有子分享 hasSubShare: function(params) { return request({ url: '/share/has-sub-share', @@ -248,6 +248,14 @@ export default { } }) }, + // 检测文件下是否含有子分享 + folderSubShare: function(params) { + return request({ + url: '/share/folder-sub-share', + method: 'get', + params + }) + }, // 取消分享 cancelShareLink: function(params) { return request({ diff --git a/src/components/ShareDialog/index.vue b/src/components/ShareDialog/index.vue index ca6f787..8693dda 100644 --- a/src/components/ShareDialog/index.vue +++ b/src/components/ShareDialog/index.vue @@ -343,7 +343,7 @@ export default { api.hasSubShare({shareIds: [this.shareId]}).then(res => { if (res.data) { - this.$confirm('选择的文件夹下存其他分享，取消分享后其下的所有分享链接都将被删除，是否继续？', '提示', { + this.$confirm('所选的文件夹下存其他分享，取消分享后其下的所有分享链接都将被删除，是否继续？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -425,7 +425,30 @@ export default { this.generateShareLinkLoading = false return } - + // 检查文件夹下是否有其他分享 + if (this.file.isFolder) { + api.folderSubShare({fileId: this.file.id}).then(res => { + if (res.data) { + this.$confirm('所选的文件夹下存其他分享，创建分享后将会覆盖其下所有已分享的链接参数，是否继续？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.doCreateShare(update, expireDate) + }).catch(() => { + this.generateShareLinkLoading = false + }) + } else { + this.doCreateShare(update, expireDate) + } + }).catch(() => { + this.generateShareLinkLoading = false + }) + } else { + this.doCreateShare(update, expireDate) + } + }, + doCreateShare(update, expireDate) { api.generate({ shortId: this.shareOption.customAddr, userId: this.$store.state.user.userId, diff --git a/src/views/share/index.vue b/src/views/share/index.vue index 16add54..af3b530 100644 --- a/src/views/share/index.vue +++ b/src/views/share/index.vue @@ -79,6 +79,7 @@ @@ -460,7 +461,7 @@ api.hasSubShare({shareIds: shareIds}).then(res => { if (res.data) { - this.$confirm('选择的文件夹下存其他分享，取消分享后其下的所有分享链接都将被删除，是否继续？', '提示', { + this.$confirm('所选的文件夹下存其他分享，取消分享后其下的所有分享链接都将被删除，是否继续？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning'