diff --git a/src/assets/icons/file/7z.vue b/src/assets/icons/file/7z.vue
new file mode 100644
index 0000000..5e19481
--- /dev/null
+++ b/src/assets/icons/file/7z.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Bmp.vue b/src/assets/icons/file/Bmp.vue
new file mode 100644
index 0000000..a1a47ac
--- /dev/null
+++ b/src/assets/icons/file/Bmp.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Bz2.vue b/src/assets/icons/file/Bz2.vue
new file mode 100644
index 0000000..7437322
--- /dev/null
+++ b/src/assets/icons/file/Bz2.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Dmg.vue b/src/assets/icons/file/Dmg.vue
new file mode 100644
index 0000000..e92a6f8
--- /dev/null
+++ b/src/assets/icons/file/Dmg.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Doc.vue b/src/assets/icons/file/Doc.vue
new file mode 100644
index 0000000..5c3fc79
--- /dev/null
+++ b/src/assets/icons/file/Doc.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Exe.vue b/src/assets/icons/file/Exe.vue
new file mode 100644
index 0000000..30417e0
--- /dev/null
+++ b/src/assets/icons/file/Exe.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Gif.vue b/src/assets/icons/file/Gif.vue
new file mode 100644
index 0000000..95e2034
--- /dev/null
+++ b/src/assets/icons/file/Gif.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Gz.vue b/src/assets/icons/file/Gz.vue
new file mode 100644
index 0000000..b5b2cb2
--- /dev/null
+++ b/src/assets/icons/file/Gz.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Img.vue b/src/assets/icons/file/Img.vue
new file mode 100644
index 0000000..db89746
--- /dev/null
+++ b/src/assets/icons/file/Img.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Jepg.vue b/src/assets/icons/file/Jepg.vue
new file mode 100644
index 0000000..f72d804
--- /dev/null
+++ b/src/assets/icons/file/Jepg.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Jpg.vue b/src/assets/icons/file/Jpg.vue
new file mode 100644
index 0000000..e8d1765
--- /dev/null
+++ b/src/assets/icons/file/Jpg.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Pdf.vue b/src/assets/icons/file/Pdf.vue
new file mode 100644
index 0000000..09f71b6
--- /dev/null
+++ b/src/assets/icons/file/Pdf.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Png.vue b/src/assets/icons/file/Png.vue
new file mode 100644
index 0000000..cbee5ef
--- /dev/null
+++ b/src/assets/icons/file/Png.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Rar.vue b/src/assets/icons/file/Rar.vue
new file mode 100644
index 0000000..9a31587
--- /dev/null
+++ b/src/assets/icons/file/Rar.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Tar.vue b/src/assets/icons/file/Tar.vue
new file mode 100644
index 0000000..8967031
--- /dev/null
+++ b/src/assets/icons/file/Tar.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Tgz.vue b/src/assets/icons/file/Tgz.vue
new file mode 100644
index 0000000..0e16f02
--- /dev/null
+++ b/src/assets/icons/file/Tgz.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Txt.vue b/src/assets/icons/file/Txt.vue
new file mode 100644
index 0000000..fe6f267
--- /dev/null
+++ b/src/assets/icons/file/Txt.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Xls.vue b/src/assets/icons/file/Xls.vue
new file mode 100644
index 0000000..c0a246c
--- /dev/null
+++ b/src/assets/icons/file/Xls.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/file/Zip.vue b/src/assets/icons/file/Zip.vue
new file mode 100644
index 0000000..c767c8e
--- /dev/null
+++ b/src/assets/icons/file/Zip.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index 2817da4..70684cc 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -31,8 +31,24 @@ export { default as MachineRoom } from './MachineRoom.vue'
export { default as CreateFolder } from './CreateFolder.vue'
export { default as CreateShare } from './CreateShare.vue'
export { default as Folder } from './Folder.vue'
-export { default as Pdf } from './Pdf.vue'
-export { default as Excel } from './Excel.vue'
+export { default as File7z } from './file/7z.vue'
+export { default as FileBmp } from './file/Bmp.vue'
+export { default as FileBz2 } from './file/Bz2.vue'
+export { default as FileDmg } from './file/Dmg.vue'
+export { default as FileDoc } from './file/Doc.vue'
+export { default as FileExe } from './file/Exe.vue'
+export { default as FileGif } from './file/Gif.vue'
+export { default as FileGz } from './file/Gz.vue'
+export { default as FileImg } from './file/Img.vue'
+export { default as FileJepg } from './file/Jepg.vue'
+export { default as FileJpg } from './file/Jpg.vue'
+export { default as FilePdf } from './file/Pdf.vue'
+export { default as FilePng } from './file/Png.vue'
+export { default as FileRar } from './file/Rar.vue'
+export { default as FileTgz } from './file/Tgz.vue'
+export { default as FileTxt } from './file/Txt.vue'
+export { default as Excel } from './file/Xls.vue'
+export { default as Zip } from './file/Zip.vue'
// 列表按钮
export { default as Delete } from './Delete.vue'
diff --git a/src/style/docs.scss b/src/style/docs.scss
index 024a6bf..ce62eab 100644
--- a/src/style/docs.scss
+++ b/src/style/docs.scss
@@ -43,5 +43,8 @@
border-radius: 4px;
display: flex;align-items: center;
border:1px solid #f3f3f3;
+ .item{
+ cursor: pointer;
+ }
}
}
diff --git a/src/views/docsManager/document.vue b/src/views/docsManager/document.vue
index 7593760..4599151 100644
--- a/src/views/docsManager/document.vue
+++ b/src/views/docsManager/document.vue
@@ -6,15 +6,12 @@
-
+
@@ -97,7 +94,7 @@
-
+
+
+
diff --git a/src/views/docsManager/moveFile.vue b/src/views/docsManager/moveFile.vue
index cc0339a..0c10aec 100644
--- a/src/views/docsManager/moveFile.vue
+++ b/src/views/docsManager/moveFile.vue
@@ -2,7 +2,7 @@
export default {
name:"moveFile",
- emits: ['success', 'closed'],
+ emits: ['success', 'closed', 'addFolder'],
data() {
return {
size:'small',
mode: "move",
titleMap: {
- move: '移动文件',
+ move: '移动文件｜文件夹',
},
visible: false,
isSave: false,
@@ -46,6 +46,7 @@ export default {
children: 'children',
label: 'name'
},
+ node:'',
move:[
{
ids:[],
@@ -73,6 +74,9 @@ export default {
update(){
this.getData();
},
+ addFolder(){
+ this.$emit('addFolder',this.node);
+ },
async getData() {
this.loading = true;
const res = await this.$API.docs.manager.folderSelect.post();
@@ -89,7 +93,6 @@ export default {
this.isSave = false;
if (res.code == 200) {
this.$emit('success', this.form, this.mode)
- // this.visible = false;
this.$message.success("操作成功")
}
},
@@ -99,6 +102,7 @@ export default {
return arr
},
getNodes(e){
+ this.node = e;
this.move.forEach(item=>{
item.target_folder_id = e.id
})
diff --git a/src/views/docsManager/share.vue b/src/views/docsManager/share.vue
index 9f30420..53081d6 100644
--- a/src/views/docsManager/share.vue
+++ b/src/views/docsManager/share.vue
@@ -6,15 +6,15 @@
-
+
@@ -86,8 +86,6 @@ export default {
return {
size:'small',
routerList: this.$store.state.global.shareRouter,
- docsList:[],
- docsNextShow:false,
dialog: {
save: false,
@@ -107,6 +105,18 @@ export default {
}
},
methods: {
+ linkRouter(item){
+ let list = this.filterDataByItem(item,this.$TOOL.objCopy(this.routerList));
+ this.routerList = list;
+ this.$store.commit("SET_share_router", list);
+
+ this.params.folder_id = item.id;
+ this.$refs.table.upData(this.params);
+ },
+ filterDataByItem(item, arr) {
+ const index = arr.findIndex((obj) => obj.id === item.id && obj.name === item.name);
+ return arr.slice(0, index + 1);
+ },
//表格选择后回调事件
selectionChange(selection){
this.selection = selection;
@@ -138,8 +148,6 @@ export default {
this.params.folder_id = this.routerList[this.routerList.length-1].id;
this.$refs.table.upData(this.params);
-
- this.docsNextShow = true;
},
// 打开文件夹
openFolder(row){
@@ -150,8 +158,6 @@ export default {
}
arrList.push(params);
this.$store.commit("SET_share_router", arrList);
- this.docsList.push(params);
- this.docsNextShow = false;
this.params.folder_id = row.id;
this.$refs.table.upData(this.params);