diff --git a/docker-compose.yml b/docker-compose.yml index 694c090fd..78a8f610d 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -103,7 +103,7 @@ services: fileview: container_name: "dootask-fileview-${APP_ID}" - image: "kuaifan/fileview:4.4.0-1" + image: "kuaifan/fileview:4.4.0-3" environment: KK_CONTEXT_PATH: "/fileview" KK_OFFICE_PREVIEW_SWITCH_DISABLED: true diff --git a/language/original-web.txt b/language/original-web.txt index 706bba728..7abe2fcf1 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -2018,3 +2018,4 @@ API请求的URL路径 报告不存在或已被删除 文件读取失败:(*) 独立窗口显示 +在消息中显示 diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 4599663e7..6ecae508b 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -246,7 +246,7 @@ $A.Electron?.listener('syncDispatch', async ({dispatchId: targetId, action, data await store.dispatch(action, data) }) $A.Electron?.listener('goForward', ({route, isReplace}) => { - $A.goForward(route, isReplace, true) + typeof $A.goForward === "function" && $A.goForward(route, isReplace, true) }) // 绑定截图快捷键 diff --git a/resources/assets/js/pages/manage/components/ProjectDialog.vue b/resources/assets/js/pages/manage/components/ProjectDialog.vue index 93006fe4d..2d4b0236c 100644 --- a/resources/assets/js/pages/manage/components/ProjectDialog.vue +++ b/resources/assets/js/pages/manage/components/ProjectDialog.vue @@ -4,9 +4,16 @@
{{$L('项目成员')}}({{projectData.project_user.length}})
-
- -
+ +
+ +
+
+ +
+ +
+
@@ -37,6 +44,13 @@ export default { return { loadIng: false, memberShowAll: false, + beforeDestroyClose: false, + } + }, + + beforeDestroy() { + if (this.beforeDestroyClose) { + requestAnimationFrame(this.toggleParameter) } }, @@ -49,6 +63,12 @@ export default { }, methods: { + onMsgOpen() { + this.$store.dispatch("openDialog", this.projectData.dialog_id); + this.goForward({name: 'manage-messenger', params: {dialogAction: 'dialog'}}); + this.beforeDestroyClose = true; + }, + onOpenDialog() { this.$store.dispatch('openDialogWindow', this.projectData.dialog_id); this.toggleParameter(); diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 1568c4530..2318b352c 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -80,7 +80,7 @@

{{taskDetail.id}}

- +