Compare commits

..

No commits in common. "d06c66ad399d434364568fcfbf076cf22dd65f7d" and "342712f219d30f9fdd3631cb0ee9c4ed3c99d3a2" have entirely different histories.

2 changed files with 65 additions and 25 deletions

View File

@ -121,18 +121,44 @@ const getDisplayOrigin = (display: any) => {
return origin return origin
} }
var windows:Array<BrowserWindow> = [];
function createWindow(option: any, url: any) { function createWindow(option: any, url: any) {
const win = new BrowserWindow(option) const win = new BrowserWindow(option)
if (URl_REGEX.test(url)) { if (URl_REGEX.test(url)) {
win.loadURL(url) win.loadURL(url)
} else { } else {
win.loadFile(url) win.loadFile(url)
} }
if(process.env.NODE_ENV === 'development') win.webContents.openDevTools()
windows.push(win); const isWindows = process.platform === 'win32';
let needsFocusFix = false;
let triggeringProgrammaticBlur = false;
//弹出警报窗口后 input获取不到焦点
win.on('blur', (event: any) => {
if(!triggeringProgrammaticBlur) {
needsFocusFix = true;
} }
})
win.on('focus', (event: any) => {
if(isWindows && needsFocusFix) {
needsFocusFix = false;
triggeringProgrammaticBlur = true;
//弹出弹窗后重新聚焦导致windows任务栏显示重新隐藏底部windows任务栏
win.minimize(); //最小化函数
win.restore(); //取消最小化函数(从最小化窗口还原函数)
setTimeout(function () {
win.blur(); //失去焦点函数
win.focus(); //获取焦点函数
setTimeout(function () {
triggeringProgrammaticBlur = false;
}, 100);
}, 100);
}
})
if(process.env.NODE_ENV === 'development') win.webContents.openDevTools()
ipcMain.on('CLOSE', (event) => { ipcMain.on('CLOSE', (event) => {
const res = dialog.showMessageBox({ const res = dialog.showMessageBox({
@ -147,15 +173,13 @@ ipcMain.on('CLOSE', (event) => {
res.then((data)=>{ res.then((data)=>{
if(data.response == 0){ if(data.response == 0){
windows.forEach((key:BrowserWindow) => { win.close()
key.close();
});
windows = [];
}else{ }else{
console.log('not close software') console.log('not close software')
} }
}) })
}) })
}
app.whenReady().then(() => { app.whenReady().then(() => {
launch() launch()

View File

@ -6,10 +6,26 @@
<div class="label">  </div> <div class="label">  </div>
<div class="content">{{ baseInfo.longitude ? baseInfo.longitude : '' }}</div> <div class="content">{{ baseInfo.longitude ? baseInfo.longitude : '' }}</div>
</div> </div>
<div>
<div class="label">经度度分</div>
<div class="content">{{ baseInfo.longitude ? longitudeD + ' ' + longitudeM : '' }}</div>
</div>
<div>
<div class="label">经度分秒</div>
<div class="content">{{ baseInfo.longitude ? longitudeD + ' ' + longitudeM + ' ' + longitudeS : '' }}</div>
</div>
<div> <div>
<div class="label">  </div> <div class="label">  </div>
<div class="content">{{ baseInfo.latitude ? baseInfo.latitude : '' }}</div> <div class="content">{{ baseInfo.latitude ? baseInfo.latitude : '' }}</div>
</div> </div>
<div>
<div class="label">纬度度分</div>
<div class="content">{{ baseInfo.latitude ? latitudeD + ' ' + latitudeM : '' }}</div>
</div>
<div>
<div class="label">纬度分秒</div>
<div class="content">{{ baseInfo.latitude ? latitudeD + ' ' + latitudeM + ' ' + latitudeS : '' }}</div>
</div>
<div> <div>
<div class="label">  </div> <div class="label">  </div>
<div class="content">{{ baseInfo.altitude }}</div> <div class="content">{{ baseInfo.altitude }}</div>