增加新特性，并修复一些问题

data/dlg/cui.go

@@ -4,14 +4,12 @@ import (
 	"fmt"
 	"log"
 	"strconv"
-	"strings"
 
 	"github.com/xxjwxc/public/tools"
 
 	"github.com/xxjwxc/gormt/data/config"
 
 	"github.com/jroimartin/gocui"
-	"github.com/xxjwxc/public/myclipboard"
 	"github.com/xxjwxc/public/mycui"
 )
 
@@ -79,7 +77,7 @@ func mainLayout(g *gocui.Gui) error {
 		// }
 	}
 
-	if v, err := g.SetView(_viewDefine, division(maxX, uiPart[0]), 1, maxX-1, maxY-3); err != nil {
+	if v, err := g.SetView(_viewDefine, division(maxX, uiPart[0]), 1, maxX-1, maxY-1); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
@@ -105,11 +103,6 @@ func nemuLayOut(g *gocui.Gui) {
 			AddHandler(gocui.KeyArrowUp, menuDlg.prevButton).AddHandler(gocui.KeyArrowDown, menuDlg.nextButton).
 			AddHandler(gocui.KeyEnter, enterSet).AddHandler(gocui.MouseLeft, enterSet))
 
-	maxX, maxY := g.Size() // division(maxY, uiPart[1])
-	clipboardBtn = mycui.NewButton(g, _clipboardBtn, SLocalize(_clipboardBtn), division(maxX, uiPart[0])+2, maxY-3, 5).
-		AddHandler(gocui.KeyEnter, enterClipboard).AddHandler(gocui.MouseLeft, enterClipboard)
-	clipboardBtn.Draw()
-
 	menuDlg.Draw()
 	menuFocusButton(g)
 }
@@ -170,24 +163,6 @@ func addlog(g *gocui.Gui, str string) error {
 	return err
 }
 
