From c0321ae0618059f6b6086e285754cad2605f4fad Mon Sep 17 00:00:00 2001 From: huqi Date: Tue, 27 Jul 2021 18:24:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E6=96=87=E6=A8=A1=E6=9D=BF=E7=AD=BE?= =?UTF-8?q?=E5=8F=91=E4=BA=BA=E9=83=A8=E5=88=86=E7=9A=84=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Module/Documenteditor/templete/command.html | 2 +- .../Module/Documenteditor/templete/letter.html | 2 +- .../Module/Documenteditor/templete/meeting.html | 12 ++++-------- .../Module/Documenteditor/templete/standard.html | 2 +- o2web/source/x_component_process_Xform/$Input.js | 5 +++++ o2web/source/x_component_process_Xform/Checkbox.js | 2 ++ .../x_component_process_Xform/Documenteditor.js | 12 ++++++++++-- o2web/source/x_component_process_Xform/Radio.js | 2 ++ o2web/source/x_component_process_Xform/Select.js | 2 ++ o2web/source/x_component_process_Xform/Textarea.js | 1 + 10 files changed, 29 insertions(+), 13 deletions(-) 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 668047108d..9eecaec379 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 @@ -222,7 +222,7 @@

+ style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-100pt; left:280pt;">

diff --git a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/letter.html b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/letter.html index 155bcae9c2..28304b8935 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/letter.html +++ b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/letter.html @@ -275,7 +275,7 @@ AAAAAAAAAAAAAAAnBAAAZHJzL2Rvd25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAC4FAAAAAA== + style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-100pt; left:290pt;">

diff --git a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/meeting.html b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/meeting.html index 858cce81b0..b5b8cc7d6f 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/meeting.html +++ b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/meeting.html @@ -169,15 +169,11 @@ - -
出席：

+ 		+

　　出席：

 -

+ 		+

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 7648377956..1c754564ad 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 @@ -277,7 +277,7 @@ + style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-100pt; left:285pt;">

diff --git a/o2web/source/x_component_process_Xform/$Input.js b/o2web/source/x_component_process_Xform/$Input.js index 8537bad2cf..c4f4bac1b4 100644 --- a/o2web/source/x_component_process_Xform/$Input.js +++ b/o2web/source/x_component_process_Xform/$Input.js @@ -11,6 +11,9 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class( Implements: [Events], Extends: MWF.APP$Module, iconStyle: "personfieldIcon", + options: { + "moduleEvents": ["change"] + }, initialize: function(node, json, form, options){ this.node = $(node); this.node.store("module", this); @@ -399,6 +402,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class( //} }, __setData: function(data){ + var old = this.getInputData(); this._setBusinessData(data); if (this.node.getFirst()){ this.node.getFirst().set("value", data); @@ -407,6 +411,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class( }else{ this.node.set("text", data); } + if (old!==data) this.fireEvent("change"); this.moduleValueAG = null; }, diff --git a/o2web/source/x_component_process_Xform/Checkbox.js b/o2web/source/x_component_process_Xform/Checkbox.js index f374d24bb2..9cdd70c1d0 100644 --- a/o2web/source/x_component_process_Xform/Checkbox.js +++ b/o2web/source/x_component_process_Xform/Checkbox.js @@ -361,6 +361,7 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox = new Class( __setData: function(data){ this.moduleValueAG = null; + var old = this.getInputData(); this._setBusinessData(data); var inputs = this.node.getElements("input"); @@ -384,6 +385,7 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox = new Class( } this.fieldModuleLoaded = true; this.fireEvent("setData"); + if (old!==data) this.fireEvent("change"); }, notValidationMode: function(text){ diff --git a/o2web/source/x_component_process_Xform/Documenteditor.js b/o2web/source/x_component_process_Xform/Documenteditor.js index c47f4a3605..ea26bf5e71 100644 --- a/o2web/source/x_component_process_Xform/Documenteditor.js +++ b/o2web/source/x_component_process_Xform/Documenteditor.js @@ -2856,6 +2856,10 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla //if (this.data[name]){ if (this[dom]){ + var value = this.data[name] || ""; + var reg = new RegExp("\n","g"); + var text = value.replace(reg,"
"); + if (dom=="layout_redHeader" || dom=="layout_issuanceUnit") { this[dom].set("html", this.data[name] || ""); }else if (dom=="layout_subject"){ @@ -2863,7 +2867,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla }else if (dom=="layout_attachment"){ this.setAttachmentData(); }else{ - this[dom].set("text", this.data[name]|| ""); + this[dom].set("html", text|| ""); } } @@ -3167,7 +3171,11 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla if (this.customLayouts){ this.customLayouts.each(function(l){ - l.node.set("html", this.data[l.name] || "　"); + var value = this.data[l.name] || ""; + var reg = new RegExp("\n","g"); + var text = value.replace(reg,"
"); + + l.node.set("html",text || "　"); }.bind(this)) } diff --git a/o2web/source/x_component_process_Xform/Radio.js b/o2web/source/x_component_process_Xform/Radio.js index 73914efad8..f65233130a 100644 --- a/o2web/source/x_component_process_Xform/Radio.js +++ b/o2web/source/x_component_process_Xform/Radio.js @@ -435,6 +435,7 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio = new Class( __setData: function(data){ this.moduleValueAG = null; + var old = this.getInputData(); this._setBusinessData(data); var inputs = this.node.getElements("input"); @@ -450,6 +451,7 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio = new Class( } this.fieldModuleLoaded = true; this.fireEvent("setData"); + if (old!==data) this.fireEvent("change"); }, notValidationMode: function(text){ diff --git a/o2web/source/x_component_process_Xform/Select.js b/o2web/source/x_component_process_Xform/Select.js index 910231b2ee..b472b2ed6b 100644 --- a/o2web/source/x_component_process_Xform/Select.js +++ b/o2web/source/x_component_process_Xform/Select.js @@ -446,6 +446,7 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect = new Class( }, __setData: function(data){ + var old = this.getInputData(); this._setBusinessData(data); if (this.readonly|| this.json.isReadonly){ var d = typeOf(data) === "array" ? data : [data]; @@ -477,6 +478,7 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect = new Class( } this.fieldModuleLoaded = true; this.fireEvent("setData", [data]); + if (old!==data) this.fireEvent("change"); } }); diff --git a/o2web/source/x_component_process_Xform/Textarea.js b/o2web/source/x_component_process_Xform/Textarea.js index ab8891ac71..5a7ac0b183 100644 --- a/o2web/source/x_component_process_Xform/Textarea.js +++ b/o2web/source/x_component_process_Xform/Textarea.js @@ -146,6 +146,7 @@ MWF.xApplication.process.Xform.Textarea = MWF.APPTextarea = new Class({ "MWFType": this.json.type }); this.node.addEvent("change", function(){ + debugger; this._setBusinessData(this.getInputData()); this.fireEvent("change"); }.bind(this)); -- GitLab