fix(v0.1.4): 十席卡片始终显示边框
宿主的 .ssw-scope button{border:0} 覆盖了 .ssw-seat 的边框,导致平时无框、只有选中时靠背景才像有框。提高选择器优先级并加粗到 2px,十席始终有蓝色描边。
This commit is contained in:
parent
d6ba6d611f
commit
d537a07e73
|
|
@ -0,0 +1,37 @@
|
|||
import { spawn } from 'node:child_process'
|
||||
import { mkdtemp } from 'node:fs/promises'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
const url = process.argv[2]
|
||||
const EDGE = 'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe'
|
||||
const profile = await mkdtemp(join(tmpdir(), 'ss-border-'))
|
||||
const out = {}
|
||||
const sleep = ms => new Promise(r => setTimeout(r, ms))
|
||||
let browser, ws
|
||||
try {
|
||||
browser = spawn(EDGE, ['--headless=new','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--user-data-dir=' + profile, 'about:blank'], { stdio: ['ignore','ignore','pipe'] })
|
||||
const endpoint = await new Promise((resolve, reject) => { let log=''; const t=setTimeout(()=>reject(Error('timeout')),20000); browser.stderr.on('data', b=>{ log+=b; const m=log.match(/DevTools listening on (.+)/); if(m){clearTimeout(t);resolve(m[1].trim())} }); browser.on('error',reject) })
|
||||
ws = new WebSocket(endpoint); await new Promise((r,j)=>{ws.onopen=r;ws.onerror=j})
|
||||
let n=0; const pend=new Map()
|
||||
ws.onmessage = e => { const m=JSON.parse(e.data); if(m.id){const p=pend.get(m.id);pend.delete(m.id);m.error?p.reject(Error(JSON.stringify(m.error))):p.resolve(m.result)} }
|
||||
const cdp=(method,params={},sid)=>new Promise((res,rej)=>{const id=++n;pend.set(id,{resolve:res,reject:rej});ws.send(JSON.stringify({id,method,params,...(sid?{sessionId:sid}:{})}))})
|
||||
const { targetId } = await cdp('Target.createTarget', { url: 'about:blank' })
|
||||
const { sessionId } = await cdp('Target.attachToTarget', { targetId, flatten: true })
|
||||
const call=(m,p={})=>cdp(m,p,sessionId)
|
||||
await call('Page.enable'); await call('Runtime.enable')
|
||||
const ev = async x => { const r=await call('Runtime.evaluate',{expression:x,returnByValue:true,awaitPromise:true}); if(r.exceptionDetails) throw Error(r.exceptionDetails.exception?.description||r.exceptionDetails.text); return r.result.value }
|
||||
const waitFor = async (x,t=45000)=>{ const end=Date.now()+t; while(Date.now()<end){ try{ if(await ev(x)) return true }catch{} await sleep(250) } return false }
|
||||
await call('Emulation.setDeviceMetricsOverride',{width:1440,height:900,deviceScaleFactor:1,mobile:false})
|
||||
await call('Page.navigate',{url})
|
||||
await waitFor("document.readyState === 'complete'",30000)
|
||||
try { await ev("(() => { const b=[...document.querySelectorAll('button')].find(x=>(x.innerText||'').trim()==='继续'); if(b)b.click(); return !!b })()") } catch {}
|
||||
await sleep(600)
|
||||
await waitFor("!!document.querySelector('.ssw-nav-hit')",60000)
|
||||
await ev("document.querySelector('.ssw-nav-hit').click(); true")
|
||||
await waitFor("!!document.querySelector('.ssw-root')",20000)
|
||||
await sleep(2500)
|
||||
out.seats = await ev("(() => [...document.querySelectorAll('.ssw-seat')].slice(0,4).map(el => { const cs=getComputedStyle(el); return { text:(el.innerText||'').replace(/\\s+/g,' ').slice(0,20), pressed:el.getAttribute('aria-pressed'), borderWidth:cs.borderTopWidth, borderStyle:cs.borderTopStyle, borderColor:cs.borderTopColor, background:cs.backgroundColor } }))()")
|
||||
out.withBorder = await ev("(() => [...document.querySelectorAll('.ssw-seat')].filter(el => parseFloat(getComputedStyle(el).borderTopWidth) > 0).length)()")
|
||||
out.total = await ev("document.querySelectorAll('.ssw-seat').length")
|
||||
} catch(e) { out.fatal = String(e?.stack ?? e) } finally { try{ws?.close()}catch{}; try{browser?.kill()}catch{} }
|
||||
console.log(JSON.stringify(out, null, 2))
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 78 KiB |
|
|
@ -453,6 +453,15 @@ body[data-ds-dark-theme] .ssw-float,html[data-theme=dark] .ssw-float{background:
|
|||
.ssw-tab-body{height:100%;min-height:0;display:flex;flex-direction:column}
|
||||
.ssw-tab-body .ssw-root{flex:1;min-height:0}
|
||||
.ssw-tab-title{font-size:13px}
|
||||
/* 宿主的 .ssw-scope button{border:0} 会盖掉 .ssw-seat 的边框(选择器更具体),
|
||||
导致十张部门卡平时没有框、只有选中时靠背景色看着像有框。这里提高选择器优先级,
|
||||
让每张卡始终显示蓝色描边,选中时再加深。 */
|
||||
.ssw-scope .ssw-seat{border:2px solid var(--ssw-frame);border-radius:10px;background:var(--ssw-card)}
|
||||
.ssw-scope .ssw-lead .ssw-seat{border-color:var(--ssw-blue)}
|
||||
.ssw-scope .ssw-six .ssw-seat{border-color:var(--ssw-frame)}
|
||||
.ssw-scope .ssw-seat:hover{border-color:var(--ssw-blue)}
|
||||
.ssw-scope .ssw-seat[aria-pressed=true]{border-color:var(--ssw-blue);background:var(--ssw-wash);box-shadow:0 0 0 2px rgba(59,130,246,.12)}
|
||||
body[data-ds-dark-theme] .ssw-scope .ssw-seat[aria-pressed=true]{box-shadow:0 0 0 2px rgba(110,168,255,.18)}
|
||||
`;
|
||||
|
||||
// src/native/panel.js
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "dsh-sansheng-liubu",
|
||||
"version": "0.1.3",
|
||||
"version": "0.1.4",
|
||||
"description": "三省六部:每个项目固定十席角色与独立会话的 DSH 插件(第一版)。",
|
||||
"keywords": [
|
||||
"dsh-plugin",
|
||||
|
|
|
|||
|
|
@ -85,4 +85,13 @@ body[data-ds-dark-theme] .ssw-float,html[data-theme=dark] .ssw-float{background:
|
|||
.ssw-tab-body{height:100%;min-height:0;display:flex;flex-direction:column}
|
||||
.ssw-tab-body .ssw-root{flex:1;min-height:0}
|
||||
.ssw-tab-title{font-size:13px}
|
||||
`
|
||||
/* 宿主的 .ssw-scope button{border:0} 会盖掉 .ssw-seat 的边框(选择器更具体),
|
||||
导致十张部门卡平时没有框、只有选中时靠背景色看着像有框。这里提高选择器优先级,
|
||||
让每张卡始终显示蓝色描边,选中时再加深。 */
|
||||
.ssw-scope .ssw-seat{border:2px solid var(--ssw-frame);border-radius:10px;background:var(--ssw-card)}
|
||||
.ssw-scope .ssw-lead .ssw-seat{border-color:var(--ssw-blue)}
|
||||
.ssw-scope .ssw-six .ssw-seat{border-color:var(--ssw-frame)}
|
||||
.ssw-scope .ssw-seat:hover{border-color:var(--ssw-blue)}
|
||||
.ssw-scope .ssw-seat[aria-pressed=true]{border-color:var(--ssw-blue);background:var(--ssw-wash);box-shadow:0 0 0 2px rgba(59,130,246,.12)}
|
||||
body[data-ds-dark-theme] .ssw-scope .ssw-seat[aria-pressed=true]{box-shadow:0 0 0 2px rgba(110,168,255,.18)}
|
||||
`
|
||||
Loading…
Reference in New Issue