-func enterClipboard(g *gocui.Gui, v *gocui.View) error {
-	myclipboard.Set(copyInfo)
-
-	maxX, _ := g.Size()
-	modal := mycui.NewModal(g, division(maxX, uiPart[0])+5, 10, division(maxX, uiPart[0])+35).
-		SetTextColor(gocui.ColorRed).SetText("copy success \n 已 复 制 到 剪 切 板 ")
-	modal.Mouse = true
-	//	modal.SetBgColor(gocui.ColorRed)
-	_handle := func(g *gocui.Gui, v *gocui.View) error {
-		modal.Close()
-		return nil
-	}
-	modal.AddButton("ok", "OK", gocui.KeyEnter, _handle).AddHandler(gocui.MouseLeft, _handle)
-	modal.Draw()
-
-	return nil
-}
-
 func enterRun(g *gocui.Gui, v *gocui.View) error {
 	setlog(g, "run .... ing")
 	generate(g, v)
@@ -230,6 +205,8 @@ func enterSet(g *gocui.Gui, v *gocui.View) error {
 		AddOptions(SLocalize("true"), SLocalize("false")).SetSelected(SLocalize(tools.AsString(config.GetIsForeignKey())))
 	form.AddSelect("is_gui", SLocalize("is_gui"), formPart[0], formPart[2]).
 		AddOptions(SLocalize("true"), SLocalize("false")).SetSelected(SLocalize(tools.AsString(config.GetIsGUI())))
+	form.AddSelect("is_table_name", SLocalize("is_table_name"), formPart[0], formPart[2]).
+		AddOptions(SLocalize("true"), SLocalize("false")).SetSelected(SLocalize(tools.AsString(config.GetIsTableName())))
 	form.AddSelect("url_tag", SLocalize("url_tag"), formPart[0], formPart[2]).
 		AddOptions("json", "url").SetSelected(tools.AsString(config.GetURLTag()))
 	form.AddSelect("db_tag", SLocalize("db_tag"), formPart[0], formPart[2]).
@@ -267,14 +244,12 @@ func buttonSave(g *gocui.Gui, v *gocui.View) error {
 	port, err := strconv.Atoi(mp["db_port"])
 	if err != nil {
 		modal := mycui.NewModal(g, division(maxX, uiPart[0])+5, 10, division(maxX, uiPart[0])+35).SetTextColor(gocui.ColorRed).SetText("port error")
-
-		_handle := func(g *gocui.Gui, v *gocui.View) error {
+		//	modal.SetBgColor(gocui.ColorRed)
+		modal.AddButton("ok", "OK", gocui.KeyEnter, func(g *gocui.Gui, v *gocui.View) error {
 			modal.Close()
 			form.SetCurrentItem(form.GetCurrentItem())
 			return nil
-		}
-		//	modal.SetBgColor(gocui.ColorRed)
-		modal.AddButton("ok", "OK", gocui.KeyEnter, _handle).AddHandler(gocui.MouseLeft, _handle)
+		})
 
 		modal.Draw()
 		return nil
@@ -294,18 +269,18 @@ func buttonSave(g *gocui.Gui, v *gocui.View) error {
 	config.SetIsOutFunc(getBool(mp["is_out_func"]))
 	config.SetForeignKey(getBool(mp["is_foreign_key"]))
 	config.SetIsGUI(getBool(mp["is_gui"]))
+	config.SetIsTableName(getBool(mp["is_table_name"]))
 	config.SetURLTag(mp["url_tag"])
 	config.SetDBTag(mp["db_tag"])
 	config.SetLG(mp["language"])
 
 	config.SaveToFile()
 	modal := mycui.NewModal(g, division(maxX, uiPart[0])+5, 10, division(maxX, uiPart[0])+35).SetText("save success")
-	_handle := func(g *gocui.Gui, v *gocui.View) error {
+	modal.AddButton("ok", "OK", gocui.KeyEnter, func(g *gocui.Gui, v *gocui.View) error {
 		modal.Close()
 		buttonCancel(g, v)
 		return nil
-	}
-	modal.AddButton("ok", "OK", gocui.KeyEnter, _handle).AddHandler(gocui.MouseLeft, _handle)
+	})
 	modal.Draw()
 
 	return nil
@@ -334,11 +309,10 @@ func showStruct(g *gocui.Gui, v *gocui.View) error {
 		l = ""
 	}
 
-	var out, out1 []string
+	var out []string
 	for _, v := range gPkg.Structs {
 		if v.Name == l {
 			out = v.GeneratesColor()
-			out1 = v.Generates()
 			break
 		}
 	}
@@ -347,9 +321,6 @@ func showStruct(g *gocui.Gui, v *gocui.View) error {
 	for _, v := range out {
 		addlog(g, v)
 	}
-
-	copyInfo = strings.Join(out1, "\n")
-
 	return nil
 }
 

data/dlg/def.go

@@ -6,16 +6,15 @@ import (
 )
 
 const (
-	_menuDefine   = "menu"
-	_listDefine   = "list"
-	_viewDefine   = "view"
-	_run          = "run"
-	_set          = "set"
-	_clipboardBtn = "clipboardBtn"
+	_menuDefine = "menu"
+	_listDefine = "list"
+	_viewDefine = "view"
+	_run        = "run"
+	_set        = "set"
 )
 
 var (
-	uiPart      = []float32{4, 5}                                 // x,y 对应列表
+	uiPart      = []float32{4, 3}                                 // x,y 对应列表
 	mainViewArr = []string{_menuDefine, _listDefine, _viewDefine} // 主菜单列表
 	mainIndex   = 0
 
@@ -34,9 +33,6 @@ type listDetails struct {
 	btnList []*mycui.Button
 }
 
-var clipboardBtn *mycui.Button
-var copyInfo string
-
 var menuDlg *menuDetails
 var form *mycui.Form
 var gPkg genstruct.GenPackage

data/dlg/i18n.go

@@ -47,9 +47,6 @@ func addChinese() error {
 	}, &i18n.Message{
 		ID:    "set",
 		Other: "设 置 🛠 ",
-	}, &i18n.Message{
-		ID:    "clipboardBtn",
-		Other: "复 制 到 剪 切 板 ",
 	}, &i18n.Message{
 		ID:    "out_dir",
 		Other: " 输 出 目 录 :",
@@ -89,6 +86,9 @@ func addChinese() error {
 	}, &i18n.Message{
 		ID:    "is_gui",
 		Other: " 界 面 模 式 :",
+	}, &i18n.Message{
+		ID:    "is_table_name",
+		Other: " 生 成 表 名 :",
 	}, &i18n.Message{
 		ID:    "url_tag",
 		Other: " web 标 签:",
@@ -138,9 +138,6 @@ func addEnglish() error {
 	}, &i18n.Message{
 		ID:    "set",
 		Other: "Set 🛠 ",
-	}, &i18n.Message{
-		ID:    "clipboardBtn",
-		Other: "Copy to clipboard",
 	}, &i18n.Message{
 		ID:    "out_dir",
 		Other: "out dir:",
@@ -180,6 +177,9 @@ func addEnglish() error {
 	}, &i18n.Message{
 		ID:    "is_gui",
 		Other: "is show gui:",
+	}, &i18n.Message{
+		ID:    "is_table_name",
+		Other: "is table name:",
 	}, &i18n.Message{
 		ID:    "url_tag",
 		Other: "url tag:",