Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/CocoRoboDesktop

css/Office/Word/WordEditor.css

@@ -565,7 +565,7 @@
     /* margin-top: 60px; */
     /* background:#fff; */
     float: left;
-    margin: 60px 0 0 65px;
+    margin: 60px 0 0 0;
 }
 
 .U_MD_O_H_head_file_bj {
@@ -611,6 +611,7 @@ U_MD_O_H_head_file_bjo>.U_MD_O_H_head_file_x {
 
 .U_MD_O_H_body {
     /* width: 1130px; */
+    width: 210mm;
     margin: auto;
 }
 
@@ -623,6 +624,7 @@ U_MD_O_H_head_file_bjo>.U_MD_O_H_head_file_x {
 }
 
 .U_MD_O_H_body_left {
+    display: none;
     width: 250px;
     float: left;
     margin-right: 80px;

js/Office/Word/WordEditor.js

@@ -50,10 +50,10 @@ U.MD.O.W.E.styleStateManage = function (style) {
     }
     $("#U_MD_O_H_align" + _align).addClass("U_MD_O_H_alignFocus"); //设置当前对齐方式为选中状态
 
-    // $("#U_MD_O_SetFontSize").Child()[0].children[0].innerText = U.MD.O.W.E.fontSize["0_" + parseFloat(style["font-size"])] || U.MD.O.W.E.fontSize["1_" + parseFloat(style["font-size"])] || parseFloat(style["font-size"]); //设置字体大小
-    // $("#U_MD_O_SetFontFamily").Child()[0].children[0].innerText = style["font-family"] || ""; //设置字体样式
-    $("#U_MD_O_SetFontSize").children()[0].children[0].innerText = U.MD.O.W.E.fontSize["0_" + parseFloat(style["font-size"])] || U.MD.O.W.E.fontSize["1_" + parseFloat(style["font-size"])] || parseFloat(style["font-size"]); //设置字体大小
-    $("#U_MD_O_SetFontFamily").children()[0].children[0].innerText = style["font-family"] || ""; //设置字体样式
+    $("#U_MD_O_SetFontSize").Child()[0].children[0].innerText = U.MD.O.W.E.fontSize["0_" + parseFloat(style["font-size"])] || U.MD.O.W.E.fontSize["1_" + parseFloat(style["font-size"])] || parseFloat(style["font-size"]); //设置字体大小
+    $("#U_MD_O_SetFontFamily").Child()[0].children[0].innerText = style["font-family"] || ""; //设置字体样式
+    // $("#U_MD_O_SetFontSize").children()[0].children[0].innerText = U.MD.O.W.E.fontSize["0_" + parseFloat(style["font-size"])] || U.MD.O.W.E.fontSize["1_" + parseFloat(style["font-size"])] || parseFloat(style["font-size"]); //设置字体大小
+    // $("#U_MD_O_SetFontFamily").children()[0].children[0].innerText = style["font-family"] || ""; //设置字体样式
 
     var _type = ""; //定义类型
     switch (style["name"]) { //判断类型
@@ -74,8 +74,8 @@ U.MD.O.W.E.styleStateManage = function (style) {
             break;
     }
 
-    // $("#U_MD_O_SetTitle").Child()[0].children[0].innerText = _type || "正文"; //设置类型
-    $("#U_MD_O_SetTitle").children()[0].children[0].innerText = _type || "正文"; //设置类型
+    $("#U_MD_O_SetTitle").Child()[0].children[0].innerText = _type || "正文"; //设置类型
+    //$("#U_MD_O_SetTitle").children()[0].children[0].innerText = _type || "正文"; //设置类型
 }
 
 
@@ -297,18 +297,18 @@ U.MD.O.W.E.createSelection = function () {
 
     _els[0].innerHTML = "";
     U.MD.UI.editor.Select({ '宋体': '宋体', 'sans-serif': 'sans-serif', '微软雅黑': '微软雅黑', '楷体': '楷体', '黑体': '黑体', '隶书': '隶书', 'andale mono': 'andale mono', 'arial black': 'arial black' },
-    { "className": "U_MD_O_H_select_list", id: "U_MD_O_SetFontFamily" },
-    function (v) { U.UF.E.setRangeStyle({ 'font-family': v }) }, _els[0]) /*创建下拉框*/
+        { "className": "U_MD_O_H_select_list", id: "U_MD_O_SetFontFamily" },
+        function (v) { U.UF.E.setRangeStyle({ 'font-family': v }) }, _els[0]) /*创建下拉框*/
     _els[1].innerHTML = "";
     U.MD.UI.editor.Select(U.MD.O.W.E.fontSize, { "className": "U_MD_O_H_select_list", id: 'U_MD_O_SetFontSize' },
-    function (key) { U.UF.E.setRangeStyle({ 'font-size': key.split('_')[1] + 'pt' }) }, _els[1])/*创建下拉框*/
+        function (key) { U.UF.E.setRangeStyle({ 'font-size': key.split('_')[1] + 'pt' }) }, _els[1])/*创建下拉框*/
     _els[2].innerHTML = "";
     U.MD.UI.editor.Select({ 'U_MD_O_W_Font_Normal': '正文', 'U_MD_O_W_Font_Heading1': '标题1', 'U_MD_O_W_Font_Heading2': '标题2', 'U_MD_O_W_Font_Heading3': '标题3', 'U_MD_O_W_Font_Heading4': '标题4' },
-    { "className": "U_MD_O_H_select_list", id: 'U_MD_O_SetTitle' },
-     function (value) { U.MD.O.W.E.titleStyle(value) }, _els[2])/*创建下拉框*/
+        { "className": "U_MD_O_H_select_list", id: 'U_MD_O_SetTitle' },
+        function (value) { U.MD.O.W.E.titleStyle(value) }, _els[2])/*创建下拉框*/
 
     _els[3].innerHTML = "";
-    U.MD.UI.editor.Select({ 10: 1, 15: 1.5, 20: 2, 25: 2.5, 30: 3 }, { "className": "U_MD_O_H_select_list", id: 'U_MD_O_SetLineHeight', style: { width: "auto"} },
+    U.MD.UI.editor.Select({ 10: 1, 15: 1.5, 20: 2, 25: 2.5, 30: 3 }, { "className": "U_MD_O_H_select_list", id: 'U_MD_O_SetLineHeight', style: { width: "auto" } },
         function (value) {
             U.UF.E.setLineStyle({ 'line-height': value / 10 });
             //  U.UF.E.setRangeStyle({ 'line-height': value / 10 });
@@ -424,8 +424,8 @@ U.MD.O.W.E.toolsbind = function () {
     };
 
     //工具栏更多处理,下拉框显示隐藏
-    // $('#U_MD_O_H_More').Child()[0].onclick = function (e) {
-    $('#U_MD_O_H_More').children()[0].onclick = function (e) {
+    $('#U_MD_O_H_More').Child()[0].onclick = function (e) {
+        //  $('#U_MD_O_H_More').children()[0].onclick = function (e) {
         U.MD.O.W.E.morelocation(e, this, $('.U_MD_O_H_More_Area')[0]);
     }
     //工具栏大小初始化
@@ -498,11 +498,11 @@ U.MD.O.W.E.sitePreview = function () {
             }
             else {
                 var _type = _wordinfo.UserDirectoryExtendType && _wordinfo.UserDirectoryExtendType.toLowerCase(), //获取文档类型
-                _callback = { //设置回调接口
-                    modifyDomain: function (res) { $('#U_MD_O_H_body_left_href_pay_a')[0].innerHTML = ""; U.MD.O.W.Panel.loadlink({ UserDirectoryID: res.FileId }) }, //修改命名后的回调
-                    addDomain: function (res) { $('#U_MD_O_H_body_left_href_pay_a')[0].innerHTML = ""; U.MD.O.W.Panel.loadlink({ UserDirectoryID: res.FileId }) }, //添加域名后的回调
-                    deleteDomain: function (res) { $('#U_MD_O_H_body_left_href_pay_a')[0].innerHTML = ""; U.MD.O.W.Panel.loadlink({ UserDirectoryID: res.FileId }) } //删除域名后的回调
-                };
+                    _callback = { //设置回调接口
+                        modifyDomain: function (res) { $('#U_MD_O_H_body_left_href_pay_a')[0].innerHTML = ""; U.MD.O.W.Panel.loadlink({ UserDirectoryID: res.FileId }) }, //修改命名后的回调
+                        addDomain: function (res) { $('#U_MD_O_H_body_left_href_pay_a')[0].innerHTML = ""; U.MD.O.W.Panel.loadlink({ UserDirectoryID: res.FileId }) }, //添加域名后的回调
+                        deleteDomain: function (res) { $('#U_MD_O_H_body_left_href_pay_a')[0].innerHTML = ""; U.MD.O.W.Panel.loadlink({ UserDirectoryID: res.FileId }) } //删除域名后的回调
+                    };
                 switch (_type) { //转文档类型字符串
                     case 'uw': case 'un': _type = 'word'; break;
                     case 'ue': _type = 'execl'; break;

kityminder-editor/dist/index.html

@@ -67,7 +67,7 @@
 <script src="../bower_components/codemirror/addon/mode/overlay.js"></script>
 <script src="../bower_components/codemirror/mode/gfm/gfm.js"></script>
 <script src="../bower_components/angular-ui-codemirror/ui-codemirror.js"></script>
-<script src="../bower_components/marked/lib/marked.js"></script>
+<script src="../bower_components/marked/lib/marked.umd.js"></script>
 <script src="../bower_components/kity/dist/kity.min.js"></script>
 <script src="../bower_components/hotbox/hotbox.js"></script>
 <script src="../bower_components/json-diff/json-diff.js"></script>
@@ -78,22 +78,20 @@
 <script src="kityminder.editor.min.js"></script>
 
 
-<script>
-	window.onload = function () {
-		angular.module('kityminderDemo', ['kityminderEditor'])
-			.config(function (configProvider) {
-				configProvider.set('imageUpload', '../server/imageUpload.php');
-			})
-			.controller('MainController', function ($scope) {
-				$scope.initEditor = function (editor, minder) {
-					window.editor = editor;
-					window.minder = minder;
-					setTimeout(function () {
-						window.editor.minder.getRenderContainer().setTranslate([(window.editor.minder._lastClientSize.width - window.editor.minder._root._contentBox.width) / 2, 120]);
-					}, 500)
-				};
-			});
-	}
+<script type="text/javascript">
+	angular.module('kityminderDemo', ['kityminderEditor'])
+		.config(function (configProvider) {
+			configProvider.set('imageUpload', '../server/imageUpload.php');
+		})
+		.controller('MainController', function ($scope) {
+			$scope.initEditor = function (editor, minder) {
+				window.editor = editor;
+				window.minder = minder;
+				setTimeout(function () {
+					window.editor.minder.getRenderContainer().setTranslate([(window.editor.minder._lastClientSize.width - window.editor.minder._root._contentBox.width) / 2, 120]);
+				}, 500)
+			};
+		});
 	document.domain = document.domain.split(".").slice(-2).join(".");
 </script>