结构调整
This commit is contained in:
parent
3f8f6d5e81
commit
536c12b280
@ -1,5 +1,8 @@
|
||||
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
|
||||
// This file is automatically generated. DO NOT EDIT
|
||||
import {context} from '../models';
|
||||
|
||||
export function Ctx():Promise<context.Context>;
|
||||
|
||||
export function ForceClose():Promise<void>;
|
||||
|
@ -2,10 +2,14 @@
|
||||
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
|
||||
// This file is automatically generated. DO NOT EDIT
|
||||
|
||||
export function Ctx() {
|
||||
return window['go']['app']['App']['Ctx']();
|
||||
}
|
||||
|
||||
export function ForceClose() {
|
||||
return window['go']['main']['App']['ForceClose']();
|
||||
return window['go']['app']['App']['ForceClose']();
|
||||
}
|
||||
|
||||
export function ReloadApp() {
|
||||
return window['go']['main']['App']['ReloadApp']();
|
||||
return window['go']['app']['App']['ReloadApp']();
|
||||
}
|
5
app/wails/frontend/wailsjs/go/dialog/Support.d.ts
vendored
Normal file
5
app/wails/frontend/wailsjs/go/dialog/Support.d.ts
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
|
||||
// This file is automatically generated. DO NOT EDIT
|
||||
import {frontend} from '../models';
|
||||
|
||||
export function OpenFileDialog(arg1:frontend.OpenDialogOptions):Promise<string>;
|
7
app/wails/frontend/wailsjs/go/dialog/Support.js
Normal file
7
app/wails/frontend/wailsjs/go/dialog/Support.js
Normal file
@ -0,0 +1,7 @@
|
||||
// @ts-check
|
||||
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
|
||||
// This file is automatically generated. DO NOT EDIT
|
||||
|
||||
export function OpenFileDialog(arg1) {
|
||||
return window['go']['dialog']['Support']['OpenFileDialog'](arg1);
|
||||
}
|
@ -2,6 +2,8 @@ package main
|
||||
|
||||
import (
|
||||
"embed"
|
||||
app2 "skapp/pkg/app"
|
||||
"skapp/pkg/app/dialog"
|
||||
"skapp/pkg/env"
|
||||
"skapp/pkg/sdk/system"
|
||||
systemUtils "skapp/pkg/system"
|
||||
@ -20,7 +22,7 @@ func main() {
|
||||
system.DestroyFileManager()
|
||||
}()
|
||||
// Create an instance of the app structure
|
||||
app := NewApp()
|
||||
app := app2.NewApp()
|
||||
|
||||
// Create application with options
|
||||
err := wails.Run(&options.App{
|
||||
@ -31,14 +33,15 @@ func main() {
|
||||
Assets: assets,
|
||||
},
|
||||
BackgroundColour: &options.RGBA{R: 255, G: 255, B: 255, A: 1},
|
||||
OnStartup: app.startup,
|
||||
OnBeforeClose: app.beforeClose,
|
||||
OnShutdown: app.shutdown,
|
||||
OnStartup: app.Startup,
|
||||
OnBeforeClose: app.BeforeClose,
|
||||
OnShutdown: app.Shutdown,
|
||||
Bind: []interface{}{
|
||||
app,
|
||||
&env.Env{},
|
||||
&utils.Utils{},
|
||||
&systemUtils.InfoUtils{},
|
||||
dialog.New(app),
|
||||
},
|
||||
Debug: options.Debug{
|
||||
OpenInspectorOnStartup: true,
|
||||
|
@ -1,4 +1,4 @@
|
||||
package main
|
||||
package app
|
||||
|
||||
import (
|
||||
"context"
|
||||
@ -32,13 +32,16 @@ func NewApp() *App {
|
||||
app.load()
|
||||
return app
|
||||
}
|
||||
func (a *App) Ctx() context.Context {
|
||||
return a.ctx
|
||||
}
|
||||
|
||||
func (a *App) ReloadApp() {
|
||||
runtime.WindowReloadApp(a.ctx)
|
||||
}
|
||||
|
||||
func (a *App) ForceClose() {
|
||||
a.shutdown(a.ctx)
|
||||
a.Shutdown(a.ctx)
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
@ -68,9 +71,7 @@ func (a *App) load() {
|
||||
a.Handler = engine.Handler()
|
||||
}
|
||||
|
||||
// startup is called when the app starts. The context is saved
|
||||
// so we can call the runtime methods
|
||||
func (a *App) startup(ctx context.Context) {
|
||||
func (a *App) Startup(ctx context.Context) {
|
||||
if !global.Config.HasDebug() || !global.Config.Debug.Enable {
|
||||
err := a.pidLock.Lock()
|
||||
if err != nil {
|
||||
@ -105,11 +106,11 @@ func (a *App) startup(ctx context.Context) {
|
||||
}()
|
||||
}
|
||||
|
||||
func (a *App) beforeClose(ctx context.Context) bool {
|
||||
func (a *App) BeforeClose(ctx context.Context) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (a *App) shutdown(ctx context.Context) {
|
||||
func (a *App) Shutdown(ctx context.Context) {
|
||||
ctx2, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
|
19
app/wails/pkg/app/dialog/dialog.go
Normal file
19
app/wails/pkg/app/dialog/dialog.go
Normal file
@ -0,0 +1,19 @@
|
||||
package dialog
|
||||
|
||||
import (
|
||||
"github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
"skapp/pkg/app"
|
||||
)
|
||||
|
||||
func New(app *app.App) *Support {
|
||||
return &Support{app}
|
||||
}
|
||||
|
||||
type Support struct {
|
||||
app *app.App
|
||||
}
|
||||
|
||||
func (s *Support) OpenFileDialog(dialogOptions runtime.OpenDialogOptions) string {
|
||||
path, _ := runtime.OpenFileDialog(s.app.Ctx(), dialogOptions)
|
||||
return path
|
||||
}
|
Loading…
Reference in New Issue
Block a user