Home Explore Help
Sign In
kejuyun
/
yvan-window
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

桌面层级逻辑及清空用户信息逻辑

liupeng 3 years ago
parent
e729626d87
commit
4762d6f44c
10 changed files with 1060 additions and 179 deletions
Unified View Show Diff Stats
  1. 1 0
      index.html
  2. 18 7
      public/static/css/style/style.css
  3. 474 0
      public/static/css/style/style1.css
  4. 0 7
      src/component/Container/Desktop/NotifySetting/index.vue
  5. 51 126
      src/component/Container/Desktop/NotifyShowall/index.vue
  6. 0 2
      src/component/Container/Desktop/UserSetting/index.vue
  7. 0 4
      src/component/Container/DesktopAppView/AppViewItem/index.vue
  8. 6 4
      src/component/Container/DesktopAppView/index.vue
  9. 373 0
      src/component/Container/Message/index.vue
  10. 137 29
      src/component/Container/index.vue

+ 1 - 0
index.html
View File 

@@ -11,6 +11,7 @@
 
   <link rel="stylesheet" href="./public/static/css/syno/syno-vue.css">
 
   <link rel="stylesheet" href="./public/static/css/syno/syno-vue.css">
 
   <link rel="stylesheet" href="./public/static/css/fixcroll/fixcroll.css">
 
   <link rel="stylesheet" href="./public/static/css/fixcroll/fixcroll.css">
 
   <link rel="stylesheet" href="./public/static/css/style/style.css">
 
   <link rel="stylesheet" href="./public/static/css/style/style.css">
 
+  <link rel="stylesheet" href="./public/static/css/style/style1.css">
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <div id="root"></div>
 
 <div id="root"></div>

+ 18 - 7
public/static/css/style/style.css
View File 

@@ -317,6 +317,7 @@ body,
 
     position: absolute;
 
     position: absolute;
 
     width: 120px;
 
     width: 120px;
 
     height: 100%;
 
     height: 100%;
 
