From 1c30ff4d40ab586767c69b304b3561297e0e54c5 Mon Sep 17 00:00:00 2001 From: shy Date: Tue, 17 Dec 2024 15:38:46 +0800 Subject: [PATCH] opt some --- src/gonganxitong/contract.go | 1 + src/gonganxitong/document.go | 1 + src/gonganxitong/goodslist.go | 1 + src/gonganxitong/paymentlist.go | 1 + src/gonganxitong/photo.go | 1 + src/gonganxitong/portal.go | 2 +- src/gonganxitong/portal.js | 4 ++-- usr/local/export/web.team.guanlixitong.portal/hash.json | 5 +++++ usr/local/export/web.team.huodongzuzhi.portal/hash.json | 5 +++++ usr/local/export/web.team.renzhengshouquan.portal/hash.json | 4 ++++ usr/local/export/web.team.yuehaoxitong.portal/hash.json | 5 +++++ 11 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/gonganxitong/contract.go b/src/gonganxitong/contract.go index 67762ff..82b661e 100644 --- a/src/gonganxitong/contract.go +++ b/src/gonganxitong/contract.go @@ -6,6 +6,7 @@ type contract struct { Table order string `data:"95"` auth string `data:"issued"` + role string `data:"leader,worker"` fields string `data:"title"` create string `name:"create title*" role:"leader"` remove string `name:"remove" role:"leader"` diff --git a/src/gonganxitong/document.go b/src/gonganxitong/document.go index dc80b05..a50fe4e 100644 --- a/src/gonganxitong/document.go +++ b/src/gonganxitong/document.go @@ -10,6 +10,7 @@ type document struct { Table order string `data:"94"` auth string `data:"issued"` + role string `data:"leader,worker"` fields string `data:"folder_id,vendor,user_uid"` open string `name:"open" style:"notice" role:"void"` } diff --git a/src/gonganxitong/goodslist.go b/src/gonganxitong/goodslist.go index b550247..16a8708 100644 --- a/src/gonganxitong/goodslist.go +++ b/src/gonganxitong/goodslist.go @@ -17,6 +17,7 @@ type goodslist struct { paymentlist paymentlist order string `data:"91"` auth string `data:"issued"` + role string `data:"leader,worker"` fields string `data:"name,amount,title,content,user_uid"` create string `name:"create name* amount* title* content*" role:"leader"` remove string `name:"remove" role:"leader"` diff --git a/src/gonganxitong/paymentlist.go b/src/gonganxitong/paymentlist.go index ffd5d9f..d3e4fc4 100644 --- a/src/gonganxitong/paymentlist.go +++ b/src/gonganxitong/paymentlist.go @@ -11,6 +11,7 @@ type paymentlist struct { Table order string `data:"92"` auth string `data:"issued"` + role string `data:"leader,worker"` fields string `data:"amount,title,content,paymentlist_status,goodslist_uid,user_uid"` create string `name:"create amount* title* content" role:"leader"` request string `name:"request" help:"支付" style:"notice" role:"void"` diff --git a/src/gonganxitong/photo.go b/src/gonganxitong/photo.go index 2fae842..fc385ab 100644 --- a/src/gonganxitong/photo.go +++ b/src/gonganxitong/photo.go @@ -11,6 +11,7 @@ type photo struct { Table order string `data:"96"` auth string `data:"issued"` + role string `data:"leader,worker"` fields string `data:"space_id,access_token,expire_time,vendor"` upload string `name:"upload" role:"worker"` rename string `name:"rename newname" role:"worker"` diff --git a/src/gonganxitong/portal.go b/src/gonganxitong/portal.go index 68060df..5148efb 100644 --- a/src/gonganxitong/portal.go +++ b/src/gonganxitong/portal.go @@ -27,7 +27,7 @@ type Portal struct { service service export string `data:"true"` short string `data:"index"` - field string `data:"time,icons,name,index,order,enable,type,auth,role,view,init,portal,public"` + field string `data:"time,icons,name,index,order,enable,type,auth,role,view,init,portal"` create string `name:"create index name icons"` list string `name:"list place_uid index uid auto" role:"void"` placeCreate string `name:"placeCreate city_name* street_name* place_name* place_type:select address" icon:"bi bi-plus-square-dotted" role:"void"` diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index ff02bd6..1919e5a 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -235,7 +235,7 @@ Volcanos(chat.ONEXPORT, { can.ui.myinit && can.onimport.myInit(can, can._index_msg, value, can.ui.myinit) can.ui.mycount && can.onimport.myCount(can, value, can.ui.mycount) can.ui.mynotice && can.onimport.myNotice(can, value, can.ui.mynotice) - can.ui.myallow && can.onmotion.toggle(can, can.ui.myallow, status && (value._role == "creator" || can.page.Select(can, can.ui.myallow, "div.item.index.role."+value._role).length > 0)) + can.ui.myallow && can.onmotion.toggle(can, can.ui.myallow, status && (value._role == "creator" || parseInt(value._role) > 0 || can.page.Select(can, can.ui.myallow, "div.item.index.role."+value._role).length > 0)) can.ui.myindex && can.onmotion.toggle(can, can.ui.myindex, status) if (!can.onmotion.cache(can, function() { return value._uid }, can.ui.header) && value.auth_background) { can.page.Append(can, can.ui.header, [{img: value.auth_background}]) @@ -244,7 +244,7 @@ Volcanos(chat.ONEXPORT, { }, index: function(can, value, role) { role = role||value._role can.ui.role && can.onmotion.toggle(can, can.ui.role, value._role == "creator") - can.ui.role && can.onmotion.select(can, can.ui.role, html.SPAN, can.page.SelectOne(can, can.ui.role, "span."+role)) + parseInt(role) > 0 || can.ui.role && can.onmotion.select(can, can.ui.role, html.SPAN, can.page.SelectOne(can, can.ui.role, "span."+role)) can.page.Select(can, can.ui.myindex, html.DIV_ITEM, function(target) { var list = target.className.split(" ") if (list.indexOf("issued") > -1 && value.auth_status != "issued") { can.onmotion.toggle(can, target, false) diff --git a/usr/local/export/web.team.guanlixitong.portal/hash.json b/usr/local/export/web.team.guanlixitong.portal/hash.json index 45c8d15..d86ad33 100644 --- a/usr/local/export/web.team.guanlixitong.portal/hash.json +++ b/usr/local/export/web.team.guanlixitong.portal/hash.json @@ -118,6 +118,7 @@ "index": "web.team.guanlixitong.goodslist", "name": "在线商城", "order": "91", + "role": "leader,worker", "time": "2024-12-04 16:43:56.678" } }, @@ -138,6 +139,7 @@ "index": "web.team.guanlixitong.photo", "name": "在线相册", "order": "95", + "role": "leader,worker", "time": "2024-11-25 18:11:44.299" } }, @@ -232,6 +234,7 @@ "index": "web.team.guanlixitong.paymentlist", "name": "在线支付", "order": "92", + "role": "leader,worker", "time": "2024-11-22 17:42:50.864" } }, @@ -251,6 +254,7 @@ "index": "web.team.guanlixitong.contract", "name": "在线合同", "order": "94", + "role": "leader,worker", "time": "2024-11-25 18:11:44.307" } }, @@ -261,6 +265,7 @@ "index": "web.team.guanlixitong.document", "name": "在线文档", "order": "93", + "role": "leader,worker", "time": "2024-11-10 09:43:58.429" } }, diff --git a/usr/local/export/web.team.huodongzuzhi.portal/hash.json b/usr/local/export/web.team.huodongzuzhi.portal/hash.json index 2640c5b..8af459e 100644 --- a/usr/local/export/web.team.huodongzuzhi.portal/hash.json +++ b/usr/local/export/web.team.huodongzuzhi.portal/hash.json @@ -6,6 +6,7 @@ "index": "web.team.huodongzuzhi.goodslist", "name": "在线商城", "order": "91", + "role": "leader,worker", "time": "2024-12-04 16:43:56.566" } }, @@ -26,6 +27,7 @@ "index": "web.team.huodongzuzhi.contract", "name": "在线合同", "order": "94", + "role": "leader,worker", "time": "2024-11-25 18:11:44.294" } }, @@ -36,6 +38,7 @@ "index": "web.team.huodongzuzhi.document", "name": "在线文档", "order": "93", + "role": "leader,worker", "time": "2024-11-25 18:19:23.750" } }, @@ -151,6 +154,7 @@ "index": "web.team.huodongzuzhi.photo", "name": "在线相册", "order": "95", + "role": "leader,worker", "time": "2024-11-25 18:11:44.292" } }, @@ -161,6 +165,7 @@ "index": "web.team.huodongzuzhi.paymentlist", "name": "在线支付", "order": "92", + "role": "leader,worker", "time": "2024-11-22 17:42:50.775" } }, diff --git a/usr/local/export/web.team.renzhengshouquan.portal/hash.json b/usr/local/export/web.team.renzhengshouquan.portal/hash.json index 079f16c..a68587c 100644 --- a/usr/local/export/web.team.renzhengshouquan.portal/hash.json +++ b/usr/local/export/web.team.renzhengshouquan.portal/hash.json @@ -7,6 +7,7 @@ "index": "web.team.renzhengshouquan.photo", "name": "在线相册", "order": "96", + "role": "leader,worker", "time": "2024-11-25 18:11:44.117" } }, @@ -28,6 +29,7 @@ "index": "web.team.renzhengshouquan.document", "name": "在线文档", "order": "95", + "role": "leader,worker", "time": "2024-11-25 18:19:23.561" } }, @@ -39,6 +41,7 @@ "index": "web.team.renzhengshouquan.contract", "name": "在线合同", "order": "94", + "role": "leader,worker", "time": "2024-11-25 18:11:44.121" } }, @@ -172,6 +175,7 @@ "index": "web.team.renzhengshouquan.paymentlist", "name": "在线支付", "order": "92", + "role": "leader,worker", "time": "2024-11-22 17:42:50.659", "type": "company,school,street,service" } diff --git a/usr/local/export/web.team.yuehaoxitong.portal/hash.json b/usr/local/export/web.team.yuehaoxitong.portal/hash.json index 0b9bb85..86dab60 100644 --- a/usr/local/export/web.team.yuehaoxitong.portal/hash.json +++ b/usr/local/export/web.team.yuehaoxitong.portal/hash.json @@ -15,6 +15,7 @@ "index": "web.team.yuehaoxitong.contract", "name": "在线合同", "order": "94", + "role": "leader,worker", "time": "2024-11-25 18:11:44.106" } }, @@ -104,6 +105,7 @@ "index": "web.team.yuehaoxitong.goodslist", "name": "在线商城", "order": "91", + "role": "leader,worker", "time": "2024-12-04 16:43:56.282" } }, @@ -134,6 +136,7 @@ "index": "web.team.yuehaoxitong.paymentlist", "name": "在线支付", "order": "92", + "role": "leader,worker", "time": "2024-11-22 17:42:50.642" } }, @@ -153,6 +156,7 @@ "index": "web.team.yuehaoxitong.photo", "name": "在线相册", "order": "95", + "role": "leader,worker", "time": "2024-11-25 18:11:44.112" } }, @@ -233,6 +237,7 @@ "index": "web.team.yuehaoxitong.document", "name": "在线文档", "order": "93", + "role": "leader,worker", "time": "2024-11-25 18:19:23.441" } },