Merge branch 'feature/component_vue_register' into 'wrdp'

增加对vue-o2component的支持，增加o2.component方法

See merge request o2oa/o2oa!5781

o2web/source/o2_core/o2.js

@@ -1141,6 +1141,19 @@ if (!window.o2) {
         String.prototype.bindJson = function (json) {
             return _parseHtml(this, json);
         };
+
+        o2.component = function(name, res){
+            o2.xApplication = o2.xApplication || {};
+            var names = name.split(".");
+            var o = o2.xApplication;
+            names.forEach(function(n){
+                o = o[n] = {};
+            });
+            o.loading = new Promise(function(resolve){
+                o2.loadAll(res, function(){ resolve(); });
+            });
+        }
+
     })();
 
 

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/letter.html

@@ -94,47 +94,6 @@
     }
 </style>
 <div class=WordSection1 style='layout-grid:15.6pt; font-size:16.0pt;font-family:仿宋'>
-    <v:line id="Line_x0020_25" o:spid="_x0000_s1026" style='position:absolute;
- left:0;text-align:left;z-index:251658240;visibility:visible;mso-wrap-style:square;
- mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;
- mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
- mso-wrap-distance-bottom:0;mso-position-horizontal:center;
- mso-position-horizontal-relative:text;mso-position-vertical:absolute;
- mso-position-vertical-relative:bottom-margin-area;mso-width-percent:0;
- mso-height-percent:0;mso-width-relative:page;mso-height-relative:page' from="0,42.55pt"
-            to="449.9pt,42.55pt" o:gfxdata="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
-" strokecolor="red" strokeweight="4.5pt">
-        <v:stroke linestyle="thinThick"/>
-        <w:wrap anchory="margin"/>
-    </v:line>
-
     <!--  红头  -->
     <div class="doc_block">
         <div class="MsoRedHeader doc_layout_redHeader" align=center
@@ -142,11 +101,20 @@ AAAAAAAAAAAAAAAnBAAAZHJzL2Rvd25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAC4FAAAAAA==
         </div>
     </div>
 
-    <div style='mso-ignore:vglayout;'>
-        <img width=649 height=6
-             src="../x_component_process_FormDesigner/Module/Documenteditor/templete/meeting_line.png"
-             style="width:100%; line-height: 5pt">
-    </div>
+    <table class="doc_block" data-compute-style="y" border=0 cellspacing=0 cellpadding=0
+           style='bottom:0; width:442.2pt; line-height:normal;border-collapse:collapse;border:none;'>
+        <tr>
+            <td style="width: 442.2pt">
+                <img src="../x_component_process_FormDesigner/Module/Documenteditor/templete/meeting_line.png"
+                     style="width:100%; line-height: 5pt">
+            </td>
+        </tr>
+    </table>
+<!--    <div style='mso-ignore:vglayout;'>-->
+<!--        <img width=649 height=6-->
+<!--             src="../x_component_process_FormDesigner/Module/Documenteditor/templete/meeting_line.png"-->
+<!--             style="width:100%; line-height: 5pt">-->
+<!--    </div>-->
     <table class="doc_block doc_layout_edition" data-compute-style="y" border=0 cellspacing=0 cellpadding=0
            style='position:absolute; bottom:0; width:442.2pt; line-height:normal;border-collapse:collapse;border:none;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:bottom;'>
         <tr>

o2web/source/x_desktop/js/base.js

@@ -332,7 +332,13 @@ if (!window.layout || !layout.desktop || !layout.addReady) {
                         layout.desktop.apps[appId].setCurrent();
                     } else {
                         if (options) options.appId = appId;
-                        _createNewApplication(e, appNamespace, appName, (options || {"appId": appId}), statusObj, inBrowser, taskitem, notCurrent);
+                        if (appNamespace.loading && appNamespace.loading.then){
+                            appNamespace.loading.then(function(){
+                                _createNewApplication(e, appNamespace, appName, (options || {"appId": appId}), statusObj, inBrowser, taskitem, notCurrent);
+                            });
+                        }else{
+                            _createNewApplication(e, appNamespace, appName, (options || {"appId": appId}), statusObj, inBrowser, taskitem, notCurrent);
+                        }
                     }
                 }.bind(this));
             }