diff --git a/data/config/MyIni.go b/data/config/MyIni.go index 260486c..280fdf9 100644 --- a/data/config/MyIni.go +++ b/data/config/MyIni.go @@ -16,7 +16,6 @@ type Config struct { Language string `yaml:"language"` // language DbTag string `yaml:"db_tag"` // 数据库标签(gormt,db) Simple bool `yaml:"simple"` - IsDbTag bool `yaml:"is_db_tag"` // 是否输出 数据库标签 IsWEBTag bool `yaml:"is_web_tag"` IsWebTagPkHidden bool `yaml:"is_web_tag_pk_hidden"` // web标记是否隐藏主键 IsForeignKey bool `yaml:"is_foreign_key"` @@ -99,16 +98,6 @@ func SetSimple(b bool) { _map.Simple = b } -// GetIsDbTag is_db_tag -func GetIsDbTag() bool { - return _map.IsDbTag -} - -// SetIsDbTag is_db_tag -func SetIsDbTag(b bool) { - _map.IsDbTag = b -} - // GetIsWEBTag json tag.json标记 func GetIsWEBTag() bool { return _map.IsWEBTag @@ -321,8 +310,3 @@ func SetIsColumnName(isColumnName bool) { func GetIsOutFileByTableName() bool { return _map.IsOutFileByTableName } - -//SetIsOutFileByTableName set gen ColumnName config. 设置是否根据表名生成文件 -func SetIsOutFileByTableName(isOutFileByTableName bool) { - _map.IsColumnName = isOutFileByTableName -} diff --git a/data/dlg/cui.go b/data/dlg/cui.go index 97cabfe..0d64271 100644 --- a/data/dlg/cui.go +++ b/data/dlg/cui.go @@ -292,7 +292,6 @@ func buttonSave(g *gocui.Gui, v *gocui.View) error { config.SetIsDev(getBool(mp["is_dev"])) config.SetSimple(getBool(mp["is_simple"])) - config.SetIsDbTag(getBool(mp["is_db_tag"])) config.SetIsOutSQL(getBool(mp["is_out_sql"])) config.SetIsOutFunc(getBool(mp["is_out_func"])) config.SetForeignKey(getBool(mp["is_foreign_key"])) diff --git a/data/view/model/model.go b/data/view/model/model.go index 47d6ac4..7212b9f 100755 --- a/data/view/model/model.go +++ b/data/view/model/model.go @@ -123,8 +123,8 @@ func (m *_Model) genTableElement(cols []ColumnsInfo) (el []genstruct.GenElement) tmp.SetName(getCamelName(v.Name)) tmp.SetNotes(v.Notes) tmp.SetType(getTypeName(v.Type, v.IsNull)) - // is_db_tag. 是否输出gorm标签 - if config.GetIsDbTag() { + // 是否输出gorm标签 + if len(_tagGorm) > 0 { // not simple output. 默认只输出gorm主键和字段标签 if !config.GetSimple() { for _, v1 := range v.Index { @@ -163,8 +163,8 @@ func (m *_Model) genTableElement(cols []ColumnsInfo) (el []genstruct.GenElement) } if len(v.Name) > 0 { - // is_db_tag. 是否输出gorm标签 - if config.GetIsDbTag() { + // 是否输出gorm标签 + if len(_tagGorm) > 0 { // not simple output if !config.GetSimple() { tmp.AddTag(_tagGorm, "column:"+v.Name)