diff --git a/.collaboration b/.collaboration index b38e08cb..cb0f79e1 100644 --- a/.collaboration +++ b/.collaboration @@ -750,17 +750,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T23:40:17.2661521+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -1212,20 +1202,7 @@ }, { "ModuleName": "Theme", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T23:41:34.8317615+08:00", - "ModuleType": 9, - "ToRemoveFiles": [ - "Theme\\CellTypeStyles", - "Theme\\ListViewStyles", - "Theme\\StyleDefaultNames", - "Theme\\ThemeConfig", - "Reports\\DefaultTheme.rdlx-theme" - ] + "ModuleType": 9 }, { "ModuleName": "image/内置图片", @@ -1589,43 +1566,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T23:54:13.8301237+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\LottiePlayer.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\加载动画-10_0_2_0.zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\甘特图-10_0_2_0.zip", - "Plugin\\用户管理命令 V2-10_0_2_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1677,16 +1618,7 @@ }, { "ModuleName": "ServerCommand/根据汇报模板生成内容", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T23:28:48.3603941+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\根据汇报模板生成内容.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/日报详情", @@ -1798,46 +1730,18 @@ }, { "ModuleName": "ServerCommand/从Gitee提取报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T23:29:29.7877778+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\从Gitee提取报工.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/服务端命令1", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T23:31:03.6923055+08:00", - "ModuleType": 15, - "ToRemoveFiles": [] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/服务端命令2", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T23:29:58.0651802+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommands/导入文件夹1", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T23:31:03.6930655+08:00", "ModuleType": 20 } ] \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 1c4302f1..db1060e8 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -92,12 +92,12 @@ }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 29.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 27.0 + "DesignLengthInPixel": 33.0 } }, "21": { @@ -107,7 +107,7 @@ }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 74.0 + "DesignLengthInPixel": 172.0 } }, "23": { @@ -202,21 +202,6 @@ "DesignLengthInPixel": 32.0 } }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "10": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -246,9 +231,24 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, - "Count": 16, + "Count": 19, "DefaultSize": 32.0 }, "Values": { @@ -259,12 +259,12 @@ "12,1": "工时数", "16,1": "特定时薪", "20,1": "工作进展", - "20,11": "从Gitee分析", + "20,14": "从Gitee分析", "27,1": "取消", - "27,12": "提交" + "27,14": "提交" }, "Formulas": { - "29,6": "DATEDIF(G30,K30,\"d\")+1", + "29,6": "DATEDIF(G30,N30,\"d\")+1", "10,1": "TODAY()&\",\"&TODAY()" }, "AttachInfos": { @@ -472,7 +472,7 @@ "SerializeProperty": "=新增报工!G30" }, "EndValue": { - "SerializeProperty": "=新增报工!K30" + "SerializeProperty": "=新增报工!N30" } } } @@ -514,7 +514,40 @@ "14,1": { "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!R13" + }, + "Value": "%Null%" + } + ] + } + ], + "ID": "92b18256-4a1a-4b14-85a5-098eaf63cd99" + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -545,7 +578,7 @@ "ErrorMessage": "工时数超过所选日期范围允许的最大小时数", "ErrorTo": 1, "ErrorToTargetCell": { - "SerializeProperty": "=新增报工!O13" + "SerializeProperty": "=新增报工!R13" } } }, @@ -583,7 +616,7 @@ "InputMessage": "留空则系统按照项目设置自动计算，除非你针对此次报工有特殊调整" } }, - "20,11": { + "20,14": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -604,33 +637,114 @@ } } }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", "ServerCommandName": "从Gitee提取报工", "Parameters": [ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "开始日期" + "ParamName": "开始日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!开始日期" + } }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "结束日期" + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!结束日期" + } }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "用户" + "ParamName": "用户", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B7" + } } ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, "ReturnPropertiesTo": [ { - "ResultPropertyName": "工时" + "ResultPropertyName": "工时", + "ResultTo": { + "SerializeProperty": "=新增报工!B15" + } }, { - "ResultPropertyName": "工作内容" + "ResultPropertyName": "工作内容", + "ResultTo": { + "SerializeProperty": "=新增报工!B23" + } } ], "RefreshAfterFinish": true, "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + } + } + ], + "ID": "eff6efc0-985c-414d-9407-2702932534a4" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!R13" + }, + "Value": "工时可能与真实不符，请核对！" + } + ] + } + ], + "ID": "9d655275-f972-4c18-ab04-3c129694412c" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" } ], "Text": "从Gitee分析", @@ -682,7 +796,7 @@ "TemplateKey": "_RS_Information3" } }, - "27,12": { + "27,14": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -936,7 +1050,7 @@ "ReloadData": true } ], - "ID": "0d5b7cca-313c-4117-8274-c5a2ab3d7174" + "ID": "00b03b8e-5c95-40f1-a88a-3699e6664c9c" }, { "CommandList": [ @@ -951,12 +1065,12 @@ "BtnText": "知道了" } ], - "ID": "4a0110c2-73b8-4923-b1f3-90760e18ca96" + "ID": "e24d766e-d420-4c65-9d18-34f47a671d01" } ] } ], - "ID": "e769ce38-75d1-44fc-9ad7-aa30965e8489" + "ID": "c6eb29b5-5c88-40b9-84f1-19196d300b4d" }, { "CommandList": [ @@ -966,7 +1080,7 @@ "Message": "用户已取消" } ], - "ID": "aafecc35-9659-436d-84f6-734ed88f988f" + "ID": "16f2ac71-4d8e-424f-9d9f-1f4a18f707d8" } ] } @@ -1009,12 +1123,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "add07b79-e909-48c8-a3ad-4f142e677b76" + "ID": "1777ea65-a465-4aa1-a155-b93e5f6cb9df" } ] } ], - "ID": "65867378-0d44-406b-811c-7b93e2429105" + "ID": "a9380541-e52d-44d9-98ca-cc4a63a83b8c" }, { "CommandList": [ @@ -1127,7 +1241,7 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "7c27e6f7-2c4e-4433-a52f-006af941a982" + "ID": "90909dcb-9e1a-4a3b-afd8-02763da204c7" } ] }, @@ -1379,7 +1493,7 @@ "ReloadData": true } ], - "ID": "2195e0ed-29a4-4ec9-8a91-e43051ca6ab8" + "ID": "2f4bd7ed-36c0-405b-9e8a-f11ff9475016" }, { "CommandList": [ @@ -1394,12 +1508,12 @@ "BtnText": "知道了" } ], - "ID": "9f0d5372-0467-463c-97ec-0a477f7b5c16" + "ID": "5f0a5b68-24a9-4416-bbf6-bc39994a0f9c" } ] } ], - "ID": "fe6d0b94-16f7-45e7-b91e-cb11206ea466" + "ID": "0fbc5305-45de-4993-89b2-803f0ef91401" } ] } @@ -1476,7 +1590,7 @@ ] } ], - "ID": "877dff23-360e-4fb1-b16b-7d8bc625816b" + "ID": "cb4cf9a5-fc9e-478f-97c9-7bc1376f1dd0" }, { "CommandList": [ @@ -1491,17 +1605,17 @@ "BtnText": "知道了" } ], - "ID": "61999c3c-9931-48c8-8d05-85502c979454" + "ID": "c18b7e4e-c026-4f98-a200-a4684395482b" } ] } ], - "ID": "1299bb0c-9e0e-4650-bc8c-24bce966514f" + "ID": "09d1f95e-b8c9-4a3c-8f47-928af7eea7e1" } ] } ], - "ID": "6d2420a2-b21c-4a77-bd06-02d80bf47fda" + "ID": "4867ede5-4e22-436e-abab-b2866a837a39" }, { "CommandList": [ @@ -1511,13 +1625,20 @@ "Message": "请添加参与人后进行操作" } ], - "ID": "d9fbe203-7056-4e52-b3c9-34a8f112139f" + "ID": "595bf9a0-5234-4b0f-b5b4-c5c3ae85d79b" } ] } ], "Text": "提交", - "TemplateKey": "_RS_Main1" + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/144_check_1.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } }, "29,1": { @@ -1611,6 +1732,9 @@ "7,13": 1, "7,14": 1, "7,15": 1, + "7,16": 1, + "7,17": 1, + "7,18": 1, "8,0": 1, "8,1": 3, "8,2": 1, @@ -1627,6 +1751,9 @@ "8,13": 1, "8,14": 1, "8,15": 1, + "8,16": 1, + "8,17": 1, + "8,18": 1, "9,0": 1, "9,1": 1, "9,2": 1, @@ -1643,11 +1770,14 @@ "9,13": 1, "9,14": 1, "9,15": 1, + "9,16": 1, + "9,17": 1, + "9,18": 1, "10,0": 1, "10,1": 1, - "10,15": 1, + "10,18": 1, "12,1": 4, - "12,14": 5, + "12,17": 5, "14,1": 1, "15,0": 1, "15,1": 1, @@ -1665,6 +1795,9 @@ "15,13": 1, "15,14": 1, "15,15": 1, + "15,16": 1, + "15,17": 1, + "15,18": 1, "16,0": 1, "16,1": 4, "16,2": 1, @@ -1681,6 +1814,9 @@ "16,13": 1, "16,14": 1, "16,15": 1, + "16,16": 1, + "16,17": 1, + "16,18": 1, "17,0": 1, "17,1": 1, "17,2": 1, @@ -1697,6 +1833,9 @@ "17,13": 1, "17,14": 1, "17,15": 1, + "17,16": 1, + "17,17": 1, + "17,18": 1, "18,0": 1, "18,1": 1, "18,2": 1, @@ -1704,15 +1843,15 @@ "18,4": 1, "18,5": 1, "18,6": 1, - "18,7": 1, - "18,8": 1, - "18,9": 1, "18,10": 1, "18,11": 1, "18,12": 1, "18,13": 1, "18,14": 1, "18,15": 1, + "18,16": 1, + "18,17": 1, + "18,18": 1, "19,0": 1, "19,1": 1, "19,2": 1, @@ -1729,6 +1868,9 @@ "19,13": 1, "19,14": 1, "19,15": 1, + "19,16": 1, + "19,17": 1, + "19,18": 1, "20,0": 1, "20,1": 3, "20,2": 1, @@ -1740,8 +1882,11 @@ "20,8": 1, "20,9": 1, "20,10": 1, - "20,11": 6, - "20,15": 1, + "20,11": 1, + "20,12": 1, + "20,13": 1, + "20,14": 6, + "20,18": 1, "21,0": 1, "21,1": 1, "21,2": 1, @@ -1758,9 +1903,12 @@ "21,13": 1, "21,14": 1, "21,15": 1, + "21,16": 1, + "21,17": 1, + "21,18": 1, "22,0": 1, "22,1": 1, - "22,15": 1, + "22,18": 1, "24,1": 1, "24,2": 1, "24,3": 1, @@ -1775,6 +1923,9 @@ "24,12": 1, "24,13": 1, "24,14": 1, + "24,15": 1, + "24,16": 1, + "24,17": 1, "25,1": 7, "25,2": 7, "25,3": 7, @@ -1789,14 +1940,18 @@ "25,12": 7, "25,13": 7, "25,14": 7, + "25,15": 7, + "25,16": 7, + "25,17": 7, "27,1": 6, "27,2": 1, "27,3": 1, + "27,14": 1, "29,6": 8, - "29,7": 1, - "29,8": 1, - "29,9": 1, - "29,10": 9 + "29,10": 1, + "29,11": 1, + "29,12": 1, + "29,13": 9 }, "SheetStyle": { "FontFamily": 2, @@ -1804,18 +1959,18 @@ } }, "Spans": [ - "14,1,1,14", - "22,1,2,14", - "27,12,1,3", + "14,1,1,17", + "22,1,2,17", "27,1,1,3", - "10,1,1,14", - "18,1,1,14", - "29,10,1,1", - "29,6,1,4", - "2,1,1,14", + "10,1,1,17", + "18,1,1,17", + "29,13,1,1", + "29,6,1,7", + "2,1,1,17", "29,1,1,4", - "6,1,1,14", - "20,11,1,4" + "6,1,1,17", + "20,14,1,4", + "27,14,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1850,7 +2005,7 @@ ] } ], - "ID": "fc47b647-ae9f-4e85-b2e7-29668c1ad1a1" + "ID": "f7d25c39-a2e9-4d69-9ed2-58a6bc0b582c" }, { "CommandList": [ @@ -1867,7 +2022,7 @@ ] } ], - "ID": "a0c20aba-9e2a-4324-b33b-b88ee6285496" + "ID": "0f62cc0e-baa6-4e85-baed-19bf45ff4723" } ] } @@ -1904,4 +2059,4 @@ "Formula": "新增报工!$B$30" } ] -}//oKG/t6cMJPsVNK941P+T0C+9dKayej9cnJa2YPfbwNYYD3lIMSXfNbbgf7hODepiZpG7/knIhZQYuJHJ2miD+zDMveGIP6LaGFXuIOytJmJg+3l015zYtemqMpciAARIxNQbK5YIox6JTnIvjgf/270I+NcMpgOu0j4cbmO1dJbPfBfivTFIAcWriZveDH2Vdiy2/TbQdiv3TzaNN/HDXVZXoWd6J/TpeDNLv7DCmVt1W60NdIFG16+gpmhpSlWIFmWJvsGMui6WuVmNlmGTeJg9Bg7a4su6/1igfhv8rvEpFjDLPewQsjHwX+KS6Dt+0lsDAMkLtoSI6t7DuhzlpU/2tAdwjQNepd0FlmzwjH/MdDnrKbXyLUj8CviQ/xGb2alSRePH1/8NJIt+o05+ZoWh+FTMpefVt58p6xS9eTqdyZuAI1CmJHBS+ITNIRid2o05/tIjQ6J00FuETcnRhzeLmv/VqpSUcRWE4V8ELLV62uNLxDoYpxx3vTvB1vKIOinq+SUwdK/NsMlrsZv4EIAZ7u8Zrwa2iYyEGtNzbqQMAWif9BpNCcQ7MVGV7O9ewHINo2VSxA4y26CWOnvtD+Nu9klpgXe7/TIOTEDVHj33WayJLMscDRI4M2Ky2fH7mNr/H9vkG1lrIbuKrUtau4LOXt6PKaYQ+U9fGRl5UAntgeoldmfytizS5CSkgyOff0Q6ebvCVYXjpG+3axVG4a263QCsgaJoEFAg2XxAGAs/CgJ3cY4Ms6oLqCt8l46uzO18C7DtNZ3LuMG64LCikwHOxY4wt6iP/NvAdnOm0CvrOhpoYo5LKxCR5zWo7UrvJjl090Q8bZzyEV4PzmHYxppiu9hFh6HbLuHxRiDGlgeOaoSB7BHWPD4rNEgzQwUkpiNny96WfX2fK6sefsbtrg==|920 \ No newline at end of file +}//iXj46tq7HodI+BChrXyZ6k4Pa7UV/prVspFUtUdXrPpt1Ii/g6vcsTQl4qgWMVKw/E77P4879QUC3dIPu0XOoEin8fzHj2hjxr9dgNmYleJ9jZQdaVRGbucKZV73UO80EkbOumpGXkiPNSHrWtwJDQKhdvCBR67CXpSS9BCRrawqpfE/T1wa+D/mB0ljM96iRJwV+ctJo/0fM1K71afkbTSOSdxfThaDNSjMc5lfjCPEXQtcs8oVQiGAdbjxFDDB3mtwUImehpiuug+/Kfore4Hq+h8V6Gd3pLXTeKP2/qD3n+kCHCXQnZz9z1k//cYRXpDFjWARD7ojyCjo77tsQ+IDADEzBCrsgiVulNS/1CjXA9Rh5YKGV9ghMc5WlXjhZdJ+KYA1MuOXt5R6O/cBRzH0rJv9X4cK3/keYmUYpAz602eB5btQrOUNEjGvGsuIm+w7IgLnlQs4AwhLebA8jnNqb+LVbLXyuRHKSOluVew8R6gX5zVDl+dV5j72gvwOTyuy8gTbNbLyIL71oB4KoNjF5yqsyQCk46aXoLjHCwI1aH73FpULaORv01Ixnpuec6SeROgpNhfEmxj1DjnoVoMCJ0gG6lfTIHFWwxlaoo/FtgaZAaT6fyQc7LUrc96QNhU1mK2bOUEvJLvq/kXVGc1VMYUbA/X84JIm3OSpQPF8b6W/IZaycggOnLEhM1kXup2CZhQrB/pONRAoTYIYcpNnrTfzjMImrRxdHvKcvnjYSbjIjWAmS4nBwJO1vykWMOqyjLDFTIKMUOwAtF/Mti9ZZM6FVrjFH50rtxvs7Nc2BbpZQLeQxf/O14A6jWH/ZlJja7un+9VUw7u8sUL7+x9qtogHHQEAaDggetn/t1Pc1xdCfDo2Nqu+vZO1oOS03nFHtpRwgdZZyj7rxqoCsg==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.rd b/Pages/任务/工时/新增报工.rd index a220f206..bcb78ced 100644 --- a/Pages/任务/工时/新增报工.rd +++ b/Pages/任务/工时/新增报工.rd @@ -1,9 +1,9 @@ { "PageType": 0, - "ColumnCount": 16, + "ColumnCount": 19, "RowCount": 31, "Formulas": { - "29,6": "DATEDIF(G30,K30,\"d\")+1", + "29,6": "DATEDIF(G30,N30,\"d\")+1", "10,1": "TODAY()&\",\"&TODAY()" }, "CustomNames": [ diff --git a/Plugin/模板引擎操作库-9_0_103_0.zip b/Plugin/模板引擎操作库-9_0_103_0.zip new file mode 100644 index 00000000..fe1a19de Binary files /dev/null and b/Plugin/模板引擎操作库-9_0_103_0.zip differ diff --git a/ServerCommands/Gitee/从Gitee提取报工.json b/ServerCommands/Gitee/从Gitee提取报工.json index dfed8106..a7f25b0c 100644 --- a/ServerCommands/Gitee/从Gitee提取报工.json +++ b/ServerCommands/Gitee/从Gitee提取报工.json @@ -32,7 +32,8 @@ "Name": "结束日期", "DataValidationInfo": { "IgnoreBlank": false - } + }, + "TestData": "2024-06-13" }, { "Name": "用户", @@ -56,7 +57,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "4228fb3e-a8a6-4dbb-b3cc-bce5b3011435", + "GUID": "8f82e754-66c0-4b46-8096-452e5b638a47", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -80,7 +81,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "b4030fac6e4643919f2d70820325c4bf" + "ID": "bbf27a5a9c66482f85c63fea495e0214" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -114,13 +115,21 @@ "ParameterValue": "0", "ID": "73122483179048b18313028406573a8f" }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件列表" + }, + "OutParamaterName": "事件列表" + }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", "LoopInfo": { "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", "LoopCount": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算天数" + "SerializeProperty": "=计算天数+1" }, "LoopIndexParamName": "index", "LoopItemParamName": "当前天数" @@ -133,7 +142,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期+index-1" }, - "ID": "16028728d41c48a6a213d0ebd8d32b2e" + "ID": "d4a5f61ea18f4cc7a24de21472568421" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -142,7 +151,7 @@ "TableName": "Git_事件记录", "BindingInfos": [ { - "GUID": "07b5b976-2ddd-4e1c-b61a-a27412db7d04", + "GUID": "8c52173d-d148-4903-b056-fb3b5e4271df", "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "日期", @@ -151,7 +160,7 @@ "ColumnName": "日期" }, { - "GUID": "0cc165a2-d802-4923-bca3-e8450105b7bd", + "GUID": "03433246-583c-4fc6-bad5-16ba014ae315", "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件内容", @@ -203,7 +212,7 @@ ] } }, - "ID": "ee6c5b8e973045dba953f276a0654008" + "ID": "09aaf1a2b4ed4c7ba9769efd0ffff595" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -229,7 +238,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=Gitee事件.0.日期" }, - "ID": "16f04d70627b4c23bd50fd5af94bc002" + "ID": "c5dc990dffbc47e18c0f4a1db5c1381e" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -238,7 +247,25 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=GETPARAM(\"Gitee事件.\"&Gitee事件.Count-1&\".日期\")" }, - "ID": "ee7c067b599447098af7b945afb6f01b" + "ID": "7c19014644ba4fcfae80f801b077dbed" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "今日工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(ROUND((最大时间-最小时间)*24,1),0)" + }, + "ID": "9dc82b30c38a47b98eed930ce1f0db4d" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "总工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=总工时+今日工时" + }, + "ID": "3cf8b482c8914dce850e9cb334ebcd33" }, { "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", @@ -255,50 +282,125 @@ "OutParamaterName": "事件内容拼接" }, { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "今日工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IFERROR(ROUND((最大时间-最小时间)*24,1),0)" - }, - "ID": "be9fc47d15544d86a333c2072f2bde64" + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件内容拼接" + } + } + ], + "OutParamaterName": "今日数据" }, { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "总工时", - "ParameterValue": { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总工时+今日工时" + "SerializeProperty": "=事件列表" }, - "ID": "ccb605ff743244d99d745fad3c9a21a0" + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=今日数据" + }, + "OutParamaterName": "事件列表" } ], - "ID": "99086d22-0b81-4634-9ce0-0f2f4e7b3153" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "无今日Gitee签入或签出记录", - "CustomReturns": [ - { - "ReturnPropertyName": "工时" - }, - { - "ReturnPropertyName": "工作内容" - } - ] - } - ], - "ID": "281e736c-4b4f-464a-a2d0-979f3a0072cd" + "ID": "5bc82618-62a0-4ad7-81de-4a4ae40003fb" } ] } ] + }, + { + "$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": "=事件列表.Count" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "事件列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件列表" + } + } + ], + "OutParamaterName": "数据源" + }, + { + "$type": "MustachePlugin.Render, MustachePlugin", + "DataSrouce": "{{#事件列表}}\r\n{{内容}}\r\n{{/事件列表}}", + "UseCustomsDataHash": true, + "CustomsDataHash": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=数据源" + }, + "SetMaxRecursionDepth": 512, + "ResultTo": "输出结果" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "生成成功", + "CustomReturns": [ + { + "ReturnPropertyName": "工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=总工时" + } + }, + { + "ReturnPropertyName": "工作内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=输出结果" + } + } + ] + } + ], + "ID": "0e598871-c20f-4ca0-abca-cf1feca9c43d" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "无Gitee记录", + "CustomReturns": [ + { + "ReturnPropertyName": "工时" + }, + { + "ReturnPropertyName": "工作内容" + } + ] + } + ], + "ID": "17cdfa64-1f6b-4a59-9670-949c6c3f5f2a" + } + ] } ], - "ID": "d41dd9b6-a1b7-4d5e-a315-f5bcf5f4bd5b" + "ID": "e0f0e898-5752-4cbb-a33a-6d032e73734d" }, { "CommandList": [ @@ -316,7 +418,7 @@ ] } ], - "ID": "215c583f-1e78-4578-a6a6-720c352259dc" + "ID": "3b95baba-3c99-45c2-b1cb-feaed60baf11" } ] } diff --git a/ServerCommands/导入文件夹1/服务端命令1.json b/ServerCommands/导入文件夹1/服务端命令1.json new file mode 100644 index 00000000..ab0a0393 --- /dev/null +++ b/ServerCommands/导入文件夹1/服务端命令1.json @@ -0,0 +1,35 @@ +{ + "Name": "服务端命令1", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + } + } + ], + "Commands": [ + { + "$type": "MustachePlugin.Render, MustachePlugin", + "DataSrouce": "123123\r\n123213213\r\n\r\n\r\n\r\n\r\n", + "UseCustomsDataHash": true, + "CustomsDataHash": "1", + "SetMaxRecursionDepth": 512, + "ResultTo": "输出结果" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/汇报/根据汇报模板生成内容.json b/ServerCommands/汇报/根据汇报模板生成内容.json index 1f0ddd12..b6df7172 100644 --- a/ServerCommands/汇报/根据汇报模板生成内容.json +++ b/ServerCommands/汇报/根据汇报模板生成内容.json @@ -330,7 +330,7 @@ ] } ], - "ID": "cee677ad-de03-4da1-b645-913b5611c298" + "ID": "26c2f871-9736-49f1-b6a1-183d5504aa38" } ] }, @@ -399,6 +399,20 @@ }, "ID": "a84cfa225a7c4b12b51e30a3b36c833e" }, + { + "$type": "MustachePlugin.Render, MustachePlugin", + "DataSrouce": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报模板.模板内容" + }, + "UseCustomsDataHash": true, + "CustomsDataHash": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=数据源" + }, + "SetMaxRecursionDepth": 11, + "ResultTo": "输出结果" + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0",