From db621f33481168d480db1dac8be1cf33058920c1 Mon Sep 17 00:00:00 2001
From: harveyshao <harveyshao@tencent.com>
Date: Thu, 7 Oct 2021 21:58:48 +0800
Subject: [PATCH] opt some

---
 misc.go            |  4 ++++
 misc/git/status.go | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/misc.go b/misc.go
index e87f7e57..4aad21f2 100644
--- a/misc.go
+++ b/misc.go
@@ -229,6 +229,10 @@ func (m *Message) cmd(arg ...interface{}) *Message {
 		case func(int, map[string]string, []string):
 			defer func() { m.Table(val) }()
 
+		case map[string]interface{}:
+			for k, v := range val {
+				opts[k] = v
+			}
 		case map[string]string:
 			for k, v := range val {
 				opts[k] = v
diff --git a/misc/git/status.go b/misc/git/status.go
index af846fd8..e338d566 100644
--- a/misc/git/status.go
+++ b/misc/git/status.go
@@ -136,7 +136,8 @@ func init() {
 				m.Cmdy(cli.SYSTEM, GIT, PUSH, ice.Option{cli.CMD_DIR, _repos_path(m.Option(kit.MDB_NAME))})
 				m.Cmdy(cli.SYSTEM, GIT, PUSH, "--tags")
 			}},
-			TAG: {Name: "tags version", Help: "标签", Hand: func(m *ice.Message, arg ...string) {
+			TAG: {Name: "tags version@key", Help: "标签", Hand: func(m *ice.Message, arg ...string) {
+				m.Option(cli.CMD_DIR, _repos_path(m.Option(kit.MDB_NAME)))
 				m.Cmdy(cli.SYSTEM, GIT, TAG, m.Option("version"))
 				m.Cmdy(cli.SYSTEM, GIT, PUSH, "--tags")
 			}},
@@ -160,6 +161,21 @@ func init() {
 				case kit.MDB_NAME:
 					m.Cmdy(REPOS, ice.OptionFields("name,time"))
 
+				case "version":
+					ls := kit.Split(strings.TrimPrefix(kit.Split(m.Option("tags"), "-")[0], "v"), ".")
+					if v := kit.Int(ls[2]); v < 9 {
+						m.Push("version", kit.Format("v%v.%v.%v", ls[0], ls[1], v+1))
+						return
+					}
+					if v := kit.Int(ls[1]); v < 9 {
+						m.Push("version", kit.Format("v%v.%v.0", ls[0], v+1))
+						return
+					}
+					if v := kit.Int(ls[0]); v < 9 {
+						m.Push("version", kit.Format("v%v.0.0", v+1))
+						return
+					}
+
 				case COMMENT:
 					ls := []string{}
 					ls = append(ls, kit.Split(m.Option(kit.MDB_FILE), " /")...)