From 3c00b78116b561186876eac1f8589366a347a981 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 01 九月 2023 19:16:11 +0800
Subject: [PATCH] 添加物料属性
---
gui/gui.go | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/gui/gui.go b/gui/gui.go
index abbe701..50080f0 100644
--- a/gui/gui.go
+++ b/gui/gui.go
@@ -1,22 +1,18 @@
package gui
import (
- "fmt"
"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"
- "fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/dialog"
"fyne.io/fyne/v2/layout"
- "fyne.io/fyne/v2/storage"
"fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget"
)
@@ -26,8 +22,9 @@
FullScreen bool
}
-func NewDisplay() *Display {
+func NewDisplay(dbConnectedChan chan bool) *Display {
a := app.New()
+
// 璁剧疆鍥炬爣
a.SetIcon(static.IconPng)
@@ -66,6 +63,7 @@
// //myWindow.Close()
//},
}
+
var submitBtn *widget.Button
submitBtn = widget.NewButtonWithIcon("鍚姩", theme.MailSendIcon(), func() {
config.Options.WebPort = strings.Trim(serverPort.Text, " ")
@@ -79,18 +77,15 @@
// 杩炴帴鏁版嵁搴�
err := kingdee.Init(config.Options.SqlUsername, config.Options.SqlPassword, config.Options.SqlAddr, config.Options.SqlDBName)
if err != nil {
- fmt.Println("db init error:", err.Error())
+ logger.Error("db init error:%s", err.Error())
dialog.ShowError(err, w)
- 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)
@@ -114,21 +109,4 @@
})
d.Window.ShowAndRun()
-}
-
-func (d *Display) DrawImage(imgUri string) {
- uri, err := storage.ParseURI(imgUri)
- if err != nil {
- fmt.Println("parse uri error:", err)
- }
-
- image := canvas.NewImageFromURI(uri)
- //image := canvas.NewImageFromImage(src)
- // image := canvas.NewImageFromReader(reader, name)
- //image := canvas.NewImageFromFile("./a.png")
- //image.FillMode = canvas.ImageFillContain
- //image.FillMode = canvas.ImageFillOriginal
- image.FillMode = canvas.ImageFillStretch
-
- d.Window.SetContent(image)
}
--
Gitblit v1.8.0