From 1ba034d9e38f9ef0376932cf8f2b8596bcf3b4a6 Mon Sep 17 00:00:00 2001
From: shylinux <shylinux@icloud.com>
Date: Wed, 19 Feb 2020 12:37:56 +0800
Subject: [PATCH] opt git.status

---
 base/web/web.go   | 10 ++++++++++
 core/team/team.go |  2 +-
 misc/git/git.go   | 23 +++++++++++++++--------
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/base/web/web.go b/base/web/web.go
index d33c0360..6418e24e 100644
--- a/base/web/web.go
+++ b/base/web/web.go
@@ -1446,6 +1446,8 @@ var Index = &ice.Context{Name: "web", Help: "网络模块",
 			if len(arg) == 1 {
 				m.Richs(ice.WEB_SHARE, nil, arg[0], func(key string, value map[string]interface{}) {
 					m.Push("detail", value)
+					m.Push("key", "qrcode")
+					m.Push("value", kit.Format(`<img src="/share/%s/qrcode">`, key))
 				})
 				return
 			}
@@ -1493,6 +1495,13 @@ var Index = &ice.Context{Name: "web", Help: "网络模块",
 
 			default:
 				m.Richs(ice.WEB_SHARE, nil, arg[0], func(key string, value map[string]interface{}) {
+					switch kit.Select("", arg, 1) {
+					case "qrcode":
+						m.Push("_output", "qrcode")
+						m.Echo("%s/%s/", m.Conf(ice.WEB_SHARE, "meta.domain"), key)
+						return
+					}
+
 					m.Info("share %s %v", arg, kit.Format(value))
 					switch value["type"] {
 					case ice.TYPE_STORY:
@@ -1533,6 +1542,7 @@ var Index = &ice.Context{Name: "web", Help: "网络模块",
 						}
 
 						if len(arg) == 2 {
+							value["count"] = kit.Int(value["count"]) + 1
 							kit.Fetch(kit.Value(value, "extra.tool"), func(index int, value map[string]interface{}) {
 								m.Push("river", arg[0])
 								m.Push("storm", arg[1])
diff --git a/core/team/team.go b/core/team/team.go
index 4fedefa8..65a180a6 100644
--- a/core/team/team.go
+++ b/core/team/team.go
@@ -290,7 +290,7 @@ var Index = &ice.Context{Name: "team", Help: "团队中心",
 
 			case "week":
 				// 周计划
-				first = first.Add(-time.Duration((first.Hour()*int(time.Hour) + first.Minute()*int(time.Minute) + first.Second()*int(time.Second))))
+				first = first.Add(-time.Duration((int64(first.Hour())*int64(time.Hour) + int64(first.Minute())*int64(time.Minute) + int64(first.Second())*int64(time.Second))))
 				one := first.AddDate(0, 0, -int(first.Weekday()))
 				end := first.AddDate(0, 0, 7-int(first.Weekday()))
 
diff --git a/misc/git/git.go b/misc/git/git.go
index 32e05aff..9620a46d 100644
--- a/misc/git/git.go
+++ b/misc/git/git.go
@@ -81,15 +81,22 @@ var Index = &ice.Context{Name: "git", Help: "代码管理",
 			})
 			m.Sort("repos")
 		}},
-		"status": {Name: "status", Help: "状态", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
-			prefix := []string{ice.CLI_SYSTEM, "git", "status"}
+		"status": {Name: "status name", Help: "状态", List: kit.List(
+			kit.MDB_INPUT, "text", "name", "repos", "action", "auto",
+			kit.MDB_INPUT, "button", "name", "查看", "action", "auto",
+			kit.MDB_INPUT, "button", "name", "返回", "cb", "Last", "action", "auto",
+		), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
+			prefix := []string{ice.CLI_SYSTEM, "git"}
 			m.Richs("repos", nil, kit.Select("*", arg, 0), func(key string, value map[string]interface{}) {
-				m.Option("cmd_dir", kit.Value(value, "meta.path"))
-				for _, v := range strings.Split(strings.TrimSpace(m.Cmdx(prefix, "-sb")), "\n") {
-					vs := strings.SplitN(strings.TrimSpace(v), " ", 2)
-					m.Push("repos", kit.Value(value, "meta.name"))
-					m.Push("tags", vs[0])
-					m.Push("file", vs[1])
+				if m.Option("cmd_dir", kit.Value(value, "meta.path")); len(arg) > 0 {
+					m.Echo(m.Cmdx(prefix, "diff"))
+				} else {
+					for _, v := range strings.Split(strings.TrimSpace(m.Cmdx(prefix, "status", "-sb")), "\n") {
+						vs := strings.SplitN(strings.TrimSpace(v), " ", 2)
+						m.Push("repos", kit.Value(value, "meta.name"))
+						m.Push("tags", vs[0])
+						m.Push("file", vs[1])
+					}
 				}
 			})
 		}},