diff --git a/src/development/model/model.go b/src/development/model/model.go index 6a11044..58d946a 100644 --- a/src/development/model/model.go +++ b/src/development/model/model.go @@ -14,7 +14,7 @@ const ( REPOS_UID = "repos_uid" REPOS_NAME = "repos_name" REPOS_TYPE = "repos_type" - RELEASE_UID = "_uid" + RELEASE_UID = "release_uid" COMPANY_UID = "company_uid" CITY_UID = "city_uid" ) diff --git a/src/development/portal.json b/src/development/portal.json index ced4c7e..49d0760 100644 --- a/src/development/portal.json +++ b/src/development/portal.json @@ -1,16 +1,17 @@ { "portal": "系统开发", - "placeCreate": "创建场景", - "placeRemove": "删除场景", + "placeCreate": "创建项目", + "placeRemove": "删除项目", + "member": "项目成员", "release": "版本发布", "icons": { "release": "https://img.icons8.com/officel/80/activity-grid.png" }, "input": { - "My Repos": "我的场景", + "My Repos": "我的项目", "user_repos_role": "用户角色", - "repos_name": "场景名称", - "repos_type": "场景类型" + "repos_name": "项目名称", + "repos_type": "项目类型" }, "value": { "user_repos_role": { @@ -24,10 +25,8 @@ } }, "repos_type": { - "term": "学期制", - "weekly": "周期性", - "step": "阶段性", - "free": "自由式" + "local": "本地", + "remote": "远程" } } } \ No newline at end of file diff --git a/src/development/repos.go b/src/development/repos.go index befec8d..044cb30 100644 --- a/src/development/repos.go +++ b/src/development/repos.go @@ -9,15 +9,13 @@ func init() { ice.TeamCtxCmd(repos{}) } type ReposType int const ( - ReposRD ReposType = iota - ReposOP - ReposHR + ReposLocal ReposType = iota + ReposRemote ) var ReposTypeList = map[ReposType]string{ - ReposRD: "RD", - ReposOP: "OP", - ReposHR: "HR", + ReposLocal: "local", + ReposRemote: "remote", } -func (s ReposType) String() string { return ReposTypeList[s] } \ No newline at end of file +func (s ReposType) String() string { return ReposTypeList[s] } diff --git a/src/development/userRepos.go b/src/development/userRepos.go index b9d651f..628145e 100644 --- a/src/development/userRepos.go +++ b/src/development/userRepos.go @@ -8,7 +8,7 @@ import ( type userRepos struct { Table - repos repos + repos repos } func (s userRepos) User(m *ice.Message, arg ...string) { @@ -31,7 +31,7 @@ func (s userRepos) List(m *ice.Message, arg ...string) { if len(arg) == 1 { s.Select(m, model.USER_UID, arg[0]) } else if len(arg) == 2 { - s.SelectDetail(m, model.USER_UID, arg[0], s.Key(s, model.REPOS_UID), arg[1]) + s.SelectDetail(m, model.USER_UID, arg[0], model.REPOS_UID, arg[1]) } else { return } @@ -54,9 +54,9 @@ const ( var UserReposRoleList = map[UserReposRole]string{ UserReposVisitor: "visitor", UserReposCreator: "creator", - UserReposLeader: "leader", - UserReposWorker: "worker", - UserReposServer: "server", + UserReposLeader: "leader", + UserReposWorker: "worker", + UserReposServer: "server", } -func (s UserReposRole) String() string { return UserReposRoleList[s] } \ No newline at end of file +func (s UserReposRole) String() string { return UserReposRoleList[s] } diff --git a/src/gongyinglian/model/model.go b/src/gongyinglian/model/model.go index a2e773c..7b00527 100644 --- a/src/gongyinglian/model/model.go +++ b/src/gongyinglian/model/model.go @@ -50,6 +50,7 @@ const ( STOCK = "stock" COUNT = "count" UNIT = "unit" + INIT = "init" ) type UserStore struct { @@ -57,6 +58,7 @@ type UserStore struct { UserUID string `gorm:"type:char(32);index"` StoreUID string `gorm:"type:char(32);index"` Role uint8 `gorm:"default:0"` + Init uint8 `gorm:"default:0"` } type Store struct { db.ModelWithUID diff --git a/src/gongyinglian/portal.json b/src/gongyinglian/portal.json index ede35d2..7cad330 100644 --- a/src/gongyinglian/portal.json +++ b/src/gongyinglian/portal.json @@ -52,6 +52,7 @@ "product_uid": "产品", "product_type": "产品类型", "company_uid": "公司", + "to_store_uid": "收货店铺", "payment_status": "付款状态", "express_status": "快递状态", "return_status": "退货状态", diff --git a/src/gongyinglian/userStore.go b/src/gongyinglian/userStore.go index 7106c1b..8823b58 100644 --- a/src/gongyinglian/userStore.go +++ b/src/gongyinglian/userStore.go @@ -27,6 +27,7 @@ func (s userStore) List(m *ice.Message, arg ...string) { s.Tables(m, s.store).FieldsWithCreatedAT(m, s, model.STORE_NAME, model.STORE_TYPE, model.USER_STORE_ROLE, model.COMPANY_UID, model.STORE_UID, + model.INIT, ) if len(arg) == 1 { s.Select(m, model.USER_UID, arg[0]) @@ -35,10 +36,8 @@ func (s userStore) List(m *ice.Message, arg ...string) { } else { return } - if m.Length() > 0 { - s.SelectJoinCompany(m) - s.SelectJoinCity(m) - } + s.SelectJoinCompany(m) + s.SelectJoinCity(m) } func init() { ice.TeamCtxCmd(userStore{}) } diff --git a/src/guanlixitong/portal.go b/src/guanlixitong/portal.go index 8ba926a..072ee36 100644 --- a/src/guanlixitong/portal.go +++ b/src/guanlixitong/portal.go @@ -4,7 +4,7 @@ import "shylinux.com/x/community/src/gonganxitong" type Portal struct { gonganxitong.Portal - placeCreate string `name:"placeCreate city_name* company_name* group_name*" role:"void"` + placeCreate string `name:"placeCreate city_name* company_name* group_type*:select group_name*" role:"void"` } func init() { diff --git a/src/guanlixitong/portal.json b/src/guanlixitong/portal.json index 93db8be..f183f51 100644 --- a/src/guanlixitong/portal.json +++ b/src/guanlixitong/portal.json @@ -1,7 +1,7 @@ { "portal": "管理系统", "placeCreate": "创建团队", - "placeRemove": "解散团队", + "placeRemove": "退出团队", "target": "目标计划", "member": "团队成员", "icons": { diff --git a/src/guanlixitong/target.js b/src/guanlixitong/target.js index f010ae4..b7ff53c 100644 --- a/src/guanlixitong/target.js +++ b/src/guanlixitong/target.js @@ -1,9 +1,9 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.shareTitle(can, msg) can.onimport.itemcards(can, msg, function(value) { return [ - {view: html.TITLE, list: [{text: value.title}]}, - {view: html.STATUS, list: [{text: value.uid.slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}, {text: value.user_name}]}, - {view: html.OUTPUT, list: [{text: value.content}]}, + {view: html.TITLE, list: [value.title]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.created_at), value.user_name]}, + {view: html.OUTPUT, list: [value.content]}, ] }) }, }) \ No newline at end of file diff --git a/src/operation/cloud.go b/src/operation/cloud.go index 69b3867..e1f69f1 100644 --- a/src/operation/cloud.go +++ b/src/operation/cloud.go @@ -9,15 +9,13 @@ func init() { ice.TeamCtxCmd(cloud{}) } type CloudType int const ( - CloudRD CloudType = iota - CloudOP - CloudHR + CloudAliyun CloudType = iota + CloudTencent ) var CloudTypeList = map[CloudType]string{ - CloudRD: "RD", - CloudOP: "OP", - CloudHR: "HR", + CloudAliyun: "aliyun", + CloudTencent: "tencent", } func (s CloudType) String() string { return CloudTypeList[s] } diff --git a/src/operation/model/model.go b/src/operation/model/model.go index 430b331..c752a35 100644 --- a/src/operation/model/model.go +++ b/src/operation/model/model.go @@ -14,7 +14,7 @@ const ( CLOUD_UID = "cloud_uid" CLOUD_NAME = "cloud_name" CLOUD_TYPE = "cloud_type" - PUBLISH_UID = "_uid" + PUBLISH_UID = "publish_uid" COMPANY_UID = "company_uid" CITY_UID = "city_uid" ) diff --git a/src/operation/portal.go b/src/operation/portal.go index 121e608..c809064 100644 --- a/src/operation/portal.go +++ b/src/operation/portal.go @@ -7,7 +7,7 @@ import ( type Portal struct { gonganxitong.Portal - placeCreate string `name:"placeCreate city_name* company_name* cloud_name*" role:"void"` + placeCreate string `name:"placeCreate city_name* company_name* cloud_type*:select cloud_name*" role:"void"` } func init() { diff --git a/src/operation/portal.json b/src/operation/portal.json index 6be219a..13364d0 100644 --- a/src/operation/portal.json +++ b/src/operation/portal.json @@ -4,7 +4,7 @@ "placeRemove": "删除场景", "publish": "系统发布", "icons": { - "系统发布": "https://img.icons8.com/officel/80/activity-grid.png" + "publish": "https://img.icons8.com/officel/80/activity-grid.png" }, "input": { "My Cloud": "我的场景", @@ -24,10 +24,12 @@ } }, "cloud_type": { - "term": "学期制", - "weekly": "周期性", - "step": "阶段性", - "free": "自由式" + "aliyun": "阿里云", + "tencent": "腾讯云", + "icons": { + "aliyun": "usr/icons/aliyun.png", + "tencent": "usr/icons/tencent.png" + } } } } \ No newline at end of file diff --git a/usr/local/export/web.team.development.portal/hash.json b/usr/local/export/web.team.development.portal/hash.json index f1792c9..b0dfee8 100644 --- a/usr/local/export/web.team.development.portal/hash.json +++ b/usr/local/export/web.team.development.portal/hash.json @@ -1,6 +1,7 @@ { "0bea40222e9b6e5925bebd060815779b": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/property-with-timer.png", "index": "web.team.development.event", "name": "事件流", @@ -11,6 +12,7 @@ }, "2dde4851ba7e250e914790995d78f408": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/multiple-smartphones.png", "index": "web.team.development.recent", "name": "最近访问", @@ -20,14 +22,17 @@ }, "317e6006aca996d98a504a6fd12328e5": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/activity-grid.png", "index": "web.team.development.release", "name": "版本发布", + "order": "1", "time": "2024-08-24 22:04:35.143" } }, "4fedc06280d241291c9e826e57532333": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/activity-grid.png", "index": "web.team.development.service", "name": "服务发现", @@ -37,6 +42,7 @@ }, "6c38b2d75cf77d3f3be03d4755650660": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/customer-support.png", "index": "web.team.development.support", "name": "客服支持", @@ -46,6 +52,7 @@ }, "90f891576bd575758a3bde4514e86e9c": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/qr-code.png", "index": "web.team.development.qrcode", "name": "场景码", @@ -56,15 +63,17 @@ }, "ae176612af13a5cdb5b01ece8172651a": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/person-at-home.png", "index": "web.team.development.member", - "name": "场景成员", + "name": "项目成员", "order": "80", "time": "2024-08-24 11:07:54.936" } }, "b985480805074cd9ce56b1f97dbf6c68": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/test-partial-passed.png", "index": "web.team.development.message", "name": "消息待办", @@ -74,6 +83,7 @@ }, "bc7d1f3b02ca339b1baeeda66822784e": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/receipt-approved.png", "index": "web.team.development.allow", "name": "权限审批", @@ -84,6 +94,7 @@ }, "dee424d13ad309aa8ec7f4247072dcb3": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/edit-property.png", "index": "web.team.development.apply", "name": "权限申请", diff --git a/usr/local/export/web.team.gongyinglian.portal/hash.json b/usr/local/export/web.team.gongyinglian.portal/hash.json index 77b1108..b04826e 100644 --- a/usr/local/export/web.team.gongyinglian.portal/hash.json +++ b/usr/local/export/web.team.gongyinglian.portal/hash.json @@ -28,7 +28,6 @@ "index": "web.team.gongyinglian.service", "name": "服务发现", "order": "102", - "role": "creator", "time": "2024-08-20 21:24:23.258" } }, @@ -48,6 +47,7 @@ "enable": "true", "icons": "https://img.icons8.com/officel/80/wood.png", "index": "web.team.gongyinglian.material", + "init": "4", "name": "原材", "order": "17", "role": "creator,boss,worker", @@ -61,7 +61,7 @@ "index": "web.team.gongyinglian.event", "name": "事件流", "order": "91", - "role": "creator", + "role": "creator,boss", "time": "2024-08-20 21:24:23.233" } }, @@ -70,6 +70,7 @@ "enable": "true", "icons": "https://img.icons8.com/officel/80/garage-closed.png", "index": "web.team.gongyinglian.warehouse", + "init": "3", "name": "仓库", "order": "18", "role": "creator,boss,worker", @@ -114,6 +115,7 @@ "enable": "true", "icons": "https://img.icons8.com/officel/80/product.png", "index": "web.team.gongyinglian.goods", + "init": "2", "name": "商品", "order": "16", "time": "2024-08-20 21:24:23.271" @@ -126,7 +128,7 @@ "index": "web.team.gongyinglian.allow", "name": "权限审批", "order": "93", - "role": "creator", + "role": "creator,boss", "time": "2024-08-20 21:24:23.188" } }, @@ -156,6 +158,7 @@ "enable": "true", "icons": "https://img.icons8.com/officel/80/shop.png", "index": "web.team.gongyinglian.shop", + "init": "1", "name": "店铺", "order": "15", "time": "2024-08-20 21:24:23.300" @@ -189,7 +192,7 @@ "index": "web.team.gongyinglian.apply", "name": "权限申请", "order": "92", - "role": "creator", + "role": "creator,boss", "time": "2024-08-20 21:24:23.155" } }, @@ -233,7 +236,7 @@ "index": "web.team.gongyinglian.qrcode", "name": "场景码", "order": "90", - "role": "creator", + "role": "creator,boss", "time": "2024-08-20 21:24:23.244" } }, diff --git a/usr/local/export/web.team.guanlixitong.portal/hash.json b/usr/local/export/web.team.guanlixitong.portal/hash.json index ef425fb..604674e 100644 --- a/usr/local/export/web.team.guanlixitong.portal/hash.json +++ b/usr/local/export/web.team.guanlixitong.portal/hash.json @@ -8,7 +8,7 @@ "icons": "https://img.icons8.com/officel/80/qr-code.png", "index": "web.team.guanlixitong.qrcode", "name": "场景码", - "order": "1", + "order": "90", "role": "creator,leader", "time": "2024-08-03 16:09:06.053" } @@ -35,7 +35,7 @@ "icons": "https://img.icons8.com/officel/80/receipt-approved.png", "index": "web.team.guanlixitong.allow", "name": "权限审批", - "order": "4", + "order": "93", "role": "creator,leader", "time": "2024-08-16 10:46:56.590" } @@ -49,8 +49,7 @@ "icons": "https://img.icons8.com/officel/80/person-at-home.png", "index": "web.team.guanlixitong.member", "name": "团队成员", - "order": "5", - "role": "creator,leader,worker,server", + "order": "1", "time": "2024-08-12 08:57:09.639" } }, @@ -63,7 +62,7 @@ "icons": "https://img.icons8.com/officel/80/property-with-timer.png", "index": "web.team.guanlixitong.event", "name": "事件流", - "order": "2", + "order": "91", "role": "creator,leader", "time": "2024-08-05 01:14:22.409" } @@ -97,7 +96,7 @@ "icons": "https://img.icons8.com/officel/80/edit-property.png", "index": "web.team.guanlixitong.apply", "name": "权限申请", - "order": "3", + "order": "92", "role": "creator,leader", "time": "2024-08-05 01:14:22.416" } @@ -121,7 +120,7 @@ "icons": "https://img.icons8.com/officel/80/goal--v1.png", "index": "web.team.guanlixitong.target", "name": "目标计划", - "order": "6", + "order": "2", "time": "2024-08-06 16:56:44.676" } } diff --git a/usr/local/export/web.team.operation.portal/hash.json b/usr/local/export/web.team.operation.portal/hash.json index 135c75f..c522cac 100644 --- a/usr/local/export/web.team.operation.portal/hash.json +++ b/usr/local/export/web.team.operation.portal/hash.json @@ -1,6 +1,7 @@ { "3b0ced2e41179097e594b91c3c36536b": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/person-at-home.png", "index": "web.team.operation.member", "name": "场景成员", @@ -10,6 +11,7 @@ }, "53b0f8b9867485bb8864f2205e31897e": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/activity-grid.png", "index": "web.team.operation.service", "name": "服务发现", @@ -17,8 +19,19 @@ "time": "2024-08-24 11:07:55.179" } }, + "65c0459a8b23e672deebedb5c1c76fe5": { + "meta": { + "enable": "true", + "icons": "https://img.icons8.com/officel/80/activity-grid.png", + "index": "web.team.operation.publish", + "name": "系统发布", + "order": "1", + "time": "2024-08-27 09:10:02.041" + } + }, "6ca4f1fc571350c2498bc5c1d7ac3563": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/qr-code.png", "index": "web.team.operation.qrcode", "name": "场景码", @@ -29,6 +42,7 @@ }, "85c8678d4af08bb0c3e9560155b7c98f": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/property-with-timer.png", "index": "web.team.operation.event", "name": "事件流", @@ -39,6 +53,7 @@ }, "b2d8434f3ab5340408f71c4bf087e3d9": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/multiple-smartphones.png", "index": "web.team.operation.recent", "name": "最近访问", @@ -48,6 +63,7 @@ }, "ca74fb83cfd850b1ca03fe18976c253a": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/test-partial-passed.png", "index": "web.team.operation.message", "name": "消息待办", @@ -57,6 +73,7 @@ }, "d47d5d11064235734413113c7440af7f": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/receipt-approved.png", "index": "web.team.operation.allow", "name": "权限审批", @@ -67,6 +84,7 @@ }, "ec25b5c62a4d26688fe114d9b25f7a56": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/customer-support.png", "index": "web.team.operation.support", "name": "客服支持", @@ -76,6 +94,7 @@ }, "f7484dd174d63a6800f84d1fb5fbb584": { "meta": { + "enable": "true", "icons": "https://img.icons8.com/officel/80/edit-property.png", "index": "web.team.operation.apply", "name": "权限申请",