diff --git a/main.tsx b/main.tsx index 7b3f6f6..d4935a9 100644 --- a/main.tsx +++ b/main.tsx @@ -1,22 +1,24 @@ import { app, BrowserWindow, Menu, MenuItem, dialog, nativeTheme } from 'electron'; +import {initMenu} from './src/AppMenu' let mainWindow: BrowserWindow = null; nativeTheme.themeSource = 'dark'; let createWindow = function () { mainWindow = new BrowserWindow({ - width: 800, - height: 600, + width: 1280, + height: 800, + transparent: true, webPreferences: { // nodeIntegration: true } // fullscreenable:false, // maximizable:false }); - mainWindow.webContents.openDevTools(); + // mainWindow.webContents.openDevTools(); mainWindow.loadFile('index.html'); mainWindow.on('closed', function () { mainWindow = null - }) + }); } app.on('ready', createWindow) app.on('window-all-closed', () => { @@ -29,4 +31,6 @@ app.on('activate', () => { if (mainWindow === null) { createWindow() } -}) \ No newline at end of file +}); + +initMenu(); \ No newline at end of file diff --git a/package.json b/package.json index 83920e4..6d918bd 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,7 @@ "description": "行为树编辑器", "main": "./dist/main.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "prestart": "webpack --config webpack.common.config.js", + "prestart": "webpack --config webpack.config.js", "start": "electron .", "build": "electron-packager ./ behavior3editor --platform=win32 --arch=x64 --out=./build" }, diff --git a/src/AppMenu.ts b/src/AppMenu.ts new file mode 100644 index 0000000..91148bb --- /dev/null +++ b/src/AppMenu.ts @@ -0,0 +1,10 @@ +import { BrowserView, Menu, app, shell, dialog, BrowserWindow, MenuItem } from 'electron'; + +export function initMenu () { + const menu: Menu = new Menu(); + const menuItem: MenuItem = new MenuItem({ + label: "test", + }); + menu.append(menuItem); + Menu.setApplicationMenu(menu); +} diff --git a/src/components/Hello.tsx b/src/components/Hello.tsx index b5fad01..9a11c77 100644 --- a/src/components/Hello.tsx +++ b/src/components/Hello.tsx @@ -3,7 +3,7 @@ import GGEditor, { Mind, RegisterNode } from 'gg-editor'; import { MindData } from 'gg-editor/lib/common/interfaces'; const data: MindData = { id: "1", - label: 'Central Topic', + label: 'Central Topic111', children: [ { id: "2", diff --git a/webpack.common.config.js b/webpack.config.js similarity index 77% rename from webpack.common.config.js rename to webpack.config.js index cdb2eab..eb470e0 100644 --- a/webpack.common.config.js +++ b/webpack.config.js @@ -18,7 +18,6 @@ module.exports = { module: { rules: [ { test: /\.tsx?$/, loader: "ts-loader" }, - { enforce: "pre", test: /\.js$/, loader: "source-map-loader" } ] }, @@ -26,5 +25,9 @@ module.exports = { plugins: [ ], - target: "electron-renderer" + target: "electron-renderer", + + externals: [{ + 'electron-reload': 'require("electron-reload")' + }] }; \ No newline at end of file