Sfoglia il codice sorgente

Merge branch 'fix/CMS.mobileDocument_execption' into 'wrdp'

Merge of fix/CMS.mobileDocument_execption 修复内容管理移动端页面打开空白的问题 to wrdp

See merge request o2oa/o2oa!2561
蔡祥熠 5 anni fa
parent
commit
9fb6ca91f9

+ 1 - 1
o2web/source/x_component_cms_Document/Main.js

@@ -69,7 +69,7 @@ MWF.xApplication.cms.Document.Main = new Class({
 
     },
     refreshTaskCenter: function(){
-        if (this.desktop.apps["cms.Explorer"]){
+        if ( this.desktop.apps && this.desktop.apps["cms.Explorer"]){
             if(this.desktop.apps["cms.Explorer"].content){
                 this.desktop.apps["cms.Explorer"].content.unmask();
             }

+ 26 - 25
o2web/source/x_desktop/cmsdocMobile.html

@@ -6,38 +6,39 @@
     <link rel="stylesheet" type="text/css" href="css/style.css" charset="UTF-8" />
     <link rel="stylesheet" href="css/mBoxNotice.css" charset="UTF-8" />
     <link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
-    <!--<script src="res/framework/htmleditor/ckeditor451/ckeditor.js"></script>-->
-    <script src="../o2_core/o2.min.js"></script>
-    <script src="js/o2m.api.js"></script>
-    <script src="js/cmsDocMobile.min.js"></script>
-    <script src="../o2_lib/Decimal.js"></script>
-    <script>layout.mobile = true;</script>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
     <meta content="yes" name="apple-mobile-web-app-capable" />
     <meta content="black" name="apple-mobile-web-app-status-bar-style" />
     <meta content="telephone=no" name="format-detection" />
-
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 
 <body style="overflow: auto; margin:0px">
-    <div id="appContent" style="overflow: auto"></div>
-    <script>
-        //动态添加 微信的 jssdk
-        function addWxJsSdk() {
-            var script = document.createElement("script");
-            script.type = "text/javascript";
-            script.src = "http://res.wx.qq.com/open/js/jweixin-1.6.0.js";
-            document.body.appendChild(script);
-        }
-        //微信的WeixinJSBridgeReady加载完成后进行判断
-        if (!window.WeixinJSBridge || !WeixinJSBridge.invoke) {
-            document.addEventListener('WeixinJSBridgeReady', addWxJsSdk, false);
-        } else {
-            addWxJsSdk();
-        }
-    </script>
+<div id="appContent" style="overflow: auto"></div>
+<script>
+    //动态添加 微信的 jssdk
+    function addWxJsSdk() {
+        var script = document.createElement("script");
+        script.type = "text/javascript";
+        script.src = "http://res.wx.qq.com/open/js/jweixin-1.6.0.js";
+        document.body.appendChild(script);
+    }
+    //微信的WeixinJSBridgeReady加载完成后进行判断
+    if (!window.WeixinJSBridge || !WeixinJSBridge.invoke) {
+        document.addEventListener('WeixinJSBridgeReady', addWxJsSdk, false);
+    } else {
+        addWxJsSdk();
+    }
+</script>
+
+<!--<script src="res/framework/htmleditor/ckeditor451/ckeditor.js"></script>-->
+<script src="../o2_core/o2.min.js"></script>
+<script src="../o2_lib/Decimal.js"></script>
+<script src="js/base.min.js"></script>
+<script src="js/o2m.api.js"></script>
+<script src="js/cmsDocMobile.min.js"></script>
+<script>layout.mobile = true;</script>
 </body>
 
 </html>

File diff suppressed because it is too large
+ 3 - 468
o2web/source/x_desktop/js/cmsDocMobile.js


Some files were not shown because too many files changed in this diff