Merge branch 'feature/menu_group' into 'wrdp'

主菜单排序

See merge request o2oa/o2oa!3042

o2web/source/o2_core/o2/lp/zh-cn.js

@@ -159,6 +159,9 @@ o2.LP.desktop = {
 
     "changeViewTitle": "切换视图样式确认",
     "changeView": "您确定要切换视图样式吗？<br><br>如果您选择“确定”，页面将直接刷新，未保存的数据可能丢失。",
+    "refreshMenu": "恢复默认菜单排序",
+    "defaultMenuTitle": "恢复默认菜单确认",
+    "defaultMenuInfor": "您确定要将菜单的排序和分组，恢复到默认状态码？",
 
     "messsage": {
         "appliction": "应用",

o2web/source/o2_core/o2/xDesktop/$Default/blue/layout-menu-pc.html

@@ -13,7 +13,6 @@
         <div class="layout_start_content_appTitle" data-o2-element="appTitleNode"></div>
         <div class="layout_start_content_appScrollContent" data-o2-element="appScrollNode">
             <div class="layout_start_content_appContent icon_loading" data-o2-element="appContentNode"></div>
-            <div data-o2-events="click:defaultMenu">恢复默认</div>
         </div>
 
     </div>

o2web/source/o2_core/o2/xDesktop/$Default/blue/style-pc.css

@@ -533,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -727,6 +727,7 @@
     height: 40px;
     border-radius: 20px;
     background-size: 22px 22px;
+    overflow: hidden;
 }
 .layout_start_groupItem_menuMask {
     position: absolute;
@@ -756,6 +757,7 @@
 }
 .layout_start_groupItem_menu_content {
     overflow: hidden;
+    padding-top: 10px;
 }
 .layout_start_item_icon_group_sub {
     width:  14px;

o2web/source/o2_core/o2/xDesktop/$Default/blue/style-skin.css

@@ -124,6 +124,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/$Default/cyan/style-pc.css

@@ -295,7 +295,7 @@
     overflow: hidden;
     cursor: pointer;
     float: left;
-    padding: 0 10px;
+    padding: 0 10px 0 10px;
     margin-left: 10px;
 }
 .layout_content_taskbar_item_icon {
@@ -323,6 +323,7 @@
     background-position: center left;
     background-repeat: no-repeat;
 }
+
 .layout_content_taskbar_item_text {
     height: 28px;
     float: left;
@@ -459,7 +460,7 @@
     display: none;
 }
 
-.layout_start_item{
+.layout_start_item {
     width: 72px;
     height: 90px;
     margin-left: 18px;
@@ -482,6 +483,7 @@
     overflow: hidden;
     margin: auto;
 }
+
 .layout_start_item_icon {
     width: 40px;
     height: 40px;
@@ -531,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -719,3 +721,77 @@
     opacity: 0;
     box-shadow: 3PX 3PX 10px #999999;
 }
+.layout_start_groupItem_menu {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    background-size: 22px 22px;
+    overflow: hidden;
+}
+.layout_start_groupItem_menuMask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0.4;
+    top: 0;
+    left: 0;
+}
+.layout_start_groupItem_menu_title {
+    height: 60px;
+    padding: 8px 0 12px 0;
+    line-height: 40px;
+    font-size: 16px;
+    text-align: center;
+    overflow: hidden;
+}
+.layout_start_groupItem_menu_scroll {
+    overflow: hidden;
+}
+.layout_start_item_icon_group {
+    width: 32px;
+    height: 32px;
+    padding: 5px 3px 3px 5px;
+    border-radius: 10px;
+    background-size: 22px 22px;
+}
+.layout_start_groupItem_menu_content {
+    overflow: hidden;
+    padding-top: 10px;
+}
+.layout_start_item_icon_group_sub {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: 10px 10px;
+    background-position: center;
+}
+.layout_start_item_icon_group_subIcon {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+.layout_start_item_sub {
+    margin-left: 12px;
+}
+.layout_start_groupItem_menu_title_edit {
+    border: 0;
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    font-size: 16px;
+    text-align: center;
+    width: 90%;
+    margin: auto;
+    border-radius: 20px;
+}

o2web/source/o2_core/o2/xDesktop/$Default/cyan/style-skin.css

@@ -82,6 +82,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/$Default/darkgreen/style-pc.css

@@ -295,7 +295,7 @@
     overflow: hidden;
     cursor: pointer;
     float: left;
-    padding: 0 10px;
+    padding: 0 10px 0 10px;
     margin-left: 10px;
 }
 .layout_content_taskbar_item_icon {
@@ -323,6 +323,7 @@
     background-position: center left;
     background-repeat: no-repeat;
 }
+
 .layout_content_taskbar_item_text {
     height: 28px;
     float: left;
@@ -459,7 +460,7 @@
     display: none;
 }
 
-.layout_start_item{
+.layout_start_item {
     width: 72px;
     height: 90px;
     margin-left: 18px;
@@ -482,6 +483,7 @@
     overflow: hidden;
     margin: auto;
 }
+
 .layout_start_item_icon {
     width: 40px;
     height: 40px;
@@ -531,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -719,3 +721,77 @@
     opacity: 0;
     box-shadow: 3PX 3PX 10px #999999;
 }
+.layout_start_groupItem_menu {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    background-size: 22px 22px;
+    overflow: hidden;
+}
+.layout_start_groupItem_menuMask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0.4;
+    top: 0;
+    left: 0;
+}
+.layout_start_groupItem_menu_title {
+    height: 60px;
+    padding: 8px 0 12px 0;
+    line-height: 40px;
+    font-size: 16px;
+    text-align: center;
+    overflow: hidden;
+}
+.layout_start_groupItem_menu_scroll {
+    overflow: hidden;
+}
+.layout_start_item_icon_group {
+    width: 32px;
+    height: 32px;
+    padding: 5px 3px 3px 5px;
+    border-radius: 10px;
+    background-size: 22px 22px;
+}
+.layout_start_groupItem_menu_content {
+    overflow: hidden;
+    padding-top: 10px;
+}
+.layout_start_item_icon_group_sub {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: 10px 10px;
+    background-position: center;
+}
+.layout_start_item_icon_group_subIcon {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+.layout_start_item_sub {
+    margin-left: 12px;
+}
+.layout_start_groupItem_menu_title_edit {
+    border: 0;
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    font-size: 16px;
+    text-align: center;
+    width: 90%;
+    margin: auto;
+    border-radius: 20px;
+}

o2web/source/o2_core/o2/xDesktop/$Default/darkgreen/style-skin.css

@@ -81,6 +81,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/$Default/gray/style-pc.css

@@ -295,7 +295,7 @@
     overflow: hidden;
     cursor: pointer;
     float: left;
-    padding: 0 10px;
+    padding: 0 10px 0 10px;
     margin-left: 10px;
 }
 .layout_content_taskbar_item_icon {
@@ -323,6 +323,7 @@
     background-position: center left;
     background-repeat: no-repeat;
 }
+
 .layout_content_taskbar_item_text {
     height: 28px;
     float: left;
@@ -459,7 +460,7 @@
     display: none;
 }
 
-.layout_start_item{
+.layout_start_item {
     width: 72px;
     height: 90px;
     margin-left: 18px;
@@ -482,6 +483,7 @@
     overflow: hidden;
     margin: auto;
 }
+
 .layout_start_item_icon {
     width: 40px;
     height: 40px;
@@ -531,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -719,3 +721,77 @@
     opacity: 0;
     box-shadow: 3PX 3PX 10px #999999;
 }
+.layout_start_groupItem_menu {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    background-size: 22px 22px;
+    overflow: hidden;
+}
+.layout_start_groupItem_menuMask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0.4;
+    top: 0;
+    left: 0;
+}
+.layout_start_groupItem_menu_title {
+    height: 60px;
+    padding: 8px 0 12px 0;
+    line-height: 40px;
+    font-size: 16px;
+    text-align: center;
+    overflow: hidden;
+}
+.layout_start_groupItem_menu_scroll {
+    overflow: hidden;
+}
+.layout_start_item_icon_group {
+    width: 32px;
+    height: 32px;
+    padding: 5px 3px 3px 5px;
+    border-radius: 10px;
+    background-size: 22px 22px;
+}
+.layout_start_groupItem_menu_content {
+    overflow: hidden;
+    padding-top: 10px;
+}
+.layout_start_item_icon_group_sub {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: 10px 10px;
+    background-position: center;
+}
+.layout_start_item_icon_group_subIcon {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+.layout_start_item_sub {
+    margin-left: 12px;
+}
+.layout_start_groupItem_menu_title_edit {
+    border: 0;
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    font-size: 16px;
+    text-align: center;
+    width: 90%;
+    margin: auto;
+    border-radius: 20px;
+}

o2web/source/o2_core/o2/xDesktop/$Default/gray/style-skin.css

@@ -80,6 +80,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/$Default/green/style-pc.css

@@ -295,7 +295,7 @@
     overflow: hidden;
     cursor: pointer;
     float: left;
-    padding: 0 10px;
+    padding: 0 10px 0 10px;
     margin-left: 10px;
 }
 .layout_content_taskbar_item_icon {
@@ -323,6 +323,7 @@
     background-position: center left;
     background-repeat: no-repeat;
 }
+
 .layout_content_taskbar_item_text {
     height: 28px;
     float: left;
@@ -459,7 +460,7 @@
     display: none;
 }
 
-.layout_start_item{
+.layout_start_item {
     width: 72px;
     height: 90px;
     margin-left: 18px;
@@ -482,6 +483,7 @@
     overflow: hidden;
     margin: auto;
 }
+
 .layout_start_item_icon {
     width: 40px;
     height: 40px;
@@ -531,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -719,3 +721,77 @@
     opacity: 0;
     box-shadow: 3PX 3PX 10px #999999;
 }
+.layout_start_groupItem_menu {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    background-size: 22px 22px;
+    overflow: hidden;
+}
+.layout_start_groupItem_menuMask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0.4;
+    top: 0;
+    left: 0;
+}
+.layout_start_groupItem_menu_title {
+    height: 60px;
+    padding: 8px 0 12px 0;
+    line-height: 40px;
+    font-size: 16px;
+    text-align: center;
+    overflow: hidden;
+}
+.layout_start_groupItem_menu_scroll {
+    overflow: hidden;
+}
+.layout_start_item_icon_group {
+    width: 32px;
+    height: 32px;
+    padding: 5px 3px 3px 5px;
+    border-radius: 10px;
+    background-size: 22px 22px;
+}
+.layout_start_groupItem_menu_content {
+    overflow: hidden;
+    padding-top: 10px;
+}
+.layout_start_item_icon_group_sub {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: 10px 10px;
+    background-position: center;
+}
+.layout_start_item_icon_group_subIcon {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+.layout_start_item_sub {
+    margin-left: 12px;
+}
+.layout_start_groupItem_menu_title_edit {
+    border: 0;
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    font-size: 16px;
+    text-align: center;
+    width: 90%;
+    margin: auto;
+    border-radius: 20px;
+}

o2web/source/o2_core/o2/xDesktop/$Default/green/style-skin.css

@@ -80,6 +80,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/$Default/navy/style-pc.css

@@ -295,7 +295,7 @@
     overflow: hidden;
     cursor: pointer;
     float: left;
-    padding: 0 10px;
+    padding: 0 10px 0 10px;
     margin-left: 10px;
 }
 .layout_content_taskbar_item_icon {
@@ -323,6 +323,7 @@
     background-position: center left;
     background-repeat: no-repeat;
 }
+
 .layout_content_taskbar_item_text {
     height: 28px;
     float: left;
@@ -459,7 +460,7 @@
     display: none;
 }
 
-.layout_start_item{
+.layout_start_item {
     width: 72px;
     height: 90px;
     margin-left: 18px;
@@ -482,6 +483,7 @@
     overflow: hidden;
     margin: auto;
 }
+
 .layout_start_item_icon {
     width: 40px;
     height: 40px;
@@ -531,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -719,3 +721,77 @@
     opacity: 0;
     box-shadow: 3PX 3PX 10px #999999;
 }
+.layout_start_groupItem_menu {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    background-size: 22px 22px;
+    overflow: hidden;
+}
+.layout_start_groupItem_menuMask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0.4;
+    top: 0;
+    left: 0;
+}
+.layout_start_groupItem_menu_title {
+    height: 60px;
+    padding: 8px 0 12px 0;
+    line-height: 40px;
+    font-size: 16px;
+    text-align: center;
+    overflow: hidden;
+}
+.layout_start_groupItem_menu_scroll {
+    overflow: hidden;
+}
+.layout_start_item_icon_group {
+    width: 32px;
+    height: 32px;
+    padding: 5px 3px 3px 5px;
+    border-radius: 10px;
+    background-size: 22px 22px;
+}
+.layout_start_groupItem_menu_content {
+    overflow: hidden;
+    padding-top: 10px;
+}
+.layout_start_item_icon_group_sub {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: 10px 10px;
+    background-position: center;
+}
+.layout_start_item_icon_group_subIcon {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+.layout_start_item_sub {
+    margin-left: 12px;
+}
+.layout_start_groupItem_menu_title_edit {
+    border: 0;
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    font-size: 16px;
+    text-align: center;
+    width: 90%;
+    margin: auto;
+    border-radius: 20px;
+}

o2web/source/o2_core/o2/xDesktop/$Default/navy/style-skin.css

@@ -81,6 +81,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/$Default/orange/style-pc.css

@@ -295,7 +295,7 @@
     overflow: hidden;
     cursor: pointer;
     float: left;
-    padding: 0 10px;
+    padding: 0 10px 0 10px;
     margin-left: 10px;
 }
 .layout_content_taskbar_item_icon {
@@ -323,6 +323,7 @@
     background-position: center left;
     background-repeat: no-repeat;
 }
+
 .layout_content_taskbar_item_text {
     height: 28px;
     float: left;
@@ -459,7 +460,7 @@
     display: none;
 }
 
-.layout_start_item{
+.layout_start_item {
     width: 72px;
     height: 90px;
     margin-left: 18px;
@@ -482,6 +483,7 @@
     overflow: hidden;
     margin: auto;
 }
+
 .layout_start_item_icon {
     width: 40px;
     height: 40px;
@@ -531,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -719,3 +721,77 @@
     opacity: 0;
     box-shadow: 3PX 3PX 10px #999999;
 }
+.layout_start_groupItem_menu {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    background-size: 22px 22px;
+    overflow: hidden;
+}
+.layout_start_groupItem_menuMask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0.4;
+    top: 0;
+    left: 0;
+}
+.layout_start_groupItem_menu_title {
+    height: 60px;
+    padding: 8px 0 12px 0;
+    line-height: 40px;
+    font-size: 16px;
+    text-align: center;
+    overflow: hidden;
+}
+.layout_start_groupItem_menu_scroll {
+    overflow: hidden;
+}
+.layout_start_item_icon_group {
+    width: 32px;
+    height: 32px;
+    padding: 5px 3px 3px 5px;
+    border-radius: 10px;
+    background-size: 22px 22px;
+}
+.layout_start_groupItem_menu_content {
+    overflow: hidden;
+    padding-top: 10px;
+}
+.layout_start_item_icon_group_sub {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: 10px 10px;
+    background-position: center;
+}
+.layout_start_item_icon_group_subIcon {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+.layout_start_item_sub {
+    margin-left: 12px;
+}
+.layout_start_groupItem_menu_title_edit {
+    border: 0;
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    font-size: 16px;
+    text-align: center;
+    width: 90%;
+    margin: auto;
+    border-radius: 20px;
+}

o2web/source/o2_core/o2/xDesktop/$Default/orange/style-skin.css

@@ -80,6 +80,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/$Default/purple/style-pc.css

@@ -295,7 +295,7 @@
     overflow: hidden;
     cursor: pointer;
     float: left;
-    padding: 0 10px;
+    padding: 0 10px 0 10px;
     margin-left: 10px;
 }
 .layout_content_taskbar_item_icon {
@@ -323,6 +323,7 @@
     background-position: center left;
     background-repeat: no-repeat;
 }
+
 .layout_content_taskbar_item_text {
     height: 28px;
     float: left;
@@ -459,7 +460,7 @@
     display: none;
 }
 
-.layout_start_item{
+.layout_start_item {
     width: 72px;
     height: 90px;
     margin-left: 18px;
@@ -482,6 +483,7 @@
     overflow: hidden;
     margin: auto;
 }
+
 .layout_start_item_icon {
     width: 40px;
     height: 40px;
@@ -531,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -719,3 +721,77 @@
     opacity: 0;
     box-shadow: 3PX 3PX 10px #999999;
 }
+.layout_start_groupItem_menu {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    background-size: 22px 22px;
+    overflow: hidden;
+}
+.layout_start_groupItem_menuMask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0.4;
+    top: 0;
+    left: 0;
+}
+.layout_start_groupItem_menu_title {
+    height: 60px;
+    padding: 8px 0 12px 0;
+    line-height: 40px;
+    font-size: 16px;
+    text-align: center;
+    overflow: hidden;
+}
+.layout_start_groupItem_menu_scroll {
+    overflow: hidden;
+}
+.layout_start_item_icon_group {
+    width: 32px;
+    height: 32px;
+    padding: 5px 3px 3px 5px;
+    border-radius: 10px;
+    background-size: 22px 22px;
+}
+.layout_start_groupItem_menu_content {
+    overflow: hidden;
+    padding-top: 10px;
+}
+.layout_start_item_icon_group_sub {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: 10px 10px;
+    background-position: center;
+}
+.layout_start_item_icon_group_subIcon {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+.layout_start_item_sub {
+    margin-left: 12px;
+}
+.layout_start_groupItem_menu_title_edit {
+    border: 0;
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    font-size: 16px;
+    text-align: center;
+    width: 90%;
+    margin: auto;
+    border-radius: 20px;
+}

o2web/source/o2_core/o2/xDesktop/$Default/purple/style-skin.css

@@ -80,6 +80,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/$Default/red/style-pc.css

@@ -295,7 +295,7 @@
     overflow: hidden;
     cursor: pointer;
     float: left;
-    padding: 0 10px;
+    padding: 0 10px 0 10px;
     margin-left: 10px;
 }
 .layout_content_taskbar_item_icon {
@@ -323,6 +323,7 @@
     background-position: center left;
     background-repeat: no-repeat;
 }
+
 .layout_content_taskbar_item_text {
     height: 28px;
     float: left;
@@ -459,7 +460,7 @@
     display: none;
 }
 
-.layout_start_item{
+.layout_start_item {
     width: 72px;
     height: 90px;
     margin-left: 18px;
@@ -482,6 +483,7 @@
     overflow: hidden;
     margin: auto;
 }
+
 .layout_start_item_icon {
     width: 40px;
     height: 40px;
@@ -531,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -719,3 +721,77 @@
     opacity: 0;
     box-shadow: 3PX 3PX 10px #999999;
 }
+.layout_start_groupItem_menu {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    background-size: 22px 22px;
+    overflow: hidden;
+}
+.layout_start_groupItem_menuMask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0.4;
+    top: 0;
+    left: 0;
+}
+.layout_start_groupItem_menu_title {
+    height: 60px;
+    padding: 8px 0 12px 0;
+    line-height: 40px;
+    font-size: 16px;
+    text-align: center;
+    overflow: hidden;
+}
+.layout_start_groupItem_menu_scroll {
+    overflow: hidden;
+}
+.layout_start_item_icon_group {
+    width: 32px;
+    height: 32px;
+    padding: 5px 3px 3px 5px;
+    border-radius: 10px;
+    background-size: 22px 22px;
+}
+.layout_start_groupItem_menu_content {
+    overflow: hidden;
+    padding-top: 10px;
+}
+.layout_start_item_icon_group_sub {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: 10px 10px;
+    background-position: center;
+}
+.layout_start_item_icon_group_subIcon {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+.layout_start_item_sub {
+    margin-left: 12px;
+}
+.layout_start_groupItem_menu_title_edit {
+    border: 0;
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    font-size: 16px;
+    text-align: center;
+    width: 90%;
+    margin: auto;
+    border-radius: 20px;
+}

o2web/source/o2_core/o2/xDesktop/$Default/red/style-skin.css

@@ -80,6 +80,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/$Default/tan/style-pc.css

@@ -295,7 +295,7 @@
     overflow: hidden;
     cursor: pointer;
     float: left;
-    padding: 0 10px;
+    padding: 0 10px 0 10px;
     margin-left: 10px;
 }
 .layout_content_taskbar_item_icon {
@@ -323,6 +323,7 @@
     background-position: center left;
     background-repeat: no-repeat;
 }
+
 .layout_content_taskbar_item_text {
     height: 28px;
     float: left;
@@ -459,7 +460,7 @@
     display: none;
 }
 
-.layout_start_item{
+.layout_start_item {
     width: 72px;
     height: 90px;
     margin-left: 18px;
@@ -482,6 +483,7 @@
     overflow: hidden;
     margin: auto;
 }
+
 .layout_start_item_icon {
     width: 40px;
     height: 40px;
@@ -531,7 +533,7 @@
 .layout_start_search {
     height: 28px;
     width: 28px;
-    margin-right: 20px;
+    /*margin-right: 20px;*/
     float: right;
     border-width: 1px;
     border-style: solid;
@@ -719,3 +721,77 @@
     opacity: 0;
     box-shadow: 3PX 3PX 10px #999999;
 }
+.layout_start_groupItem_menu {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    background-size: 22px 22px;
+    overflow: hidden;
+}
+.layout_start_groupItem_menuMask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0.4;
+    top: 0;
+    left: 0;
+}
+.layout_start_groupItem_menu_title {
+    height: 60px;
+    padding: 8px 0 12px 0;
+    line-height: 40px;
+    font-size: 16px;
+    text-align: center;
+    overflow: hidden;
+}
+.layout_start_groupItem_menu_scroll {
+    overflow: hidden;
+}
+.layout_start_item_icon_group {
+    width: 32px;
+    height: 32px;
+    padding: 5px 3px 3px 5px;
+    border-radius: 10px;
+    background-size: 22px 22px;
+}
+.layout_start_groupItem_menu_content {
+    overflow: hidden;
+    padding-top: 10px;
+}
+.layout_start_item_icon_group_sub {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: 10px 10px;
+    background-position: center;
+}
+.layout_start_item_icon_group_subIcon {
+    width:  14px;
+    height: 14px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    border-radius: 10px;
+    float: left;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+.layout_start_item_sub {
+    margin-left: 12px;
+}
+.layout_start_groupItem_menu_title_edit {
+    border: 0;
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    font-size: 16px;
+    text-align: center;
+    width: 90%;
+    margin: auto;
+    border-radius: 20px;
+}

o2web/source/o2_core/o2/xDesktop/$Default/tan/style-skin.css

@@ -81,6 +81,9 @@
 .icon_startMenu_search {
     background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_sousuo_click.png) !important;
 }
+.icon_startMenu_refresh {
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/refresh_menu.png) !important;
+}
 .icon_close {
     background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_off_round_grey.png) !important;
 }

