From 76e66ab43338e0c9d0dcc992d97ae21744311500 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 11 Jun 2022 23:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BD=BF=E7=94=A8=E6=96=B0=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/components/DialogView.vue |  9 ++--
 .../pages/manage/components/FileHistory.vue   |  9 ++--
 .../pages/manage/components/FilePreview.vue   |  6 ++-
 .../js/pages/manage/components/TaskDetail.vue |  9 ++--
 resources/assets/js/pages/manage/file.vue     | 49 ++++++++++++-------
 resources/assets/js/pages/single/file.vue     |  2 +-
 6 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue
index beb93cf2d..5c849b481 100644
--- a/resources/assets/js/pages/manage/components/DialogView.vue
+++ b/resources/assets/js/pages/manage/components/DialogView.vue
@@ -426,10 +426,13 @@ export default {
                 });
             } else if (this.$isEEUiApp) {
                 $A.eeuiAppOpenPage({
-                    pageType: 'web',
+                    pageType: 'app',
                     pageTitle: `${this.msgData.msg.name} (${$A.bytesToSize(this.msgData.msg.size)})`,
-                    statusBarStyle: false,
-                    url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                    url: 'web.js',
+                    params: {
+                        titleFixed: true,
+                        url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                    },
                 });
             } else {
                 window.open($A.apiUrl(`..${uri}`))
diff --git a/resources/assets/js/pages/manage/components/FileHistory.vue b/resources/assets/js/pages/manage/components/FileHistory.vue
index 34e59ad1f..a4ec0eb83 100644
--- a/resources/assets/js/pages/manage/components/FileHistory.vue
+++ b/resources/assets/js/pages/manage/components/FileHistory.vue
@@ -200,10 +200,13 @@ export default {
                         });
                     } else if (this.$isEEUiApp) {
                         $A.eeuiAppOpenPage({
-                            pageType: 'web',
+                            pageType: 'app',
                             pageTitle: $A.getFileName(this.file) + ` [${row.created_at}]`,
-                            statusBarStyle: false,
-                            url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                            url: 'web.js',
+                            params: {
+                                titleFixed: true,
+                                url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                            },
                         });
                     } else {
                         window.open($A.apiUrl(`..${uri}`))
diff --git a/resources/assets/js/pages/manage/components/FilePreview.vue b/resources/assets/js/pages/manage/components/FilePreview.vue
index 63d1b4652..3066b36f8 100644
--- a/resources/assets/js/pages/manage/components/FilePreview.vue
+++ b/resources/assets/js/pages/manage/components/FilePreview.vue
@@ -2,7 +2,7 @@
     <div class="file-preview">
         <IFrame v-if="isPreview" class="preview-iframe" :src="previewUrl" @on-message="onMessage"/>
         <template v-else>
-            <div v-show="!['word', 'excel', 'ppt'].includes(file.type)" class="edit-header">
+            <div v-show="headerShow && !['word', 'excel', 'ppt'].includes(file.type)" class="edit-header">
                 <div class="header-title">
                     <div class="title-name">{{$A.getFileName(file)}}</div>
                     <Tag color="default">{{$L('只读')}}</Tag>
@@ -68,6 +68,10 @@ export default {
                 return {};
             }
         },
+        headerShow: {
+            type: Boolean,
+            default: true
+        },
     },
 
     data() {
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 82016c905..7553a08ac 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -1303,10 +1303,13 @@ export default {
                 });
             } else if (this.$isEEUiApp) {
                 $A.eeuiAppOpenPage({
-                    pageType: 'web',
+                    pageType: 'app',
                     pageTitle: `${file.name} (${$A.bytesToSize(file.size)})`,
-                    statusBarStyle: false,
-                    url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                    url: 'web.js',
+                    params: {
+                        titleFixed: true,
+                        url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                    },
                 });
             } else {
                 window.open($A.apiUrl(`..${uri}`))
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index 909646d16..9ce2aeed5 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -995,7 +995,7 @@ export default {
                 }
             }
             // 客户端打开独立窗口
-            if (this.$Electron) {
+            if (this.$Electron || this.$isEEUiApp) {
                 this.openFileSingle(item);
                 return;
             }
@@ -1005,22 +1005,37 @@ export default {
         },
 
         openFileSingle(item) {
-            this.$Electron.sendMessage('windowRouter', {
-                name: `file-${item.id}`,
-                path: `/single/file/${item.id}`,
-                userAgent: "/hideenOfficeTitle/",
-                force: false, // 如果窗口已存在不重新加载
-                config: {
-                    title: $A.getFileName(item),
-                    titleFixed: true,
-                    parent: null,
-                    width: Math.min(window.screen.availWidth, 1440),
-                    height: Math.min(window.screen.availHeight, 900),
-                },
-                webPreferences: {
-                    nodeIntegrationInSubFrames: item.type === 'drawio'
-                },
-            });
+            const uri = `/single/file/${item.id}`;
+            if (this.$Electron) {
+                this.$Electron.sendMessage('windowRouter', {
+                    name: `file-${item.id}`,
+                    path: uri,
+                    userAgent: "/hideenOfficeTitle/",
+                    force: false, // 如果窗口已存在不重新加载
+                    config: {
+                        title: $A.getFileName(item),
+                        titleFixed: true,
+                        parent: null,
+                        width: Math.min(window.screen.availWidth, 1440),
+                        height: Math.min(window.screen.availHeight, 900),
+                    },
+                    webPreferences: {
+                        nodeIntegrationInSubFrames: item.type === 'drawio'
+                    },
+                });
+            } else if (this.$isEEUiApp) {
+                $A.eeuiAppOpenPage({
+                    pageType: 'app',
+                    pageTitle: $A.getFileName(item),
+                    url: 'web.js',
+                    params: {
+                        titleFixed: true,
+                        url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                    },
+                });
+            } else {
+                window.open($A.apiUrl(`..${uri}`))
+            }
             this.browseFile(0);
         },
 
diff --git a/resources/assets/js/pages/single/file.vue b/resources/assets/js/pages/single/file.vue
index 64bd9bf41..48be9ce82 100644
--- a/resources/assets/js/pages/single/file.vue
+++ b/resources/assets/js/pages/single/file.vue
@@ -3,7 +3,7 @@
         <PageTitle :title="pageName"/>
         <Loading v-if="loadIng > 0"/>
         <template v-else-if="fileInfo">
-            <FilePreview v-if="isPreview" :code="code" :file="fileInfo" :historyId="historyId"/>
+            <FilePreview v-if="isPreview" :code="code" :file="fileInfo" :historyId="historyId" :headerShow="!$isEEUiApp"/>
             <FileContent v-else v-model="fileShow" :file="fileInfo"/>
         </template>
     </div>