Merge branch 'release' into 'develop'

Release

See merge request o2oa/o2oa!1695

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/documenteditor.html

@@ -120,6 +120,16 @@
 				</td>
 			</tr>
 		</table>
+		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+			<tr>
+				<td class="editTableTitle">双页显示:</td>
+				<td class="editTableValue">
+					<input class="editTableRadio" name="canDoublePage" text{($.textIndent!=='n')?'checked':''} type="radio" value="y"/>是
+					<input class="editTableRadio" name="canDoublePage" text{($.textIndent=='n')?'checked':''} type="radio" value="n"/>否
+					<div>是否允许双页显示</div>
+				</td>
+			</tr>
+		</table>
 
 		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
 			<tr>

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -1519,17 +1519,20 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
             }
         }
 
-        this.doublePageAction = new Element("div", {"styles": this.css.doc_toolbar_doublePage, "text": MWF.xApplication.process.Xform.LP.doublePage}).inject(this.toolbarNode);
-        this.doublePageAction.addEvent("click", function(){
-            if (this.options.pageShow!=="double"){
-                this._doublePage();
-            }else{
-                this.options.pageShow="single";
-                this.reload();
-                //this._singlePage();
-            }
-        }.bind(this));
-        if (layout.mobile) this.doublePageAction.hide();
+        if (this.json.canDoublePage!=="n" && !layout.mobile){
+            this.doublePageAction = new Element("div", {"styles": this.css.doc_toolbar_doublePage, "text": MWF.xApplication.process.Xform.LP.doublePage}).inject(this.toolbarNode);
+            this.doublePageAction.addEvent("click", function(){
+                if (this.options.pageShow!=="double"){
+                    this._doublePage();
+                }else{
+                    this.options.pageShow="single";
+                    this.reload();
+                    //this._singlePage();
+                }
+            }.bind(this));
+            //if (layout.mobile) this.doublePageAction.hide();
+        }
+
 
 
         this.zoomActionArea =  new Element("div", {"styles": {"float": "right", "margin-right": "10px"}}).inject(this.toolbarNode);