From 9926a79ba29f3d6dba91b39253c82ee7fa9e7c0d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 四月 2025 23:07:37 +0800
Subject: [PATCH] 2025-04-02
---
src/index.js | 16 ++++++++++------
src/views/main/index.jsx | 11 +++++++++++
src/views/login/index.jsx | 18 ++++++++++++++++--
3 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/index.js b/src/index.js
index a03d6c9..ac00e9a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -391,12 +391,16 @@
value: GLOB.debugger
})
} else if (GLOB.sysType === 'cloud') {
- Object.defineProperty(GLOB, 'debugger', {
- writable: false,
- value: GLOB.debugger
- })
-
- GLOB.breakpoint = false
+ if (sessionStorage.getItem('cloudRun') === 'debug') {
+ GLOB.debugger = true
+ } else {
+ Object.defineProperty(GLOB, 'debugger', {
+ writable: false,
+ value: GLOB.debugger
+ })
+
+ GLOB.breakpoint = false
+ }
} else {
if (sessionStorage.getItem('breakpoint')) {
GLOB.debugger = true
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 20043a7..850d770 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -599,6 +599,20 @@
if (!['shutter', 'linkage_navigation', 'linkage', 'menu_board', 'menu_board_navigation'].includes(res.menu_type)) {
res.menu_type = 'shutter'
}
+
+ let loginOtop = ''
+ let loginOleft = ''
+ let windowWidth = window.innerWidth
+ let fix = null
+ res.login_screen_offset && res.login_screen_offset.forEach(item => {
+ if (!item.offset_x && !item.offset_y) return
+
+ if (fix === null || Math.abs(windowWidth - item.resolution_width) < fix) {
+ fix = Math.abs(windowWidth - item.resolution_width)
+ loginOtop = item.offset_y + item.y_unit
+ loginOleft = item.offset_x + item.x_unit
+ }
+ })
let systemMsg = {
favicon: res.titlelogo || '',
@@ -617,8 +631,8 @@
app_version: res.app_version,
Member_Level: 0,
appname: res.appname || '',
- loginOtop: res.loginOtop || '',
- loginOleft: res.loginOleft || ''
+ loginOtop: loginOtop,
+ loginOleft: loginOleft
}
if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) {
diff --git a/src/views/main/index.jsx b/src/views/main/index.jsx
index 6971bcf..2686a48 100644
--- a/src/views/main/index.jsx
+++ b/src/views/main/index.jsx
@@ -68,6 +68,17 @@
MKEmitter.emit('debugChange')
}
})
+ } else {
+ Object.defineProperty(window, 'debugger', {
+ configurable: true,
+ enumerable: true,
+ set(value) {
+ if (value === 1949) {
+ sessionStorage.setItem('cloudRun', 'debug')
+ window.location.reload()
+ }
+ }
+ })
}
}
--
Gitblit v1.8.0