Merge pull request '图标' (#65) from lyc-dev into main
This commit is contained in:
commit
01d972f18e
Binary file not shown.
Before Width: | Height: | Size: 264 KiB After Width: | Height: | Size: 264 KiB |
|
@ -18,6 +18,7 @@ function createLoginWindow() {
|
|||
show: false,
|
||||
frame: false,
|
||||
autoHideMenuBar: true,
|
||||
icon: join(__dirname, '../../resources/logo.ico'),
|
||||
...(process.platform === 'linux' ? { icon } : {}),
|
||||
webPreferences: {
|
||||
preload: join(__dirname, '../preload/index.js'),
|
||||
|
@ -52,6 +53,7 @@ function createMainWindow() {
|
|||
show: false,
|
||||
frame: false, // 无边框
|
||||
autoHideMenuBar: true,
|
||||
icon: join(__dirname, '../../resources/logo.ico'),
|
||||
...(process.platform === 'linux' ? { icon } : {}),
|
||||
webPreferences: {
|
||||
preload: join(__dirname, '../preload/index.js'),
|
||||
|
|
|
@ -64,8 +64,8 @@ const submitFile = (data) => {
|
|||
let fileList = toRaw(data)
|
||||
const { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } = sourceStore.query
|
||||
// 给每个文件添加属性
|
||||
let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot }
|
||||
fileList.forEach(item => {
|
||||
let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot }
|
||||
fileData.fileShowName = item.fileData.fileShowName
|
||||
fileData.fileFlag = item.fileData.fileFlag
|
||||
item.fileData = fileData
|
||||
|
|
Loading…
Reference in New Issue