Эх сурвалжийг харах

Merge branch 'fix/javascript_load' into 'develop'

Merge of fix/javascript_load to develop 版式文件更新

See merge request o2oa/o2oa!1104
胡起 5 жил өмнө
parent
commit
64067c3cd5

+ 2 - 1
o2web/source/x_component_process_Xform/Documenteditor.js

@@ -2028,7 +2028,7 @@ debugger;
                 this._computeItemFieldData(name, dataItem);
                 //if (this.data[name]){
                 if (this[dom]){
-                    if (dom=="layout_redHeader" || dom=="layout_subject"){
+                    if (dom=="layout_redHeader" || dom=="layout_subject" || dom=="layout_issuanceUnit" || dom=="layout_meetingAttendContent" || dom=="layout_meetingLeaveContent" || dom=="layout_meetingSitContent" || dom=="layout_meetingRecordContent"){
                         this[dom].set("html", this.data[name]|| "");
                     }else if (dom=="layout_attachment"){
                         this.setAttachmentData();
@@ -2178,6 +2178,7 @@ debugger;
                 this._computeItemFieldData(name, null, dataItem);
                 //if (this.data[name]){
                 if (this[dom]){
+                    debugger;
                     if (dom=="layout_redHeader" || dom=="layout_subject" || dom=="layout_issuanceUnit"){
                         this[dom].set("html", this.data[name]|| "");
                     }else if (dom=="layout_attachment"){