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=$(`
- ${window.i18n.tools.preview.pagingPreview}
+ 预览
`);
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=$(`
-
- ${window.i18n.tools.save.saveAs}
-
- `);
- ul.append(saveAs);
- saveAs.click(function(){
- const content=tableToXml(_this.context);
- saveDialog.show(content,_this.context);
- });
+ // const saveAs=$(`
+ //
+ // ${window.i18n.tools.save.saveAs}
+ //
+ // `);
+ // ul.append(saveAs);
+ // saveAs.click(function(){
+ // const content=tableToXml(_this.context);
+ // saveDialog.show(content,_this.context);
+ // });
group.append(mainBtn);
group.append(ul);