diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index c9a259d..af98bec 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -98,8 +98,8 @@
  • @@ -237,10 +237,10 @@
    获取更多数据... {{ - !finished - ? "已加载 " + getSummaries3 - : "已全部加载 " + getSummaries3 - }} + !finished + ? "已加载 " + getSummaries3 + : "已全部加载 " + getSummaries3 + }}
    @@ -369,7 +369,7 @@ v-if="scope.row.ossPlatform" size="small" class="pc list oss-folder" - >{{ scope.row.ossPlatform }} + >{{ scope.row.ossPlatform }} @@ -386,10 +386,7 @@ > @@ -620,7 +617,7 @@
    document
    @@ -661,8 +658,8 @@ {{ - rowContextData.isFolder ? "文件夹" : rowContextData.contentType - }} + rowContextData.isFolder ? "文件夹" : rowContextData.contentType + }}
    @@ -693,15 +690,9 @@ > - {{ rowContextData.path }} + {{ + rowContextData.path + }} {{ rowContextData.uploadDate }} @@ -722,18 +713,18 @@ 查看压缩文件 解压到...解压到... 解压到当前目录解压到当前目录 预览预览 @@ -788,39 +779,36 @@ size="small" @click="fileTreeAndNewFolder" :disabled="fileTreeAndNewFolderDisabled" - >  新建文件夹 + >  新建文件夹 移 动移 动 复制复制 解压解压 取 消取 消
    - + 取消取消 确定确定 @@ -1241,11 +1229,19 @@ export default { } }, created() {}, + watch: { + $route(to) { + if (to.query.tagId && this.queryCondition.tagId !== this.$route.query.tagId) { + this.queryCondition.tagId = this.$route.query.tagId; + this.getFileList(); + } + } + }, mounted() { Bus.$on("fileSuccess", (filename) => { this.setOnCreateFilename(filename) }); - Bus.$on("loadFileFaild", () => { + Bus.$on("loadFileFailed", () => { this.notPreviewDialogVisible = true; }); Bus.$on("clickMore", rows => { @@ -1330,7 +1326,7 @@ export default { }, destroyed() { Bus.$off("fileSuccess"); - Bus.$off("loadFileFaild"); + Bus.$off("loadFileFailed"); Bus.$off("clickMore"); Bus.$off("renameRow"); Bus.$off("msg/file/change"); @@ -1392,16 +1388,15 @@ export default { // 获取有效长度。如果有后缀，则包括后缀和点的长度；否则是基础名称和后7位的长度 getEffectiveLength(base, suffix) { let chineseLength = Array.from(base).reduce( - (count, char) => count + this.getCharLength(char), - 0 + (count, char) => count + this.getCharLength(char), + 0 ); return suffix - ? chineseLength + suffix.length + 1 - : chineseLength; + ? chineseLength + suffix.length + 1 + : chineseLength; }, keydown(event) { - console.log('sdf') const isMac = navigator.platform.startsWith("Mac"); const { key, c, keyCode, ctrlKey, metaKey } = event; this.isCmd = (isMac && metaKey) || (!isMac && ctrlKey); @@ -2549,11 +2544,11 @@ export default { this.darwRectangle(); this.loadContextMenus(); // 使列表滑到顶部 - if (!this.grid) { - if (this.fileListScrollTop > 0) { - this.$refs.fileListTable.pagingScrollTopLeft() - } - } + if (!this.grid) { + if (this.fileListScrollTop > 0) { + this.$refs.fileListTable.pagingScrollTopLeft() + } + } this.fileListScrollTop = 0 }, // 加载菜单查看状态 @@ -2698,15 +2693,15 @@ export default { this.pathList.push(item1); this.$router.push(`?vmode=${this.vmode}&search-file=${key}`); api.searchFile({ - userId: this.$store.state.user.userId, - username: this.$store.state.user.name, - keyword: key, - sortableProp: this.sortable.prop, - order: this.sortable.order, - currentDirectory: encodeURI(this.$route.query.path), - pageIndex: this.pagination.pageIndex, - pageSize: this.pagination.pageSize - }) + userId: this.$store.state.user.userId, + username: this.$store.state.user.name, + keyword: key, + sortableProp: this.sortable.prop, + order: this.sortable.order, + currentDirectory: encodeURI(this.$route.query.path), + pageIndex: this.pagination.pageIndex, + pageSize: this.pagination.pageSize + }) .then(res => { this.loadData(res, onLoad); this.path = ""; @@ -4039,7 +4034,7 @@ export default { this.pagination.pageIndex = 1; const path = encodeURI(this.path); if (this.$store.getters.userId !== row.userId) { - row.mountFileId = row.id + row.mountFileId = row.id } if (row.mountFileId) { localStorage.setItem(this.path, row.mountFileId) @@ -4187,7 +4182,7 @@ export default { } a:hover { - color: #409eff; + color: #409EFF; } } @@ -4219,7 +4214,7 @@ export default { >>> .plTableBox .el-table .el-table__header { th { - background-color: #ffffff; + background-color: #FFFFFF; } .is-sortable:hover { @@ -4239,7 +4234,7 @@ export default { } .home-link:hover { - color: #409eff; + color: #409EFF; } .info-statistics { @@ -4268,7 +4263,7 @@ export default { margin-left: 5px !important; } -> .open-file-dialog { +> > > .open-file-dialog { .el-dialog { width: 420px; } @@ -4282,13 +4277,13 @@ export default { } } -> .v-contextmenu-item { +> > > .v-contextmenu-item { .svg-icon { font-size: 14px; } } -> .new-text-file-dialog { +> > > .new-text-file-dialog { height: 350px; top: calc(50% - 175px); @@ -4312,7 +4307,7 @@ export default { } } -> .van-grid-item__content { +> > > .van-grid-item__content { background-size: cover; background-position: center; padding: 0; @@ -4377,3 +4372,4 @@ export default { } } + diff --git a/src/components/office/Drawio.vue b/src/components/office/Drawio.vue index 932ffa4..3339389 100644 --- a/src/components/office/Drawio.vue +++ b/src/components/office/Drawio.vue @@ -140,11 +140,11 @@ export default { this.drawioUrlValid = true } else { this.$emit('onClose') - Bus.$emit('loadFileFaild') + Bus.$emit('loadFileFailed') } }).catch(() => { this.$emit('onClose') - Bus.$emit('loadFileFaild') + Bus.$emit('loadFileFailed') }) }, viewHistoryFile({historyInfo, recovery}) { diff --git a/src/components/office/OnlyOfficeEditor.vue b/src/components/office/OnlyOfficeEditor.vue index 85f926e..a378141 100644 --- a/src/components/office/OnlyOfficeEditor.vue +++ b/src/components/office/OnlyOfficeEditor.vue @@ -96,7 +96,7 @@ export default { $J.loadScript($J.apiUrl(officeApiUrl), (e) => { if (e !== null) { this.$emit('onClose') - Bus.$emit('loadFileFaild') + Bus.$emit('loadFileFailed') return } if(this.$store.state.user.token && this.$store.state.user.userId === this.file.userId){ diff --git a/src/components/preview/OfficePreview.vue b/src/components/preview/OfficePreview.vue index fa9e5d4..555901d 100644 --- a/src/components/preview/OfficePreview.vue +++ b/src/components/preview/OfficePreview.vue @@ -98,7 +98,7 @@ export default { let that = this this.delayClosing = setTimeout(function () { if (!that.readyShow) { - that.loadFileFaild() + that.loadFileFailed() } },12000) } @@ -129,9 +129,9 @@ export default { /** * 加载失败 */ - loadFileFaild() { + loadFileFailed() { this.close() - Bus.$emit('loadFileFaild') + Bus.$emit('loadFileFailed') this.readyShow = true }, /** diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 72e7a4e..3e4fcbb 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -178,7 +178,6 @@ export default { mounted() { tagApi.tagList({userId: this.$store.state.user.userId,}).then(res => { this.tagList = res.data - console.log(this.tagList) }) Bus.$on('msg/file/change', (msg) => this.onmessage(msg)) }, @@ -209,9 +208,7 @@ export default { }) }, tagClick(tag) { - console.log('tagClick', tag.id) this.$router.push(`/tag?tagId=${tag.id}`); - Bus.$emit('tagPageChange', tag.id) }, mouseleave() { }, diff --git a/src/views/tag/index.vue b/src/views/tag/index.vue index 17be50b..e670b55 100644 --- a/src/views/tag/index.vue +++ b/src/views/tag/index.vue @@ -28,17 +28,11 @@ export default { } }, mounted() { - console.log('tag mounted') if (this.$route.query.tagId) { this.queryCondition.tagId = this.$route.query.tagId } - Bus.$on('tagPageChange', (tagId) => { - console.log('tagPageChange', tagId) - this.queryCondition.tagId = tagId - }) }, destroyed() { - Bus.$off('tagPageChange') } }