diff --git a/shells/version.txt b/shells/version.txt index 3762a99b..64bb58dd 100644 --- a/shells/version.txt +++ b/shells/version.txt @@ -1,5 +1,5 @@ v1.9.6 -2025-12-08 16:53:14 +2025-12-08 17:23:42 1. 一些累计更新,一些BUG修复 2. 优化客户端数据同步,减少服务器流量 3. 去除cdkey,改为发电解锁中继速度 diff --git a/src/linker.web/src/assets/style.css b/src/linker.web/src/assets/style.css index db8a10f3..43f5e91f 100644 --- a/src/linker.web/src/assets/style.css +++ b/src/linker.web/src/assets/style.css @@ -244,7 +244,8 @@ span.split-pad10 { } } - +/* .device-remark{position: absolute;left:0;top:0;right:0;bottom:0; backdrop-filter: blur(2px); + -webkit-backdrop-filter: blur(2px);z-index: 99;} */ .scrollbar, diff --git a/src/linker.web/src/views/components/device/Device.vue b/src/linker.web/src/views/components/device/Device.vue index 5d004f7d..0c00ad08 100644 --- a/src/linker.web/src/views/components/device/Device.vue +++ b/src/linker.web/src/views/components/device/Device.vue @@ -7,31 +7,34 @@ diff --git a/src/linker.web/src/views/components/device/devices.js b/src/linker.web/src/views/components/device/devices.js index 556f497e..0994a37d 100644 --- a/src/linker.web/src/views/components/device/devices.js +++ b/src/linker.web/src/views/components/device/devices.js @@ -43,7 +43,7 @@ export const provideDevices = () => { const dataFn = (hook)=>{ return new Promise((resolve, reject) => { - hook.dataFn(devices.page.List).then(changed=>{ + hook.dataFn(devices.page.List.filter(c=>c)).then(changed=>{ hook.changed = hook.changed ||changed; resolve(); }); @@ -58,16 +58,19 @@ export const provideDevices = () => { hook.refreshFn(devices.page.List); }); - const chaneds = Object.values(hooks).filter(c=>c.changed); - chaneds.forEach(hook=>{ hook.changed=false }); - if(chaneds.length > 0){ + const changeds = Object.values(hooks).filter(c=>c.changed); + changeds.forEach(hook=>{ hook.changed=false }); + if(changeds.length > 0){ for (let i = 0; i< devices.page.List.length; i++) { - const json = {_index:i}; - for(let j = 0; j < chaneds.length; j++) { - const hook = chaneds[j]; - hook.processFn(devices.page.List[i],json); + const device = devices.page.List[i]; + if(device){ + const json = {_index:i}; + for(let j = 0; j < changeds.length; j++) { + const hook = changeds[j]; + hook.processFn(devices.page.List[i],json); + } + Object.assign(devices.page.List[i], json); } - Object.assign(devices.page.List[i], json); } } await Promise.all(Object.values(hooks).map(hook=>dataFn(hook))); @@ -89,6 +92,10 @@ export const provideDevices = () => { devices.page.Request = res.Request; devices.page.Count = res.Count; for (let j in res.List) { + // if(machineId.value != res.List[j].MachineId){ + // res.List[j] = null; + // continue; + // } Object.assign(res.List[j], { showDel: machineId.value != res.List[j].MachineId && res.List[j].Connected == false, showAccess: machineId.value != res.List[j].MachineId && res.List[j].Connected, diff --git a/src/linker.web/src/views/components/forward/Forward.vue b/src/linker.web/src/views/components/forward/Forward.vue index 92d32c06..89c1f01a 100644 --- a/src/linker.web/src/views/components/forward/Forward.vue +++ b/src/linker.web/src/views/components/forward/Forward.vue @@ -1,7 +1,7 @@