Merge branch 'hotfix/CMS.mobileDocument_execption' into 'master'

Merge of hotfix/CMS.mobileDocument_execption 修复移动端打开内容管理内容空白的错误' to wrdp See merge request o2oa/o2oa!2555

Merge branch 'hotfix/CMS.mobileDocument_execption' into 'master'
Merge of hotfix/CMS.mobileDocument_execption 修复移动端打开内容管理内容空白的错误' to wrdp See merge request o2oa/o2oa!2555
004a0bcb · NoSubject · e008b44e · a482fae3 · 004a0bcb · 004a0bcb
4 changed file
--- a/o2web/.gitignore
+++ b/o2web/.gitignore
@@ -2,6 +2,7 @@
 /coverage/
 /dest/
 /out/
+/jsdoc/
 /node_modules/
 npm-debug.log
 /test/

--- a/o2web/source/x_component_cms_Document/Main.js
+++ b/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();
            }

--- a/o2web/source/x_desktop/cmsdocMobile.html
+++ b/o2web/source/x_desktop/cmsdocMobile.html
@@ -6,19 +6,12 @@
    <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">
@@ -38,6 +31,14 @@
            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>
--- a/o2web/source/x_desktop/js/cmsDocMobile.js
+++ b/o2web/source/x_desktop/js/cmsDocMobile.js