首页桌面用户

public/static/css/style/style.css

@@ -1792,7 +1792,7 @@ ul.sds-desktop-shortcut {
     justify-content: center;
 }
 
-/* 消息弹出框 */
+/* notifyTrayPanel */
 .sds-tray-panel {
     box-shadow: 0px 2px 6px rgba(0,0,0,0.5);
     background-color: #fff;
@@ -2041,7 +2041,7 @@ ul.sds-desktop-shortcut {
     text-align: center;
 }
 
-/* notiify详情页面 */
+/* notifyTrayPanelDetail */
 .sds-notify-detail-dialog.v-window .v-window-header-wrapper .app-icon {
     display: none;
 }
@@ -2062,7 +2062,7 @@ ul.sds-desktop-shortcut {
     padding-top: 16px;
 }
 
-/* notiify 设置 */
+/* notifySetting */
 .syno-ux-gridpanel .x-grid3-hd.sort-desc .x-grid3-hd-inner .x-grid3-sort-icon, .syno-ux-editorgridpanel .x-grid3-hd.sort-desc .x-grid3-hd-inner .x-grid3-sort-icon, .syno-ux-gridpanel .x-grid3-hd.sort-asc .x-grid3-hd-inner .x-grid3-sort-icon, .syno-ux-editorgridpanel .x-grid3-hd.sort-asc .x-grid3-hd-inner .x-grid3-sort-icon {
     background-image: url("../../../image/index/arrowTable.png");
 }
@@ -2071,6 +2071,10 @@ ul.sds-desktop-shortcut {
     background-image: url("../../../image/index/checkbox.svg");
 }
 
+.syno-ux-grid-enable-column-unchecked{
+    background-image: url("../../../image/index/checkbox.svg");
+}
+
 ::-webkit-scrollbar-thumb, ::-webkit-scrollbar-corner {
     background-color: rgba(80,90,100,0.3);
 }
@@ -2088,7 +2092,7 @@ ul.sds-desktop-shortcut {
   }
 
 
-/* notiify 查看全部 */
+/* notifyShowAll */
 .sds-notify-showall-dialog.v-window .v-window-header-wrapper .app-icon {
     display: none;
 }
@@ -2173,6 +2177,105 @@ ul.sds-desktop-shortcut {
     background-image: url(../../../image/index/reset.png);
 }
 
+/* userTrayPanel */
+.taskbar-menu.user-menu.v-menu {
+    padding: 0 0 8px 0;
+}
+
+.taskbar-menu.v-menu {
+    padding: 0;
+    box-sizing: border-box;
+    box-shadow: 0 2px 6px rgba(0,0,0,0.5);
+    border-radius: 3px;
+    user-select: none;
+    border: none;
+}
+
+.taskbar-menu.v-menu::before {
+    background: #fff;
+    content: '';
+    position: absolute;
+    margin: 0 auto;
+    left: 0;
+    right: 0;
+    top: -4px;
+    width: 14px;
+    height: 14px;
+    transform: rotate(45deg);
+}
+
+.taskbar-menu.user-menu.v-menu .taskbar-title {
+    margin-bottom: 8px;
+}
+
+.taskbar-menu.v-menu .taskbar-title {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    font-size: 12px;
+    color: #414B55;
+    text-align: center;
+    line-height: 24px;
+    padding: 6px 0 5px 0;
+    border-bottom: 1px solid rgba(198,212,224,0.7);
+    border-radius: 3px 3px 0 0;
+}
+
+.taskbar-menu.v-menu .taskbar-title {
+    font-weight: 700;
+}
+
+.taskbar-menu.user-menu.v-menu .v-menu-item {
+    display: flex;
+    align-items: center;
+    margin: 0px 8px;
+    padding: 0;
+    height: 32px;
+    border-radius: 4px;
+}
+
+.taskbar-menu.user-menu.v-menu .v-menu-item:hover {
+    background-color: rgba(198,212,224,0.4);
+}
+
+.taskbar-menu.user-menu.v-menu .v-menu-item .menu-icon.setting {
+    background-image: url(../../../image/index/userSetting.png);
+    background-size: 24px 24px;
+}
+
+.taskbar-menu.user-menu.v-menu .v-menu-item .menu-icon.reboot {
+    background-image: url(../../../image/index/userReboot.png);
+    background-size: 24px 24px;
+}
+
+.taskbar-menu.user-menu.v-menu .v-menu-item .menu-icon.poweroff {
+    background-image: url(../../../image/index/userPoweroff.png);
+    background-size: 24px 24px;
+}
+
+.taskbar-menu.user-menu.v-menu .v-menu-item .menu-icon.about {
+    background-image: url(../../../image/index/userAbout.png);
+    background-size: 24px 24px;
+}
+
+.taskbar-menu.user-menu.v-menu .v-menu-item .menu-icon.logout {
+    background-image: url(../../../image/index/userLogout.png);
+    background-size: 24px 24px;
+}
+
+.taskbar-menu.user-menu.v-menu .v-menu-item .menu-icon {
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    background-position: 0 0;
+    flex: 0 0 auto;
+    margin: 0 6px;
+}
+
+.taskbar-menu.user-menu.v-menu .v-menu-item-divider {
+    margin: 8px 0 8px 0;
+}
+
 /* 清除弹出窗 */
 .sds-window-v5.x-window-dlg.confirm-delete-icon:before {
     content: '';
@@ -2196,4 +2299,5 @@ ul.sds-desktop-shortcut {
     height: 0;
     line-height: 0;
     overflow: hidden;
-}
+}
+

src/component/Desktop/NotifyShowall/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- notifyShowAll -->
   <div
     class="
       v-layout
@@ -406,8 +407,10 @@ export default {
     },
     // 重新加载数据
     reload() {
+      this.maskDisplay = "block";
       this.loading = true;
       setTimeout(() => {
+        this.maskDisplay = "none";
         this.loading = false;
       }, 1000);
     },
@@ -456,7 +459,6 @@ export default {
       }
       this.maskDisplay = "block";
       this.loading = true;
-
       setTimeout(() => {
         this.maskDisplay = "none";
         this.loading = false;

src/component/Desktop/NotifyTrayPanel/index.vue

@@ -13,7 +13,7 @@
   >
     <div class="x-panel-header">
       <span class="x-panel-header-text"
-        ><div class="sds-notify-setting-btn" @click="openNotifySetting">&nbsp;</div>
+        ><div class="sds-notify-setting-btn" @click.stop="openNotifySetting">&nbsp;</div>
         <span class="x-panel-header-text">消息</span></span
       >
     </div>
@@ -548,6 +548,7 @@ export default {
     },
     // 打开设置页面
     openNotifySetting(){
+      this.display = "none";
       this.$bus.emit('openNotifySetting')
     }
   },

src/component/Desktop/NotifyTrayPanelDetail/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- notifyTrayPanelDetail -->
   <div
     class="
       v-layout
@@ -183,7 +184,6 @@ export default {
     },
     // 关闭本页面
     closeNotifyDetail() {
-      console.log(111)
       this.display = "none";
     },
   },

src/component/Desktop/index.vue

@@ -7,7 +7,8 @@
         <NotifyTrayPanel></NotifyTrayPanel>
         <NotifyTrayPanelDetail :defaultZIndex='defaultZIndex'></NotifyTrayPanelDetail>
         <NotifyShowall :defaultZIndex='defaultZIndex'></NotifyShowall>
-        <NotifySetting></NotifySetting>
+        <NotifySetting :defaultZIndex='defaultZIndex'></NotifySetting>
+        <UserTrayPanel></UserTrayPanel>
         <DeleteNotifyMessage></DeleteNotifyMessage>
         <Mask></Mask>
     </div>
@@ -23,6 +24,7 @@ import NotifyShowall from './NotifyShowall'
 import NotifySetting from './NotifySetting'
 import DeleteNotifyMessage from './DeleteNotifyMessage'
 import Mask from './Mask'
+import UserTrayPanel from './UserTrayPanel'
 
 
 export default {
@@ -54,7 +56,8 @@ export default {
     NotifyShowall,
     NotifySetting,
     DeleteNotifyMessage,
-    Mask
+    Mask,
+    UserTrayPanel
   },
   name:'Desktop',
 }