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