+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
@@ -71,6 +72,17 @@
readonly="readonly" v-model="extractionCode">
提取码
+
+
+
+
+ 上传
+ 修改
+ 删除
+
+
+
+
@@ -180,6 +192,7 @@ export default {
expiresDateOption: 1,
isPrivacy: false,
expiresDate: '',
+ operationPermissionList: undefined
},
shareLink: "",
qrCodeshareLink: "",
@@ -187,18 +200,32 @@ export default {
shareOptionConfig: {
shared: false,
linkLabel: "选择有效期",
- }
+ },
+ filename: '',// 文件名
+ }
+ },
+ computed: {
+ filenamePath() {
+ return this.filename.slice(0, this.filename.lastIndexOf('/'))
}
},
watch: {
status(visible) {
if (visible) {
+ this.filename = this.file.name
this.shareDialogVisible = true
if (this.file.shareId) {
+ api.getFileInfoById({
+ id: this.file.fileId
+ }).then(res => {
+ this.filename = res.data.path + this.file.name
+ })
+
this.shareOptionConfig.shared = true
this.shareOptionConfig.linkLabel = '分享链接'
this.setShareLink(this.getShareLink(this.file.shareId))
this.shareOption.isPrivacy = this.file.isPrivacy
+ this.shareOption.operationPermissionList = this.file.operationPermissionList || []
if (this.file.expireDate) {
this.shareOption.expiresDate = moment(this.file.expireDate).format('x')
}
@@ -215,9 +242,12 @@ export default {
}
},
methods: {
- setShareLink(sahreLink) {
- this.shareLink = sahreLink
- QRCode.toDataURL(sahreLink)
+ permissionActionChange() {
+ this.createShare()
+ },
+ setShareLink(shareLink) {
+ this.shareLink = shareLink
+ QRCode.toDataURL(shareLink)
.then(url => {
this.qrCodeshareLink = url
})
@@ -247,6 +277,7 @@ export default {
submitShare() {
this.$refs.form.validate((valid) => {
if (valid) {
+ this.shareOption.operationPermissionList = undefined
this.createShare()
} else {
console.log('error submit!!');
@@ -279,16 +310,18 @@ export default {
fileId: this.file.fileId,
isFolder: this.file.isFolder,
expireDate: expireDate,
- isPrivacy: this.shareOption.isPrivacy
+ isPrivacy: this.shareOption.isPrivacy,
+ operationPermissionList: this.shareOption.operationPermissionList
}).then(res => {
if (res.data) {
- let {shareId, extractionCode} = res.data
+ let {shareId, extractionCode, operationPermissionList} = res.data
this.setShareLink(this.getShareLink(shareId))
this.generateShareLinkLoading = false
this.shareOptionConfig.shared = true
this.shareOption.expiresDateOption = 2
this.shareOptionConfig.linkLabel = "分享链接"
this.extractionCode = extractionCode
+ this.shareOption.operationPermissionList = operationPermissionList || []
this.$emit('onSuccess', shareId)
if (update) {
if (!expireDate) {
@@ -385,13 +418,14 @@ export default {
}
> > > .el-form-item__label {
+ text-align: left;
line-height: 32px;
}
.shared-expires-text {
text-align: right;
line-height: 32px;
- padding-right: 5px;
+ padding-right: 10px;
}
}
@@ -428,5 +462,9 @@ export default {
text-align: center;
padding: 0 10px;
}
+
+ >>> .el-collapse {
+ border-top: 0;
+ }
}
diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index f8a5fd8..2a164ae 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -1,23 +1,42 @@
-
+
-
+
-
-
-
-
+
@@ -26,20 +45,41 @@
-
-
+
+
-
-
-
-
+
+
-
@@ -142,38 +236,55 @@
-
-
+
-
+
@@ -56,31 +96,40 @@
-
-
+ -
-
+
-
+
-
获取更多数据...
- {{ !finished ? '已加载 ' + getSummaries3 : '已全部加载 ' + getSummaries3 }}
+ {{
+ !finished
+ ? "已加载 " + getSummaries3
+ : "已全部加载 " + getSummaries3
+ }}
-
+
- -
- +
+
-
+
-
@@ -228,43 +343,91 @@
:prop="item.name"
:label="item.label"
:sort-orders="['ascending', 'descending']"
- :sortable="item.sortable ? (orderCustom ?'custom':true) : false"
+ :sortable="
+ item.sortable ? (orderCustom ? 'custom' : true) : false
+ "
>
-
+
-
+
-
-
+
-
+
-
@@ -276,7 +439,9 @@
:index="index"
:label="item.label"
:sort-orders="['ascending', 'descending']"
- :sortable="item.sortable ? (orderCustom ?'custom':true) : false"
+ :sortable="
+ item.sortable ? (orderCustom ? 'custom' : true) : false
+ "
:show-overflow-tooltip="true"
align="left"
header-align="left"
@@ -294,67 +459,132 @@
:index="index"
:label="item.label"
:sort-orders="['ascending', 'descending']"
- :sortable="item.sortable ? (orderCustom ?'custom':true) : false"
+ :sortable="
+ item.sortable ? (orderCustom ? 'custom' : true) : false
+ "
:show-overflow-tooltip="true"
align="left"
header-align="left"
>
-
-
- {{ formatTime(scope.row.agoTime) }}
+
+ {{ formatTime(scope.row.agoTime) }}
-
-
{{ scope.row.name }}
- {{ scope.row.ossPlatform }}
+ {{ scope.row.ossPlatform }}
+
-
-
-
-
+
+
+
+
{{ rowContextData.name }}
- {{ rowContextData.isFolder ? '文件夹' : rowContextData.contentType }}
+ {{
+ rowContextData.isFolder ? "文件夹" : rowContextData.contentType
+ }}
{{ rowContextData.music.singer }}
- {{ '《' + rowContextData.music.album + '》' }}
+ {{ "《" + rowContextData.music.album + "》" }}
- {{ '《' + rowContextData.music.songName + '》' }}
+ {{ "《" + rowContextData.music.songName + "》" }}
-
- {{ rowContextData.w + ' x ' + rowContextData.h }}
+
+ {{ rowContextData.w + " x " + rowContextData.h }}
- {{
- rowContextData.size
- }}字节 {{ rowContextData.size > 0 ? '(' + formatSize(rowContextData.size) + ')' : '' }}
+
+ {{ rowContextData.size }}字节
+ {{
+ rowContextData.size > 0
+ ? "(" + formatSize(rowContextData.size) + ")"
+ : ""
+ }}
- {{ rowContextData.path }}
+ {{
+ rowContextData.path
+ }}
{{ rowContextData.uploadDate }}
@@ -435,13 +706,25 @@
class="open-file-dialog"
title="提示"
top="35vh"
- :visible.sync="openCompressionVisible">
+ :visible.sync="openCompressionVisible"
+ >
-
+
@@ -485,46 +774,83 @@
>
-
+ :visible.sync="newCreateFileDialog"
+ >
-
diff --git a/src/views/setting/ossManager.vue b/src/views/setting/ossManager.vue
index d113857..014140e 100644
--- a/src/views/setting/ossManager.vue
+++ b/src/views/setting/ossManager.vue
@@ -124,9 +124,6 @@ export default {
secretKey: [
{required: true, message: '请填写secretKey', trigger: 'submit'}
],
- region: [
- {required: true, message: '请填写region', trigger: 'submit'}
- ],
bucket: [
{required: true, message: '请填写bucket', trigger: 'submit'}
],
diff --git a/src/views/share/index.vue b/src/views/share/index.vue
index de61b82..8ed5e38 100644
--- a/src/views/share/index.vue
+++ b/src/views/share/index.vue
@@ -205,13 +205,6 @@
audioCoverUrl: `${process.env.VUE_APP_BASE_API}/view/cover?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`,
fileMenuActive: '',
path: this.$route.query.path,
- showNewFolder: false,
- isShowNewFolder: false,
- listModeSearch: false,
- listModeSearchOpenDir: false,
- newFolderName: '新建文件夹',
- renameFileName: '',
- searchFileName: '',
pathList: [
{ 'folder': '', index: 0 },
{ 'folder': '+', index: 1 }
@@ -252,7 +245,6 @@
name: 'expireDate', label: '过期时间', sortable: 'custom', index: 7
}
],
- rowContextData: {},
selectRowData: [],
tableLoading: false,
finished: false,
@@ -443,23 +435,30 @@
},
// 取消分享
cancelShare(row) {
- let shareIds = []
- if(row){
- shareIds.push(row.id)
- } else {
- this.selectRowData.forEach(row => {
- shareIds.push(row.id)
- })
- }
- api.cancelShareLink({
- userId: this.$store.state.user.userId,
- shareId: shareIds
+ let title = row === false ? '确定要取消选中的' + this.selectRowData.length + '项分享吗？' : '确定要取消分享 "' + row.fileName + '" 吗?'
+ this.$confirm(title, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
}).then(() => {
- if(shareIds.length === 1){
- this.fileList.splice(row.index,1)
- }else{
- this.getFileList()
+ let shareIds = []
+ if(row){
+ shareIds.push(row.id)
+ } else {
+ this.selectRowData.forEach(row => {
+ shareIds.push(row.id)
+ })
}
+ api.cancelShareLink({
+ userId: this.$store.state.user.userId,
+ shareId: shareIds
+ }).then(() => {
+ if(shareIds.length === 1){
+ this.fileList.splice(row.index,1)
+ }else{
+ this.getFileList()
+ }
+ })
})
},
// 点击文件或文件夹
- 
+
-
-
@@ -368,59 +598,100 @@
:emptyStatus="emptyStatus"
>
-
+
-
+
+ 1个文件
-
+