From 2d5b55a9eb83e75f5f68b7ed6fc2e23c3aba5566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Tue, 25 Jun 2024 17:23:17 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E9=A2=98"},{"State":1,"Type":36,"Name":"Shar?= =?UTF-8?q?eCommandContainer/=E5=8F=91=E8=B5=B7=E9=A2=84=E7=AE=97=E7=94=B3?= =?UTF-8?q?=E8=AF=B7"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=A3=80=E6=9F=A5"},{"Stat?= =?UTF-8?q?e":1,"Type":7,"Name":"Table/TODO"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 61 +-- Pages/项目/项目列表.json | 4 +- Pages/项目/项目首页/项目标题.json | 89 ++-- ServerCommands/系统/用户登录检查.json | 574 ++++++++++++++++++++++- ShareCommandContainers/发起预算申请.json | 29 +- Tables/TODO/TODO.json | 7 + 6 files changed, 625 insertions(+), 139 deletions(-) diff --git a/.collaboration b/.collaboration index d7f87cc8..c7d9d179 100644 --- a/.collaboration +++ b/.collaboration @@ -518,21 +518,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:06:02.6477409+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目列表.json", - "Pages\\项目\\项目列表.rd", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员详情", @@ -560,17 +546,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:19:11.8084799+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -1124,16 +1100,7 @@ }, { "ModuleName": "ShareCommandContainer/发起预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:22:33.9716741+08:00", - "ModuleType": 36, - "ToRemoveFiles": [ - "ShareCommandContainers\\发起预算申请.json" - ] + "ModuleType": 36 }, { "ModuleName": "ShareCommandContainer/跳转当前项目", @@ -1923,16 +1890,7 @@ }, { "ModuleName": "ServerCommand/用户登录检查", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:10:28.9653883+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\系统\\用户登录检查.json" - ] + "ModuleType": 15 }, { "ModuleName": "Notification/提醒通知", @@ -2262,16 +2220,7 @@ }, { "ModuleName": "Table/TODO", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:14:13.3850012+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\TODO\\TODO.json" - ] + "ModuleType": 7 }, { "ModuleName": "Image/float to-do.png", diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index 880a121e..a724062d 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -68,7 +68,7 @@ }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 235.0, + "DesignLengthInPixel": 379.0, "Mode": 1 } }, @@ -1863,4 +1863,4 @@ "Formula": "项目列表!$O$19" } ] -}//pgaMpEvetUquPgGkN/FM2OwEjBWSeSYCJm5/xv/zetpBCnfZQUoF7hnTal+aeFksYt5dPxxAUilIgAbhh55MQAZ6+F2WpBLPpq9WHMvT8Na8ZYFtJtzlffF9jCE21fhv5ce4ExclaRJXVs3xIS+J2UP2pFQgJvk2tUgNjnV+igmip5wgiuSly2KtTm7s9h/5IYpErGkYwLr0224364qBdG+11/FZce3CA6UxSG5thWgYcLSrYMh1UwbQeoL3fwbUUgOD8svEcPngHZJyUAlmZAVxvIdQ7FTvTII/2QmCF4sey8e4vkcAk4V9rHYn+qN0p9XzUxOpYtDsS8rSPsZsJVPpcrl2tarc7oUKgW7v2ZgVAlGFhqngBqG6tgsFLFsMPvohI8TTVcxCcDgoiS5Ce4f5BK08FNO0TK5aq10JGkUa6MKcrdzerST8MRidl9Eo0x+pUzQVO3ZmB0EYBnj0GLE3PwI3RoEcWAiLq0IKyLhnPq3msd+2VZvB6C+WCFRmvXi8nWV75Br6gEuIFwhEIlgbA8ADpxpwnNxVhjQJPSbW/5eR37HLCL1yJvsgFuaPjBIsQ4Hbv8OO9sms0/PPW3nwxH6IGPPk/ZxHP7W0Qy5tKJ/0k0BekuMLKOrvKL+UUhymY/TX0hCgo8TU8xQLuCpUzETJzsO0sNSMjkFhQ+tA5iOUnpcH881EqONZ7HoHqjalEyoasgtCEILFk0IhXwUMyHC5Szs870aAG2AKzS2NdtCOsOtg/B+hKPE7TvpY634U/MtBb0+Ol8oND0lKpSvenZTHnj7tN67xqa78euMDoWcB3ghE4/W6OugormtszaPD+fZFzGXqDdBO4fJdgOVc74HZ5i7WhupbT+18FuGoiKXfwFtNWv+/LkZZobpawepLOFnA0WJtjZqYMQkN/g==|920 \ No newline at end of file +}//Se9QkR8wdMJ7PkZ34IbnQsJSAhG9rEaF8FOopLKqkcIElRqu/6el3IX7Akwc6GjbHaovTRu+wGDB2Qj+PV+mkJZW59o48KrNGgA1XJtHOXo8LI3e0O/FdGZN5HEpOGlz1mopn/BMjbVz5g7CkjLOlb6TJiGYjCnaa26zqhRd7x/REbFFqFWH3cJQ5a4dCpVVVRK7Nz41OxdRipTlS88r0uTxRF9orhvtcv5cx0gQeY3az+0l288ceAKyqjW1lWdXyngeMAaC1Q5IzzVxgIhySnWA8BamGnvmO2Dlr7Swn9T2i72CtvysxuFYf2SkkxQcV5ZClCRx75SeQ1WJbf9th6sNgpLOywHUHcrEPxkkzY2bf1qzZl0cnd/ZDW8cZrPgo6ciCml3yVHxoifqeY880s92A7mIfRFzY+ynKyE0hVvhV3YAwBCbc+OpPoB/GbSyykak/xPhO3h8qPUkfoDlgJJ3Lo5TPeVCAI2VsnejHBl9vrG4VeQ3s+u1cOnJ8AIiFImRYP/APLAsxtmKEqdUksRiGBYB4bR2Vv5cumh5WUuw7H3qk30jfMtU+j4w1FyD0CylMhmykzPdYENaz5zhYUM2vwWxIMvfg3xWxR6SYsSaoBwVTJ8eaXnlkxkK/SdhxF7zfKSs9qifgsYgsq8bUKlv5Z8P5HprmcXTweVKQTltPAAi5qMNqMz5bRjZAwYEZsPf2vtBvZSu11ayTcTvt6q63GCTdnqfnZgJqtk7Q9vsxwFG228m5kkRGEqmBR5zO0n3HQVXFccSfkFWWY0mbpWlzgcCDc9G/Pq8dNLIcb0wX72mZmeyHcbFuzOGCrJS95Twdcj+QNxzQQEPaPQ1JqpHLvNE3LMdvB9b5gAlzS90uC3mW5fJ6tmUIKh1/fsFvQKby682pzb4nF4DCpOhQA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index 097760b5..6723d78b 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -402,7 +402,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "357f7676-c604-4c5e-bf17-4e181033c250" + "ID": "e0285f38-44c2-4116-a682-4d8f0adc2bfb" }, { "Condition": { @@ -424,7 +424,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "dd8de1a9-37b1-4ca2-9120-086ff23e3660" + "ID": "db366eaa-82f0-4105-9824-f64780163aca" }, { "Condition": { @@ -441,39 +441,52 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "项目预算申请历史", - "LoadBindingDataOption": 1 - }, - { - "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", - "ShareCommandContainerRefer": { - "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9" - }, - "Params": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "ParamReferObject": { - "ParamID": "30be91f8-0920-4879-bfdb-73a2443b9f1b", - "ShareCommandContainerReferObject": { - "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "834426a3-df55-496e-9f86-a68870c188d5" + } + }, + "value": "%CurrentUser.UserName%" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目ID" - } + "CommandList": [ + { + "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", + "TableName": "ACT_HI_PROCINST_View" + }, + { + "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", + "TableName": "ACT_RU_TASK_View" + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目预算申请历史", + "LoadBindingDataOption": 1 + } + ], + "ID": "253f3d9a-f2ef-4638-b708-c53a302d351c" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "只允许项目经理进行申请" + } + ], + "ID": "2b6b9795-e62d-46cd-883c-3d153c6a41fd" } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "Disabled": true + ] } ], - "ID": "7fc62185-0fe6-48f0-b5f8-b34b8b1b9580" + "ID": "c83926f2-44c1-46a7-826c-a80880ab16ab" }, { "Condition": { @@ -509,7 +522,7 @@ "Message": "操作完成" } ], - "ID": "5c961117-2d32-46c1-bd0a-0aee3a85858d" + "ID": "660c226c-2cc7-4c86-954a-ed65e83c95c2" }, { "Condition": { @@ -605,12 +618,12 @@ "IsOpenInNewTab": true } ], - "ID": "fbb00e51-a5f6-4b7a-881f-5dc1ba6bdc70" + "ID": "b94417e5-4cf6-4c8e-a3f8-0ca266181d20" } ] } ], - "ID": "ac31011b-0237-416d-a295-1c68871a4583" + "ID": "43816a7a-d115-4b08-84d4-3c9d7a616cab" }, { "CommandList": [ @@ -620,12 +633,12 @@ "Message": "当前项目未开启收集需求功能，请开启后分享！" } ], - "ID": "890a7c39-2c59-47ca-9e72-b42034a0ad9e" + "ID": "82d497e3-0ff8-4762-89db-780d5a5febf2" } ] } ], - "ID": "caade8eb-0426-498b-a2bd-f023439e7902" + "ID": "9766539e-f07d-4abc-8e29-509a0b9c12f7" }, { "Condition": { @@ -658,12 +671,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "a995d8fe-5c6f-4b98-b6c3-d5d29a273535" + "ID": "5190c63a-c396-425c-aae7-3a4ba99b873d" } ] } ], - "ID": "bb388977-12e8-4bbc-ab28-327d634385d2" + "ID": "0f6bff74-2586-4aa2-8992-3953414c7963" } ] } @@ -960,4 +973,4 @@ "Formula": "项目标题!$F$2" } ] -}//7lGWbGS2E8YnXuPYY0wGKGG/OA9x0wUA64jjf+yS/mwCon/0qb0Wlrhy2oYCvKtkBqBQuIEhtqW81N1fQckGS3WcqD0+d6NXe+AQpGK51C5AsUn7Mo+kD/BLLgG/YmjLQxA1CXWBQ/uhUjUQ1mkzbjzq1K17fl228kl5XWEUJAHjj5gjV8k2sGug+AcDoxNcolOqScvu1EkWV9Yj9Hu4yykvMfRBn7KB/DShEUjeAgEwZJQkKU29rplclWhfb7diLPxq3eaI2S6GdfchTgFG8zkwNzsOxSQQ4vHbYFZIrLSnLbWkM1mkHwm/NXA9qoQrg+T+oBIEGQiNPtSQjc12ptKCJhej59LIZnFtzGokprKEF3LbfD43gaTQxc9/efWMlGj74OrkiS/+7T4NSgrCPXup24JdG3rdxmCk5vb1djIcT19sCja5CvDkgP1jXM4gbh6STRKQNi/NYkwHBm9DlfIxmBoSYsaxL7kWF2UbRIQJk8L4K+GL549f2BVkSWdfjvBeIaefuTJZNobkASYw8guZjzT/NZYfOCwKy8ymFYQ2kJ0FmYqebkFKOJt8B394PySiteXLycSjghooW9eGxxhvy5AC7IU+/NZ2CYd4GFpqZFgIIYatnLtWeprHMRnJHyU9XscDv13CuyLYMgaceeZ9bhvCQYpz/n+gy/3ShgBTJXDxn4vT/raN4bLLXCtJilikOZZWu3lCDQnKYTnNYPbboTf7CwhMoGGT590GlGmk98+EJJtAnXRCF0fd3dbBU0s+OD3BJg07bsRlAx2nBezhyUN6B9WGh67Ty4HH/SdAd2wzC94KmMQHKsGXcwTPYkdmWcdFFcSIYCz7nH4hP9Wp4S4ELuYjmblWZ/hoElsB8Rsn89rBNr5GmduM9bCu2PuEVnGjfyjQ/lsR0YPr4w==|920 \ No newline at end of file +}//VDUpFtGABbDKuKTOYc2GzvB7qkDV09OmYJCt0Ay9ZwUrwrHJ1Jzvbr9KnS6YhbxmnmIeJyQDghiCxSUQmT/FCFsCiMqgnR30ZGt3wfgs59LHX4BVhWptLEUj2xYCES9f4fyh8mbjXKUkm4RbhYFfx8AUVnGQ3GCWABjVI7QLhgN3Cb/GwlRGFK3KjzRpqjMNZ8aDaca9Cq63+sZATuplqwMHlDhZ3zTRvtFH6/wS92YXA7L2DE6Rcj/Zfsr0qh/jOhvWh+mWVYWS+LpaTGIYksIh75aLTAe2Tw4HfGkZKJp4oD/4nxxMKiqA/hbvZ7YGfef0CEC5QrU0wftKvzUqgrl71/LSpypREdQcKHdoLTmJSRaZwwVO0VquzRI22IS45RMEkkyJTzFyetzzLKLvZCVMGOR+HAvHvFp+Dn4NEZSTc+4UgalXrEO2BvrN3iy7caZVu8h3sslv3kte1pJR8XLZs+E0BFvbmOy7z2hd/DBYe9z7jPQ0IcIGz7Tkc3zj63uhK+fckhIuaHn2EBZ6imJphhSrSH189Ri3pDalINOViFEVxF6g/hKNmkpBuKNmsq5IWIs+2doQLNgaXBW3UeWrI+r1UFUrN3sNMlGxnv6cLkx69UTotwwk9govzyRK1NmK5A6ibTyq4Qptv5uzR984s8n6vNmHlIAJywb6j7rwteA1E6foF9Mddt15NC258QUGpkq/iuNMkvlO+355+FkJaSYcrJFLFoZ/LtvMFa5ZgfBcXhOEAb9kpBinNwpx3AU4aDq/8Xd31tWBeRviACTc8QYu9+q3tLaBkUwQpb23yTVfWCcZ71gyhtkn5Kfrfr5sC+x9XApn5/3v3CKWP1zEOKu8fvKH/HVAO3qWVB+WNTR/W22K0QPjX8SVTwwXWT/CdaNkr6a+sWoirkYduA==|920 \ No newline at end of file diff --git a/ServerCommands/系统/用户登录检查.json b/ServerCommands/系统/用户登录检查.json index 87f9e964..c830fef5 100644 --- a/ServerCommands/系统/用户登录检查.json +++ b/ServerCommands/系统/用户登录检查.json @@ -31,6 +31,106 @@ } ], "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "系统通知分类", + "TableValue": { + "TableName": "TODO_分类", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "cf49211c-5c43-4a9e-a82c-33ce82a64ee8", + "BindingInfo": { + "TableName": "TODO_分类", + "ColumnName": "ID", + "GUID": "3586244f-b0f1-4e33-8f3f-c527e9f4dd54" + }, + "ColumnName": "ID" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO_分类", + "ColumnName": "分类名称", + "GUID": "cf6aa651-86d2-463c-ac10-46d532007be0" + }, + "Value": "系统通知" + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "f76b52f99d9e4fcd9c749234558cd8ac" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=系统通知分类" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "TODO_分类", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "TODO_分类", + "ColumnName": "用户", + "GUID": "b5bf3b81-b6ba-4bdd-ba1c-3b7ee60f1fa0" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "BindingInfo": { + "TableName": "TODO_分类", + "ColumnName": "分类名称", + "GUID": "f770d898-c418-425a-83a6-b8d6cfa480cb" + }, + "Value": "系统通知" + } + ], + "ParamNameToSaveNewRowValue": "新分类" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "分类ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新分类.ID" + }, + "ID": "f36548a257f143b5922c83035fca15ef" + } + ], + "ID": "8748a38d-9f5e-4f94-b388-145087b3f785" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "分类ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=系统通知分类.ID" + }, + "ID": "7a12acd09ba94631a6dc9be484bec0a5" + } + ], + "ID": "d2a0b8f1-7a86-47e7-bb6e-da6763e5d232" + } + ] + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "汇报数量", @@ -65,7 +165,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "8abbcee08d8c413dbed21601f8f7940b" + "ID": "c62aaa0b1ae04a3696335b9257a4f30b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -109,7 +209,8 @@ "Name": "目标单元格" } ], - "OutParamaterName": "参数对象" + "OutParamaterName": "参数对象", + "Disabled": true }, { "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", @@ -144,10 +245,150 @@ } } ], - "ID": "11518a616b094f43ba03d51ec355ed96" + "ID": "ed100d351928456c8880491d45ff7167", + "Disabled": true + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否已提醒", + "TableValue": { + "TableName": "TODO", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "用户", + "GUID": "5cfd84df-17c1-4a4c-bb59-d211b89365d0" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "分类", + "GUID": "b82958ba-cf60-4b23-8999-eea2da32fb09" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分类ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "标识", + "GUID": "fff3d11b-714d-4e54-b75f-1cb79e0798e2" + }, + "Value": "汇报提醒" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "FGC_CreateDate", + "GUID": "5fe1df80-9f60-4f20-81f3-fa0dc5911919" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()" + } + } + ] + } + }, + "ID": "156478a4d2fe4a5c9fcdd78649579aa4" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否已提醒" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "TODO", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "分类", + "GUID": "baa1c5b4-8e53-4715-a3ad-34b0a9229c95" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分类ID" + } + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "用户", + "GUID": "d18915b2-7474-43a2-b1c1-182259e166b9" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "内容", + "GUID": "6676540d-b5f6-4d3d-9e7e-7839589fd851" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"你有\"&汇报数量&\"份汇报等待查看！\"" + } + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "重复", + "GUID": "2b22a7bc-454a-4135-9ac0-9cc495ef4944" + }, + "Value": "不重复" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "完成", + "GUID": "28205cdf-06cc-4385-8a9f-4a90c0ad1256" + }, + "Value": "0" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "标识", + "GUID": "d8a0aabb-fec4-4c51-bad3-68bcc3b5296b" + }, + "Value": "汇报提醒" + } + ] + } + ], + "ID": "403573a0-99fd-4579-96e9-d5596de72c5c" + } + ] } ], - "ID": "4a145f73-ec81-4433-95d6-a0277c514680" + "ID": "9b0a8774-3714-417e-b227-72809875ba0d" } ] }, @@ -159,7 +400,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "737ba7a1-1bd1-4fc4-a9bf-c4d0e0c14960", + "GUID": "926daed8-5fe3-4a7b-ac00-c2695a499f04", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -168,7 +409,7 @@ "ColumnName": "用户名" }, { - "GUID": "02eb17f6-264f-47ab-a232-d093b10332bd", + "GUID": "b980c87b-760c-4962-86c7-d46214fec098", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", @@ -177,7 +418,7 @@ "ColumnName": "全名" }, { - "GUID": "225c0e6a-ff13-44a0-8b9c-c08264c87087", + "GUID": "e0ddb425-dd51-4940-bb82-554e057c0015", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "有效", @@ -186,7 +427,7 @@ "ColumnName": "有效" }, { - "GUID": "eebce87b-4edd-4810-bfaf-3689d0f49d6b", + "GUID": "716d20c4-d027-45dd-b67d-19fff72c05d5", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "角色", @@ -195,7 +436,7 @@ "ColumnName": "角色" }, { - "GUID": "5a8e6ca1-8ad2-4112-aa10-23390619d568", + "GUID": "ee905ad0-f3f6-405c-8202-0f02ca502803", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "组织上级", @@ -204,7 +445,7 @@ "ColumnName": "组织上级" }, { - "GUID": "ce13ef50-27e5-4fa0-95d6-d3af621cb8a7", + "GUID": "789edfc0-5ebf-4009-8322-4d930f88669b", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "负荷", @@ -213,7 +454,7 @@ "ColumnName": "负荷" }, { - "GUID": "0931c53d-202d-4ce7-b118-f6dbc5b3d94e", + "GUID": "e03edc3f-174d-432d-93ac-45ff17889f53", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "默认时薪", @@ -222,7 +463,7 @@ "ColumnName": "默认时薪" }, { - "GUID": "d3867fc4-27fc-4182-a884-4b0045e5be5f", + "GUID": "7ed994b8-c7eb-47ba-beac-052d817e0d8d", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -231,7 +472,7 @@ "ColumnName": "GIT用户名" }, { - "GUID": "7d04ac61-a167-4f48-b0ee-5ccd6089ab31", + "GUID": "d06e7d73-d9e7-4bce-9db2-83a82a2a3b90", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT密码", @@ -240,7 +481,7 @@ "ColumnName": "GIT密码" }, { - "GUID": "2d3ec105-9701-4a40-b9f2-fb67df34ea77", + "GUID": "08fb6602-e253-4e99-a5f5-8d027739d45d", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "公司", @@ -249,7 +490,7 @@ "ColumnName": "公司" }, { - "GUID": "e09891db-df68-4888-8af9-2ed63c46e8d2", + "GUID": "ffc11776-e752-4951-8231-afc02a109463", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "部门", @@ -258,7 +499,7 @@ "ColumnName": "部门" }, { - "GUID": "90ddaaf0-c7f5-4c34-a72e-d6a4e3803078", + "GUID": "01f328b4-8364-4b69-b06e-d4de72b8de4a", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "小组", @@ -282,7 +523,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "6abe2f6a515f4dd998f6674b6a48bf50" + "ID": "cc7ea097aa1a4cd6a0f45c6035aad4e0" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -343,7 +584,8 @@ "Name": "目标单元格" } ], - "OutParamaterName": "参数对象" + "OutParamaterName": "参数对象", + "Disabled": true }, { "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", @@ -375,10 +617,147 @@ } } ], - "ID": "5aaaef1a24d842a18ce87024d2cbff7b" + "ID": "30c92f50d0cf4ddbbe4e4b2be9c95587", + "Disabled": true + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否已提醒", + "TableValue": { + "TableName": "TODO", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "用户", + "GUID": "7e5260e1-8049-4da4-ba47-4dabf2549fb7" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "分类", + "GUID": "3bc38c6b-a794-4a66-8326-3218a3c1a0e3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分类ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "标识", + "GUID": "96aec143-c8a3-4037-afe7-718c234b2def" + }, + "Value": "gitee资料完善" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "FGC_CreateDate", + "GUID": "dbe793ca-fbf6-4a87-ab1b-3839c8b07ea9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()" + } + } + ] + } + }, + "ID": "3b597b7141a34da58c39596ce37f955d" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否已提醒" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "TODO", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "分类", + "GUID": "b6c97f0a-5c1d-4ae5-bb0c-c74ca52fe769" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分类ID" + } + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "用户", + "GUID": "97107e52-db37-4ee9-917c-4b8357298aa0" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "内容", + "GUID": "10b9e64b-ec4e-4b54-8274-ec0c8036f8cd" + }, + "Value": "您的Gitee信息还未绑定，赶紧填写享受更多自动化功能吧~" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "重复", + "GUID": "fadfb5ab-9726-4821-8aed-b993bb086868" + }, + "Value": "不重复" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "完成", + "GUID": "b5304974-1280-40a6-9eae-b2082018b57d" + }, + "Value": "0" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "标识", + "GUID": "2acd8377-8e89-42bb-b349-39b74e23a13a" + }, + "Value": "gitee资料完善" + } + ] + } + ], + "ID": "d6cad7b6-c74a-4f9c-8d26-e785923547ed" + } + ] } ], - "ID": "1aac1baa-622d-43f3-85ff-bee640c0c9ab" + "ID": "0e8cd23a-1fcd-471b-b34d-9a27522e70d9" } ] }, @@ -440,7 +819,8 @@ "Name": "目标单元格" } ], - "OutParamaterName": "参数对象" + "OutParamaterName": "参数对象", + "Disabled": true }, { "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", @@ -472,10 +852,158 @@ } } ], - "ID": "da259cd75df340d4be185ce075a0df64" + "ID": "d62bd472f73c41c1a9b7125bbc37b84a", + "Disabled": true + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否已提醒", + "TableValue": { + "TableName": "TODO", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "用户", + "GUID": "23c03490-e82d-4c95-a600-e693cb982ba1" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "分类", + "GUID": "231534d1-335d-499c-9de5-113e9220f890" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分类ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "标识", + "GUID": "b4ac73ab-8e5c-4a56-a4b1-ef5f41732cbb" + }, + "Value": "个人资料完善" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "FGC_CreateDate", + "GUID": "aa856ff8-9ecd-4493-8270-7c3881c33e14" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()" + } + } + ] + } + }, + "ID": "380ed2327ef349118d66dc6031abe9e6" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否已提醒" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "TODO", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "分类", + "GUID": "003f562a-536a-4670-b58b-c82cf1d87759" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分类ID" + } + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "用户", + "GUID": "ddb4c1f3-0966-4cbd-91ca-3547ab13ec45" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "提醒日期", + "GUID": "9a31fc26-0a1d-4a82-a4b2-0b1a9fe9056f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOW()" + } + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "内容", + "GUID": "3b8a0701-fa34-4cb8-b910-493c2a117f36" + }, + "Value": "您的时薪、负荷等信息还未定义，可能会影响报工哦~" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "重复", + "GUID": "62d7b344-e502-4d19-8eee-e512c29bf8f4" + }, + "Value": "不重复" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "完成", + "GUID": "87be6836-2c9b-4a1a-a23f-19b2564217e4" + }, + "Value": "0" + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "标识", + "GUID": "9893a8b8-f4bf-4aa6-916b-05aeb3fb8671" + }, + "Value": "个人资料完善" + } + ] + } + ], + "ID": "2317a5ed-30f7-4f8d-a4f6-bdf70504b652" + } + ] } ], - "ID": "a4e5817f-618a-4bd5-8350-ad67db75174a" + "ID": "dfe4af86-60ef-49a4-9f3b-783f27f377c5" } ] }, diff --git a/ShareCommandContainers/发起预算申请.json b/ShareCommandContainers/发起预算申请.json index f97f88e8..24f02b50 100644 --- a/ShareCommandContainers/发起预算申请.json +++ b/ShareCommandContainers/发起预算申请.json @@ -124,18 +124,6 @@ "value": "0" }, "CommandList": [ - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_RE_PROCDEF_View", - "ColumnName": "NAME_", - "GUID": "0706ffe2-2824-46f5-9195-3bccbf19a88a" - }, - "Value": "预算申请" - } - }, { "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", "ProcessDefinitionResourceName": "预算申请", @@ -264,7 +252,7 @@ "Message": "已为您自动删除流程" } ], - "ID": "b65b1040-f5dc-4b1a-a56d-b65100d554a8" + "ID": "90c5c194-3723-434b-ba62-cdcdf9c519a5" }, { "CommandList": [ @@ -274,12 +262,12 @@ "Message": "您取消了流程填写，如有需要请前往待办结束刚刚发起的流程" } ], - "ID": "23ed7bc4-db33-4a4f-b65a-10ba8c237d3a" + "ID": "67e14608-17f7-4606-8ccc-a3afa5d1c7e4" } ] } ], - "ID": "912841a1-f26a-4ce9-8b39-a221efcc0154" + "ID": "bb78be97-6157-4f8c-9cdb-8992464235eb" } ] } @@ -300,10 +288,11 @@ }, "CellName": "项目ID" } - ] + ], + "LoadBindingDataOption": 2 } ], - "ID": "b9f2e843-8bc4-4d96-a190-332cc085f351" + "ID": "3537aacf-cd1e-4f1f-8e58-f2507d4dba98" }, { "CommandList": [ @@ -320,12 +309,12 @@ "BtnText": "知道了" } ], - "ID": "edbe6214-fc13-4697-9d64-d77699ff2b04" + "ID": "c275dd26-3879-416b-995b-ba77469e0ea2" } ] } ], - "ID": "0a142ab9-0974-4222-b312-4407e52603c1" + "ID": "abf3a71f-a5be-45cb-9cc1-b1db726f8736" }, { "CommandList": [ @@ -342,7 +331,7 @@ "BtnText": "知道了" } ], - "ID": "383c1746-feec-4232-a196-24dc51ee0c32" + "ID": "5371bbaf-cb92-44ac-9116-02e1bed57a70" } ] } diff --git a/Tables/TODO/TODO.json b/Tables/TODO/TODO.json index 2b3a53f4..4fd13095 100644 --- a/Tables/TODO/TODO.json +++ b/Tables/TODO/TODO.json @@ -199,6 +199,13 @@ "Name": "时间描述", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "标识", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",