+ +
+diff --git a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/command.html b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/command.html index 4d3d7905cffb34db595416a47c9995cd3949a57b..668047108da5be225a97ca2386db2b35eae8254b 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/command.html +++ b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/command.html @@ -224,6 +224,11 @@ data-mso-position-horizontal-relative="margin" data-mso-position-vertical-relative="paragraph" style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-88pt; left:290pt;"> +
+ +
++ +
+diff --git a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html index c7455b9ae72e0928bbd47923fae90be6d982282e..7648377956a4cdf7e7307f9be8761990f2354224 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html +++ b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html @@ -283,6 +283,12 @@
+ +
+diff --git a/o2web/source/x_component_process_Xform/Documenteditor.js b/o2web/source/x_component_process_Xform/Documenteditor.js index 297cebf27c9c74980bd7662d68c2e783931e528c..603421c5ef6c1875b3a08d68b4e6fc525dfe9ab0 100644 --- a/o2web/source/x_component_process_Xform/Documenteditor.js +++ b/o2web/source/x_component_process_Xform/Documenteditor.js @@ -2679,6 +2679,15 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla this[dom].set("html", (this.data[name] || "")); }else if (dom=="layout_attachment"){ this.setAttachmentData(); + }else if (dom=="layout_annotation"){ + var annotation = this.data[name]; + if (annotation){ + if (annotation.substring(0, 1)!=="（") annotation = "（"+annotation; + if (annotation.substring(annotation.length-1, annotation.length)!=="）") annotation = annotation+"）"; + this[dom].set("text", annotation); + }else{ + this[dom].set("text", " "); + } }else{ this[dom].set("text", this.data[name]|| ""); } @@ -2969,7 +2978,12 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla } if (this.layout_issuanceUnit) this.data.issuanceUnit = this.layout_issuanceUnit.get("html"); if (this.layout_issuanceDate) this.data.issuanceDate = this.layout_issuanceDate.get("text"); - if (this.layout_annotation) this.data.annotation = this.layout_annotation.get("text"); + if (this.layout_annotation){ + var annotation = this.layout_annotation.get("text"); + if (annotation.substring(0,1)=="（") annotation = annotation.substring(1, annotation.length); + if (annotation.substring(annotation.length-1, annotation.length)=="）") annotation = annotation.substring(0, annotation.length-1); + this.data.annotation = annotation; + } if (this.layout_copytoTitle) this.data.copytoTitle = this.layout_copytoTitle.get("text"); if (this.layout_copytoContent) this.data.copyto = this.layout_copytoContent.get("text"); if (this.layout_copyto2Title) this.data.copyto2Title = this.layout_copyto2Title.get("text"); @@ -3093,7 +3107,16 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla if (this.layout_issuanceUnit) this.layout_issuanceUnit.set("html", data.issuanceUnit || " "); if (this.layout_issuanceDate) this.layout_issuanceDate.set("text", data.issuanceDate || " "); - if (this.layout_annotation) this.layout_annotation.set("text", data.annotation || " "); + if (this.layout_annotation){ + var annotation = data.annotation; + if (annotation){ + if (annotation.substring(0, 1)!=="（") annotation = "（"+annotation; + if (annotation.substring(annotation.length-1, annotation.length)!=="）") annotation = annotation+"）"; + this.layout_annotation.set("text", annotation); + }else{ + this.layout_annotation.set("text", " "); + } + } if (this.layout_copytoTitle) this.layout_copytoTitle.set("text", data.copytoTitle || " "); if (this.layout_copytoContent) this.layout_copytoContent.set("text", data.copyto || " "); if (this.layout_copyto2Title) this.layout_copyto2Title.set("text", data.copyto2Title || " "); diff --git a/o2web/source/x_desktop/js/initialScriptText.js b/o2web/source/x_desktop/js/initialScriptText.js index d828f464af51e11374374e99cd8308a0ce4ea5d7..cb22218a8f99882a4c9b58ecb599ef7e5d51c5ed 100644 --- a/o2web/source/x_desktop/js/initialScriptText.js +++ b/o2web/source/x_desktop/js/initialScriptText.js @@ -897,54 +897,85 @@ bind.parameters = { } }; //bind.parameters = this.parameters || null; -bind.response = (function(){ - var _self = this; - if (this.jaxrsResponse){ - if (this.jaxrsResponse.get()){ - var value = this.jaxrsResponse.get(); - if (JSON.validate(value)){ - return { - "status": this.jaxrsResponse.status, - "value": JSON.decode(value), - "get": function(){ JSON.decode(value) } - }; - }else{ - return { - "status": this.jaxrsResponse.status, - "value": value, - "get": function(){ return value; } - }; - } - }else{ - return { - "status": this.jaxrsResponse.status, - "value": this.jaxrsResponse.value, - "get": function(){ return _self.jaxrsResponse.value; } - }; + +var response = {}; +Object.defineProperty(response, "status", {enumerable: true,configurable: true, + get: function(){ return _self.jaxrsResponse.status; } +}); +Object.defineProperty(response, "value", {enumerable: true,configurable: true, + get: function(){ + if (_self.jaxrsResponse){ + return _self.jaxrsResponse.get(); + }else if(_self.jaxwsResponse){ + return _self.jaxwsResponse; } - }else{ - return { - "get": function(){ - return _self.jaxwsResponse || null; - // if (_self.jaxwsResponse && _self.jaxwsResponse.get()){ - // if (JSON.validate(_self.jaxwsResponse.get())){ - // return { - // "status": _self.jaxwsResponse.status, - // "value": JSON.decode(_self.jaxwsResponse.get()) - // }; - // }else{ - // return { - // "status": _self.jaxwsResponse.status, - // "value": _self.jaxwsResponse.value - // }; - // } - // }else{ - // return {"status": _self.jaxwsResponse.status}; - // } + } +}); +Object.defineProperty(response, "get", {enumerable: true,configurable: true, + get: function(){ + return function(){ + if (_self.jaxrsResponse){ + var value = _self.jaxrsResponse.get(); + if (JSON.validate(value)){ + return JSON.decode(value); + } + return value; + }else if(_self.jaxwsResponse){ + return _self.jaxwsResponse || null } - } + }; } -}).apply(this); +}); +bind.response = response; + +// bind.response = (function(){ +// // var _self = this; +// // if (this.jaxrsResponse){ +// if (this.jaxrsResponse.get()){ +// var value = this.jaxrsResponse.get(); +// if (JSON.validate(value)){ +// return { +// "status": this.jaxrsResponse.status, +// "value": JSON.decode(value), +// "get": function(){ JSON.decode(value) } +// }; +// }else{ +// return { +// "status": this.jaxrsResponse.status, +// "value": value, +// "get": function(){ return value; } +// }; +// } +// }else{ +// return { +// "status": this.jaxrsResponse.status, +// "value": this.jaxrsResponse.value, +// "get": function(){ return _self.jaxrsResponse.value; } +// }; +// } +// }else{ +// return { +// "get": function(){ +// return _self.jaxwsResponse || null; +// // if (_self.jaxwsResponse && _self.jaxwsResponse.get()){ +// // if (JSON.validate(_self.jaxwsResponse.get())){ +// // return { +// // "status": _self.jaxwsResponse.status, +// // "value": JSON.decode(_self.jaxwsResponse.get()) +// // }; +// // }else{ +// // return { +// // "status": _self.jaxwsResponse.status, +// // "value": _self.jaxwsResponse.value +// // }; +// // } +// // }else{ +// // return {"status": _self.jaxwsResponse.status}; +// // } +// } +// } +// } +// }).apply(this); bind.assginData = { "data": null,