Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
0288bd9f06
@ -29,9 +29,10 @@
|
|||||||
"jshint": "^2.11.1",
|
"jshint": "^2.11.1",
|
||||||
"less-loader": "^6.1.0",
|
"less-loader": "^6.1.0",
|
||||||
"lib-flexible": "^0.3.2",
|
"lib-flexible": "^0.3.2",
|
||||||
|
"monaco-editor": "^0.23.0",
|
||||||
"monaco-editor-vue": "^1.0.10",
|
"monaco-editor-vue": "^1.0.10",
|
||||||
"monaco-editor-webpack-plugin": "^1.9.0",
|
"monaco-editor-webpack-plugin": "^3.0.1",
|
||||||
"monaco-languages": "^1.10.0",
|
"monaco-languages": "^2.3.0",
|
||||||
"normalize.css": "7.0.0",
|
"normalize.css": "7.0.0",
|
||||||
"nprogress": "0.2.0",
|
"nprogress": "0.2.0",
|
||||||
"path-to-regexp": "2.4.0",
|
"path-to-regexp": "2.4.0",
|
||||||
|
|||||||
@ -325,10 +325,12 @@
|
|||||||
return doc
|
return doc
|
||||||
})
|
})
|
||||||
if(reLoad){
|
if(reLoad){
|
||||||
this.tree.reload(this.convert(data))
|
this.$nextTick(() => {
|
||||||
if(activeNodeData){
|
this.tree.reload(this.convert(data))
|
||||||
this.$emit('treeNodeClick', activeNodeData)
|
if(activeNodeData){
|
||||||
}
|
this.$emit('treeNodeClick', activeNodeData)
|
||||||
|
}
|
||||||
|
})
|
||||||
}else{
|
}else{
|
||||||
this.initTree(this.convert(data))
|
this.initTree(this.convert(data))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1553,7 +1553,6 @@ export default {
|
|||||||
this.pagination.pageIndex = 1
|
this.pagination.pageIndex = 1
|
||||||
this.getFileList()
|
this.getFileList()
|
||||||
}
|
}
|
||||||
// setPath(this.path, this.pathList)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 新建文档
|
// 新建文档
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<!-- <van-pull-refresh v-model="refreshing" @refresh="onRefresh"> -->
|
<!-- <van-pull-refresh v-model="refreshing" @refresh="onRefresh"> -->
|
||||||
|
|
||||||
<!--左侧菜单-->
|
<!--左侧菜单-->
|
||||||
<van-popup v-model="leftMenuShow" get-container="body" position="left" :style="{ height: '100%', width: '35%'}">
|
<van-popup v-model="leftMenuShow" get-container="body" position="left" :style="{ height: '100%', width: '35%'}">
|
||||||
<div class="left-menu">
|
<div class="left-menu">
|
||||||
@ -43,11 +42,11 @@
|
|||||||
<!-- <div>{{test}} {{diffTabbarTop}} {{lastTabbarOffsetTop}}</div> -->
|
<!-- <div>{{test}} {{diffTabbarTop}} {{lastTabbarOffsetTop}}</div> -->
|
||||||
<van-nav-bar
|
<van-nav-bar
|
||||||
:style="vanNavBarClass"
|
:style="vanNavBarClass"
|
||||||
v-if="pathList.length < 3 && !selectStatus"
|
v-if="pathList.length < 2 && !selectStatus"
|
||||||
title="浏览"
|
title="浏览"
|
||||||
right-arrow
|
right-arrow
|
||||||
@click-right="checkboxAll"
|
@click-right="checkboxAll"
|
||||||
:right-text="this.selectRowData.length !== this.fileList.length ? '选择44' : '取消'"
|
:right-text="this.selectRowData.length !== this.fileList.length ? '选择' : '取消'"
|
||||||
@click-left="leftMenu"
|
@click-left="leftMenu"
|
||||||
left-arrow>
|
left-arrow>
|
||||||
<div class="header-button" slot="left">
|
<div class="header-button" slot="left">
|
||||||
@ -75,8 +74,8 @@
|
|||||||
</van-nav-bar>
|
</van-nav-bar>
|
||||||
<van-nav-bar
|
<van-nav-bar
|
||||||
:style="vanNavBarClass"
|
:style="vanNavBarClass"
|
||||||
v-if="pathList.length >= 3 && !selectStatus"
|
v-if="pathList.length >= 2 && !selectStatus"
|
||||||
:title="pathList[pathList.length-2].folder"
|
:title="pathList[pathList.length-1].folder"
|
||||||
:right-text="this.selectRowData.length !== this.fileList.length ? '选择' : '取消'"
|
:right-text="this.selectRowData.length !== this.fileList.length ? '选择' : '取消'"
|
||||||
left-arrow
|
left-arrow
|
||||||
@click-right="checkboxAll"
|
@click-right="checkboxAll"
|
||||||
@ -345,20 +344,6 @@
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted(){
|
mounted(){
|
||||||
// // 加载路径
|
|
||||||
// const pathList = getPathList()
|
|
||||||
// if (pathList && pathList !== 'undefined') {
|
|
||||||
// const res = JSON.parse(pathList)
|
|
||||||
// const list = []
|
|
||||||
// res.forEach(function(element) {
|
|
||||||
// const item0 = {}
|
|
||||||
// item0['folder'] = element.folder + ''
|
|
||||||
// item0['index'] = element.index
|
|
||||||
// list.push(item0)
|
|
||||||
// })
|
|
||||||
// this.pathList = list
|
|
||||||
// }
|
|
||||||
|
|
||||||
// 加载url上的path
|
// 加载url上的path
|
||||||
if (this.$route.query.path !== '/') {
|
if (this.$route.query.path !== '/') {
|
||||||
const path = decodeURI(this.$route.query.path)
|
const path = decodeURI(this.$route.query.path)
|
||||||
@ -372,7 +357,6 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
console.log(this.pathList)
|
|
||||||
|
|
||||||
if (window.history && window.history.pushState) {
|
if (window.history && window.history.pushState) {
|
||||||
history.pushState(null, null, document.URL)
|
history.pushState(null, null, document.URL)
|
||||||
@ -609,15 +593,13 @@
|
|||||||
username: this.$store.state.user.name,
|
username: this.$store.state.user.name,
|
||||||
fileIds: fileIds
|
fileIds: fileIds
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
// 移除列表
|
// 刷新列表
|
||||||
if (this.selectRowData.length === 1) {
|
this.getFileList()
|
||||||
this.fileList.splice(this.rowContextData.index, 1)
|
|
||||||
} else {
|
|
||||||
this.getFileList()
|
|
||||||
}
|
|
||||||
vant.Toast.setDefaultOptions({ duration: 800 });
|
vant.Toast.setDefaultOptions({ duration: 800 });
|
||||||
vant.Toast.success('删除成功');
|
vant.Toast.success('删除成功');
|
||||||
this.selectRowData = []
|
if (this.selectRowData.length > 1){
|
||||||
|
this.selectRowData = []
|
||||||
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@ -687,13 +669,17 @@
|
|||||||
},
|
},
|
||||||
// 浏览器的返回事件
|
// 浏览器的返回事件
|
||||||
goBack(){
|
goBack(){
|
||||||
const linkIndex = this.pathList.length - 2
|
if (this.pathList.length === 2) {
|
||||||
|
this.$router.push(`/_m?vmode=${this.vmode}&path=${encodeURIComponent(this.path)}`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const linkIndex = this.pathList.length - 3
|
||||||
this.handleLink(this.pathList[linkIndex],linkIndex)
|
this.handleLink(this.pathList[linkIndex],linkIndex)
|
||||||
},
|
},
|
||||||
// 点击返回按钮(标题)
|
// 点击返回按钮(标题), 返回上一级
|
||||||
clickBack() {
|
clickBack() {
|
||||||
const linkIndex = this.pathList.length - 2
|
this.handleLink(this.pathList[this.pathList.length - 2], this.pathList.length - 2)
|
||||||
this.handleLink(this.pathList[linkIndex], linkIndex, true)
|
|
||||||
},
|
},
|
||||||
//菜单键
|
//菜单键
|
||||||
leftMenu(){
|
leftMenu(){
|
||||||
@ -772,32 +758,35 @@
|
|||||||
this.actionsMenus.push(menuItem)
|
this.actionsMenus.push(menuItem)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleLink(item, index, isPushLink) {
|
handleLink(item, index, unPushLink, unRefresh) {
|
||||||
if (!this.$route.query.path){
|
if (item && item.search) {
|
||||||
this.$router.push(`/_m`)
|
if (item.searchKey) {
|
||||||
}
|
|
||||||
|
|
||||||
if(item.search){
|
|
||||||
if(item.searchKey){
|
|
||||||
this.searchFileByKeyWord(item.searchKey)
|
this.searchFileByKeyWord(item.searchKey)
|
||||||
} else if(item.row){
|
} else if (item.row) {
|
||||||
this.searchFileAndOpenDir(item.row)
|
this.searchFileAndOpenDir(item.row)
|
||||||
}
|
}
|
||||||
this.pathList.splice(this.pathList.findIndex(v => v.index === index + 2), this.pathList.length - (index + 2))
|
this.pathList.splice(this.pathList.findIndex((v, i) => i === index + 1), this.pathList.length - (index + 1))
|
||||||
} else {
|
} else {
|
||||||
this.pathList.splice(this.pathList.findIndex(v => v.index === index + 2), this.pathList.length - (index + 2))
|
this.pathList.splice(this.pathList.findIndex((v, i) => i === index + 1), this.pathList.length - (index + 1))
|
||||||
this.pathList.forEach((p, number) => {
|
this.pathList.forEach((p, number) => {
|
||||||
if (number === 0) {
|
if (number === 0) {
|
||||||
this.path = ''
|
this.path = ''
|
||||||
} else if (number === this.pathList.length - 1) {
|
} else if (number === this.pathList.length) {
|
||||||
} else {
|
} else {
|
||||||
this.path += '/' + this.pathList[number].folder
|
this.path += '/' + this.pathList[number].folder
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
if(isPushLink){
|
if (!unPushLink) {
|
||||||
this.$router.push(`/_m?path=${encodeURIComponent(this.path)}`)
|
if (!this.$route.query.path) {
|
||||||
|
this.$router.push(`/_m?vmode=${this.vmode}&path=${encodeURIComponent(this.path)}`)
|
||||||
|
} else {
|
||||||
|
this.$router.push(`/_m?vmode=${this.vmode}&path=${encodeURIComponent(this.path)}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!unRefresh) {
|
||||||
|
this.pagination.pageIndex = 1
|
||||||
|
this.getFileList()
|
||||||
}
|
}
|
||||||
this.getFileList()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 格式化最近时间
|
// 格式化最近时间
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user