From efb92d737774650854cb79b37677b0ac4924f37d Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 15 八月 2023 18:10:05 +0800
Subject: [PATCH] 修复channel的初始化
---
gui/gui.go | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/gui/gui.go b/gui/gui.go
index 1dfdb39..50080f0 100644
--- a/gui/gui.go
+++ b/gui/gui.go
@@ -1,14 +1,12 @@
package gui
import (
- "kingdee-dbapi/logger"
"strings"
"kingdee-dbapi/config"
"kingdee-dbapi/kingdee"
- "kingdee-dbapi/report"
+ "kingdee-dbapi/logger"
"kingdee-dbapi/static"
- "kingdee-dbapi/webserver"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/app"
@@ -24,8 +22,9 @@
FullScreen bool
}
-func NewDisplay() *Display {
+func NewDisplay(dbConnectedChan chan bool) *Display {
a := app.New()
+
// 璁剧疆鍥炬爣
a.SetIcon(static.IconPng)
@@ -64,6 +63,7 @@
// //myWindow.Close()
//},
}
+
var submitBtn *widget.Button
submitBtn = widget.NewButtonWithIcon("鍚姩", theme.MailSendIcon(), func() {
config.Options.WebPort = strings.Trim(serverPort.Text, " ")
@@ -79,19 +79,13 @@
if err != nil {
logger.Error("db init error:%s", err.Error())
dialog.ShowError(err, w)
-
- if !config.Options.Debug {
- return
- }
}
form.Disable()
submitBtn.Text = "宸插惎鍔�"
submitBtn.Disable()
- report.StartReport()
-
- go webserver.Serve(serverPort.Text)
+ dbConnectedChan <- true
})
content := container.New(layout.NewGridWrapLayout(fyne.NewSize(300, 200)), form)
--
Gitblit v1.8.0