From 69e0443438f4fd29118361cdacbeb9ab51459a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=87=95=E9=B9=8F?= <mail_yanpeng@163.com>
Date: Wed, 16 Jun 2021 10:28:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=94=B9=E9=80=A0=EF=BC=9A?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=A6=E5=AD=98=E4=B8=BA=EF=BC=8C=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=BF=9D=E5=AD=98=E5=B9=B6?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=EF=BC=8C=E5=88=86=E9=A1=B5=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ureport2-js/src/i18n/designer.json   |  2 +-
 ureport2-js/src/tools/PreviewTool.js | 33 +++++++++++++++++++++++-----
 ureport2-js/src/tools/SaveTool.js    | 20 ++++++++---------
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/ureport2-js/src/i18n/designer.json b/ureport2-js/src/i18n/designer.json
index 8b1c503..42fbd45 100644
--- a/ureport2-js/src/i18n/designer.json
+++ b/ureport2-js/src/i18n/designer.json
@@ -88,7 +88,7 @@
     },
     "preview":{
       "preview":"预览报表",
-      "view":"预览",
+      "view":"保存并预览",
       "pagingPreview":"分页预览",
       "previewFail":"报表预览操作失败！"
     },
diff --git a/ureport2-js/src/tools/PreviewTool.js b/ureport2-js/src/tools/PreviewTool.js
index 430e5f3..2b47be7 100644
--- a/ureport2-js/src/tools/PreviewTool.js
+++ b/ureport2-js/src/tools/PreviewTool.js
@@ -4,6 +4,7 @@
 import Tool from './Tool.js';
 import {tableToXml} from '../Utils.js';
 import {alert} from '../MsgBox.js';
+import {resetDirty} from "../Utils";
 
 export default class PreviewTool extends Tool{
     execute(){
@@ -23,15 +24,34 @@ export default class PreviewTool extends Tool{
         ul.append(preview);
         const _this=this;
         preview.click(function(){
-            _this.doPreview();
+            const content=tableToXml(_this.context);
+            if(window._reportFile){
+                $.ajax({
+                    url:window._server+"/designer/saveReportFile",
+                    data:{content,file:window._reportFile},
+                    type:'POST',
+                    success:function(){
+                        resetDirty();
+                        _this.doPreview();
+                    },
+                    error:function(response){
+                        if(response && response.responseText){
+                            alert("服务端错误："+response.responseText+"");
+                        }else{
+                            alert(`${window.i18n.tools.save.failSave}`);
+                        }
+                    }
+                });
+            }
         });
         const pagingPreview=$(`<li>
                 <a href="###">
-                    <i class="glyphicon glyphicon-search" style="color: #0e90d2;"></i> ${window.i18n.tools.preview.pagingPreview}
+                    <i class="glyphicon glyphicon-search" style="color: #0e90d2;"></i> 预览
                 </a>
             </li>`);
         ul.append(pagingPreview);
         pagingPreview.click(function(){
+            // _this.doPreview(true);
             _this.doPreview(true);
         });
         group.append(mainBtn);
@@ -39,10 +59,11 @@ export default class PreviewTool extends Tool{
         return group;
     }
     doPreview(withPaging){
-        let targetUrl=window._server+"/preview?_u=p";
-        if(withPaging){
-            targetUrl+='&_i=1&_r=1';
-        }
+        // let targetUrl=window._server+"/preview?_u=p";
+        let targetUrl=window._server+"/preview?_u="+ withPaging ? "p" : window._reportFile;
+        // if(withPaging){
+        //     targetUrl+='&_i=1&_r=1';
+        // }
         const content=tableToXml(this.context);
         $.ajax({
             url:window._server+"/designer/savePreviewData",
diff --git a/ureport2-js/src/tools/SaveTool.js b/ureport2-js/src/tools/SaveTool.js
index 2d07de7..985ea9d 100644
--- a/ureport2-js/src/tools/SaveTool.js
+++ b/ureport2-js/src/tools/SaveTool.js
@@ -48,16 +48,16 @@ export default class SaveTool extends Tool{
                 saveDialog.show(content,_this.context);
             }
         });
-        const saveAs=$(`<li>
-                <a href="###">
-                    <i class="glyphicon glyphicon-floppy-disk" style="color: #0e90d2;font-size: 16px"></i> ${window.i18n.tools.save.saveAs}
-                </a>
-            </li>`);
-        ul.append(saveAs);
-        saveAs.click(function(){
-            const content=tableToXml(_this.context);
-            saveDialog.show(content,_this.context);
-        });
+        // const saveAs=$(`<li>
+        //         <a href="###">
+        //             <i class="glyphicon glyphicon-floppy-disk" style="color: #0e90d2;font-size: 16px"></i> ${window.i18n.tools.save.saveAs}
+        //         </a>
+        //     </li>`);
+        // ul.append(saveAs);
+        // saveAs.click(function(){
+        //     const content=tableToXml(_this.context);
+        //     saveDialog.show(content,_this.context);
+        // });
 
         group.append(mainBtn);
         group.append(ul);