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

css/Desktop/Desktop.css

@@ -604,7 +604,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
 .U_MD_D_KO {
     cursor: pointer;
     width: 65px;
-    height: 90px;
+    height: 85px;
     position: absolute;
     top: 0;
     left: 80px;
@@ -639,7 +639,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
     width: 51px;
     height: 15px;
     line-height: 15px;
-    margin-top: 6px;
+    margin-top: 3px;
     text-align: center;
 }
 

js/Desktop/DeskTop.js

@@ -202,7 +202,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
             }, _frag); // 
             _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
             $$("div", { className: "U_MD_D_KOS U_Img", "style": _studentDesktopIconInfo[i].style }, _iconcontent);
-            $$("div", { className: "U_MD_D_KOX", "style": { "cssText": "text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -webkit-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -moz-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; filter: Glow(color=#777777, strength=1)\9;" }, "innerHTML": _studentDesktopIconInfo[i].Name }, _iconcontent);
+            $$("div", { className: "U_MD_D_KOX", "innerHTML": _studentDesktopIconInfo[i].Name }, _iconcontent);
         }
     } else if ((_type == 1 || _type == 4) && _org == "7ada499f-4ec7-11ed-8c78-005056b86db5") {
         for (i = 0; i < _orgStemDeskIcon.length; i++) {
@@ -219,7 +219,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
             }, _frag); // 
             _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
             $$("div", { className: "U_MD_D_KOS U_Img", "style": _orgStemDeskIcon[i].style }, _iconcontent);
-            $$("div", { className: "U_MD_D_KOX", "style": { "cssText": "text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -webkit-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -moz-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; filter: Glow(color=#777777, strength=1)\9;" }, "innerHTML": _orgStemDeskIcon[i].Name }, _iconcontent);
+            $$("div", { className: "U_MD_D_KOX","innerHTML": _orgStemDeskIcon[i].Name }, _iconcontent);
         }
     } else if ((_type == 1 || _type == 4) && _org == "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d") {
         for (i = 0; i < _orgDesktopIconInfo.length; i++) {
@@ -236,7 +236,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
             }, _frag); // 
             _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
             $$("div", { className: "U_MD_D_KOS U_Img", "style": _orgDesktopIconInfo[i].style }, _iconcontent);
-            $$("div", { className: "U_MD_D_KOX", "style": { "cssText": "text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -webkit-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -moz-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; filter: Glow(color=#777777, strength=1)\9;" }, "innerHTML": _orgDesktopIconInfo[i].Name }, _iconcontent);
+            $$("div", { className: "U_MD_D_KOX",  "innerHTML": _orgDesktopIconInfo[i].Name }, _iconcontent);
         }
     } else if ((_type == 1 || _type == 4) && _oid != "91305d49-01ba-11ed-8c78-005056b86db5") {
         for (i = 0; i < _teacherDesktopIconInfo.length; i++) {
@@ -253,7 +253,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
             }, _frag); // 
             _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
             $$("div", { className: "U_MD_D_KOS U_Img", "style": _teacherDesktopIconInfo[i].style }, _iconcontent);
-            $$("div", { className: "U_MD_D_KOX", "style": { "cssText": "text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -webkit-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -moz-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; filter: Glow(color=#777777, strength=1)\9;" }, "innerHTML": _teacherDesktopIconInfo[i].Name }, _iconcontent);
+            $$("div", { className: "U_MD_D_KOX", "innerHTML": _teacherDesktopIconInfo[i].Name }, _iconcontent);
         }
     } else if ((_type == 1 || _type == 4) && _oid == "91305d49-01ba-11ed-8c78-005056b86db5") {
         for (i = 0; i < _schoolDesktopIconInfo.length; i++) {
@@ -270,7 +270,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
             }, _frag); // 
             _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
             $$("div", { className: "U_MD_D_KOS U_Img", "style": _schoolDesktopIconInfo[i].style }, _iconcontent);
-            $$("div", { className: "U_MD_D_KOX", "style": { "cssText": "text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -webkit-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -moz-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; filter: Glow(color=#777777, strength=1)\9;" }, "innerHTML": _schoolDesktopIconInfo[i].Name }, _iconcontent);
+            $$("div", { className: "U_MD_D_KOX","innerHTML": _schoolDesktopIconInfo[i].Name }, _iconcontent);
         }
     } else if (_type == 2 && _oid == "91305d49-01ba-11ed-8c78-005056b86db5") {
         for (i = 0; i < _studentDesktopIconInfo.length; i++) {
@@ -287,7 +287,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
             }, _frag); // 
             _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
             $$("div", { className: "U_MD_D_KOS U_Img", "style": _studentDesktopIconInfo[i].style }, _iconcontent);
-            $$("div", { className: "U_MD_D_KOX", "style": { "cssText": "text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -webkit-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -moz-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; filter: Glow(color=#777777, strength=1)\9;" }, "innerHTML": _studentDesktopIconInfo[i].Name }, _iconcontent);
+            $$("div", { className: "U_MD_D_KOX",  "innerHTML": _studentDesktopIconInfo[i].Name }, _iconcontent);
         }
     } else {
         for (i = 0; i < _teacherDesktopIconInfo.length; i++) {
@@ -304,7 +304,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
             }, _frag); // 
             _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
             $$("div", { className: "U_MD_D_KOS U_Img", "style": _teacherDesktopIconInfo[i].style }, _iconcontent);
-            $$("div", { className: "U_MD_D_KOX", "style": { "cssText": "text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -webkit-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; -moz-text-shadow: rgb(100 100 100) 2px 1px 3px, rgb(102 102 102) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; filter: Glow(color=#777777, strength=1)\9;" }, "innerHTML": _teacherDesktopIconInfo[i].Name }, _iconcontent);
+            $$("div", { className: "U_MD_D_KOX", "innerHTML": _teacherDesktopIconInfo[i].Name }, _iconcontent);
         }
     }
 
@@ -349,7 +349,7 @@ U.MD.D.iconPostion = function(childs, top, left) {
         if (top + 95 > US.height - 10) {
             //left超过了页面范围处理，则向上重叠打印处理
             if ((left + 180) > US.width) {
-                top -= 115;
+                top -= 110;
                 left -= 90;
             }
             //没有超过范围，那么left+90添加到下一个竖排打印
@@ -361,8 +361,8 @@ U.MD.D.iconPostion = function(childs, top, left) {
         //给图标的位置赋值
         U.selectEl(childs[i]).css({ top: top + "px", left: left + "px" });
         if (i < childs.length - 1) {
-            //页面图标每次向下加115
-            top += 115;
+            //页面图标每次向下加95
+            top += 95;
         }
     }
     //返回最后调用的图标的位置