修复pad端预案运行时还能开窗的BUG并添加相应提示
This commit is contained in:
parent
9b68fa58a5
commit
40a1705c07
|
@ -476,4 +476,5 @@ export default {
|
||||||
"the current browser does not support full screen": "当前浏览器不支持全屏",
|
"the current browser does not support full screen": "当前浏览器不支持全屏",
|
||||||
_SOFT_PAD_LOGIN_TITLE_: "软件管理平台",
|
_SOFT_PAD_LOGIN_TITLE_: "软件管理平台",
|
||||||
welcome: "欢迎",
|
welcome: "欢迎",
|
||||||
|
"plan running! can't open window!": "预案正在运行!不能开窗!",
|
||||||
};
|
};
|
||||||
|
|
|
@ -608,6 +608,7 @@ export default defineComponent({
|
||||||
}
|
}
|
||||||
|
|
||||||
const onDropSignalSourceOrPolliong = (evt: _IDropToWall) => {
|
const onDropSignalSourceOrPolliong = (evt: _IDropToWall) => {
|
||||||
|
if (!plan_running.value) {
|
||||||
if (evt && evt.data) {
|
if (evt && evt.data) {
|
||||||
// const x =
|
// const x =
|
||||||
// evt.pos.x -
|
// evt.pos.x -
|
||||||
|
@ -629,7 +630,10 @@ export default defineComponent({
|
||||||
|
|
||||||
// 有可能是窗口的子节点收到了拖拽信息,需要找到真正的窗口节点来判断
|
// 有可能是窗口的子节点收到了拖拽信息,需要找到真正的窗口节点来判断
|
||||||
if (dom) {
|
if (dom) {
|
||||||
const temp = find_parent_dom(dom, ["wall_item_flag", "window_flag"]);
|
const temp = find_parent_dom(dom, [
|
||||||
|
"wall_item_flag",
|
||||||
|
"window_flag",
|
||||||
|
]);
|
||||||
if (temp) {
|
if (temp) {
|
||||||
dom = temp;
|
dom = temp;
|
||||||
}
|
}
|
||||||
|
@ -763,6 +767,14 @@ export default defineComponent({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
$q.notify({
|
||||||
|
type: "warning",
|
||||||
|
message: $t.t("plan running! can't open window!"),
|
||||||
|
position: "top",
|
||||||
|
timeout: 1500,
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
EventBus.getInstance().on(
|
EventBus.getInstance().on(
|
||||||
|
|
|
@ -708,6 +708,16 @@ export default defineComponent({
|
||||||
target.classList.remove("drag-enter");
|
target.classList.remove("drag-enter");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (plan_running.value) {
|
||||||
|
$q.notify({
|
||||||
|
type: "warning",
|
||||||
|
message: $t.t("plan running! can't open window!"),
|
||||||
|
position: "top",
|
||||||
|
timeout: 1500,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const type = e.dataTransfer?.getData("type");
|
const type = e.dataTransfer?.getData("type");
|
||||||
const uuid = e.dataTransfer?.getData("uuid");
|
const uuid = e.dataTransfer?.getData("uuid");
|
||||||
if (uuid && uuid.length > 0 && type && type.length > 0) {
|
if (uuid && uuid.length > 0 && type && type.length > 0) {
|
||||||
|
|
Loading…
Reference in New Issue