From cd217f11df38bb6da1af754886ffbd80471abc81 Mon Sep 17 00:00:00 2001
From: "mrs_12345@163.com" <mrs_12345@163.com>
Date: Fri, 8 Jul 2022 15:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E5=B8=83=E7=BC=A9?=
 =?UTF-8?q?=E7=95=A5=E5=9B=BE=E4=B8=8E=E9=A1=B5=E9=9D=A2=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...al.pl.repository.designer.view.portal.html | 97 ++++++++++---------
 .../js/pal.pl.repository.designer.view.js     |  3 +-
 2 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
index 04ef5a3a..e02cd016 100755
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
@@ -638,6 +638,7 @@
     </script>
     <script>
         $(document).ready(function(){
+            $('#content_zoom').append(Math.round(Designer.config.scale * 100) + "%")
     		var output = initOutputFileLink();
     		if (output != 0) {
     			output = 40;
@@ -858,13 +859,31 @@
             $("#designer_layout").height(newHeight);
         })
 
+        function navOperate(type) {
+            if (type == 'show') {
+                $(".dock_view").hide();
+                $('#showNav').hide()
+                $('#closeNav').show()
+            } else {
+                $('#closeNav').hide()
+                $('#showNav').show()
+                Dock.showView('navigator')
+            }
+        }
+
         function canvasresizeMax() {
-            designerZoom = designerZoom * 1.1;
-            Designer.setZoomScale(designerZoom / 100);
+            // designerZoom = designerZoom * 1.1;
+            // Designer.setZoomScale(designerZoom / 100);
+            resizeMax()
+            $('#content_zoom').empty()
+            $('#content_zoom').append(Math.round(Designer.config.scale * 100) + "%")
         }
         function canvasresizeMin() {
-            designerZoom = designerZoom * 0.9;
-            Designer.setZoomScale(designerZoom / 100);
+            // designerZoom = designerZoom * 0.9;
+            // Designer.setZoomScale(designerZoom / 100);
+            resizeMin()
+            $('#content_zoom').empty()
+            $('#content_zoom').append(Math.round(Designer.config.scale * 100) + "%")
         }
     </script>
 </head>
@@ -878,7 +897,7 @@
     </div>
     <div id="tools" style="text-align:center;line-height:40px;font-size:17px;padding-right:20px;background-color:#f4f4f4;height:40px;">
     	<span><#typeName></span>
-		<div class="toolbar_info2" style="width:369px;"> 
+		<div class="toolbar_info2" style="width:332px;">
 			<div id="tab" style="display: none;font-size: 17px;">
 				<div id="processDesc" class="headerTab" onclick="clickTab('processDesc');">文件属性</div>
 				<div id="processAttr" class="headerTab" onclick="clickTab('processAttr');">活动属性</div>
@@ -905,15 +924,15 @@
         </div>
     </div>
 
-    <button name="dock_btn_enlarge" type="button" class="awsui-btn" onclick="canvasresizeMax();">放大</button>
-    <button name="dock_btn_narrow" type="button" class="awsui-btn" onclick="canvasresizeMin();">缩小</button>
+<!--    <button name="dock_btn_enlarge" type="button" class="awsui-btn" onclick="canvasresizeMax();">放大</button>-->
+<!--    <button name="dock_btn_narrow" type="button" class="awsui-btn" onclick="canvasresizeMin();">缩小</button>-->
 
 
     <div id="designer">
         <div id="designer_viewport" class="readonly">
             <div id="designer_layout" class="" style="background:white;">
                 <div id="canvas_container" style="padding:0px;background-color:white;">
-                    <div id="designer_canvas">
+                    <div id="designer_canvas" style="background-color: white !important;">
 
 
                         <canvas id="designer_grids" style="background-color:white;">您的浏览器不支持HTML5，请使用IE9及以上版本，或Chrome、Firefox等浏览器</canvas>
@@ -978,40 +997,6 @@
                 <canvas width="160px"></canvas>
                 <div></div>
             </div>
-            <div id="navigation_view" class="dock_view dock_view_navigator">
-                <div class="dock_view_header">
-                    导航
-                    <div class="ico ico_dock_collapse"></div>
-                </div>
-                <div class="navigation_bounding">
-                    <div class="navigation_view_container">
-                        <canvas id="navigation_canvas" width="120px" height="160px"></canvas>
-                        <div id="navigation_eye"></div>
-                    </div>
-                </div>
-                <div class="dock_devider" style="margin: 0px 10px"></div>
-                <div class="navigation_view_bar">
-                    <div id="dock_zoom" class="spinner active"></div>
-                    <div id="dock_btn_fullscreen" class="toolbar_button active" onclick="Dock.enterFullScreen()" awsui-qtip='全屏视图' title_pos="top">
-                        <div class="ico ico_fullscreen"></div>
-                    </div>
-                </div>
-                <div id="fullscreen_tip" class="alert error">
-                    <div class="ico dlg_close" onclick="$('#fullscreen_tip').hide();"></div>
-                    <div class="t"></div>
-                    <div class="full_suggest">
-                        <span style="float: left;">我们推荐使用以下浏览器：</span>
-                        <span style="float: left;">
-                            <a href="http://www.google.com/chrome" target="_blank">
-                                <span class="ico chrome"></span>
-                            </a>
-                            <a href="http://www.firefox.com" target="_blank">
-                                <span class="ico firefox"></span>
-                            </a>
-                        </span>
-                    </div>
-                </div>
-            </div>
             <!-- Graphic Dock Window -->
             <!-- 流程描述 -->
             <div class="dock_view_portalDescShow portalAttr" id="portalDescDock">
@@ -1024,8 +1009,32 @@
 			<div class="dock_view_portalFileShow portalAttr" id="portalFileDock"></div>
         </div>
     </div>
-	<div id="outputFile" style="height:40px;background-color:white;border-top:1px solid #efefef;vertical-align:middle;padding-top:9px;display:none;">
-		<!-- <span style="margin-left:40px;">报告:</span> -->
+    <div style="height:40px;background-color:white;border-top:1px solid #efefef;vertical-align:middle;position: relative" >
+        <div id="outputFile" style="vertical-align:middle;padding-top:9px;display:none;float: left"></div>
+        <div style="font-size: 15px;vertical-align:middle;padding-top:9px;float:right;">
+            <span class="awsui-iconfont" id="showNav" style="margin-right:30px;display: none" awsui-qtip="显示导航" onclick="navOperate('show')">
+                <i class="awsui-iconfont" style="color:#555;">&#xe722;</i>
+            </span>
+            <span class="awsui-iconfont" id="closeNav" style="margin-right:30px" awsui-qtip="关闭导航" onclick="navOperate('close')">
+                <i class="awsui-iconfont" style="color:#555;">&#xe723;</i>
+            </span>
+            <span class="awsui-iconfont" id="narrow" style="margin-right:10px;" onclick="canvasresizeMin()" awsui-qtip="缩小" >
+                <i class="awsui-iconfont" style="color:#555;">&#xe71d;</i>
+            </span>
+            <span class="awsui-iconfont" id="content_zoom" style="margin-right:10px;"></span>
+            <span class="awsui-iconfont" id="enlarge" style="margin-right:50px;" onclick="canvasresizeMax()"  awsui-qtip="放大" >
+                <i class="awsui-iconfont" style="color:#555;">&#xe71e;</i>
+            </span>
+        </div>
+        <div id="navigation_view" class="dock_view dock_view_navigator" style="position:absolute;top: -200px">
+            <div class="navigation_bounding">
+                <div class="navigation_view_container">
+                    <canvas id="navigation_canvas" width="120px" height="160px"></canvas>
+                    <div id="navigation_eye"></div>
+                </div>
+            </div>
+        </div>
+    </div>
 	</div>
     <div style="width:510px;display:none;" id="shapes_dialog">
         <div id="content" class="dlg-content awsui-ux">
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/pal.pl.repository.designer.view.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/pal.pl.repository.designer.view.js
index c2382275..986108ad 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/pal.pl.repository.designer.view.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/pal.pl.repository.designer.view.js
@@ -254,7 +254,6 @@ function previewBox_to_chartDiv(){
 }
 
 function resizeMin(){
-	debugger;
 	if (!checkHtml5()) {
 		var currentW = $("#chartDiv").width();
 		var currentH = $("#chartDiv").height();
@@ -286,7 +285,7 @@ function resizeMin(){
 }
 
 function resizeMax(){
-	if (!checkHtmld5()) {
+	if (!checkHtml5()) {
 		var currentW = $("#chartDiv").width();
 		var currentH = $("#chartDiv").height();
 		var imgW = $("#chartDiv").find("img").width();