working around on table
This commit is contained in:
parent
e6f5d152f0
commit
23fd193c34
36 changed files with 3999 additions and 82 deletions
|
|
@ -13,9 +13,7 @@ import { eventGetKeyChain } from './keychain'
|
|||
// │ │ └── preload.js
|
||||
// │
|
||||
process.env.DIST = path.join(__dirname, '../dist-renderer')
|
||||
process.env.VITE_PUBLIC = app.isPackaged
|
||||
? process.env.DIST
|
||||
: path.join(process.env.DIST, '../public')
|
||||
process.env.VITE_PUBLIC = app.isPackaged ? process.env.DIST : path.join(process.env.DIST, '../public')
|
||||
|
||||
let win: BrowserWindow | null
|
||||
// 🚧 Use ['ENV_NAME'] avoid vite:define plugin - Vite@2.x
|
||||
|
|
@ -26,7 +24,9 @@ function createWindow() {
|
|||
icon: path.join(process.env.VITE_PUBLIC, 'electron-vite.svg'),
|
||||
webPreferences: {
|
||||
preload: path.join(__dirname, 'preload.js')
|
||||
}
|
||||
},
|
||||
width: 1270,
|
||||
height: 720
|
||||
})
|
||||
|
||||
// Test active push message to Renderer-process.
|
||||
|
|
@ -36,9 +36,7 @@ function createWindow() {
|
|||
|
||||
if (process.defaultApp) {
|
||||
if (process.argv.length >= 2) {
|
||||
app.setAsDefaultProtocolClient('taobin-electron', process.execPath, [
|
||||
path.resolve(process.argv[1])
|
||||
])
|
||||
app.setAsDefaultProtocolClient('taobin-electron', process.execPath, [path.resolve(process.argv[1])])
|
||||
}
|
||||
} else {
|
||||
app.setAsDefaultProtocolClient('taobin-electron')
|
||||
|
|
@ -46,43 +44,36 @@ function createWindow() {
|
|||
|
||||
let grantedDeviceThroughPermHandler: Electron.USBDevice
|
||||
|
||||
win.webContents.session.on(
|
||||
'select-usb-device',
|
||||
(event, details, callback) => {
|
||||
// Add events to handle devices being added or removed before the callback on
|
||||
// `select-usb-device` is called.
|
||||
win?.webContents.session.on('usb-device-added', (_event, device) => {
|
||||
console.log('usb-device-added FIRED WITH', device)
|
||||
// Optionally update details.deviceList
|
||||
})
|
||||
win.webContents.session.on('select-usb-device', (event, details, callback) => {
|
||||
// Add events to handle devices being added or removed before the callback on
|
||||
// `select-usb-device` is called.
|
||||
win?.webContents.session.on('usb-device-added', (_event, device) => {
|
||||
console.log('usb-device-added FIRED WITH', device)
|
||||
// Optionally update details.deviceList
|
||||
})
|
||||
|
||||
win?.webContents.session.on('usb-device-removed', (_event, device) => {
|
||||
console.log('usb-device-removed FIRED WITH', device)
|
||||
// Optionally update details.deviceList
|
||||
})
|
||||
win?.webContents.session.on('usb-device-removed', (_event, device) => {
|
||||
console.log('usb-device-removed FIRED WITH', device)
|
||||
// Optionally update details.deviceList
|
||||
})
|
||||
|
||||
event.preventDefault()
|
||||
if (details.deviceList && details.deviceList.length > 0) {
|
||||
const deviceToReturn = details.deviceList.find(
|
||||
device => device.vendorId === 1478
|
||||
)
|
||||
if (deviceToReturn) {
|
||||
callback(deviceToReturn.deviceId)
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
event.preventDefault()
|
||||
if (details.deviceList && details.deviceList.length > 0) {
|
||||
const deviceToReturn = details.deviceList.find(device => device.vendorId === 1478)
|
||||
if (deviceToReturn) {
|
||||
callback(deviceToReturn.deviceId)
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
win.webContents.session.setPermissionCheckHandler(
|
||||
(_webContents, permission) => {
|
||||
if (permission === 'usb') {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
win.webContents.session.setPermissionCheckHandler((_webContents, permission) => {
|
||||
if (permission === 'usb') {
|
||||
return true
|
||||
}
|
||||
)
|
||||
return false
|
||||
})
|
||||
|
||||
win.webContents.session.setDevicePermissionHandler(details => {
|
||||
console.log(details)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue