diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index c8c8891b0..09ea28dfc 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -56,9 +56,12 @@
+
+ {{$L('隐藏共享文件')}}
+
@@ -67,7 +70,23 @@
@drop.prevent="filePasteDrag($event, 'drag')"
@dragover.prevent="fileDragOver(true, $event)"
@dragleave.prevent="fileDragOver(false, $event)">
-
+
+
{{$L('没有任何文件')}}
@@ -121,22 +140,6 @@
-
@@ -400,7 +403,7 @@ import DialogSelect from "./components/DialogSelect";
const FilePreview = () => import('./components/FilePreview');
const FileContent = () => import('./components/FileContent');
-const FileObject = {sort: null, mode: null};
+const FileObject = {sort: null, mode: null, shared: null};
export default {
components: {DialogSelect, PreviewImage, FilePreview, DrawerOverlay, UserInput, FileContent},
@@ -463,6 +466,7 @@ export default {
],
tableMode: "",
+ hideShared: false,
columns: [],
shareShow: false,
@@ -516,12 +520,14 @@ export default {
async beforeRouteEnter(to, from, next) {
FileObject.sort = await $A.IDBJson("cacheFileSort")
FileObject.mode = await $A.IDBString("fileTableMode")
+ FileObject.shared = await $A.IDBBoolean("fileHideShared")
next()
},
created() {
this.tableMode = FileObject.mode
+ this.hideShared = FileObject.shared
this.columns = [
{
type: 'selection',
@@ -713,9 +719,6 @@ export default {
},
mounted() {
- if (!this.tableMode && this.$isEEUiApp) {
- this.tableMode = 'block';
- }
this.uploadAccept = this.uploadFormat.map(item => {
return '.' + item
}).join(",");
@@ -758,8 +761,11 @@ export default {
},
fileList() {
- const {fileLists, searchKey, pid, selectIds} = this;
+ const {fileLists, searchKey, hideShared, pid, selectIds, userId} = this;
const list = $A.cloneJSON(sortBy(fileLists.filter((file) => {
+ if (hideShared && file.share && file.userid != userId) {
+ return false
+ }
if (searchKey) {
return file.name.indexOf(searchKey) !== -1;
}
@@ -773,6 +779,11 @@ export default {
})
},
+ hasShareFile() {
+ const {fileLists, userId} = this;
+ return fileLists.findIndex(file => file.share && file.userid != userId) !== -1
+ },
+
shearFirst() {
const {fileLists, shearIds} = this;
if (shearIds.length === 0) {
@@ -848,6 +859,10 @@ export default {
$A.IDBSave("fileTableMode", val)
},
+ hideShared(val) {
+ $A.IDBSave("fileHideShared", val)
+ },
+
fileShow(val) {
if (!val) {
this.browseFile(0)
diff --git a/resources/assets/sass/element.scss b/resources/assets/sass/element.scss
index 6607f15e7..ec6069ea7 100644
--- a/resources/assets/sass/element.scss
+++ b/resources/assets/sass/element.scss
@@ -5,6 +5,8 @@ $--tooltip-font-size: 14px;
$--dropdown-menuItem-hover-fill: #f4f5f7;
$--dropdown-menuItem-hover-color: #606266;
+$--font-path: '../css/fonts';
+
@import "~element-ui/packages/theme-chalk/src/common/transition";
@import "~element-ui/packages/theme-chalk/src/icon";
@import "~element-ui/packages/theme-chalk/src/avatar";
diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss
index cd7553579..230cb4145 100644
--- a/resources/assets/sass/pages/page-file.scss
+++ b/resources/assets/sass/pages/page-file.scss
@@ -100,7 +100,6 @@
display: flex;
align-items: center;
overflow: auto;
- margin-right: 12px;
> li {
display: flex;
list-style: none;
@@ -182,8 +181,21 @@
}
.flex-full {
flex: 1;
+ margin-right: 24px;
+ }
+ .only-checkbox {
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
+ margin-right: 14px;
+ opacity: 0.9;
+ height: 30px;
+ .ivu-checkbox-focus {
+ box-shadow: none;
+ }
}
.switch-button {
+ flex-shrink: 0;
display: flex;
align-items: center;
background-color: #ffffff;
@@ -224,7 +236,7 @@
color: $primary-color;
}
}
- &.block {
+ &.table {
&:before {
left: 50%;
}
@@ -684,6 +696,12 @@
}
.file-navigator {
margin: 0 24px 0;
+ .flex-full {
+ margin-right: 10px;
+ }
+ .only-checkbox {
+ margin-right: 0;
+ }
}
.file-drag {
.file-list {