feat(server): 用户管理与变更历史接口;修复 result_revisions.parent_id 从未写入
This commit is contained in:
1 parent
f3813171d3
commit
72462792ec
39 files changed
+10001
-28
No files matched your search
@@ -92,7 +92,7 @@ class DisplayManager {
|
||||
this.applyGeometry(existing.win, display, single)
|
||||
if (existing.page !== page) {
|
||||
existing.page = page
|
||||
this.loadPage(existing, display, page)
|
||||
this.loadPage(existing, display, page, single)
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -107,7 +107,11 @@ class DisplayManager {
|
||||
const win = new BrowserWindow({
|
||||
...this.geometryFor(display, single),
|
||||
show: false,
|
||||
frame: single,
|
||||
// 窗口化模式由页面自绘标题栏(与应用其它窗口同风格),保留原生边框会多出一条标题栏;
|
||||
// 多屏 kiosk 本来就不要边框
|
||||
frame: false,
|
||||
// 与 Console 主窗口同一套兜底:个别平台会忽略 frame:false
|
||||
titleBarStyle: 'hidden',
|
||||
kiosk: !single && this.display.kiosk !== false,
|
||||
autoHideMenuBar: true,
|
||||
backgroundColor: this.display.backgroundColor || '#000000',
|
||||
@@ -156,7 +160,7 @@ class DisplayManager {
|
||||
}
|
||||
|
||||
this.applyGeometry(win, display, single)
|
||||
this.loadPage(entry, display, page)
|
||||
this.loadPage(entry, display, page, single)
|
||||
this.log.push('console', `打开大屏窗口 display=${display.id} bounds=${bounds.width}x${bounds.height}@${bounds.x},${bounds.y} page=${page}`)
|
||||
return entry
|
||||
}
|
||||
@@ -186,9 +190,9 @@ class DisplayManager {
|
||||
win.setBounds(this.geometryFor(display, single))
|
||||
}
|
||||
|
||||
loadPage(entry, display, page) {
|
||||
loadPage(entry, display, page, single) {
|
||||
if (!entry || !entry.win || entry.win.isDestroyed()) return
|
||||
const url = this.urlFor(display, page)
|
||||
const url = this.urlFor(display, page, single)
|
||||
this.log.push('console', `大屏加载 ${url}`)
|
||||
entry.win.loadURL(url).catch((err) => {
|
||||
// 服务端还没起来时加载失败是正常的,健康检查通过后会重排重载
|
||||
@@ -196,13 +200,15 @@ class DisplayManager {
|
||||
})
|
||||
}
|
||||
|
||||
urlFor(display, page) {
|
||||
urlFor(display, page, single) {
|
||||
const params = new URLSearchParams()
|
||||
params.set(this.display.pageParam || 'page', page)
|
||||
// lock=1 告知页面锁死单页,不参与轮播
|
||||
params.set('lock', '1')
|
||||
params.set('screen', String(display.id))
|
||||
params.set('instance', `${os.hostname()}-${display.id}`)
|
||||
// 只有单屏窗口化才画标题栏;多屏 kiosk 全屏无人值守,不能占高度
|
||||
if (single) params.set('windowed', '1')
|
||||
return `http://127.0.0.1:${this.server.port}/display?${params.toString()}`
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user