From a07eba9ff1548a4840e51da3be94627454cd44ad Mon Sep 17 00:00:00 2001 From: zhengzhou Date: Tue, 20 Apr 2021 18:35:22 +0800 Subject: [PATCH] workspace update --- src/components/app-header/app-header.vue | 2 +- .../components/archive-view/index.vue | 11 ++++ .../components/file-explorer/index.vue | 1 + src/views/main_web/workspace/index.vue | 60 ++++++++++++++++++- 4 files changed, 71 insertions(+), 3 deletions(-) diff --git a/src/components/app-header/app-header.vue b/src/components/app-header/app-header.vue index cc1f4ef9..36f27068 100644 --- a/src/components/app-header/app-header.vue +++ b/src/components/app-header/app-header.vue @@ -107,7 +107,7 @@ export default { }, isOnLine() { return this.$store.state.gatewayState; - } + }, }, watch: { isMaxWindowSize(val) { diff --git a/src/views/main_web/workspace/components/archive-view/index.vue b/src/views/main_web/workspace/components/archive-view/index.vue index edea450e..9f094fff 100644 --- a/src/views/main_web/workspace/components/archive-view/index.vue +++ b/src/views/main_web/workspace/components/archive-view/index.vue @@ -56,6 +56,11 @@ @click.stop="authModalVisible = true" > 交付并认证 + + 取消交付 @@ -247,6 +252,8 @@ export default { this.fetchFolderFiles(); // 2. 查询历史提交记录 this.fetchArchiveHistory(); + + this.fetchReceiverInfo(); }, watch: { authModalVisible(v) { @@ -261,6 +268,9 @@ export default { }, }, methods: { + cancelArchive() { + this.$emit('cancel'); + }, isChildrenAllChecked(node) { return recursionEvery(node.children, this.selectedKeyMap); }, @@ -385,6 +395,7 @@ export default { ); wrapErrorHint(res); this.receiverInfo = firstCharToLowerCase(res.Data || {}); + this.$emit('on-query-receiver-info', this.receiverInfo); }, }, }; diff --git a/src/views/main_web/workspace/components/file-explorer/index.vue b/src/views/main_web/workspace/components/file-explorer/index.vue index 07cd9e27..8a571394 100644 --- a/src/views/main_web/workspace/components/file-explorer/index.vue +++ b/src/views/main_web/workspace/components/file-explorer/index.vue @@ -861,6 +861,7 @@ export default { if (v) { this.selectedFileIdList = []; } + this.$emit('select-mode-change', v); }, isShowCommitJudgeWindow(val) { // this.lookCoopTarget(); diff --git a/src/views/main_web/workspace/index.vue b/src/views/main_web/workspace/index.vue index 873537e8..ce2bfc8e 100644 --- a/src/views/main_web/workspace/index.vue +++ b/src/views/main_web/workspace/index.vue @@ -11,7 +11,27 @@ :showRecycleBin="!workFlowVisible" :onBackBtnClick="appHeaderBackBtnClick" > -