o2web/source/o2_core/o2/xDesktop/Default.js

@@ -912,9 +912,14 @@ o2.xDesktop.Default.StartMenu = new Class({
         this.inforCategoryTab = new Element("div.layout_start_tab", {"text": o2.LP.desktop.message.infor}).inject(this.appTitleNode);
         this.queryCategoryTab = new Element("div.layout_start_tab", {"text": o2.LP.desktop.message.query}).inject(this.appTitleNode);
 
+        this.refreshNode =  new Element("div.layout_start_search", {"title": o2.LP.desktop.message.refreshMenu}).inject(this.appTitleNode);
+        this.refreshNode = new Element("div.layout_start_search_icon").inject(this.refreshNode);
+        this.refreshNode.addClass("icon_startMenu_refresh");
+
         this.searchNode =  new Element("div.layout_start_search").inject(this.appTitleNode);
         this.searchIconNode = new Element("div.layout_start_search_icon").inject(this.searchNode);
         this.searchIconNode.addClass("icon_startMenu_search");
+
         var currentWidth = this.searchNode.getSize().x;
         this.searchNode.store("currentWidth", currentWidth);
 
@@ -947,6 +952,17 @@ o2.xDesktop.Default.StartMenu = new Class({
         }.bind(this));
 
         this.searchIconNode.addEvent("click", this.searchIconAction.bind(this));
+
+        this.refreshNode.addEvent("click", function(e){
+            var _self = this;
+            MWF.xDesktop.confirm("infor", e, o2.LP.desktop.defaultMenuTitle, o2.LP.desktop.defaultMenuInfor, 420, 100, function(){
+                    _self.defaultMenu();
+                    this.close();
+                }, function(){
+                    this.close();
+                }, null, null, "o2"
+            );
+        }.bind(this));
     },
     searchIconAction: function(){
         if (!this.isMorph){
@@ -1806,6 +1822,7 @@ o2.xDesktop.Default.StartMenu.Item = new Class({
         }
     },
     _drag_leave: function(el, inObj){
+        console.log("_drag_leave");
         if (inObj.hasClass("layout_start_content_appContent")){
             //this.node.inject(this.menu.appContentNode);
         }else if (inObj.hasClass("layout_start_groupItem_menu_content")){
@@ -2044,10 +2061,15 @@ o2.xDesktop.Default.StartMenu.GroupItem = new Class({
             "transition": Fx.Transitions.Quart.easeOut
         });
         this.menuTitleNode.addEvent("click", function(){
-            
             var input = this.menuTitleNode.getElement("input");
             if (!input) this.editTitle();
-        }.bind(this))
+        }.bind(this));
+
+        o2.require("o2.widget.ScrollBar", function(){
+            this.appScrollBar = new o2.widget.ScrollBar(this.menuContentNode, {
+                "style":"xDesktop_Message", "where": "before", "indent": false, "distance": 100, "friction": 6,	"axis": {"x": false, "y": true}
+            });
+        }.bind(this));
     },
     destroy: function(){
         this.menu.items.erase(this);