首页桌面

public/static/css/style/style.css

@@ -2071,6 +2071,22 @@ ul.sds-desktop-shortcut {
     background-image: url("../../../image/index/checkbox.svg");
 }
 
+::-webkit-scrollbar-thumb, ::-webkit-scrollbar-corner {
+    background-color: rgba(80,90,100,0.3);
+}
+
+.syno-ux-grid-enable-column-checked {
+    background-image: url("../../../image/index/checkbox.svg");
+}
+
+.mcontentwrapper{
+    overflow: scroll !important;
+}
+
+.mcontentwrapper::-webkit-scrollbar {
+    display: none;
+  }
+
 
 /* notiify 查看全部 */
 .sds-notify-showall-dialog.v-window .v-window-header-wrapper .app-icon {

src/component/Desktop/FixWindow/Changelog/index.vue

@@ -62,7 +62,7 @@ export default {
     return {
         ChangeLog:{
             id: 1,
-            title: '文件更新日志',
+            title: '文件更改日志',
             titleImgUrl: '../../../../../../public/image/index/wdgt_icn_title_file_change_logs.png',
             detailMessageList: [],
             cls:'',
@@ -75,3 +75,13 @@ export default {
 
 }
 </script>
+<style scoped lang="css">
+.v-widget-item-content .ext-el-mask {
+    z-index: 1;
+}
+
+.v-widget-item-content .ext-el-mask-msg{
+    z-index: 2;
+}
+    
+</style>

src/component/Desktop/FixWindow/index.vue

@@ -148,7 +148,7 @@ export default {
   data() {
     return {
       zIndex: 9040,
-      cls: "",
+      cls: "deactve-win",
       selectedNum: 2,
       display: "block",
       top: 0,
@@ -291,7 +291,7 @@ export default {
       "changeOrHiddenWidgetPosition",
       this.changeOrHiddenWidgetPosition
     );
-    this.$bus.on("dialogWindowZIndexIsMax", this.dialogWindowZIndexIsMax);
+    // this.$bus.on("dialogWindowZIndexIsMax", this.dialogWindowZIndexIsMax);
     let el = document.querySelector(".v-widget-window .ps__thumb-y");
     let el1 = document.querySelector(".v-widget-window .v-window-header-wrapper");
     el.addEventListener("mouseup", this.mouseupProgress);
@@ -318,15 +318,15 @@ export default {
         this.$bus.emit("changeMinDefaultZindexWindowCls");
         this.$bus.emit("fixWindowZIndexMax", true);
       }
-      this.dialogWindowZIndexIsMax(false);
+      // this.dialogWindowZIndexIsMax(false);
     },
     // 修改changeFixWindow
     changeFixWindowZIndex() {
       if (this.zIndex != 999999999) {
         this.zIndex = 9040;
       }
-      if (this.cls != "") this.cls = "";
-      this.dialogWindowZIndexIsMax(true);
+      if (this.cls != "deactve-win") this.cls = "deactve-win";
+      // this.dialogWindowZIndexIsMax(true);
     },
     //点击进度条
     mousedownProgress(e) {
@@ -589,12 +589,12 @@ export default {
         el.className = el.className.replace(" active", "");
         this.$bus.emit("fixWindowZIndexMax", false);
         this.zIndex = this.defaultZIndex;
-        this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
+        this.$bus.emit("changeDefaultZIndex", this.defaultZIndex -10);
         this.$bus.emit("fixWindowZIndexMax", true);
       } else {
         el.className = el.className + " active";
         this.zIndex = 999999999;
-        // this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
+        this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
         this.$bus.emit("fixWindowZIndexMax", true);
       }
     },
@@ -619,6 +619,15 @@ export default {
       };
     },
   },
+  watch:{
+    defaultZIndex(newVal){
+      if(this.zIndex < newVal){
+        this.cls = 'deactive-win'
+      }else{
+        this.cls = 'active-win'
+      }
+    }
+  },
   beforeDestroy() {
     this.$bus.off("changeFixWindowZIndex", this.changeFixWindowZIndex);
   },

src/component/Desktop/NotifyShowall/index.vue

@@ -5,10 +5,11 @@
       sds-notify-showall-dialog
       layout-window-app
       v-window
-      active-win
     "
-    style="position: absolute; left: 10px; z-index: 9050"
-    :style="{ display: display, width: width, height: height, top: top }"
+    :class="cls"
+    style="position: absolute; left: 10px;"
+    :style="{ display: display, width: width, height: height, top: top ,zIndex: zIndex}"
+    @click="clickNotifyShowall"
   >
     <div class="v-window-header-wrapper draggable">
       <div class="app-icon"></div>
@@ -333,6 +334,7 @@
 
 <script>
 export default {
+  props: ["defaultZIndex"],
   data() {
     return {
       display: "none",
@@ -341,6 +343,8 @@ export default {
       width: "840px",
       height: "480px",
       top: "10px",
+      zIndex: 9050,
+      cls:'active-win',
       thContantArray: [
         {
           id: 0,
@@ -386,11 +390,19 @@ export default {
         item.cls1 = "";
       });
       this.notifyShowallDetail.detailMessageList = detailMessageList1;
-      console.log(this.notifyShowallDetail.detailMessageList);
+      this.clickNotifyShowall()
     },
     // 关闭本页面
     closeNotifyShowall() {
       this.display = "none";
+      this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
+    },
+    // 点击本页面
+    clickNotifyShowall(){
+      if(this.zIndex < this.defaultZIndex){
+        this.zIndex = this.defaultZIndex + 10;
+        this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
+      }
     },
     // 重新加载数据
     reload() {
@@ -463,6 +475,16 @@ export default {
       this.width = "840px";
       this.height = "480px";
       this.windowIsMax = false
+      this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
+    }
+  },
+  watch:{
+    defaultZIndex(newVal){
+      if(this.zIndex < newVal){
+        this.cls = 'deactive-win'
+      }else{
+        this.cls = 'active-win'
+      }
     }
   },
   components: {},

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">&nbsp;</div>
+        ><div class="sds-notify-setting-btn" @click="openNotifySetting">&nbsp;</div>
         <span class="x-panel-header-text">消息</span></span
       >
     </div>
@@ -546,6 +546,10 @@ export default {
     clearAllNotifyMessage() {
       this.notifyTrayPanelDetail.detailMessageList = [];
     },
+    // 打开设置页面
+    openNotifySetting(){
+      this.$bus.emit('openNotifySetting')
+    }
   },
   name: "NotifyTrayPanel",
 };

src/component/Desktop/NotifyTrayPanelDetail/index.vue

@@ -174,10 +174,12 @@ export default {
         this.display = "block";
       }
       if(this.zIndex < this.defaultZIndex){
-        this.notifyTrayPanelDetail.detailMessage[0] = detailMessage;
         this.zIndex = this.defaultZIndex + 10;
         this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
       }
+      if(detailMessage.title){
+        this.notifyTrayPanelDetail.detailMessage[0] = detailMessage;
+      }
     },
     // 关闭本页面
     closeNotifyDetail() {

src/component/Desktop/Shortcut/ResizablePinned/index.vue

@@ -8,12 +8,12 @@
         visibility: visible;
         left: 50%;
         top: 50%;
-        transform: translate(-50%,-50%);
+        transform: translate(-50%, -50%);
         background: #fff;
       "
       :style="{
         width: detailMessage.width,
-        height:detailMessage.height,
+        height: detailMessage.height,
         minHeight: detailMessage.minHeight,
         display: detailMessage.display,
         zIndex: detailMessage.zIndex,
@@ -23,7 +23,7 @@
         detailMessage, detailMessageIndex
       ) in resizablePinnedDetail.detailMessageList"
       :key="detailMessage.id"
-      @click.stop="
+      @click="
         changeDialogWindow(detailMessage.titleImgUrl, detailMessageIndex)
       "
     >
@@ -230,7 +230,7 @@ export default {
             minHeight: "560px",
             title: "套件中心",
             spacialCls: "tjCenter",
-            cls: "",
+            cls: "deactive-win",
             titleImgUrl: "../../../../public/image/index/tjCenter.png",
             display: "none",
             zIndex: 9053,
@@ -244,7 +244,7 @@ export default {
             minHeight: "520px",
             title: "控制中心",
             spacialCls: "controlCenter",
-            cls: "11111111",
+            cls: "deactive-win",
             titleImgUrl: "../../../../public/image/index/controlCenter.png",
             display: "none",
             zIndex: 9053,
@@ -258,7 +258,7 @@ export default {
             minHeight: "440px",
             title: "File Station",
             spacialCls: "file",
-            cls: "",
+            cls: "deactive-win",
             titleImgUrl: "../../../../public/image/index/file.png",
             display: "none",
             zIndex: 9053,
@@ -272,7 +272,7 @@ export default {
             minHeight: "420px",
             title: "DSM 说明",
             spacialCls: "question",
-            cls: "",
+            cls: "deactive-win",
             titleImgUrl: "../../../../public/image/index/question.png",
             display: "none",
             zIndex: 9053,
@@ -303,11 +303,11 @@ export default {
   mounted() {
     this.$bus.on("clickShortcutItem", this.clickShortcutItem);
     this.$bus.on("clickMenuItem", this.clickMenuItem);
-    this.$bus.on("fixWindowZIndexMax", this.fixWindowZIndexMax);
-    this.$bus.on(
-      "changeMinDefaultZindexWindowCls",
-      this.changeMinDefaultZindexWindowCls
-    );
+    // this.$bus.on("fixWindowZIndexMax", this.fixWindowZIndexMax);
+    // this.$bus.on(
+    //   "changeMinDefaultZindexWindowCls",
+    //   this.changeMinDefaultZindexWindowCls
+    // );
   },
   methods: {
     // 点击大菜单图标
@@ -329,13 +329,16 @@ export default {
         "block";
       this.resizablePinnedDetail.detailMessageList[detailMessageIndex].cls =
         "active-win";
-        this.$bus.emit("changeFixWindowZIndex");
+      this.$bus.emit("changeFixWindowZIndex");
 
-      if (this.lastCheckIndex == detailMessageIndex) {
+      if (
+        this.lastCheckIndex == detailMessageIndex &&
+        this.zIndex >= this.defaultZIndex
+      ) {
         return;
       }
       this.resizablePinnedDetail.detailMessageList.forEach((item) => {
-        item.cls = "";
+        item.cls = "deactive-win";
       });
       this.resizablePinnedDetail.detailMessageList[detailMessageIndex].cls =
         "active-win";
@@ -345,9 +348,13 @@ export default {
       this.resizablePinnedDetail.detailMessageList[detailMessageIndex].zIndex =
         defaultZIndex;
       this.lastCheckIndex = detailMessageIndex;
-      this.changeZIndexMaxMenuItemCls()
-      this.$bus.emit('dialogWindowZIndexIsMax',true)
-      this.$bus.emit("fixWindowZIndexMax", false);
+      this.$bus.emit(
+          "changeDialogWindow",
+          this.resizablePinnedDetail.detailMessageList[detailMessageIndex].titleImgUrl
+        );
+      // this.changeZIndexMaxMenuItemCls()
+      // this.$bus.emit('dialogWindowZIndexIsMax',true)
+      // this.$bus.emit("fixWindowZIndexMax", false);
     },
     // 切换弹出窗口
     changeDialogWindow(imgUrl, menuIndex) {
@@ -360,10 +367,9 @@ export default {
       // }
       this.$bus.emit("changeDialogWindow", imgUrl);
       this.openDialogWindow(menuIndex);
-      
-      this.$bus.emit("fixWindowZIndexMax", false);
-      this.changeZIndexMaxMenuItemCls()
-      
+
+      // this.$bus.emit("fixWindowZIndexMax", false);
+      // this.changeZIndexMaxMenuItemCls()
     },
     // 打开DSM 说明
     openDSMWindow() {
@@ -379,7 +385,7 @@ export default {
         this.resizablePinnedDetail.detailMessageList[detailMessageIndex]
           .spacialCls;
       let obj = { imgUrl, spacialCls };
-      this.$bus.emit("changeDialogWindow", obj);
+      // this.$bus.emit("changeDialogWindow", obj);
     },
     // 最小化弹出框口
     minMizeWindow(detailMessageIndex) {
@@ -394,12 +400,17 @@ export default {
         detailMessageList = JSON.parse(
           JSON.stringify(this.arraySort(detailMessageList, "zIndex"))
         );
+        this.resizablePinnedDetail.detailMessageList[
+          detailMessageIndex
+        ].zIndex = this.defaultZIndex - 10;
+        console.log(detailMessageList[detailMessageList.length - 1].title)
         this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
-        // this.defaultZIndex = this.defaultZIndex -10
-        this.$bus.emit(
-          "changeDialogWindow",
-          detailMessageList[detailMessageList.length - 1].titleImgUrl
-        );
+        let index = this.resizablePinnedDetail.detailMessageList.findIndex(item=>{
+          return item.title === detailMessageList[detailMessageList.length - 1].title
+        })
+        if(index != -1){
+          this.openDialogWindow(index);
+        }
       }
     },
     //最大化弹出窗口
@@ -412,6 +423,22 @@ export default {
       this.resizablePinnedDetail.detailMessageList[
         detailMessageIndex
       ].iconMaximize = "none";
+      this.openDialogWindow(detailMessageIndex);
+
+      //  let detailMessageList =
+      //   this.resizablePinnedDetail.detailMessageList.filter((item) => {
+      //     return item.display == "block";
+      //   });
+      // if (detailMessageList.length) {
+      //   detailMessageList = JSON.parse(
+      //     JSON.stringify(this.arraySort(detailMessageList, "zIndex"))
+      //   );
+      // // let index = this.resizablePinnedDetail.detailMessageList.findIndex(item=>{
+      // //   return item.title === detailMessageList[detailMessageList.length - 1].title
+      // // })
+      // // if(index != -1){
+      // //   }
+      // }
     },
     //恢复弹出窗口宽度
     restoreMizeWindow(detailMessageIndex) {
@@ -422,7 +449,9 @@ export default {
       ].iconRestore = "none";
       this.resizablePinnedDetail.detailMessageList[
         detailMessageIndex
-      ].iconMaximize = "block";
+      ].iconMaximize = "block"; 
+      this.countOpenWindowNum();
+      this.openDialogWindow(detailMessageIndex);
     },
     //关闭弹出窗口
     closeWindow(detailMessageIndex) {
@@ -434,18 +463,27 @@ export default {
       this.$bus.emit("closeDialogWindow", imgUrl);
       let detailMessageList =
         this.resizablePinnedDetail.detailMessageList.filter((item) => {
-          return item.display == "block";
+          console.log(item.display)
+          return item.display === "block";
         });
       if (detailMessageList.length) {
         detailMessageList = JSON.parse(
           JSON.stringify(this.arraySort(detailMessageList, "zIndex"))
         );
+        this.resizablePinnedDetail.detailMessageList[
+          detailMessageIndex
+        ].zIndex = this.defaultZIndex - 10;
         this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
-        // this.defaultZIndex = this.defaultZIndex -10
-        this.$bus.emit(
-          "changeDialogWindow",
-          detailMessageList[detailMessageList.length - 1].titleImgUrl
-        );
+        // this.$bus.emit(
+        //   "changeDialogWindow",
+        //   detailMessageList[detailMessageList.length - 1].titleImgUrl
+        // );
+         let index = this.resizablePinnedDetail.detailMessageList.findIndex(item=>{
+          return item.title === detailMessageList[detailMessageList.length - 1].title
+        })
+        if(index != -1){
+          this.openDialogWindow(index);
+        }
       }
       this.countOpenWindowNum();
     },
@@ -458,8 +496,8 @@ export default {
         }
       });
       if (this.openWindowNum == 0) {
-        this.$bus.emit('dialogWindowZIndexIsMax',false)
-        this.$bus.emit("fixWindowZIndexMax", true);
+        // this.$bus.emit('dialogWindowZIndexIsMax',false)
+        // this.$bus.emit("fixWindowZIndexMax", true);
         this.resizablePinnedDetail.detailMessageList.forEach((item) => {
           item.zIndex = 9053;
         });
@@ -482,44 +520,38 @@ export default {
       // var y = e.pageY;
     },
     //如果固定窗口的zindex是最大的
-    fixWindowZIndexMax(bol) {
-      this.fixWindowZIndedxIsMax = bol;
-    },
+    // fixWindowZIndexMax(bol) {
+    //   this.fixWindowZIndedxIsMax = bol;
+    // },
     //修改zIndex小于defaultZindex(公共z-index)窗口的类名使其变淡
     changeMinDefaultZindexWindowCls() {
-        this.changeZIndexMaxMenuItemCls()
-    //   console.log(this.defaultZIndex);
-    //   this.resizablePinnedDetail.detailMessageList.forEach((item) => {
-    //     console.log(item.zIndex);
-    //     if (item.zIndex < this.defaultZIndex) {
-    //       console.log(item.cls);
-    //       item.cls = "deactive-win";
-    //     }
-    //   });
-    //   console.log(this.fixWindowZIndedxIsMax);
-    //   if (!this.fixWindowZIndedxIsMax) {
-    //     // 找有menuItem 等于 defaultZIndex的下标
-    //     let maxZIndexMenuItemIndex =
-    //       this.resizablePinnedDetail.detailMessageList.findIndex((item) => {
-    //         console.log(item.zIndex);
-    //         return item.zIndex >= this.defaultZIndex;
-    //       });
-    //     if (maxZIndexMenuItemIndex != -1) {
-    //       let detailMessageList =
-    //         this.resizablePinnedDetail.detailMessageList.filter((item) => {
-    //           return item.display == "block";
-    //         });
-    //       if (detailMessageList.length) {
-    //         detailMessageList = JSON.parse(
-    //           JSON.stringify(this.arraySort(detailMessageList, "zIndex"))
-    //         );
-    //         this.changeFoundMenuItemCls(
-    //           detailMessageList[detailMessageList.length - 1].title
-    //         );
-    //         console.log(detailMessageList[detailMessageList.length - 1].title);
-    //       }
-    //     }
-    //   }
+      // this.changeZIndexMaxMenuItemCls()
+      //   this.resizablePinnedDetail.detailMessageList.forEach((item) => {
+      //     if (item.zIndex < this.defaultZIndex) {
+      //       item.cls = "deactive-win";
+      //     }
+      //   });
+      //   if (!this.fixWindowZIndedxIsMax) {
+      //     // 找有menuItem 等于 defaultZIndex的下标
+      //     let maxZIndexMenuItemIndex =
+      //       this.resizablePinnedDetail.detailMessageList.findIndex((item) => {
+      //         return item.zIndex >= this.defaultZIndex;
+      //       });
+      //     if (maxZIndexMenuItemIndex != -1) {
+      //       let detailMessageList =
+      //         this.resizablePinnedDetail.detailMessageList.filter((item) => {
+      //           return item.display == "block";
+      //         });
+      //       if (detailMessageList.length) {
+      //         detailMessageList = JSON.parse(
+      //           JSON.stringify(this.arraySort(detailMessageList, "zIndex"))
+      //         );
+      //         this.changeFoundMenuItemCls(
+      //           detailMessageList[detailMessageList.length - 1].title
+      //         );
+      //       }
+      //     }
+      //   }
     },
     // 修改对应标题的menuItem的类名
     changeFoundMenuItemCls(title) {
@@ -531,38 +563,61 @@ export default {
         }
       });
     },
-    //修改zIndex最大的menuItem的类名
-    changeZIndexMaxMenuItemCls() {
-      if (this.fixWindowZIndedxIsMax) {
-        this.resizablePinnedDetail.detailMessageList.forEach((item) => {
-          item.cls = "deactive-win";
-        });
-      } else {
-        let maxZIndexMenuItemIndex =
-          this.resizablePinnedDetail.detailMessageList.findIndex((item) => {
-            return item.zIndex >= this.defaultZIndex;
-          });
-        if (maxZIndexMenuItemIndex != -1) {
-          let detailMessageList =
-            this.resizablePinnedDetail.detailMessageList.filter((item) => {
-              return item.display == "block";
-            });
-          if (detailMessageList.length) {
-            detailMessageList = JSON.parse(
-              JSON.stringify(this.arraySort(detailMessageList, "zIndex"))
-            );
-            this.changeFoundMenuItemCls(
-              detailMessageList[detailMessageList.length - 1].title
-            );
-          }
-        }
-      }
+    //修改zIndex最大及其他的menuItem的类名
+    changeZIndexMenuItemCls() {
+      // if (this.dialogZIndexMaxIndex == -1) {
+      //   this.resizablePinnedDetail.detailMessageList.forEach((item) => {
+      //     item.cls = "deactive-win";
+      //   });
+      // } else {
+      //   let maxZIndexMenuItemIndex =
+      //     this.resizablePinnedDetail.detailMessageList.findIndex((item) => {
+      //       return item.zIndex >= this.defaultZIndex;
+      //     });
+      //   if (maxZIndexMenuItemIndex != -1) {
+      //     let detailMessageList =
+      //       this.resizablePinnedDetail.detailMessageList.filter((item) => {
+      //         return item.display == "block";
+      //       });
+      //     if (detailMessageList.length) {
+      //       detailMessageList = JSON.parse(
+      //         JSON.stringify(this.arraySort(detailMessageList, "zIndex"))
+      //       );
+      //       this.changeFoundMenuItemCls(
+      //         detailMessageList[detailMessageList.length - 1].title
+      //       );
+      //     }
+      //   }
+      // }
     },
+    //
   },
 
   watch: {
     defaultZIndex() {
-      this.changeMinDefaultZindexWindowCls();
+      this.dialogZIndexMaxIndex =
+        this.resizablePinnedDetail.detailMessageList.findIndex((item) => {
+          return item.zIndex >= this.defaultZIndex && item.display === "block";
+        });
+      if (
+        this.dialogZIndexMaxIndex != -1 &&
+        this.dialogZIndexMaxIndex != undefined
+      ) {
+        this.resizablePinnedDetail.detailMessageList.forEach((item) => {
+          if (item.cls === "active-win") {
+            item.cls = "deactive-win";
+          }
+        });
+        this.resizablePinnedDetail.detailMessageList[
+          this.dialogZIndexMaxIndex
+        ].cls = "active-win";
+      } else {
+        this.resizablePinnedDetail.detailMessageList.forEach((item) => {
+          if (item.cls === "active-win") {
+            item.cls = "deactive-win";
+          }
+        });
+      }
     },
   },
   beforeDestroy() {

src/component/Desktop/index.vue

@@ -6,7 +6,7 @@
         <FixWindow :defaultZIndex='defaultZIndex'></FixWindow>
         <NotifyTrayPanel></NotifyTrayPanel>
         <NotifyTrayPanelDetail :defaultZIndex='defaultZIndex'></NotifyTrayPanelDetail>
-        <NotifyShowall></NotifyShowall>
+        <NotifyShowall :defaultZIndex='defaultZIndex'></NotifyShowall>
         <NotifySetting></NotifySetting>
         <DeleteNotifyMessage></DeleteNotifyMessage>
         <Mask></Mask>

src/component/Header/index.vue

@@ -22,7 +22,7 @@
         </button>
         <button
           class="tray-item widget-button system"
-          @click.stop="showOrHiddenWidget"
+          @click="showOrHiddenWidget"
         >
           <div></div>
         </button>