+    z-index: 6;
 
 }
 
 }
 
 
 
 .menu.sds-desktop ul{
 
 .menu.sds-desktop ul{
 
@@ -2411,22 +2412,32 @@ ul.sds-desktop-shortcut {
 
     top: 0;
 
     top: 0;
 
 }
 
 }
 
 
 
-/* @keyframes notifyShowAllClearAllAnimate {
 
+@keyframes notifyShowAllClearAllAnimate {
 
     0% {
 
     0% {
 
         box-shadow: 0 4px 16px 0 rgba(0,0,0,.6);
 
         box-shadow: 0 4px 16px 0 rgba(0,0,0,.6);
 
     }
 
     }
 
-    100% {
 
+    25% {
 
+        box-shadow: none ;
 
+    }
 
+    50% {
 
+        box-shadow: 0 4px 16px 0 rgba(0,0,0,.6);
 
+    }
 
+    75% {
 
         box-shadow: none ;
 
         box-shadow: none ;
 
     }
 
     }
 
+    100% {
 
+        box-shadow: 0 4px 16px 0 rgba(0,0,0,.6);
 
+    }
 
+
 
 }
 
 }
 
 
 
-.notify-showall-window .v-message-box-window.animate{
 
-    animation: notifyShowAllClearAllAnimate 0.1s linear 3;
 
-} */
 
+.notify-showall-window .v-message-box-window.no-shadow{
 
+    animation: notifyShowAllClearAllAnimate .35s linear;
 
+}
 
 
 
-.notify-showall-window .no-shadow{
 
+/* .notify-showall-window .no-shadow{
 
     box-shadow: none ;
 
     box-shadow: none ;
 
-} 
+}  */
 
 /* userAbout消息弹出框 */
 
 /* userAbout消息弹出框 */
 
 .sds-user-about-mask {
 
 .sds-user-about-mask {
 
     background-color: #000000;
 
     background-color: #000000;

+ 474 - 0
public/static/css/style/style1.css
View File 

@@ -0,0 +1,474 @@
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-theme .sds-window-v5 .x-tool-close:hover .button-icon {
 
+      background-position: 0 -24px;
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-indicator-button:hover .button-icon {
 
+        background-position: 0 -24px;
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-icon-button:hover .button-icon {
 
+      background-position: 0 -24px;
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-icon-button-confirm:hover .button-icon {
 
+      background-position: 0 -32px;
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-icon-button-confirm:hover {
 
+      background-color: #e86052;
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-icon-button-space-selector:hover .button-icon {
 
+      background-position: 0 -20px;
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-text-icon-button:hover .button-icon {
 
+      background-position: 0 -24px;
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-select-button:hover .button-icon {
 
+      background-position: 0 -24px;
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-icon-button-expand:hover .button-icon {
 
+      background-position: 0 -24px;
 
+    }
 
+}
 
+
 
+  @media (hover: hover) and (pointer: fine) {
 
+    .synofoto-see-more-button:hover .button-icon {
 
+      background-position: 0 -20px;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-tips-dialog-overlay-open {
 
+    to {
 
+      background-color: rgba(0, 0, 0, 0.5);
 
+    }
 
+    0% {
 
+      background-color: transparent;
 
+    }
 
+}
 
+
 
+@keyframes synofoto-tips-dialog-overlay-open {
 
+    to {
 
+      background-color: rgba(0, 0, 0, 0.5);
 
+    }
 
+    0% {
 
+      background-color: transparent;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-tips-dialog-overlay-close {
 
+    to {
 
+      background-color: transparent;
 
+    }
 
+    0% {
 
+      background-color: rgba(0, 0, 0, 0.5);
 
+    }
 
+}
 
+
 
+@keyframes synofoto-tips-dialog-overlay-close {
 
+    to {
 
+      background-color: transparent;
 
+    }
 
+    0% {
 
+      background-color: rgba(0, 0, 0, 0.5);
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-shared-space-keyframes {
 
+    0% {
 
+      opacity: 0;
 
+      top: 58px;
 
+    }
 
+    to {
 
+      opacity: 1;
 
+      top: 98px;
 
+    }
 
+  }
 
+  @keyframes synofoto-shared-space-keyframes {
 
+    0% {
 
+      opacity: 0;
 
+      top: 58px;
 
+    }
 
+    to {
 
+      opacity: 1;
 
+      top: 98px;
 
+    }
 
+  }
 
+  @-webkit-keyframes synofoto-change-view-keyframes {
 
+    0% {
 
+      opacity: 0;
 
+      top: 68px;
 
+    }
 
+    to {
 
+      opacity: 1;
 
+      top: 108px;
 
+    }
 
+  }
 
+  @keyframes synofoto-change-view-keyframes {
 
+    0% {
 
+      opacity: 0;
 
+      top: 68px;
 
+    }
 
+    to {
 
+      opacity: 1;
 
+      top: 108px;
 
+    }
 
+  }
 
+  @-webkit-keyframes synofoto-switch-space-keyframes {
 
+    0% {
 
+      opacity: 0;
 
+      top: 58px;
 
+    }
 
+    to {
 
+      opacity: 1;
 
+      top: 98px;
 
+    }
 
+  }
 
+  @keyframes synofoto-switch-space-keyframes {
 
+    0% {
 
+      opacity: 0;
 
+      top: 58px;
 
+    }
 
+    to {
 
+      opacity: 1;
 
+      top: 98px;
 
+    }
 
+  }
 
+  @-webkit-keyframes synofoto-add-to-album-keyframes {
 
+    0% {
 
+      bottom: 94px;
 
+      opacity: 0;
 
+    }
 
+    to {
 
+      bottom: 134px;
 
+      opacity: 1;
 
+    }
 
+  }
 
+  @keyframes synofoto-add-to-album-keyframes {
 
+    0% {
 
+      bottom: 94px;
 
+      opacity: 0;
 
+    }
 
+    to {
 
+      bottom: 134px;
 
+      opacity: 1;
 
+    }
 
+  }
 
+  @-webkit-keyframes synofoto-search-keyframes {
 
+    0% {
 
+      opacity: 0;
 
+      top: 16px;
 
+    }
 
+    to {
 
+      opacity: 1;
 
+      top: 56px;
 
+    }
 
+  }
 
+  @keyframes synofoto-search-keyframes {
 
+    0% {
 
+      opacity: 0;
 
+      top: 16px;
 
+    }
 
+    to {
 
+      opacity: 1;
 
+      top: 56px;
 
+    }
 
+  }
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-selected-single-condition
 
+      .synofoto-icon-button-remove-condition:hover
 
+      .button-icon,
 
+    .synofoto-selected-single-source-folder
 
+      .synofoto-icon-button-remove-condition:hover
 
+      .button-icon {
 
+      background-position: 0 -20px;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-album-owner-change-dialog-overlay-open {
 
+    to {
 
+      background-color: rgba(0, 0, 0, 0.5);
 
+    }
 
+    0% {
 
+      background-color: transparent;
 
+    }
 
+}
 
+
 
+@keyframes synofoto-album-owner-change-dialog-overlay-open {
 
+    to {
 
+      background-color: rgba(0, 0, 0, 0.5);
 
+    }
 
+    0% {
 
+      background-color: transparent;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-album-owner-change-dialog-overlay-close {
 
+    to {
 
+      background-color: transparent;
 
+    }
 
+    0% {
 
+      background-color: rgba(0, 0, 0, 0.5);
 
+    }
 
+}
 
+
 
+@keyframes synofoto-album-owner-change-dialog-overlay-close {
 
+    to {
 
+      background-color: transparent;
 
+    }
 
+    0% {
 
+      background-color: rgba(0, 0, 0, 0.5);
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-general-tag.synofoto-react-select
 
+      .synofoto__multi-value
 
+      .Select-value-icon:hover
 
+      .button-icon {
 
+      background-position: 0 -20px;
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-lightbox-nav-icon-button:hover .button-icon {
 
+      background-position: 0 -48px;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-lightbox-tap-hint-animation {
 
+    0% {
 
+      bottom: 0;
 
+      opacity: 0;
 
+    }
 
+    12.5% {
 
+      bottom: 36px;
 
+      opacity: 1;
 
+    }
 
+    87.5% {
 
+      bottom: 36px;
 
+      opacity: 1;
 
+    }
 
+    to {
 
+      bottom: 0;
 
+      opacity: 0;
 
+    }
 
+}
 
+
 
+@keyframes synofoto-lightbox-tap-hint-animation {
 
+    0% {
 
+      bottom: 0;
 
+      opacity: 0;
 
+    }
 
+    12.5% {
 
+      bottom: 36px;
 
+      opacity: 1;
 
+    }
 
+    87.5% {
 
+      bottom: 36px;
 
+      opacity: 1;
 
+    }
 
+    to {
 
+      bottom: 0;
 
+      opacity: 0;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-progress-bar-striped {
 
+    0% {
 
+      background-position-x: 19.1px;
 
+    }
 
+}
 
+  
+@keyframes synofoto-progress-bar-striped {
 
+    0% {
 
+      background-position-x: 19.1px;
 
+    }
 
+}
 
+
 
+@media (pointer: fine) {
 
+    .synofoto-selectable-overlay:hover .synofoto-selectable-checkbox {
 
+      opacity: 1;
 
+    }
 
+    .synofoto-selectable-overlay:hover .synofoto-selectable-color-banner {
 
+      opacity: 1;
 
+      visibility: visible;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-selected-bar-open {
 
+    to {
 
+      bottom: 60px;
 
+      opacity: 1;
 
+    }
 
+    0% {
 
+      bottom: 0;
 
+      opacity: 0;
 
+    }
 
+}
 
+
 
+@keyframes synofoto-selected-bar-open {
 
+    to {
 
+      bottom: 60px;
 
+      opacity: 1;
 
+    }
 
+    0% {
 
+      bottom: 0;
 
+      opacity: 0;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-selected-bar-open-mobile {
 
+    to {
 
+      bottom: 24px;
 
+      opacity: 1;
 
+    }
 
+    0% {
 
+      bottom: 0;
 
+      opacity: 0;
 
+    }
 
+}
 
+
 
+@keyframes synofoto-selected-bar-open-mobile {
 
+    to {
 
+      bottom: 24px;
 
+      opacity: 1;
 
+    }
 
+    0% {
 
+      bottom: 0;
 
+      opacity: 0;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-top-toast-drop {
 
+    to {
 
+      top: 75px;
 
+    }
 
+    0% {
 
+      top: 50px;
 
+    }
 
+}
 
+
 
+@keyframes synofoto-top-toast-drop {
 
+    to {
 
+      top: 75px;
 
+    }
 
+    0% {
 
+      top: 50px;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-task-queue-open {
 
+    to {
 
+      opacity: 1;
 
+      top: 50px;
 
+    }
 
+    0% {
 
+      opacity: 0;
 
+      top: 0;
 
+    }
 
+}
 
+
 
+@keyframes synofoto-task-queue-open {
 
+    to {
 
+      opacity: 1;
 
+      top: 50px;
 
+    }
 
+    0% {
 
+      opacity: 0;
 
+      top: 0;
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-waiting-rotate-left {
 
+    to {
 
+      -webkit-transform: rotate(30deg);
 
+      transform: rotate(30deg);
 
+    }
 
+    0% {
 
+      -webkit-transform: rotate(175deg);
 
+      transform: rotate(175deg);
 
+    }
 
+}
 
+
 
+@keyframes synofoto-waiting-rotate-left {
 
+    to {
 
+      -webkit-transform: rotate(30deg);
 
+      transform: rotate(30deg);
 
+    }
 
+    0% {
 
+      -webkit-transform: rotate(175deg);
 
+      transform: rotate(175deg);
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-waiting-rotate-right {
 
+    0% {
 
+      -webkit-transform: rotate(-175deg);
 
+      transform: rotate(-175deg);
 
+    }
 
+    to {
 
+      -webkit-transform: rotate(-30deg);
 
+      transform: rotate(-30deg);
 
+    }
 
+}
 
+
 
+@keyframes synofoto-waiting-rotate-right {
 
+    0% {
 
+      -webkit-transform: rotate(-175deg);
 
+      transform: rotate(-175deg);
 
+    }
 
+    to {
 
+      -webkit-transform: rotate(-30deg);
 
+      transform: rotate(-30deg);
 
+    }
 
+}
 
+
 
+@-webkit-keyframes synofoto-waiting-rotate-all {
 
+    0% {
 
+      -webkit-transform: rotate(0deg);
 
+      transform: rotate(0deg);
 
+    }
 
+    to {
 
+      -webkit-transform: rotate(-1turn);
 
+      transform: rotate(-1turn);
 
+    }
 
+}
 
+
 
+@keyframes synofoto-waiting-rotate-all {
 
+    0% {
 
+      -webkit-transform: rotate(0deg);
 
+      transform: rotate(0deg);
 
+    }
 
+    to {
 
+      -webkit-transform: rotate(-1turn);
 
+      transform: rotate(-1turn);
 
+    }
 
+}
 
+
 
+@media (hover: hover) and (pointer: fine) {
 
+    .synofoto-wizard-nav-icon-button:hover .button-icon {
 
+      background-position: 0 -84px;
 
+    }
 
+}

+ 0 - 7
src/component/Container/Desktop/NotifySetting/index.vue
View File 

@@ -1104,13 +1104,6 @@ export default {
 
     },
 
     },
 
   },
 
   },
 
   watch:{
 
   watch:{
 
-    // defaultZIndex(newVal){
 
-    //   if(this.notifySettingContant.zIndex < newVal){
 
-    //     this.notifySettingContant.cls = 'deactive-win'
 
-    //   }else{
 
-    //     this.notifySettingContant.cls = 'active-win'
 
-    //   }
 
-    // }
 
     notifySettingData(){
 
     notifySettingData(){
 
       this.notifySettingContant = this.notifySettingData
 
       this.notifySettingContant = this.notifySettingData
 
     }
 
     }

+ 51 - 126
src/component/Container/Desktop/NotifyShowall/index.vue
View File 

@@ -23,11 +23,11 @@
 
         <div class="window-header-tool-wrapper light">
 
         <div class="window-header-tool-wrapper light">
 
           <div
 
           <div
 
             class="tool maximize"
 
             class="tool maximize"
 
-            @click.stop="maxWindow"
 
+            @click.capture="maxWindow"
 
             v-if="!windowIsMax"
 
             v-if="!windowIsMax"
 
           ></div>
 
           ></div>
 
-          <div class="tool restore" @click.stop="minWindow" v-else></div>
 
-          <div class="tool close" @click.stop="closeNotifyShowall"></div>
 
+          <div class="tool restore" @click.capture="restoreWindow" v-else></div>
 
+          <div class="tool close" @click.capture="closeNotifyShowall"></div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div class="v-window-body">
 
       <div class="v-window-body">
 
@@ -121,7 +121,7 @@
 
                                     thContant, thContantIndex
 
                                     thContant, thContantIndex
 
                                   ) in thContantArray"
 
                                   ) in thContantArray"
 
                                   :key="thContant.id"
 
                                   :key="thContant.id"
 
-                                  @click.stop="sort(thContantIndex)"
 
+                                  @click.capture="sort(thContantIndex)"
 
                                 >
 
                                 >
 
                                   <div class="inner-cell">
 
                                   <div class="inner-cell">
 
                                     <div class="head-cell cell">
 
                                     <div class="head-cell cell">
 
@@ -135,51 +135,6 @@
 
                                     </div>
 
                                     </div>
 
                                   </div>
 
                                   </div>
 
                                 </th>
 
                                 </th>
 
-                                <!-- <th
 
-                                colspan="1"
 
-                                rowspan="1"
 
-                                class=""
 
-                                @click.stop="sort"
 
-                              >
 
-                                <div class="inner-cell">
 
-                                  <div class="head-cell cell">
 
-                                    <span class="cell-title">类别</span>
 
-                                    <span
 
-                                      class="v-table-column-sorter down"
 
-                                    ></span>
 
-                                  </div>
 
-                                </div>
 
-                              </th>
 
-                              <th
 
-                                colspan="1"
 
-                                rowspan="1"
 
-                                class=""
 
-                                @click.stop="sort"
 
-                              >
 
-                                <div class="inner-cell">
 
-                                  <div class="head-cell cell">
 
-                                    <span class="cell-title">主题</span>
 
-                                    <span
 
-                                      class="v-table-column-sorter down"
 
-                                    ></span>
 
-                                  </div>
 
-                                </div>
 
-                              </th>
 
-                              <th
 
-                                colspan="1"
 
-                                rowspan="1"
 
-                                class="last-th-cell"
 
-                                @click.stop="sort"
 
-                              >
 
-                                <div class="inner-cell">
 
-                                  <div class="head-cell cell">
 
-                                    <span class="cell-title">时间</span>
 
-                                    <span
 
-                                      class="v-table-column-sorter down"
 
-                                    ></span>
 
-                                  </div>
 
-                                </div>
 
-                              </th> -->
 
                               </tr>
 
                               </tr>
 
                             </thead>
 
                             </thead>
 
                           </table>
 
                           </table>
 
@@ -198,7 +153,7 @@
 
                                 <tbody class="v-table-tbody">
 
                                 <tbody class="v-table-tbody">
 
                                   <tr
 
                                   <tr
 
                                     class="row"
 
                                     class="row"
 
-                                    @click.stop="clickTr(detailMessageIndex)"
 
+                                    @click.capture="clickTr(detailMessageIndex)"
 
                                     @mouseenter="
 
                                     @mouseenter="
 
                                       mouseenterTr(detailMessageIndex)
 
                                       mouseenterTr(detailMessageIndex)
 
                                     "
 
                                     "
 
@@ -367,7 +322,7 @@
 
             notifyShowAllContant.clearAllNotifyData
 
             notifyShowAllContant.clearAllNotifyData
 
               .clearAllNotifyMessageDisplay,
 
               .clearAllNotifyMessageDisplay,
 
         }"
 
         }"
 
-        @click.stop.self="maskClick()"
 
+        @click.stop="maskClick()"
 
       >
 
       >
 
         <div
 
         <div
 
           class="v-window v-message-box-window auto-height"
 
           class="v-window v-message-box-window auto-height"
 
@@ -437,14 +392,14 @@
 
                       <button
 
                       <button
 
                         type="button"
 
                         type="button"
 
                         class="v-btn v-btn-footbar v-btn-cancel"
 
                         class="v-btn v-btn-footbar v-btn-cancel"
 
-                        @click.stop="cancelDeleteAllNotifyMessage"
 
+                        @click.capture="cancelDeleteAllNotifyMessage"
 
                       >
 
                       >
 
                         <span>取消</span>
 
                         <span>取消</span>
 
                       </button>
 
                       </button>
 
                       <button
 
                       <button
 
                         type="button"
 
                         type="button"
 
                         class="v-btn v-btn-footbar v-btn-red"
 
                         class="v-btn v-btn-footbar v-btn-red"
 
-                        @click.stop="confirmDeleteAllNotifyMessage"
 
+                        @click.capture="confirmDeleteAllNotifyMessage"
 
                       >
 
                       >
 
                         <span>删除</span>
 
                         <span>删除</span>
 
                       </button>
 
                       </button>
 
@@ -480,7 +435,7 @@ export default {
 
       maskDisplay: "none",
 
       maskDisplay: "none",
 
       width: "840px",
 
       width: "840px",
 
       height: "480px",
 
       height: "480px",
 
-      top: "10px",
 
+      top: "50px",
 
       thContantArray: [
 
       thContantArray: [
 
         {
 
         {
 
           id: 0,
 
           id: 0,
 
@@ -524,7 +479,7 @@ export default {
 
       this.maskDisplay = "block";
 
       this.maskDisplay = "block";
 
       this.loading = true;
 
       this.loading = true;
 
       this.notifyShowAllContant.display = "block";
 
       this.notifyShowAllContant.display = "block";
 
-      this. clickNotifyShowall()
 
+      this.clickNotifyShowall();
 
       setTimeout(() => {
 
       setTimeout(() => {
 
         this.maskDisplay = "none";
 
         this.maskDisplay = "none";
 
         this.loading = false;
 
         this.loading = false;
 
@@ -538,7 +493,7 @@ export default {
 
     // 关闭本页面
 
     // 关闭本页面
 
     closeNotifyShowall() {
 
     closeNotifyShowall() {
 
       this.notifyShowAllContant.display = "none";
 
       this.notifyShowAllContant.display = "none";
 
-      this.notifyShowAllContant.zIndex = this.defaultZIndex - 10;
 
+      this.notifyShowAllContant.zIndex = 9050;
 
       this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
 
       this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
 
     },
 
     },
 
     // 点击本页面
 
     // 点击本页面
 
@@ -612,8 +567,8 @@ export default {
 
       this.height = "calc(100vh - 40px)";
 
       this.height = "calc(100vh - 40px)";
 
       this.windowIsMax = true;
 
       this.windowIsMax = true;
 
     },
 
     },
 
-    // 页面最小化
 
-    minWindow() {
 
+    // 恢复页面宽度
 
+    restoreWindow() {
 
       this.top = "10px";
 
       this.top = "10px";
 
       this.width = "840px";
 
       this.width = "840px";
 
       this.height = "480px";
 
       this.height = "480px";
 
@@ -622,41 +577,21 @@ export default {
 
     },
 
     },
 
     // 显示清除全部信息弹出框
 
     // 显示清除全部信息弹出框
 
     showClearAllNotifyMessage() {
 
     showClearAllNotifyMessage() {
 
-      // if(this.notifyShowAllContant.cls === 'deactive-win'){
 
-      //   this.notifyShowAllContant.zIndex = this.defaultZIndex + 10
 
-      //   this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
 
-      // }
 
       this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageDisplay =
 
       this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageDisplay =
 
         "block";
 
         "block";
 
-
 
-      if (
 
-        this.notifyShowAllContant.clearAllNotifyData
 
-          .clearAllNotifyMessageCls === "deactive-win"
 
-      ) {
 
-        this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
 
-          this.defaultZIndex + 10;
 
-        this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
 
-      }
 
-      console.log(
 
-        this.notifyShowAllContant.clearAllNotifyData
 
-          .clearAllNotifyMessageZIndex,
 
-        this.defaultZIndex
 
-      );
 
-      // this.$bus.emit("maskShowOrHidden", true);
 
+      this.notifyShowAllContant.zIndex = this.defaultZIndex + 10;
 
+      this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
 
+        this.defaultZIndex + 20;
 
+      this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 20);
 
+      this.$bus.emit("showOrHiddenNotifyShowallClearAll", true);
 
       this.$bus.emit("showOrHiddenNotifyShowallClearAll", true);
 
       this.$bus.emit("showOrHiddenNotifyShowallClearAll", true);
 
-      window.addEventListener("click", this.windowClick, true);
 
     },
 
     },
 
     // 点击清除全部信息弹出框
 
     // 点击清除全部信息弹出框
 
     clickClearAllNotifyMessage() {
 
     clickClearAllNotifyMessage() {
 
-      // if(this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageCls === 'deactive-win'
 
-      // ) {
 
-      //   this.clickNotifyShowall();
 
-      // }
 
       if (
 
       if (
 
         this.notifyShowAllContant.clearAllNotifyData
 
         this.notifyShowAllContant.clearAllNotifyData
 
           .clearAllNotifyMessageCls === "deactive-win"
 
           .clearAllNotifyMessageCls === "deactive-win"
 
       ) {
 
       ) {
 
-        // this.clickNotifyShowall();
 
         this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
 
         this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
 
           this.defaultZIndex + 10;
 
           this.defaultZIndex + 10;
 
         this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
 
         this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
 
@@ -664,48 +599,35 @@ export default {
 
         this.$bus.emit("showOrHiddenNotifyShowallClearAll", true);
 
         this.$bus.emit("showOrHiddenNotifyShowallClearAll", true);
 
       }
 
       }
 
     },
 
     },
 
-    // 没关闭清除全部信息弹出框时点击页面
 
-    windowClick() {
 
+    //没关闭清除全部信息弹出框时点击遮罩层
 
+    maskClick() {
 
       let el = document.querySelector(
 
       let el = document.querySelector(
 
         ".notify-showall-window .v-message-box-window"
 
         ".notify-showall-window .v-message-box-window"
 
       );
 
       );
 
-      console.log(el);
 
-      // for(var i = 0;i<3;i++){
 
-      //    setTimeout(()=>{
 
-      //      console.log(el.className)
 
-      //      if(el.className)
 
-      //       el.className = el.className + ' no-shadow' 
-      //       setTimeout(()=>{
 
-      //         el.className = el.className.replace(' no-shadow')
 
-      //       },100)
 
-      //   },100)
 
-      // }
 
-     
-      // if(! el.className.includes(' animate')){
 
-      //   el.className = el.className + ' animate' 
-      // }
 
-    },
 
-    //没关闭清除全部信息弹出框时点击遮罩层
 
-    maskClick() {
 
-      // if (
 
-      //   this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageCls === 'deactive-win'
 
-      // ) {
 
-      //   this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
 
-      //     this.defaultZIndex + 10;
 
-      //   this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
 
-      //   window.removeEventListener("click", this.windowClick, true);
 
-      // }
 
+      if (!el.className.includes(" no-shadow")) {
 
+        el.className = el.className + " no-shadow";
 
+        setTimeout(() => {
 
+          el.className = el.className.replace(" no-shadow", "");
 
+        }, 500);
 
+      }
 
+      if (
 
+        this.notifyShowAllContant.clearAllNotifyData
 
+          .clearAllNotifyMessageZIndex < this.defaultZIndex
 
+      ) {
 
+        this.notifyShowAllContant.zIndex = this.defaultZIndex + 10;
 
+        this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
 
+          this.defaultZIndex + 20;
 
+        this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 20);
 
+        this.$bus.emit("showOrHiddenNotifyShowallClearAll", true);
 
+      }
 
     },
 
     },
 
     // 取消删除
 
     // 取消删除
 
     cancelDeleteAllNotifyMessage(e) {
 
     cancelDeleteAllNotifyMessage(e) {
 
       e.stopPropagation();
 
       e.stopPropagation();
 
-      console.log("cancel");
 
       this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageDisplay =
 
       this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageDisplay =
 
         "none";
 
         "none";
 
       this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex = 9050;
 
       this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex = 9050;
 
       this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
 
       this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
 
-      // this.$bus.emit("maskShowOrHidden", false);
 
-
 
       this.$bus.emit("showOrHiddenNotifyShowallClearAll", false);
 
       this.$bus.emit("showOrHiddenNotifyShowallClearAll", false);
 
     },
 
     },
 
     // 确认删除
 
     // 确认删除
 
@@ -718,18 +640,21 @@ export default {
 
   },
 
   },
 
   watch: {
 
   watch: {
 
     defaultZIndex() {
 
     defaultZIndex() {
 
-      if (
 
-        this.notifyShowAllContant.clearAllNotifyData
 
-          .clearAllNotifyMessageZIndex < this.defaultZIndex
 
-      ) {
 
-        this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
 
-          "deactive-win";
 
-        this.$bus.emit("showOrHiddenNotifyShowallClearAll", false);
 
-      } else {
 
-        this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
 
-          "active-win";
 
-      }
 
+      // if (
 
+      //   this.notifyShowAllContant.clearAllNotifyData
 
+      //     .clearAllNotifyMessageZIndex < this.defaultZIndex
 
+      // ) {
 
+      //   this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageCls =
 
+      //     "deactive-win";
 
+      //   this.$bus.emit("showOrHiddenNotifyShowallClearAll", false);
 
+      // } else {
 
+      //   this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageCls =
 
+      //     "active-win";
 
+      // }
 
     },
 
     },
 
+    notifyShowAllData(){
 
+      this.notifyShowAllContant = this.notifyShowAllData
 
+    }
 
   },
 
   },
 
   components: {},
 
   components: {},
 
   name: "NotifyShowall",
 
   name: "NotifyShowall",
 
@@ -740,4 +665,4 @@ export default {
 
 .v-window .v-window-body {
 
 .v-window .v-window-body {
 
   height: calc(100% - 40px);
 
   height: calc(100% - 40px);
 
 }
 
 }
 
-</style>
 
+</style>

+ 0 - 2
src/component/Container/Desktop/UserSetting/index.vue
View File 

@@ -53,7 +53,6 @@ export default {
 
   mounted() {
 
   mounted() {
 
     this.$bus.on("openUserSetting", this.openUserSetting);
 
     this.$bus.on("openUserSetting", this.openUserSetting);
 
     this.openUserSettingDetail = this.userSettingData;
 
     this.openUserSettingDetail = this.userSettingData;
 
-    console.log(this.openUserSettingDetail)
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
@@ -65,7 +64,6 @@ export default {
 
     openUserSetting() {
 
     openUserSetting() {
 
       if (this.openUserSettingDetail.display) {
 
       if (this.openUserSettingDetail.display) {
 
         this.openUserSettingDetail.zIndex = this.defaultZIndex + 10;
 
         this.openUserSettingDetail.zIndex = this.defaultZIndex + 10;
 
-        console.log(this.openUserSettingDetail.zIndex, this.defaultZIndex);
 
         this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
 
         this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
 
         this.openUserSettingDetail.display = "block";
 
         this.openUserSettingDetail.display = "block";
 
       }
 
       }

+ 0 - 4
src/component/Container/DesktopAppView/AppViewItem/index.vue
View File 

@@ -279,7 +279,6 @@ export default {
 
     openDialogWindow(detailMessageIndex) {
 
     openDialogWindow(detailMessageIndex) {
 
       this.resizablePinnedDetail.detailMessageList[detailMessageIndex].display =
 
       this.resizablePinnedDetail.detailMessageList[detailMessageIndex].display =
 
         "block";
 
         "block";
 
-        console.log(detailMessageIndex,this.resizablePinnedDetail.detailMessageList[detailMessageIndex].cls)
 
       if (
 
       if (
 
         (!detailMessageIndex && detailMessageIndex != 0) ||
 
         (!detailMessageIndex && detailMessageIndex != 0) ||
 
         detailMessageIndex == -1 ||
 
         detailMessageIndex == -1 ||
 
@@ -288,7 +287,6 @@ export default {
 
       ) {
 
       ) {
 
         return;
 
         return;
 
       }
 
       }
 
-      console.log(11231)
 
       // this.resizablePinnedDetail.detailMessageList[detailMessageIndex].cls =
 
       // this.resizablePinnedDetail.detailMessageList[detailMessageIndex].cls =
 
       //   "active-win";
 
       //   "active-win";
 
       this.resizablePinnedDetail.detailMessageList.forEach((item) => {
 
       this.resizablePinnedDetail.detailMessageList.forEach((item) => {
 
@@ -322,7 +320,6 @@ export default {
 
         this.resizablePinnedDetail.detailMessageList.findIndex((item) => {
 
         this.resizablePinnedDetail.detailMessageList.findIndex((item) => {
 
           return item.id === 1;
 
           return item.id === 1;
 
         });
 
         });
 
-        console.log(this.resizablePinnedDetail.detailMessageList[detailMessageIndex])
 
       if (detailMessageIndex || detailMessageIndex === 0 && detailMessageIndex !== -1) {
 
       if (detailMessageIndex || detailMessageIndex === 0 && detailMessageIndex !== -1) {
 
         this.openDialogWindow(detailMessageIndex);
 
         this.openDialogWindow(detailMessageIndex);
 
       }
 
       }
 
@@ -380,7 +377,6 @@ export default {
 
       this.resizablePinnedDetail.detailMessageList[
 
       this.resizablePinnedDetail.detailMessageList[
 
         detailMessageIndex
 
         detailMessageIndex
 
       ].iconMaximize = "none";
 
       ].iconMaximize = "none";
 
-      console.log(detailMessageIndex)
 
       if (detailMessageIndex || detailMessageIndex === 0 && detailMessageIndex !== -1) {
 
       if (detailMessageIndex || detailMessageIndex === 0 && detailMessageIndex !== -1) {
 
         this.openDialogWindow(detailMessageIndex);
 
         this.openDialogWindow(detailMessageIndex);
 
       }
 
       }

+ 6 - 4
src/component/Container/DesktopAppView/index.vue
View File 

@@ -15,6 +15,7 @@
 
               placeholder="搜索"
 
               placeholder="搜索"
 
               class="search-field-input"
 
               class="search-field-input"
 
               @click.stop="searchInputFocus"
 
               @click.stop="searchInputFocus"
 
+              @input="searchAppView"
 
             />
 
             />
 
             <button
 
             <button
 
               type="button"
 
               type="button"
 
@@ -107,21 +108,23 @@ export default {
 
         e.srcElement.parentElement.className = e.srcElement.parentElement.className + " search-field-focused"
 
         e.srcElement.parentElement.className = e.srcElement.parentElement.className + " search-field-focused"
 
       }
 
       }
 
     },
 
     },
 
+    // 搜索
 
+    searchAppView(){
 
+      console.log(this)
 
+    },
 
     // 点击页面关闭本页面
 
     // 点击页面关闭本页面
 
     WindowClick() {
 
     WindowClick() {
 
-      console.log('false')
 
       let el = document.querySelector('.search-field-focused')
 
       let el = document.querySelector('.search-field-focused')
 
       if (el) {
 
       if (el) {
 
         el.className = el.className.replace(' search-field-focused','') 
         el.className = el.className.replace(' search-field-focused','') 
       }
 
       }
 
       this.display = "none";
 
       this.display = "none";
 
       this.$bus.emit("hiddenOrShowOtherWindow", false);
 
       this.$bus.emit("hiddenOrShowOtherWindow", false);
 
-      window.removeEventListener("click", this.WindowClick, true);
 
+      window.removeEventListener("click", this.WindowClick, false);
 
       this.$bus.emit("showDialogWindow");
 
       this.$bus.emit("showDialogWindow");
 
     },
 
     },
 
     // 点击appViewItem
 
     // 点击appViewItem
 
     clickAppViewItem(id) {
 
     clickAppViewItem(id) {
 
-      console.log(id)
 
       this.$bus.emit("clickAppViewItem", id);
 
       this.$bus.emit("clickAppViewItem", id);
 
       this.WindowClick()
 
       this.WindowClick()
 
     },
 
     },
 
@@ -129,7 +132,6 @@ export default {
 
   watch:{
 
   watch:{
 
     appViewData(){
 
     appViewData(){
 
      this.desktopAppViewDetail.detailMessageList = this.appViewData
 
      this.desktopAppViewDetail.detailMessageList = this.appViewData
 
-     console.log(appViewData)
 
     }
 
     }
 
   },
 
   },
 
   components: {
 
   components: {

+ 373 - 0
src/component/Container/Message/index.vue
View File 

@@ -0,0 +1,373 @@
 
+<template>
 
+  <!-- 消息弹出框 -->
 
+  <div
 
+    class="x-window x-window-dlg sds-window-v5"
 
+    style="
 
+      position: absolute;
 
+      z-index: 11004;
 
+      left: 50%;
 
+      top: 50%;
 
+      transform: translate(-50%, -50%);
 
+      width: 480px;
 
+    "
 
+    :style="{ display: display }"
 
+    :class="messageContant.cls ? messageContant.cls : ''"
 
+  >
 
+    <div class="x-dlg-focus"></div>
 
+    <div class="x-window-tl">
 
+      <div class="x-window-tr"><div class="x-window-tc"></div></div>
 
+    </div>
 
+    <div class="x-window-bwrap" v-if="messageContant">
 
+      <div class="x-window-ml">
 
+        <div class="x-window-mr">
 
+          <div class="x-window-mc">
 
+            <div
 
+              class="x-window-body"
 
+            >
 
+              <div :class="{'x-dlg-icon' : messageContant.icon}">
 
+                <div class="ext-mb-content">
 
+                  <div class="ext-mb-title" style="display: none"></div>
 
+                  <span class="ext-mb-text">{{ messageContant.text }}</span
 
+                  ><br class="ext-mb-br" />
 
+                  <div class="ext-mb-fix-cursor"></div>
 
+                </div>
 
+                <div class="ext-mb-grid" style="display: none"></div>
 
+                <div class="x-progress-wrap syno-mb-progress x-hide-display">
 
+                  <div class="x-progress-inner">
 
+                    <div class="x-progress-bar" style="height: 6px; width: 0px">
 
+                      <div
 
+                        class="x-progress-text"
 
+                        style="z-index: 99; width: 0px"
 
+                      >
 
+                        <div style="width: 6px; height: 6px">&nbsp;</div>
 
+                      </div>
 
+                    </div>
 
+                    <div class="x-progress-text x-progress-text-back">
 
+                      <div style="width: 6px; height: 6px">&nbsp;</div>
 
+                    </div>
 
+                  </div>
 
+                </div>
 
+                <div class="x-clear"></div>
 
+                <span class="syno-mb-progress-status"></span>
 
+                <div class="syno-mb-progress-info"></div>
 
+              </div>
 
+            </div>
 
+          </div>
 
+        </div>
 
+      </div>
 
+      <div class="x-window-bl">
 
+        <div class="x-window-br">
 
+          <div class="x-window-bc">
 
+            <div class="x-window-footer x-panel-btns" style="width: 428px">
 
+              <div
 
+                class="x-panel-fbar x-small-editor x-toolbar-layout-ct"
 
+                style="width: auto"
 
+              >
 
+                <table cellspacing="0" class="x-toolbar-ct">
 
+                  <tbody>
 
+                    <tr>
 
+                      <td class="x-toolbar-left" align="left">
 
+                        <table cellspacing="0">
 
+                          <tbody>
 
+                            <tr class="x-toolbar-left-row">
 
+                              <td class="x-toolbar-cell x-hide-display">
 
+                                <span
 
+                                  cellspacing="0"
 
+                                  class="
 
+                                    x-btn
 
+                                    syno-ux-button syno-ux-button-grey
 
+                                    x-btn-noicon
 
+                                  "
 
+                                  style="margin-left: 0px"
 
+                                  ><em class="x-unselectable" unselectable="on"
 
+                                    ><button
 
+                                      type="button"
 
+                                      class="x-btn-text"
 
+                                    ></button></em
 
+                                ></span>
 
+                              </td>
 
+                            </tr>
 
+                          </tbody>
 
+                        </table>
 
+                      </td>
 
+                      <td class="x-toolbar-right" align="right">
 
+                        <table cellspacing="0" class="x-toolbar-right-ct">
 
+                          <tbody>
 
+                            <tr>
 
+                              <td>
 
+                                <table cellspacing="0">
 
+                                  <tbody>
 
+                                    <tr class="x-toolbar-right-row" v-if='messageContant.buttonList.length'>
 
+                                      <td class="x-toolbar-cell" v-for="button in messageContant.buttonList" :key="button.id">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em class="x-unselectable"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="v-btn v-btn-footbar"
 
+                                              :class="button.cls"
 
+                                              @click="button.event"
 
+                                            >
 
+                                              {{button.text}}
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td>
 
+                                      <!-- <td class="x-toolbar-cell x-hide-display">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                            x-btn
 
+                                            syno-ux-button syno-ux-button-grey
 
+                                            x-btn-noicon
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em
 
+                                            class="x-unselectable"
 
+                                            unselectable="on"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="x-btn-text"
 
+                                            >
 
+                                              取消
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td>
 
+                                      <td class="x-toolbar-cell">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                            x-btn
 
+                                            syno-ux-button
 
+                                            x-btn-noicon
 
+                                            syno-ux-button-grey
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em class="x-unselectable"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="x-btn-text"
 
+                                              @click="cancleClear"
 
+                                            >
 
+                                              取消
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td>
 
+                                      <td class="x-toolbar-cell x-hide-display">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                            x-btn
 
+                                            syno-ux-button syno-ux-button-blue
 
+                                            x-btn-noicon
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em class="x-unselectable"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="x-btn-text"
 
+                                            >
 
+                                              确定
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td>
 
+                                      <td class="x-toolbar-cell">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                            x-btn
 
+                                            syno-ux-button
 
+                                            x-btn-noicon
 
+                                            syno-ux-button-red
 
+                                            syno-ux-button-blue
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em class="x-unselectable"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="x-btn-text"
 
+                                              @click="confirmClear"
 
+                                            >
 
+                                              清除全部
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td> -->
 
+                                    </tr>
 
+                                    <!-- <tr class="x-toolbar-right-row">
 
+                                      <td class="x-toolbar-cell x-hide-display">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                            x-btn
 
+                                            syno-ux-button syno-ux-button-grey
 
+                                            x-btn-noicon
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em class="x-unselectable"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="x-btn-text"
 
+                                            >
 
+                                              否
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td>
 
+                                      <td class="x-toolbar-cell x-hide-display">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                            x-btn
 
+                                            syno-ux-button syno-ux-button-grey
 
+                                            x-btn-noicon
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em
 
+                                            class="x-unselectable"
 
+                                            unselectable="on"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="x-btn-text"
 
+                                            >
 
+                                              取消
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td>
 
+                                      <td class="x-toolbar-cell">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                            x-btn
 
+                                            syno-ux-button
 
+                                            x-btn-noicon
 
+                                            syno-ux-button-grey
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em class="x-unselectable"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="x-btn-text"
 
+                                              @click="cancleClear"
 
+                                            >
 
+                                              取消
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td>
 
+                                      <td class="x-toolbar-cell x-hide-display">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                            x-btn
 
+                                            syno-ux-button syno-ux-button-blue
 
+                                            x-btn-noicon
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em class="x-unselectable"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="x-btn-text"
 
+                                            >
 
+                                              确定
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td>
 
+                                      <td class="x-toolbar-cell">
 
+                                        <span
 
+                                          cellspacing="0"
 
+                                          class="
 
+                                            x-btn
 
+                                            syno-ux-button
 
+                                            x-btn-noicon
 
+                                            syno-ux-button-red
 
+                                            syno-ux-button-blue
 
+                                          "
 
+                                          style="width: auto; margin-left: 0px"
 
+                                          ><em class="x-unselectable"
 
+                                            ><button
 
+                                              type="button"
 
+                                              class="x-btn-text"
 
+                                              @click="confirmClear"
 
+                                            >
 
+                                              清除全部
 
+                                            </button></em
 
+                                          ></span
 
+                                        >
 
+                                      </td>
 
+                                    </tr> -->
 
+                                  </tbody>
 
+                                </table>
 
+                              </td>
 
+                              <td>
 
+                                <table cellspacing="0">
 
+                                  <tbody>
 
+                                    <tr class="x-toolbar-extras-row"></tr>
 
+                                  </tbody>
 
+                                </table>
 
+                              </td>
 
+                            </tr>
 
+                          </tbody>
 
+                        </table>
 
+                      </td>
 
+                    </tr>
 
+                  </tbody>
 
+                </table>
 
+              </div>
 
+              <div class="x-clear"></div>
 
+            </div>
 
+          </div>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  data() {
 
+    return {
 
+      display: "none",
 
+      messageContant: {
 
+        cls:'',
 
+        buttonList:[]
 
+      },
 
+      zIndex: 0,
 
+    };
 
+  },
 
+  mounted() {
 
+    this.$bus.on("openMessage", this.openMessage);
 
+    this.$bus.on("closeMessage", this.closeMessage);
 
+  },
 
+  methods: {
 
+    // 打开本页面
 
+    openMessage(obj) {
 
+      this.display = "block";
 
+      this.messageContant = obj;
 
+      if(! this.messageContant.cls.includes(' active-win')){
 
+        this.messageContant.cls = this.messageContant.cls + ' active-win'
 
+      }
 
+    },
 
+    // 关闭本页面
 
+    closeMessage() {
 
+      this.display = "none";
 
+      this.messageContant = "";
 
+      if(this.messageContant.cls && ! this.messageContant.cls.includes(' active-win')){
 
+        this.messageContant.cls = this.messageContant.cls .replace( ' active-win','')
 
+      }else if(this.messageContant.cls && this.messageContant.cls.includes('active-win')){
 
+        this.messageContant.cls = this.messageContant.cls .replace( 'active-win','')
 
+      }
 
+    },
 
+  },
 
+  components: {},
 
+  name: "Message",
 
+};
 
+</script>

+ 137 - 29
src/component/Container/index.vue
View File 

@@ -32,8 +32,8 @@ export default {
 
   data() {
 
   data() {
 
     return {
 
     return {
 
       defaultZIndex: 9050,
 
       defaultZIndex: 9050,
 
-      maskIsShow:false,
 
-      notifyIsShow:false,
 
+      maskIsShow: false,
 
+      notifyShowallClearAllShow: false,
 
       appViewData: [
 
       appViewData: [
 
         {
 
         {
 
           id: 0,
 
           id: 0,
 
@@ -412,7 +412,6 @@ export default {
 
           cls: "deactive-win",
 
           cls: "deactive-win",
 
           titleImgUrl:
 
           titleImgUrl:
 
             "../../../../public/image/DesktopAppView/noteStation.png",
 
             "../../../../public/image/DesktopAppView/noteStation.png",
 
-          display: "none",
 
           zIndex: 9050,
 
           zIndex: 9050,
 
           iconRestore: "none",
 
           iconRestore: "none",
 
           iconMaximize: "block",
 
           iconMaximize: "block",
 
@@ -527,13 +526,15 @@ export default {
 
           clearAllNotifyMessageZIndex: 9050,
 
           clearAllNotifyMessageZIndex: 9050,
 
         },
 
         },
 
       },
 
       },
 
-      
     };
 
     };
 
   },
 
   },
 
   mounted() {
 
   mounted() {
 
     this.$bus.on("changeDefaultZIndex", this.changeDefaultZIndex);
 
     this.$bus.on("changeDefaultZIndex", this.changeDefaultZIndex);
 
-    this.$bus.on('maskShowOrHidden',this.maskShowOrHidden)
 
-    this.$bus.on("showOrHiddenNotifyShowallClearAll",this.showOrHiddenNotifyShowallClearAll)
 
+    this.$bus.on("maskShowOrHidden", this.maskShowOrHidden);
 
+    this.$bus.on(
 
+      "showOrHiddenNotifyShowallClearAll",
 
+      this.showOrHiddenNotifyShowallClearAll
 
+    );
 
   },
 
   },
 
   methods: {
 
   methods: {
 
     // 改变公共zIndex
 
     // 改变公共zIndex
 
@@ -552,18 +553,16 @@ export default {
 
       });
 
       });
 
     },
 
     },
 
     // 遮罩层的显示与隐藏
 
     // 遮罩层的显示与隐藏
 
-    maskShowOrHidden(bol){
 
-      this.maskIsShow = bol
 
+    maskShowOrHidden(bol) {
 
+      this.maskIsShow = bol;
 
     },
 
     },
 
     // notifyShowAll界面的清除全部遮罩层的显示与隐藏
 
     // notifyShowAll界面的清除全部遮罩层的显示与隐藏
 
-    showOrHiddenNotifyShowallClearAll(bol){
 
-      this.notifyIsShow = bol
 
-      console.log(bol)
 
-    }
 
+    showOrHiddenNotifyShowallClearAll(bol) {
 
+      this.notifyShowallClearAllShow = bol;
 
+    },
 
   },
 
   },
 
   watch: {
 
   watch: {
 
     defaultZIndex() {
 
     defaultZIndex() {
 
-      console.log(this.maskIsShow)
 
       let appViewIndex = this.appViewData.findIndex((item) => {
 
       let appViewIndex = this.appViewData.findIndex((item) => {
 
         return item.zIndex >= this.defaultZIndex && item.display === "block";
 
         return item.zIndex >= this.defaultZIndex && item.display === "block";
 
       });
 
       });
 
@@ -582,13 +581,19 @@ export default {
 
       let notifyShowAllZIndexMax =
 
       let notifyShowAllZIndexMax =
 
         this.notifyShowAllData.zIndex >= this.defaultZIndex &&
 
         this.notifyShowAllData.zIndex >= this.defaultZIndex &&
 
         this.notifyShowAllData.display === "block";
 
         this.notifyShowAllData.display === "block";
 
+      let clearAllNotifyMessageZIndexMax =
 
+        this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageZIndex >=
 
+          this.defaultZIndex &&
 
+        this.notifyShowAllData.clearAllNotifyData
 
+          .clearAllNotifyMessageDisplay === "block";
 
       console.log(
 
       console.log(
 
         appViewIndex,
 
         appViewIndex,
 
         fixWindowZIndexIsMax,
 
         fixWindowZIndexIsMax,
 
         userSettingZIndexMax,
 
         userSettingZIndexMax,
 
         notifyTrayPanelDetailZIndexMax,
 
         notifyTrayPanelDetailZIndexMax,
 
         notifySettingZIndexMax,
 
         notifySettingZIndexMax,
 
-        notifyShowAllZIndexMax
 
+        notifyShowAllZIndexMax,
 
+        clearAllNotifyMessageZIndexMax
 
       );
 
       );
 
       console.log(
 
       console.log(
 
         this.defaultZIndex,
 
         this.defaultZIndex,
 
@@ -596,7 +601,8 @@ export default {
 
         this.userSettingData.zIndex,
 
         this.userSettingData.zIndex,
 
         this.notifyTrayPanelDetailData.zIndex,
 
         this.notifyTrayPanelDetailData.zIndex,
 
         this.notifySettingData.zIndex,
 
         this.notifySettingData.zIndex,
 
-        this.notifyShowAllData.zIndex
 
+        this.notifyShowAllData.zIndex,
 
+        this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageZIndex
 
       );
 
       );
 
       if ((appViewIndex || appViewIndex === 0) && appViewIndex !== -1) {
 
       if ((appViewIndex || appViewIndex === 0) && appViewIndex !== -1) {
 
         this.appViewData.forEach((item) => {
 
         this.appViewData.forEach((item) => {
 
@@ -618,12 +624,16 @@ export default {
 
         this.fixWindowData.cls = "deactive-win";
 
         this.fixWindowData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifySettingData.cls = "deactive-win";
 
         this.notifySettingData.cls = "deactive-win";
 
+        this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageCls =
 
+          "deactive-win";
 
       } else if (fixWindowZIndexIsMax) {
 
       } else if (fixWindowZIndexIsMax) {
 
         this.fixWindowData.cls = "active-win";
 
         this.fixWindowData.cls = "active-win";
 
         this.userSettingData.cls = "deactive-win";
 
         this.userSettingData.cls = "deactive-win";
 
         this.notifyTrayPanelDetailData.cls = "deactive-win";
 
         this.notifyTrayPanelDetailData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifySettingData.cls = "deactive-win";
 
         this.notifySettingData.cls = "deactive-win";
 
+        this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageCls =
 
+          "deactive-win";
 
         this.appViewData.forEach((item) => {
 
         this.appViewData.forEach((item) => {
 
           if (item.cls === "active-win") {
 
           if (item.cls === "active-win") {
 
             item.cls = "deactive-win";
 
             item.cls = "deactive-win";
 
@@ -639,10 +649,12 @@ export default {
 
           id: this.userSettingData.id,
 
           id: this.userSettingData.id,
 
         };
 
         };
 
         this.$bus.emit("clickShortcutItem", obj);
 
         this.$bus.emit("clickShortcutItem", obj);
 
-        this.notifyTrayPanelDetailData.cls = "deactive-win";
 
         this.fixWindowData.cls = "deactive-win";
 
         this.fixWindowData.cls = "deactive-win";
 
+        this.notifyTrayPanelDetailData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifySettingData.cls = "deactive-win";
 
         this.notifySettingData.cls = "deactive-win";
 
+        this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageCls =
 
+          "deactive-win";
 
         this.appViewData.forEach((item) => {
 
         this.appViewData.forEach((item) => {
 
           if (item.cls === "active-win") {
 
           if (item.cls === "active-win") {
 
             item.cls = "deactive-win";
 
             item.cls = "deactive-win";
 
@@ -654,6 +666,8 @@ export default {
 
         this.fixWindowData.cls = "deactive-win";
 
         this.fixWindowData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifySettingData.cls = "deactive-win";
 
         this.notifySettingData.cls = "deactive-win";
 
+        this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageCls =
 
+          "deactive-win";
 
         this.appViewData.forEach((item) => {
 
         this.appViewData.forEach((item) => {
 
           if (item.cls === "active-win") {
 
           if (item.cls === "active-win") {
 
             item.cls = "deactive-win";
 
             item.cls = "deactive-win";
 
@@ -665,13 +679,14 @@ export default {
 
         this.userSettingData.cls = "deactive-win";
 
         this.userSettingData.cls = "deactive-win";
 
         this.fixWindowData.cls = "deactive-win";
 
         this.fixWindowData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
+        this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageCls =
 
+          "deactive-win";
 
         this.appViewData.forEach((item) => {
 
         this.appViewData.forEach((item) => {
 
           if (item.cls === "active-win") {
 
           if (item.cls === "active-win") {
 
             item.cls = "deactive-win";
 
             item.cls = "deactive-win";
 
           }
 
           }
 
         });
 
         });
 
       } else if (notifyShowAllZIndexMax) {
 
       } else if (notifyShowAllZIndexMax) {
 
-        console.log(1121)
 
         this.notifyShowAllData.cls = "active-win";
 
         this.notifyShowAllData.cls = "active-win";
 
         this.notifyTrayPanelDetailData.cls = "deactive-win";
 
         this.notifyTrayPanelDetailData.cls = "deactive-win";
 
         this.userSettingData.cls = "deactive-win";
 
         this.userSettingData.cls = "deactive-win";
 
@@ -682,6 +697,19 @@ export default {
 
             item.cls = "deactive-win";
 
             item.cls = "deactive-win";
 
           }
 
           }
 
         });
 
         });
 
+      } else if (clearAllNotifyMessageZIndexMax) {
 
+        this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageCls =
 
+          "active-win";
 
+        this.notifyShowAllData.cls = "deactive-win";
 
+        this.notifyTrayPanelDetailData.cls = "deactive-win";
 
+        this.userSettingData.cls = "deactive-win";
 
+        this.fixWindowData.cls = "deactive-win";
 
+        this.notifySettingData.cls = "deactive-win";
 
+        this.appViewData.forEach((item) => {
 
+          if (item.cls === "active-win") {
 
+            item.cls = "deactive-win";
 
+          }
 
+        });
 
       }
 
       }
 
       if (
 
       if (
 
         appViewIndex === -1 &&
 
         appViewIndex === -1 &&
 
@@ -689,22 +717,30 @@ export default {
 
         !userSettingZIndexMax &&
 
         !userSettingZIndexMax &&
 
         !notifyTrayPanelDetailZIndexMax &&
 
         !notifyTrayPanelDetailZIndexMax &&
 
         !notifySettingZIndexMax &&
 
         !notifySettingZIndexMax &&
 
-        !notifyShowAllZIndexMax
 
+        !notifyShowAllZIndexMax &&
 
+        !clearAllNotifyMessageZIndexMax
 
       ) {
 
       ) {
 
         let appViewData = this.appViewData.filter((item) => {
 
         let appViewData = this.appViewData.filter((item) => {
 
-          console.log(item.display);
 
           return item.display === "block";
 
           return item.display === "block";
 
         });
 
         });
 
         if (appViewData.length) {
 
         if (appViewData.length) {
 
           appViewData = this.arraySort(appViewData, "zIndex");
 
           appViewData = this.arraySort(appViewData, "zIndex");
 
         }
 
         }
 
-        console.log(appViewData.length, appViewData);
 
         let fixWindowZIndexIsMax1 =
 
         let fixWindowZIndexIsMax1 =
 
           this.fixWindowData.display === "block" &&
 
           this.fixWindowData.display === "block" &&
 
-          (this.fixWindowData.zIndex >= this.userSettingData.zIndex ||
 
-            this.userSettingData.display === "none") &&
 
+          (this.fixWindowData.zIndex >= this.notifyShowAllData.zIndex ||
 
+            this.notifyShowAllData.display === "none") &&
 
           (this.fixWindowData.zIndex >= this.notifyTrayPanelDetailData.zIndex ||
 
           (this.fixWindowData.zIndex >= this.notifyTrayPanelDetailData.zIndex ||
 
             this.notifyTrayPanelDetailData.display === "none") &&
 
             this.notifyTrayPanelDetailData.display === "none") &&
 
+          (this.fixWindowData.zIndex >= this.userSettingData.zIndex ||
 
+            this.userSettingData.display === "none") &&
 
+          (this.fixWindowData.zIndex >=
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageZIndex ||
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageDisplay === "none") &&
 
+          (this.fixWindowData.zIndex >= this.notifySettingData.zIndex ||
 
+            this.notifySettingData.display === "none") &&
 
           (appViewData.length
 
           (appViewData.length
 
             ? this.fixWindowData.zIndex >=
 
             ? this.fixWindowData.zIndex >=
 
               appViewData[appViewData.length - 1].zIndex
 
               appViewData[appViewData.length - 1].zIndex
 
@@ -713,9 +749,18 @@ export default {
 
           this.userSettingData.display === "block" &&
 
           this.userSettingData.display === "block" &&
 
           (this.userSettingData.zIndex >= this.fixWindowData.zIndex ||
 
           (this.userSettingData.zIndex >= this.fixWindowData.zIndex ||
 
             this.fixWindowData.display === "none") &&
 
             this.fixWindowData.display === "none") &&
 
+          (this.userSettingData.zIndex >= this.notifyShowAllData.zIndex ||
 
+            this.notifyShowAllData.display === "none") &&
 
           (this.userSettingData.zIndex >=
 
           (this.userSettingData.zIndex >=
 
             this.notifyTrayPanelDetailData.zIndex ||
 
             this.notifyTrayPanelDetailData.zIndex ||
 
             this.notifyTrayPanelDetailData.display === "none") &&
 
             this.notifyTrayPanelDetailData.display === "none") &&
 
+          (this.userSettingData.zIndex >=
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageZIndex ||
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageDisplay === "none") &&
 
+          (this.userSettingData.zIndex >= this.notifySettingData.zIndex ||
 
+            this.notifySettingData.display === "none") &&
 
           (appViewData.length
 
           (appViewData.length
 
             ? this.userSettingData.zIndex >=
 
             ? this.userSettingData.zIndex >=
 
               appViewData[appViewData.length - 1].zIndex
 
               appViewData[appViewData.length - 1].zIndex
 
@@ -723,15 +768,25 @@ export default {
 
         let notifyTrayPanelDetailZIndexMax1 =
 
         let notifyTrayPanelDetailZIndexMax1 =
 
           this.notifyTrayPanelDetailData.display === "block" &&
 
           this.notifyTrayPanelDetailData.display === "block" &&
 
           (this.notifyTrayPanelDetailData.zIndex >=
 
           (this.notifyTrayPanelDetailData.zIndex >=
 
-            this.userSettingData.zIndex ||
 
-            this.userSettingData.display === "none") &&
 
+            this.notifyShowAllData.zIndex ||
 
+            this.notifyShowAllData.display === "none") &&
 
           (this.notifyTrayPanelDetailData.zIndex >= this.fixWindowData.zIndex ||
 
           (this.notifyTrayPanelDetailData.zIndex >= this.fixWindowData.zIndex ||
 
             this.fixWindowData.display === "none") &&
 
             this.fixWindowData.display === "none") &&
 
+          (this.notifyTrayPanelDetailData.zIndex >=
 
+            this.userSettingData.zIndex ||
 
+            this.userSettingData.display === "none") &&
 
+          (this.notifyTrayPanelDetailData.zIndex >=
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageZIndex ||
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageDisplay === "none") &&
 
+          (this.notifyTrayPanelDetailData.zIndex >=
 
+            this.notifySettingData.zIndex ||
 
+            this.notifySettingData.display === "none") &&
 
           (appViewData.length
 
           (appViewData.length
 
             ? this.notifyTrayPanelDetailData.zIndex >=
 
             ? this.notifyTrayPanelDetailData.zIndex >=
 
               appViewData[appViewData.length - 1].zIndex
 
               appViewData[appViewData.length - 1].zIndex
 
             : true);
 
             : true);
 
-
 
         let notifySettingZIndexMax1 =
 
         let notifySettingZIndexMax1 =
 
           this.notifySettingData.display === "block" &&
 
           this.notifySettingData.display === "block" &&
 
           (this.notifySettingData.zIndex >= this.userSettingData.zIndex ||
 
           (this.notifySettingData.zIndex >= this.userSettingData.zIndex ||
 
@@ -743,6 +798,11 @@ export default {
 
             this.notifyTrayPanelDetailData.display === "none") &&
 
             this.notifyTrayPanelDetailData.display === "none") &&
 
           (this.notifySettingData.zIndex >= this.notifyShowAllData.zIndex ||
 
           (this.notifySettingData.zIndex >= this.notifyShowAllData.zIndex ||
 
             this.notifyShowAllData.display === "none") &&
 
             this.notifyShowAllData.display === "none") &&
 
+          (this.notifySettingData.zIndex >=
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageZIndex ||
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageDisplay === "none") &&
 
           (appViewData.length
 
           (appViewData.length
 
             ? this.notifySettingData.zIndex >=
 
             ? this.notifySettingData.zIndex >=
 
               appViewData[appViewData.length - 1].zIndex
 
               appViewData[appViewData.length - 1].zIndex
 
@@ -756,10 +816,42 @@ export default {
 
           (this.notifyShowAllData.zIndex >=
 
           (this.notifyShowAllData.zIndex >=
 
             this.notifyTrayPanelDetailData.zIndex ||
 
             this.notifyTrayPanelDetailData.zIndex ||
 
             this.notifyTrayPanelDetailData.display === "none") &&
 
             this.notifyTrayPanelDetailData.display === "none") &&
 
+          (this.notifyShowAllData.zIndex >= this.notifySettingData.zIndex ||
 
+            this.notifySettingData.display === "none") &&
 
+          (this.notifyShowAllData.zIndex >=
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageZIndex ||
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageZIndexDisplay === "none") &&
 
           (appViewData.length
 
           (appViewData.length
 
             ? this.notifyShowAllData.zIndex >=
 
             ? this.notifyShowAllData.zIndex >=
 
               appViewData[appViewData.length - 1].zIndex
 
               appViewData[appViewData.length - 1].zIndex
 
             : true);
 
             : true);
 
+
 
+        let clearAllNotifyMessageZIndexMax1 =
 
+          this.notifyShowAllData.clearAllNotifyData
 
+            .clearAllNotifyMessageDisplay === "block" &&
 
+          (this.notifyShowAllData.clearAllNotifyData
 
+            .clearAllNotifyMessageZIndex >= this.userSettingData.zIndex ||
 
+            this.userSettingData.display === "none") &&
 
+          (this.notifyShowAllData.clearAllNotifyData
 
+            .clearAllNotifyMessageZIndex >= this.fixWindowData.zIndex ||
 
+            this.fixWindowData.display === "none") &&
 
+          (this.notifyShowAllData.clearAllNotifyData
 
+            .clearAllNotifyMessageZIndex >= this.notifyShowAllData.zIndex ||
 
+            this.notifyShowAllData.display === "none") &&
 
+          (this.notifyShowAllData.clearAllNotifyData
 
+            .clearAllNotifyMessageZIndex >=
 
+            this.notifyTrayPanelDetailData.zIndex ||
 
+            this.notifyTrayPanelDetailData.display === "none") &&
 
+          (this.notifyShowAllData.clearAllNotifyData
 
+            .clearAllNotifyMessageZIndex >= this.notifySettingData.zIndex ||
 
+            this.notifySettingData.display === "none") &&
 
+          (appViewData.length
 
+            ? this.notifyShowAllData.clearAllNotifyData
 
+                .clearAllNotifyMessageZIndex >=
 
+              appViewData[appViewData.length - 1].zIndex
 
+            : true);
 
         let appViewIsMax =
 
         let appViewIsMax =
 
           appViewData.length &&
 
           appViewData.length &&
 
           (appViewData[appViewData.length - 1].zIndex >
 
           (appViewData[appViewData.length - 1].zIndex >
 
@@ -770,17 +862,28 @@ export default {
 
             this.userSettingData.display === "none") &&
 
             this.userSettingData.display === "none") &&
 
           (appViewData[appViewData.length - 1].zIndex >
 
           (appViewData[appViewData.length - 1].zIndex >
 
             this.notifyTrayPanelDetailData.zIndex ||
 
             this.notifyTrayPanelDetailData.zIndex ||
 
-            this.notifyTrayPanelDetailData.display === "none");
 
+            this.notifyTrayPanelDetailData.display === "none") &&
 
+          (appViewData[appViewData.length - 1].zIndex >
 
+            this.notifySettingData.zIndex ||
 
+            this.notifySettingData.display === "none") &&
 
+          (appViewData[appViewData.length - 1].zIndex >
 
+            this.notifyShowAllData.zIndex ||
 
+            this.notifyShowAllData.display === "none") &&
 
+          (appViewData[appViewData.length - 1].zIndex >
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageZIndex ||
 
+            this.notifyShowAllData.clearAllNotifyData
 
+              .clearAllNotifyMessageDisplay === "none");
 
         console.log(
 
         console.log(
 
           fixWindowZIndexIsMax1,
 
           fixWindowZIndexIsMax1,
 
           userSettingZIndexMax1,
 
           userSettingZIndexMax1,
 
           notifyTrayPanelDetailZIndexMax1,
 
           notifyTrayPanelDetailZIndexMax1,
 
           notifySettingZIndexMax1,
 
           notifySettingZIndexMax1,
 
           notifyShowAllZIndexMax1,
 
           notifyShowAllZIndexMax1,
 
+          clearAllNotifyMessageZIndexMax1,
 
           appViewIsMax
 
           appViewIsMax
 
         );
 
         );
 
         if (fixWindowZIndexIsMax1) {
 
         if (fixWindowZIndexIsMax1) {
 
-          console.log("1111w");
 
           this.fixWindowData.cls = "active-win";
 
           this.fixWindowData.cls = "active-win";
 
         } else if (userSettingZIndexMax1) {
 
         } else if (userSettingZIndexMax1) {
 
           this.userSettingData.cls = "active-win";
 
           this.userSettingData.cls = "active-win";
 
@@ -798,6 +901,9 @@ export default {
 
           this.notifySettingData.cls = "active-win";
 
           this.notifySettingData.cls = "active-win";
 
         } else if (notifyShowAllZIndexMax1) {
 
         } else if (notifyShowAllZIndexMax1) {
 
           this.notifyShowAllData.cls = "active-win";
 
           this.notifyShowAllData.cls = "active-win";
 
+        } else if (clearAllNotifyMessageZIndexMax1) {
 
+          this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageCls =
 
+            "active-win";
 
         } else if (appViewIsMax) {
 
         } else if (appViewIsMax) {
 
           let index = this.appViewData.findIndex((item) => {
 
           let index = this.appViewData.findIndex((item) => {
 
             return item.id === appViewData[appViewData.length - 1].id;
 
             return item.id === appViewData[appViewData.length - 1].id;
 
@@ -820,7 +926,7 @@ export default {
 
           }
 
           }
 
         }
 
         }
 
       }
 
       }
 
-      if(this.maskIsShow || this.notifyIsShow){
 
+      if (this.maskIsShow) {
 
         this.appViewData.forEach((item) => {
 
         this.appViewData.forEach((item) => {
 
           if (item.cls === "active-win") {
 
           if (item.cls === "active-win") {
 
             item.cls = "deactive-win";
 
             item.cls = "deactive-win";
 
@@ -831,6 +937,8 @@ export default {
 
         this.notifyTrayPanelDetailData.cls = "deactive-win";
 
         this.notifyTrayPanelDetailData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.notifyShowAllData.cls = "deactive-win";
 
         this.userSettingData.cls = "deactive-win";
 
         this.userSettingData.cls = "deactive-win";
 
+        this.notifyShowAllData.clearAllNotifyData.clearAllNotifyMessageCls =
 
+          "deactive-win";
 
       }
 
       }
 
     },
 
     },
 
   },
 
   },
 
@@ -840,7 +948,7 @@ export default {
 
     DesktopAppView,
 
     DesktopAppView,
 
     UserAbout,
 
     UserAbout,
 
     Mask,
 
     Mask,
 
-    Message
 
+    Message,
 
   },
 
   },
 
   name: "Container",
 
   name: "Container",
 
 };
 
 };