Merge branch 'master' into master

data/view/model/genmysql/genmysql.go

@@ -60,9 +60,20 @@ func (m *mysqlModel) GetPkgName() string {
 }
 
 func getPackageInfo(orm *mysqldb.MySqlDB, info *model.DBInfo) {
-	tables := getTables(orm) // get table and notes
-
-	for tabName, notes := range tables {
+	tabls := getTables(orm) // get table and notes
+	// if m := config.GetTableList(); len(m) > 0 {
+	// 	// 制定了表之后
+	// 	newTabls := make(map[string]string)
+	// 	for t := range m {
+	// 		if notes, ok := tabls[t]; ok {
+	// 			newTabls[t] = notes
+	// 		} else {
+	// 			fmt.Printf("table: %s not found in db\n", t)
+	// 		}
+	// 	}
+	// 	tabls = newTabls
+	// }
+	for tabName, notes := range tabls {
 		var tab model.TabInfo
 		tab.Name = tabName
 		tab.Notes = notes

data/view/model/model.go

@@ -30,6 +30,7 @@ func Generate(info DBInfo) (out []GenOutInfo, m _Model) {
 	var stt GenOutInfo
 	stt.FileCtx = m.generate()
 	stt.FileName = info.DbName + ".go"
+
 	out = append(out, stt)
 	// ------end
 
@@ -48,6 +49,7 @@ func (m *_Model) GetPackage() genstruct.GenPackage {
 		pkg.SetPackage(m.info.PackageName) //package name
 		for _, tab := range m.info.TabList {
 			var sct genstruct.GenStruct
+			sct.SetTableName(tab.Name)
 			sct.SetStructName(getCamelName(tab.Name)) // Big hump.大驼峰
 			sct.SetNotes(tab.Notes)
 			sct.AddElement(m.genTableElement(tab.Em)...) // build element.构造元素