From 940683323903dfaaf454051b154793f41fd6355e Mon Sep 17 00:00:00 2001
From: shy <shy@shylinux.com>
Date: Mon, 5 Aug 2024 23:20:48 +0800
Subject: [PATCH] add some

---
 src/guanlixitong/common.go    |  4 ++++
 src/guanlixitong/groupUser.go | 12 ++----------
 src/guanlixitong/groupUser.js |  8 ++++----
 src/guanlixitong/portal.json  | 17 ++++++++---------
 src/guanlixitong/target.js    | 13 +++++++------
 5 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/guanlixitong/common.go b/src/guanlixitong/common.go
index 97c8c6f..fc8d9a0 100644
--- a/src/guanlixitong/common.go
+++ b/src/guanlixitong/common.go
@@ -8,6 +8,10 @@ import (
 	"shylinux.com/x/enterprise/src/guanlixitong/model"
 )
 
+type Tables struct {
+	gonganxitong.Tables
+	list string `name:"list group_uid uid auto" role:"void"`
+}
 type Table struct {
 	gonganxitong.Table
 	list string `name:"list group_uid uid auto" role:"void"`
diff --git a/src/guanlixitong/groupUser.go b/src/guanlixitong/groupUser.go
index 6f369da..b3bebcf 100644
--- a/src/guanlixitong/groupUser.go
+++ b/src/guanlixitong/groupUser.go
@@ -1,20 +1,12 @@
 package guanlixitong
 
-import (
-	"shylinux.com/x/ice"
-
-	"shylinux.com/x/enterprise/src/guanlixitong/model"
-)
+import "shylinux.com/x/ice"
 
 type groupUser struct {
-	portal    portal
+	Tables
 	userGroup userGroup
-	list      string `name:"list group_uid uid auto" help:"团队成员" icon:"https://img.icons8.com/officel/80/crowd.png" role:"void"`
 }
 
-func (s groupUser) Init(m *ice.Message, arg ...string) {
-	s.portal.Show(m, model.ROLE, "creator,leader")
-}
 func (s groupUser) List(m *ice.Message, arg ...string) {
 	m.Cmdy(s.userGroup, s.userGroup.User, arg).Display("")
 }
diff --git a/src/guanlixitong/groupUser.js b/src/guanlixitong/groupUser.js
index d9f4521..21b0165 100644
--- a/src/guanlixitong/groupUser.js
+++ b/src/guanlixitong/groupUser.js
@@ -1,10 +1,10 @@
 Volcanos(chat.ONIMPORT, {
-	_init: function(can, msg) {
-		if (msg.IsDetail()) { can.onexport.share_title(can, msg, "user_group_role"); return msg.Show(can) }
-		can.onimport.itemcards(can, msg, function(value) { value._style = [value.user_group_role]
+	_init: function(can, msg) { var USER_GROUP_ROLE = "user_group_role"
+		if (msg.IsDetail()) { can.onexport.share_title(can, msg, USER_GROUP_ROLE); return msg.Show(can) }
+		can.onimport.itemcards(can, msg, function(value) { value._style = [value[USER_GROUP_ROLE]]
 			return [
 				{view: html.TITLE, list: [{text: value.user_name},
-					{text: [can.user.transValue(can, value, "user_group_role"), "", aaa.ROLE]},
+					{text: [can.user.transValue(can, value, USER_GROUP_ROLE), "", [aaa.ROLE, value[USER_GROUP_ROLE]]]},
 				]},
 				{view: html.STATUS, list: [{text: value.uid.slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}]},
 			]
diff --git a/src/guanlixitong/portal.json b/src/guanlixitong/portal.json
index b0d8fb4..b737426 100644
--- a/src/guanlixitong/portal.json
+++ b/src/guanlixitong/portal.json
@@ -3,32 +3,31 @@
 	"scanQRCode": "扫码添加",
 	"placeCreate": "创建团队",
 	"placeRemove": "解散团队",
+	"groupUser": "团队成员",
 	"target": "目标计划",
 	"icons": {
+		"groupUser": "https://img.icons8.com/officel/80/crowd.png",
 		"target": "https://img.icons8.com/officel/80/goal--v1.png"
 	},
 	"input": {
 		"My Group": "我的团队",
-		"user_name": "用户昵称",
-		"user_avatar": "用户头像",
 		"user_group_role": "用户角色",
-		"group_uid": "团队",
 		"group_name": "团队名称",
 		"group_type": "团队类型",
 		"company_name": "公司名称"
 	},
 	"value": {
-		"group_type": {
-			"RD": "研发",
-			"icons": {
-				"RD": "https://img.icons8.com/officel/80/code.png"
-			}
-		},
 		"user_group_role": {
 			"creator": "创建人",
 			"visitor": "访客",
 			"leader": "领导",
 			"member": "组员"
+		},
+		"group_type": {
+			"RD": "研发",
+			"icons": {
+				"RD": "https://img.icons8.com/officel/80/code.png"
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/guanlixitong/target.js b/src/guanlixitong/target.js
index e17ab5b..28034c9 100644
--- a/src/guanlixitong/target.js
+++ b/src/guanlixitong/target.js
@@ -1,14 +1,15 @@
 Volcanos(chat.ONIMPORT, {
 	_init: function(can, msg) {
+		if (msg.IsDetail()) { var value = msg.TableDetail(); msg.Option("_share_content", value.content)
+			msg.Option("_share_title", can.base.trimPrefix(value.created_at.split(" ")[0], can.base.Time(null, "%y-")))
+			return msg.Show(can)
+		}
 		can.onimport.itemcards(can, msg, function(value) { return [
 			{view: html.TITLE, list: [{text: value.user_name},
 				{text: [can.user.transValue(can, value, "user_group_role"), "", aaa.ROLE]},
-				{text: can.base.TimeTrim(value.created_at)},
 			]},
-			{view: html.STATUS, list: [{text: value.content}]},
+			{view: html.STATUS, list: [{text: value.uid.slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)},]},
+			{view: html.OUTPUT, list: [{text: value.content}]},
 		] })
-		if (msg.IsDetail()) { var value = msg.TableDetail(); msg.Option("_share_content", value.content)
-			msg.Option("_share_title", can.base.trimPrefix(value.created_at.split(" ")[0], can.base.Time(null, "%y-")))
-		}
 	},
-})
+})
\ No newline at end of file