diff --git a/.collaboration b/.collaboration index 350a596f..5e207046 100644 --- a/.collaboration +++ b/.collaboration @@ -766,17 +766,7 @@ }, { "ModuleName": "PCPage/项目菜单", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T20:30:04.7867063+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\项目菜单.json", - "Pages\\共用\\项目菜单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/编辑删除页面", @@ -1611,16 +1601,7 @@ }, { "ModuleName": "Table/Git仓库表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T21:09:59.7411879+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\Git\\Git仓库表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/Git_WebHook", @@ -1632,16 +1613,7 @@ }, { "ModuleName": "ServerCommand/GitCallback", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T20:34:27.9442182+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\GitCallback.json" - ] + "ModuleType": 15 }, { "ModuleName": "Table/日志表", @@ -1815,19 +1787,6 @@ "ModuleName": "ServerCommand/服务端命令3", "ModuleType": 15 }, - { - "ModuleName": "ServerCommand/同步仓库的所有提交", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T21:33:05.7434158+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\同步仓库的所有提交.json" - ] - }, { "ModuleName": "Image/d3148bd6742da6598200d24b4966ba9f.png", "ModuleType": 38 @@ -2018,19 +1977,7 @@ }, { "ModuleName": "PCPage/项目代码", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T20:56:07.9769742+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.rd", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.json", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.rd" - ] + "ModuleType": 1 }, { "ModuleName": "image/登录方式", @@ -2086,16 +2033,7 @@ }, { "ModuleName": "TaskScheduler/仓库新增事件", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T20:55:28.0108453+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\仓库新增事件.json" - ] + "ModuleType": 16 }, { "ModuleName": "ServerCommandPrivate/判断是否为仓库成员", @@ -2131,16 +2069,7 @@ }, { "ModuleName": "Table/积分记录表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T21:20:25.4145389+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\KPI\\积分记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "ProcessItem/项目立项流程", @@ -2212,19 +2141,7 @@ }, { "ModuleName": "UserControlPage/Gitee事件记录列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T21:02:56.1951988+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\Gitee事件记录列表.json", - "UserControlPages\\Gitee事件记录列表.rd", - "Pages\\8fc0150152814864a2f1c5fda59114d.json", - "Pages\\8fc0150152814864a2f1c5fda59114d.rd" - ] + "ModuleType": 31 }, { "ModuleName": "UserControlPage/任务统计信息", @@ -2232,32 +2149,14 @@ }, { "ModuleName": "Image/下载.svg", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T21:06:33.2445779+08:00", "ModuleType": 38 }, { "ModuleName": "ServerCommand/从页面同步仓库的所有提交", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T21:31:38.9584917+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/同步仓库的所有提交", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T21:33:05.7434762+08:00", "ModuleType": 27 } ] \ No newline at end of file diff --git a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json index b3310a35..0c24a64a 100644 --- a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json +++ b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json @@ -47,12 +47,18 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "InLogicalVisibleIndexes": [ - 10 + 10, + 11 ], - "Count": 11, + "Count": 12, "DefaultSize": 24.0 }, "Cols": { @@ -67,6 +73,11 @@ "DesignLengthInPixel": 113.0 } }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 112.0 + } + }, "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 @@ -81,11 +92,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 112.0 - } } }, "Count": 6 @@ -121,7 +127,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "f60bf190-4898-4a45-b621-3235783e3a61" + "ID": "c3ea9cf4-5d87-46e7-b8dc-6ac8b860b076" } ] } @@ -241,6 +247,97 @@ }, "TemplateCellSource": "仓库成员" }, + "8,4": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", + "Title": "提示", + "Message": "同步可能耗时较长，会在后台进行！", + "Answer": "我已确认", + "OklButton": "确认", + "CancelButton": "取消", + "Result": "按钮结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=按钮结果" + } + ] + }, + "value": "确认" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "从页面同步仓库的所有提交", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!B12" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "分支名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!C12" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RequestAsync": true, + "RefreshAfterFinish": true, + "CheckDataValidation": false + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!E9" + }, + "PropertyType": 1, + "Value": false + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "已在后台开始同步，请稍后查看！" + } + ], + "ID": "06c1b2be-a356-4b82-a599-73ce15ad1ea4" + } + ] + } + ], + "ToolTip": "同步提交记录", + "Size": 14, + "ImagePath": "Application/058_refresh_2.svg", + "BuiltIn": true, + "UseCellForeColor": true + } + }, "10,1": { "TemplateCellSource": "创建人", "RulesGuidList": [ @@ -249,6 +346,12 @@ }, "10,2": { "TemplateCellSource": "ID" + }, + "11,1": { + "TemplateCellSource": "仓库ID" + }, + "11,2": { + "TemplateCellSource": "分支名称" } }, "StyleDatas": { @@ -346,20 +449,22 @@ "9,3": 7, "9,4": 7, "10,1": 8, - "10,2": 8 + "10,2": 8, + "11,1": 1, + "11,2": 1 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "8,1,1,4", "5,1,1,4", "3,1,1,4", "10,1,1,1", "6,1,1,2", "4,1,1,4", - "1,1,1,2" + "1,1,1,2", + "8,1,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -388,4 +493,4 @@ "PaperSize": {}, "Margin": {} } -}//lzXWO5ul+J0JVpULwoZGZ3PTfykLML1Gh+8YwS6puF0rTY1IU8etM7PLDR5FhIq/W7h5hic+Y4+H2ySM8Vv9sl8oDAx3v7hpJ7exg0vjJ3zCPi+HDuQqx3xGZ0qcxPrPojCHBpJtFP7+qVMiy4/4u413Fubzr44aDf/BuZkBxh4NA0Wg/aV48E3wcPNQVKCg8d+BiT8uLAzH3bHjDW6KIkyVIXo9owBKTgIj439oIvrIxFirX08clmzUvhUVzIV+iCsJtzS64qJhZlrOBbV4kZqOQKhC41Xz+M6WfNoPZ6twHHiAO535a9QbCpe9G8JDk1PoTcN2gPO1iSuQLCUHpI3CqnjxipmrrGdKjPKNJEGLeA0UsbT5guOY31uSW/UZNCJcWYLNtGhZbLcfRMFp6gq0ba/EUCMpcGPQFwUDs33BFxy+b9jvYiba+d/vQpN7yfbhHjufYh2AF98F+yN9I1oJTPKXbiOCzPzA+eMKds9FM7mMTCebSev5EKLtcnUC6fZXtr2PxLkPgh38EQNuZJyF7PeRwNqcf2mdEf1+JUXPjt0BUQuxcudBxN8kwMcWFHqCHf1uQNMspzp6K6lNet1+obFo+hUhA+mjgC8o8+CLJy6cSvCgSOIbID7eYxmW1GkwGjc4bDkZgRlB2sJQ49YcCv71U9Ladb0WLXHwJgS/Zin2JWiWxGLPwWBcgXYhwjF1i0f3HKambBtirucN+iUe+EGrfmp6hAoaUY8zO7PxBK0Xr/H4tiqmlw4F6ZRbgkr9YWb1fJHgcAWWzi93FIh0XJGzIAoIkAAt7664YCCFAXHydQjOYtTLnflQ8TMhTOh8V3xAWjS5TZZioSiUh+9QcFafsgyCRypjIFcpqGGQov+MSn/JXyFHjabdAcXAcR0nJ1BFLoX62x0g2JhOsA==|920 \ No newline at end of file +}//GYJAS0aUNLjgeZk8Bt8Y+dRcLyVedyG+t22+bho+mcbP3FO+kuhlRhPaWzA+zPXRSCgr+mRLgW+m8dC798khPqx7WviWcZzE60Lz+5sYn1RND03BJjUV7SNQvlQpU0dJJjH9ZznHpGNn7SYYSeQyQo+hN7gD8aTwDQjvI7F2rYlsGU3BNfKYorA5jAnucYmCZ15B2iLFRVFy2kQDSf2yxTyjME4U6iGLp3lhu6NbY3N+qTvCq6IMo7hef8qYl1YbH+pJ/fjIYj6rq0i5FAu4V4Io/6G0Ki8rt5chvBydVnYLI0CKIN9nWVglKZu4w8o6RvALQKpABNT7EGc8uhf4IyO4GsA80IKdPGv+a3Y9wUYJCV39QBc9lP6HuTZUji7OgFJ9j3S0NhNIPT+E1IgaggSItQPY3L4JZkOyyRGSt/j1Xtp3+hdxXI3rbTvGSbS11hAX14+7rq1IIJdCywz1c+3bY+yUF2vyhMLkDn/PKlr7SVpXlYb/Kj2xflXXPpQo72vMQ6b0U8U8RP+rLGSP9hwor5HeK7w4OKLwRQBfK4reZoPlrBwjwO96XJAZdhJ6GnuXBICsLXZ/rcDD4GjnqU4KCoIWxo+cFJ9lhr0pgyMVIMvZfZxIrzZkcFHwARnCR4V5nOC/cAjVtXekINzdn3VQgMUYh8XeHa1Szbd774dp+IBBfVvKZID0VKL1H017BGcH7Fp/kz5gAOVHpsccB5bVGqPokPMCcez1Ns4kP4WY8+eIHwbokAJBKcPo7Ds0Rwmyin7lUt8RXHx46ghq6qQ3KJNSRmxcNjG9WgvITyU7huTGXEsrAsEoFziw56EZtNrgs6hdxKE28ELZR6CSZ+/EzeemKEaEJADHQvRAWs6IKoTOo43nTqd1Ht7o9V8BIm4LNwjEruEOpxHiu/tylA==|920 \ No newline at end of file diff --git a/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd b/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd index a7e7cf17..02c34854 100644 --- a/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd +++ b/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 6, - "RowCount": 11 + "RowCount": 12 } \ No newline at end of file diff --git a/Pages/共用/项目菜单.json b/Pages/共用/项目菜单.json index 07e10cce..489b95ea 100644 --- a/Pages/共用/项目菜单.json +++ b/Pages/共用/项目菜单.json @@ -85,7 +85,7 @@ "2,1": "项目岗位", "3,1": "预算申请", "4,1": "邀请反馈", - "5,1": "新增分组", + "5,1": "发布上线", "6,1": "归档项目", "7,1": "退出项目", "8,1": "移到回收站", @@ -217,7 +217,7 @@ ] } ], - "Text": "新增分组", + "Text": "发布上线", "TemplateKey": "链接样式", "Icon": { "Name": "增加.svg", @@ -422,4 +422,4 @@ "Formula": "项目菜单!$B$3" } ] -}//1Dqj1s67YOOjr4jx/V4n9ttdbB0GUbOpturx3857iISP4HIop7ydu6oltNU+GdIWhbrnlDGxTRygDtcp4eYe6RX6VDJUGX8uuodttOxX47MdEFYIhpC9VSLcVZ5BeQ9RbqdICnx7uaOwhavMGA7JG2BC6IIiz+1CE9PaQX+EMaBzQeiJquUT6PTVV8BgMpyWMegCYU5R8me7He7SBQfkcQ3cyhZ4A0PEYwxHg4o7RPRA5XwPOoHTqNyDIHk7muVb6OrrPyAtoSE+FmQU3AKfL1xa1LTAhclNDF0BzDFuYBDuPKEzWG2QxdS27AD9CopItUewPHEewlWmtJNjGjU6pQZUgnIp5R+TkeQmegHvrKDCloqPTnwlbQvtawdwZxwXpgj27hZb1rQh/arnVFLs+wSDHzNFzjK6M5W7X4tTt9EinUwZNeSF8e5njkyg1zUqC8ZIJJxYH6SpdJVxFL+cY0RwSduq8fL+DnouXDRWzo03rfd7YtiGiq0FDUQgSTqH8gcBD7bRP30IHeJ2fcOt+JsWLRv5BEbRMMzKm8kDF8iwdsaRirmR2FpzlPV/3JQkgnPaGYpEz5+W3fQo3qpYPoql4HNaNL+CBe0WHv2i/oLZbdWgpD3oB6HnrvfC7YOOe262b7mZdIhlKF4xcO2dDLPdQQN2AZUWotMrSI9+VGEUrbYVjb9k+2FH0GMPfTKU/Uz8qu73OfrmQ0zosZgSsY0zArTNae96sh2oKQ8FOsBVIihP12bx86tE8J+kPGf6dgbCaTZms7tq4QdxzA1E8kBaC3oDe3abgzUHFMt89TNihVGIIQmaPyQaZ8mesKKMtb/fNRH3LtHjsOb7LacQ+mdqLALBSe2ZSwKVAn2ADQwuan61VGGC+SJjh4XnQ1MggqrJMQVpBAxdbTh/l0bl8w==|920 \ No newline at end of file +}//eWhxdo9sOcGWCtUd5d2YQUNBpliPqSACe9vCSMenhB7159wl6ll/T1pRj+Sh774M9U8R8AJGhXSKo6VltK2ZQkCyCeU8UUivohpIfBQGDTgGK2ZbuCd5VVrK38dj+K/ChEOPCdRoXQzGv0FexTOvWbNwMdOqv0kZyTllA2G5eB3mBWalSwyrv2i2TyElzZ5DNZcdRQML/UZh2B531LGucIMuPluq0Yba7ZKmRJFTPWC1JE2Kz+VskiKfQk+9N9zZsMrfBsKaq6t46/0DuZw8u4SofxdQjFlQD5QftN9teM1JJhTJFNObQTRUrKseTyPil8h2taGpjxUit0zbmF4+Nr+m0iXxiH+ceBuPrt5Is1Evh8ZYkD5/bUYOWfs7CF3tLVWMDMeBAWigg4tnr6oy8CjbnY23vDWEBIyZjA0nGEcdY0LemkN2OSPHL7GjhIZj4ISEiA/zCwc4N8zo6xl5YFxmlW7y843xzVmq8DNgOTQ1uQtEceSrVnKtxmoLWrJ1KuY0Hk5ZBM7sfxRUP/g7krZ1i4jdceDlPtwJAR3sHvCNloYj88moIcVf+She+2/V9DWuIoLI89eK1nWlT9v731Kxgil7Or2d2HLECHtmr0ahion4tdXuOLKpPFGJL/8l1p93gIxrYJjrpnVFrisDRk9sFDFo0arffMf1TspI9JU5gM6AT3L2I5wqVWaLMV+NE/6/3o3V6QYyAdgHrpVWMxIaG43DBzPgb0jhewOHEviFgUOhrPvTPxNEK9uCtP6hKmFN5Ds2bQb2U7NRShQrmICGMCArDuFB3LoMkLkaiZB1Nfobsfka3jVw4EsHXGZ9sY+KiNFuqfH2sIeiL5/ypTiK4p/tRLj8Kiutlyp41serqJoQtBPYY0S5agpWiuXvIgSrEbBZ0cpqM9RfX59TDQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目代码.json b/Pages/项目/项目首页/项目首页-容器页面/项目代码.json index d1e7f2c5..fb113c95 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目代码.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目代码.json @@ -525,6 +525,15 @@ } }, "ColumnName": "仓库URL" + }, + { + "GUID": "4410d2cb-f895-469b-b037-035395d5cbad", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "分支名称", + "GUID": "b2b53767-30f9-48e4-86a5-48f2be07ad32" + }, + "ColumnName": "分支名称" } ], "SqlCondition": { @@ -1255,4 +1264,4 @@ "Formula": "项目代码!$B$26" } ] -}//SzynQSMpDj1QuZWchxnxLaf1MM+wFQPlrqbTxFamc9aBfWOn1R7VVYbKFNbuwvJiDAQW9weHQgiVf0KBLqvb3jyHFPwkppF84E6a8eYCXAAgMvFw0RgIs9JhWymN967rOAVyj9n2C1m45AVaWc07UO4mOOsbfEbPV37FOZL55NRoYgv1s54MMPeLAdlFUE+N6vKWYE0TesQTsT2db3Au/IO1uSjtzqGxzi9Z8jt8mL89pEFBre4eyzO+ejqHosw+zJAqPnAUpcEWUpCq5QAOTZX1xhIc+ZtC6Fx4w//LuzrxrjxyTv3vocNa2y/uEUCRkzsXORA2fzhqz3TvbhQ32Lf+iilWOzPb0z4qB8g+fxuEkJOka7DsdaeOOdOh6AXBmADJfz/737fHR2XcodZfvx2i7SoECmavxjbjhbeKfohbePv7IKfKOGRn2q5Fa5W+aqPJK0rrhhE6+ESKUULiug91gH03MPLVQgFzyif/HDiUcKEwjguKSmBSpTi6f+YwfLvp53DHes3pGmRL46cX2/Qp2m0hUVKCH7PPpLbQscjbB4jQ1mpllPvilpo5xQrZgjCxiuJW9I3EdzUzy0pfAYv5WD9Ugx+d6qNajbxd0seCI2Moyo7nBq813IJysmofOJiTqVbc8nmTBXvyYtc4TYNUHxEzMsbqoNyot8tbszkPpU4CtcZytf7boH8t0m0UqV1RT7Bl/ZAeb6SKgW/zSPvV/XnCA2J1mYN2sEHrlTojXko+jmX4H1W7iq2Cf7qnQmsKvHByjSMOTbgCeJeT0fwYfr37T6zZIzuNuCV/HSbiwotRvt05hOZ0I8MqLiFuXK9yC5uZsCsKKbOov+VFH84/ukDgmW7UCQrFoYTWdn33Nc7qw8SHqdMVoqraUpSMW/TAi7BpwpXYhCdzfY7QwA==|920 \ No newline at end of file +}//evIWfK3Mkt6Y+V46CwEs/9Cev6Q13dYGC6P4aStQoUVk8RHkSsWbF07SW97tnk0T5wWOiAcoquiIKIP9MlG6oi/KMv9OIih05ZaiVmp6A6J9UTTMcNcqCNcnT/0uXSZOhRwRjj9LxcdkA5uhHP3wmzC8Txlx0o8E25ZueZORgCSDjnHVaAlRhlCBEocJI+FJQT/rkqguOwdi6tJknMbu4lFAuvWy1JhXaqTgVARtz1WHiBL/lEPqXqNJTJ4By3fLWLlPAs1V04+fp/jZ209EkOICjtsGfcnalnwOHWHjKlPU/1HdgFjEAOu+GD/TyYR8TDjq9es1hkvZqvHSqBUii+SKPBuq7xa6b6SwxDiSt2xO6r8BrIcY47zzbzE7kN0iEXFjs6UKeZM1wwol0xCirQPD93Z0doPSS2DpMcJoYcZxE0jWa4Z1UXvEYQF2uKxXvqQoBh3MB/kZYQy1EFLFdiGqLfK9ePcw9Lp3o/tyCChqyRcIer30+TPwfqxrF57IMw9aH9XQWZTO/6yWCsEERihuP+5WZgORhdKTmpn6O5+k4P4Kwc623TI3xpMTQeR+X4HT4HLghgfXkcpvRMsHa5cxIsu1Umksyb0/1Hc9caTmsrSnGJ31L/TcsIo4TTyaF03szrldVgRYSxj/eQOtD+UU7VXOvXPtAOnRt9H85A8+Djf5CYa/ymTkL1VnERNEds93sd/301F3P7bdTmGTzaIqa/+5o5GrHTMses2DqkB8akdr2nmIPidCJktCGwUBGAOOF3Yuzi314Iz1NRdzPRTcIHxCOhWPD9rhnsefhYihXMyT362jz1h+ldPZuXmoN4Z991h4MKRXOoOnjoN2axfnUMJFCsUge0E19Ab/TJm6oeuf2IU19aoqaoK5KUFOwbb5Uiz4XFbgG4jTzvUwLA==|920 \ No newline at end of file diff --git a/SchedulerTasks/仓库新增事件.json b/SchedulerTasks/仓库新增事件.json index 640bd661..47c2cfef 100644 --- a/SchedulerTasks/仓库新增事件.json +++ b/SchedulerTasks/仓库新增事件.json @@ -23,7 +23,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "5ce51b6f-356c-45ae-b319-9d17473fe305", + "GUID": "3b46b4ca-f9d8-42ff-b3b8-3f16ac77bf85", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库ID", @@ -47,7 +47,33 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "679ba12e65b74705b0d6f257963a2e23" + "ID": "c3b76409d13b461eb4df829ffd6281fc" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步仓库的所有提交", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.仓库ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "分支名" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -66,32 +92,6 @@ "compareType": 1 }, "CommandList": [ - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "同步仓库的所有提交", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "仓库ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库.仓库ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "分支名" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": { @@ -104,7 +104,7 @@ } } ], - "ID": "0cddff84-18ce-4ed1-9c98-b82ee9321acf" + "ID": "fbadb806-86bb-4f7d-a9e7-0d8ba7e4920a" }, { "CommandList": [ @@ -114,7 +114,7 @@ "Message": "仓库不存在" } ], - "ID": "cb44fec5-9b34-41a0-b1d2-e2a9f58f3a81" + "ID": "3a56322c-80d1-4849-86bc-2ffabc460149" } ] } diff --git a/ServerCommands/Gitee/GitCallback.json b/ServerCommands/Gitee/GitCallback.json index a0551e2d..609c8218 100644 --- a/ServerCommands/Gitee/GitCallback.json +++ b/ServerCommands/Gitee/GitCallback.json @@ -19,6 +19,9 @@ } ] } + }, + "InvokeTriggerTestData": { + "UserName": "Administrator" } } ], @@ -84,11 +87,11 @@ { "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", "Operation": 17, - "OperationParamaterAName": { + "OperationParamaterAName": "/", + "OperationParamaterBName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=钩子数据.ref" }, - "OperationParamaterBName": "/", "OutParamaterName": "ref" }, { @@ -116,7 +119,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(内容得分>100,100,内容得分)" }, - "ID": "f0c40e1a767a47f59d53c4cf2de66cb8" + "ID": "94c3f90ece7f4f1da065672d832b71bc" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -144,7 +147,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件名称", - "GUID": "e3d8237d-2981-42d5-9fc2-5d2bfd05bf60" + "GUID": "f5728a26-d93f-4c8d-95ce-81f96969dd0a" }, "Value": "签入工程" }, @@ -152,7 +155,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "hook_id", - "GUID": "00547c56-457a-494c-8f96-86022934bf14" + "GUID": "c87cd952-ef50-418c-893f-3a38ddb64c1a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -163,7 +166,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件内容", - "GUID": "a109b9ce-1bbd-4622-8d16-cef097c1bc2a" + "GUID": "1455fcf6-d422-40f7-b96d-103a71f51a78" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -174,7 +177,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "空间路径", - "GUID": "17a84b21-4818-4889-8fe3-fcdceb91dade" + "GUID": "ed438631-1542-4734-8281-4b55b6c09990" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -185,7 +188,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库名称", - "GUID": "59a0cc7f-f8b0-4685-a121-551f723c439e" + "GUID": "4c3924b2-7d09-4dd8-a6d4-234618128853" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -196,7 +199,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库路径", - "GUID": "784bdb0b-55ad-4910-b4ec-bafa65529fc0" + "GUID": "da433dcc-a5f7-44af-8e18-49a581d58b86" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -207,7 +210,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "url", - "GUID": "f590a2d6-b93a-4089-bdec-2c30c471398c" + "GUID": "c5802278-760f-4346-9fff-5dd169d7a167" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -218,7 +221,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "提交人", - "GUID": "00485f10-6feb-4fa0-b027-099ff6eac91b" + "GUID": "3607700b-92ac-4076-959a-be225339146d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -229,7 +232,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "git用户名", - "GUID": "07059c00-6828-4e30-b89e-ecad8c7045cd" + "GUID": "42ab09c4-d71c-4fda-b6cd-c083d0ee40c3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -240,7 +243,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库ID", - "GUID": "0ad23830-fd5a-4d97-ab30-d2278de68da0" + "GUID": "e9d7e4e9-d2c2-4af5-9c38-c580f32afa03" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -251,7 +254,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "日期", - "GUID": "24992ce1-4463-45da-b635-2d7d35ffd8d2" + "GUID": "2ecf9f6b-8cb0-41df-a0fc-d54e427cd660" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -262,7 +265,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "内容得分", - "GUID": "012c118f-89d1-4f0b-9926-7c7e53c3359e" + "GUID": "1d3ac7f3-23d8-4615-b5c4-c25ff9d6cf45" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -273,7 +276,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "sha", - "GUID": "88a1499b-a29b-4891-9aa8-8946c7aaff38" + "GUID": "ae4a80e9-a6b0-43fc-a1a6-be84aff1b071" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -284,7 +287,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "分支", - "GUID": "5abe4aec-eaaf-4a67-b05b-b1b768d6c08a" + "GUID": "385c23f4-efcc-43eb-bffe-88c777f9db3b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -294,7 +297,7 @@ ] } ], - "ID": "f5d81c7a-11ef-4056-a912-a74c9fd0e656" + "ID": "b13cafa3-b4ef-41ee-bdb0-fbdfd6611504" } ] }, @@ -306,7 +309,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "00bbebd3-cf38-47e0-9cd0-cd5011d2244c", + "GUID": "19eeec3f-dee6-4b51-96c7-5a50412a9db9", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -330,7 +333,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "cacecf37904549a7b959662d7894f91d" + "ID": "1a60c725ef3b4a2380ffdd8496fa830c" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -359,7 +362,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "用户", - "GUID": "dcc2eab7-f5f9-401a-a00a-e3b035448c6c" + "GUID": "e9513eeb-ae0a-4188-ade8-3076325b6ce5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -370,7 +373,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "类型", - "GUID": "fd54a12e-68cd-457e-8db9-5893395f298e" + "GUID": "51fad653-a46a-4be6-a483-6f9b96e20379" }, "Value": "GitPush" }, @@ -378,7 +381,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "分数", - "GUID": "6efe5a8a-03b2-49bc-b902-1321173a9347" + "GUID": "03909ab6-62b4-41e4-98e4-a2a174622fa2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -389,7 +392,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "变动日期", - "GUID": "85db9acb-4983-44e1-b01b-7ada81a3a897" + "GUID": "cd49dcfc-a4ae-45ec-bcc1-79d71db9125c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -400,7 +403,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "备注", - "GUID": "de778986-632b-4cab-bf90-621fc732e6fa" + "GUID": "33fb126a-2df3-4bc6-b91e-cf9d12577240" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -410,7 +413,7 @@ ] } ], - "ID": "3548ce71-6182-4937-afb5-3549ee527715" + "ID": "04bcba5a-ab6c-4ae0-815e-468975f920ab" } ] }, @@ -420,15 +423,65 @@ "Message": "签入已被记录" } ], - "ID": "0f88bf34-7490-4db0-8038-a5dac125d48e" + "ID": "05e3b5c0-24c6-4b8b-9b8b-7b6d0aacf2b6" } ] } ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "0b7ad66f-04e7-456a-91ba-c329e0ff318e" + }, + "Value": "CallBack" + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "646d1de8-c6a2-48fb-8e68-9743fb1f9c0c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "0f380873-1489-4994-b42f-a2d97976102d" + }, + "Value": "错误" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] } } ], - "ID": "43e74129-e99a-4c4e-9c83-23616e386428" + "ID": "104d53d2-0226-46bd-aa08-6e4eee60e46b" } ] } diff --git a/ServerCommands/Gitee/从页面同步仓库的所有提交.json b/ServerCommands/Gitee/从页面同步仓库的所有提交.json new file mode 100644 index 00000000..e43ead65 --- /dev/null +++ b/ServerCommands/Gitee/从页面同步仓库的所有提交.json @@ -0,0 +1,80 @@ +{ + "Name": "从页面同步仓库的所有提交", + "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" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "仓库ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "分支名", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步仓库的所有提交", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "分支名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分支名" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/Gitee/同步仓库的所有提交.json b/ServerCommands/Gitee/同步仓库的所有提交.json index 17c233c5..e2eaab87 100644 --- a/ServerCommands/Gitee/同步仓库的所有提交.json +++ b/ServerCommands/Gitee/同步仓库的所有提交.json @@ -3,39 +3,23 @@ "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" - ] - } - ] - } - }, + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", "Parameters": [ { "Name": "仓库ID", "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "32969134" + "TestData": "33487312" }, { "Name": "分支名", - "DataValidationInfo": {}, - "TestData": "master" + "DataValidationInfo": {} } ], "InvokeTriggerTestData": { - "UserName": "Administrator" + "UserName": "Administrator", + "RequestTimeout": 300 } } ], @@ -48,7 +32,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "d38e2fe4-5a7d-41c3-9538-77e8875b1048", + "GUID": "26dcb396-9bee-4eb2-b246-3834594ad3b5", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", @@ -57,7 +41,7 @@ "ColumnName": "空间路径名" }, { - "GUID": "b5136c0c-56f4-4bef-a309-66e88e0d3973", + "GUID": "bc4d7471-ba59-46ff-aee3-7d82e2e8e167", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", @@ -66,7 +50,7 @@ "ColumnName": "仓库路径名" }, { - "GUID": "dd7fffc1-a816-40c6-992a-1f9d7405e3dc", + "GUID": "56048e33-c0ee-4b6d-ad8c-c9a88f7b7f36", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", @@ -75,13 +59,22 @@ "ColumnName": "仓库名称" }, { - "GUID": "cec1fc8d-1f21-4f9e-a3d1-8e01c9686840", + "GUID": "c4960534-043f-4291-9c95-b8a927d6683b", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "拉取人员", "GUID": "1e47126d-9b27-4586-9e85-617839459cf1" }, "ColumnName": "拉取人员" + }, + { + "GUID": "3b804b6a-c0ef-4c43-be07-1c1f58cd79ab", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "最后事件接收日期", + "GUID": "08be87e6-b94c-4b73-86cd-03bbaafcdcc9" + }, + "ColumnName": "最后事件接收日期" } ], "SqlCondition": { @@ -99,13 +92,22 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "575825b5495d488bb5fe2954f610c5f0" + "ID": "3eda6a7cb85440dea2a723990a2241e6" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "同步起始日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(仓库.最后事件接收日期=\"\",\"\",TEXT(仓库.最后事件接收日期,\"yyyy-mm-dd hh:mm:ss\"))" + }, + "ID": "799b0ab715814e4c948275f8c45aeecb" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "同步数量", "ParameterValue": "0", - "ID": "8574363f8b0947b1b03cc76a1b444538" + "ID": "3559e701107b45919558b9f3a7dcfe0d" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -209,66 +211,155 @@ "TryCommandPart": { "CommandList": [ { - "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", - "PostData": { - "DataItemType": 1, - "Data": { - "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", - "Data": [ - { - "Name": "access_token", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ACCESS_TOKEN" - } - }, - { - "Name": "author", - "DataItemType": 0 - }, - { - "Name": "sha", - "DataItemType": 0, - "Data": { + "$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%", + "compareType": 1 + }, + "CommandList": [ { - "Name": "since", - "DataItemType": 0 - }, - { - "Name": "until", - "DataItemType": 0 - }, - { - "Name": "page", - "DataItemType": 0, - "Data": { + "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", + "PostData": { + "DataItemType": 1, + "Data": { + "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", + "Data": [ + { + "Name": "access_token", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ACCESS_TOKEN" + } + }, + { + "Name": "author", + "DataItemType": 0 + }, + { + "Name": "sha", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分支名" + } + }, + { + "Name": "since", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=同步起始日期" + } + }, + { + "Name": "until", + "DataItemType": 0 + }, + { + "Name": "page", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=循环次数" + } + }, + { + "Name": "per_page", + "DataItemType": 0, + "Data": 100 + } + ] + } + }, + "WebUrl": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=循环次数" - } - }, - { - "Name": "per_page", - "DataItemType": 0, - "Data": 100 + "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&仓库.空间路径名&\"/\"&仓库.仓库路径名&\"/commits\"" + }, + "Method": "GET", + "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", + "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", + "NewParameter": "result", + "Header": [], + "Timeout": 100.0 } - ] + ], + "ID": "5ddc0fea-8381-42a9-a5e9-626b59a1eac0" + }, + { + "CommandList": [ + { + "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", + "PostData": { + "DataItemType": 1, + "Data": { + "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", + "Data": [ + { + "Name": "access_token", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ACCESS_TOKEN" + } + }, + { + "Name": "author", + "DataItemType": 0 + }, + { + "Name": "since", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=同步起始日期" + } + }, + { + "Name": "until", + "DataItemType": 0 + }, + { + "Name": "page", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=循环次数" + } + }, + { + "Name": "per_page", + "DataItemType": 0, + "Data": 100 + } + ] + } + }, + "WebUrl": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&仓库.空间路径名&\"/\"&仓库.仓库路径名&\"/commits\"" + }, + "Method": "GET", + "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", + "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", + "NewParameter": "result", + "Header": [], + "Timeout": 100.0 + } + ], + "ID": "23b22c80-8fe9-4372-a02a-c67492547f14" } - }, - "WebUrl": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&仓库.空间路径名&\"/\"&仓库.仓库路径名&\"/commits\"" - }, - "Method": "GET", - "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", - "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", - "NewParameter": "result", - "Header": [], - "Timeout": 100.0 + ] }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -308,7 +399,7 @@ "WithinLoop": true } ], - "ID": "02b1bc06-6b08-40f3-9940-346b98d114ba" + "ID": "cec24241-daa8-42d7-af64-5dfaea9cb153" }, { "CommandList": [ @@ -416,15 +507,6 @@ "compareType": 1 }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "同步数量", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=同步数量+result.Count" - }, - "ID": "0bfba15e31c94c6da7557d24eb34bc5c" - }, { "$type": "GETPOST.正则类.正则_校验, GETPOST", "JieShouMsg": { @@ -441,157 +523,346 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(内容有效性,0,LEN(message.Message))" }, - "ID": "fa3c335eefc041dea44953f44a0cc564" + "ID": "7a32695f6ce542e8968e8cb1ded1a232" }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "Git_事件记录", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库ID", - "GUID": "5e824315-5955-41da-be3f-f628d307c9b6" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(内容有效性,1,0)" + } + }, + "value": "0" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库ID" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "事件名称", - "GUID": "a44e3498-b444-4eeb-94b2-cadffa7aaf2d" - }, - "Value": "签入工程" - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "空间路径", - "GUID": "cc8f4f3c-1af8-4b9f-9432-c68f972c8827" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库.空间路径名" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库名称", - "GUID": "8f1e71da-f543-4758-95b9-888654ed6648" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库.仓库名称" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库路径", - "GUID": "f0a7745a-11b9-415d-810e-42311b11478a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库.仓库路径名" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "提交人", - "GUID": "f9e7c496-0cff-4ecb-891c-588e037987a5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=完整ITEM.committer.name" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "事件内容", - "GUID": "a5f07281-31a5-4bea-91cd-147e5f2ab6d9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=message.Message" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "url", - "GUID": "f11fd976-3bea-4288-bba6-6297a57c0598" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=完整ITEM.html_url" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "git用户名", - "GUID": "bffbc696-0387-425e-86bd-4ebac35e400f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=完整ITEM.committer.login" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "日期", - "GUID": "bbabf6d6-15de-4746-bfbf-82aba78ee815" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=完整ITEM.commit.committer.date" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "内容得分", - "GUID": "abf39d1a-c07f-497a-94bf-b8290b5242e6" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(内容得分>100,100,内容得分)" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "sha", - "GUID": "5b7e01a6-ab9b-45ac-91cf-67b7d2598d71" + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "同步数量", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=同步数量+1" + }, + "ID": "d762787be83f4411a14dee04cf70b9c2" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "Git_事件记录", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库ID", + "GUID": "594da392-5262-488b-b37e-68fdf5e514b3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "事件名称", + "GUID": "41618106-9e21-456a-9875-4649ebb408bc" + }, + "Value": "签入工程" + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "空间路径", + "GUID": "e921ed18-b673-47c2-89c2-785c4725ca26" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.空间路径名" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库名称", + "GUID": "39b9d260-b60e-41a3-8424-0ac99911017c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.仓库名称" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库路径", + "GUID": "ac9aad97-ead2-46e0-a282-90a0168d25e0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.仓库路径名" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "提交人", + "GUID": "2dd1bf4c-2c17-48db-b0ac-71c70635f470" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.committer.name" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "事件内容", + "GUID": "585a581c-42dd-4835-9580-6a98aa500b54" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=message.Message" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "url", + "GUID": "a7c5243a-56f6-464a-9097-52abfda3e6f3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.html_url" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "git用户名", + "GUID": "b3e54524-2ea2-4459-85c5-4be18bc596e4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.committer.login" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "日期", + "GUID": "1ecc3c24-c66b-447d-a1ac-d23b637c5230" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.commit.committer.date" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "内容得分", + "GUID": "20463586-3560-4d42-af25-abf32d119f97" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(内容得分>100,100,内容得分)" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "sha", + "GUID": "acada9b5-c9a5-4ff1-9b98-1c63ddd997a8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.sha" + } + } + ] + } + ], + "ID": "0468dcdc-04cb-4701-b9a5-48bae83a808a" + } + ] + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否已记录", + "TableValue": { + "TableName": "积分记录表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "积分记录表", + "ColumnName": "来源标识", + "GUID": "8401e7ac-8d37-46e5-a19d-b3b3e61ddf1c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=完整ITEM.sha" } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "49e56134f0e24e448f13c8883b62b9c0" + }, + { + "$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.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "用户", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "46c7f177-9a96-4ff2-9e27-415c231c6825", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "311be55b-90c9-417e-b8fb-378024d8f3ce" + }, + "ColumnName": "用户名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "GIT用户名", + "GUID": "f42da023-ab7d-46ba-bbc7-0d0a65476625" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.committer.login" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "ee8c68eba7654bf0891e3d2f4fb2f335" + }, + { + "$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%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "积分记录表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "积分记录表", + "ColumnName": "用户", + "GUID": "7ba96f62-cffc-4381-b86f-a7e46a4db96c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户.用户名" + } + }, + { + "BindingInfo": { + "TableName": "积分记录表", + "ColumnName": "类型", + "GUID": "e5802afd-a07a-45c5-982f-2ddd87d7fe22" + }, + "Value": "GitPush" + }, + { + "BindingInfo": { + "TableName": "积分记录表", + "ColumnName": "分数", + "GUID": "b5fc3d44-5b94-40a4-aef2-cc8080126e6b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=内容得分" + } + }, + { + "BindingInfo": { + "TableName": "积分记录表", + "ColumnName": "变动日期", + "GUID": "456c7303-c4c8-4694-b23d-1be301eaf343" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOW()" + } + }, + { + "BindingInfo": { + "TableName": "积分记录表", + "ColumnName": "备注", + "GUID": "49313604-a708-4dc1-909e-f7ea03ab1add" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"用户对Git仓库[\"&仓库.仓库名称&\"]的签入，被系统自动评分。\"&CHAR(10)&\"签入内容：\"&message.Message" + } + } + ] + } + ], + "ID": "613a4321-1bb3-437d-8b40-681f989088b1" + } + ] + } + ], + "ID": "793de4f7-47c6-44f4-b6c4-019c12624a2c" } ] } ], - "ID": "583c643e-f5ed-467b-97ef-dc5b1013ef86" + "ID": "0169d7b8-263c-4d6b-be31-13e9b8e20352" } ] } ], - "ID": "b79cbc00-24c6-4396-b809-e5d5d03123e4" + "ID": "65c8f997-087a-4a07-ab2a-8097ba951df4" } ] } ], - "ID": "943c23ad-dc8d-40a1-9219-2b9e1ad1cc3e" + "ID": "89fb0092-ce79-4e7e-a228-7081b723f9ea" } ] } @@ -601,7 +872,7 @@ ] } ], - "ID": "ba22b6aa-ec8d-4aa0-a0a8-3560fddecb07" + "ID": "7d08bff3-0eff-4c33-b8a0-6f139b71962d" } ] } @@ -636,7 +907,7 @@ } } ], - "ID": "cc2f7d06-2810-4f50-89ae-4fb850629e1e" + "ID": "acd9b6f2-60bf-451d-8c17-60e648a75591" }, { "CommandList": [ @@ -652,12 +923,12 @@ } } ], - "ID": "97be4a8e-96bf-458a-bc44-7f0554bd0fa2" + "ID": "b4f85c9d-9056-401d-a919-b4b595d104e2" } ] } ], - "ID": "90295fd0-f9ae-42cd-b4c0-49f2a00fb536" + "ID": "0d2baa8a-777e-432c-89a5-f96500ef503f" }, { "CommandList": [ @@ -667,7 +938,7 @@ "Message": "仓库不存在或尚未设置拉取人员" } ], - "ID": "5549cfc8-9683-4201-90ac-dfb52fbaadc9" + "ID": "c5620ff3-c761-4d11-a269-008c233d4195" } ] } diff --git a/Tables/Git/Git仓库表.json b/Tables/Git/Git仓库表.json index 7942f6b3..c25b6b97 100644 --- a/Tables/Git/Git仓库表.json +++ b/Tables/Git/Git仓库表.json @@ -161,6 +161,19 @@ "Name": "空间路径加仓库路径", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "日期", + "GUID": "983855eb-eeb7-4831-a794-07cb89116997" + }, + "AggregateFunction": 2, + "DataColumnName": "日期", + "DetailTableName": "Git_事件记录", + "Name": "最后事件接收日期", + "ColumnType": "System.DateTime, 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", diff --git a/Tables/KPI/积分记录表.json b/Tables/KPI/积分记录表.json index 053d718e..0be5aea8 100644 --- a/Tables/KPI/积分记录表.json +++ b/Tables/KPI/积分记录表.json @@ -50,6 +50,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", diff --git a/UserControlPages/Gitee事件记录列表.json b/UserControlPages/Gitee事件记录列表.json index b977b275..2fd86536 100644 --- a/UserControlPages/Gitee事件记录列表.json +++ b/UserControlPages/Gitee事件记录列表.json @@ -36,7 +36,7 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 270.0, + "DesignLengthInPixel": 251.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -45,10 +45,20 @@ "Value": 1.0 } } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, - "Count": 1, - "DefaultSize": 270.0 + "Count": 3, + "DefaultSize": 32.0 }, "Values": { "1,0": "Gitee提交历史" @@ -65,6 +75,55 @@ "IconSize": 12.0 } }, + "1,1": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "图文列表表格1", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "Reload", + "ParameterValues": { + "clearFilter": false, + "clearSort": false, + "clearRuntimeQueryConditions": false + } + } + } + ], + "ToolTip": "同步最新提交信息", + "Size": 14, + "ImagePath": "下载.svg", + "UseCellForeColor": true + } + }, + "1,2": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "图文列表表格1", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "Reload", + "ParameterValues": { + "clearFilter": false, + "clearSort": false, + "clearRuntimeQueryConditions": false + } + } + } + ], + "ToolTip": "刷新", + "Size": 14, + "ImagePath": "Application/058_refresh_2.svg", + "BuiltIn": true, + "UseCellForeColor": true + } + }, "3,0": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", @@ -195,31 +254,49 @@ "TextIndent": 10 }, { - "HorizontalAlignment": 0 + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, + "TextIndent": 10, + "HorizontalAlignment": 2 + }, + { + "Foreground": 1, + "TextIndent": 10 + }, + { + "HorizontalAlignment": 3 }, { "FontSize": 13.333333333333332, - "HorizontalAlignment": 1 + "HorizontalAlignment": 2 } ], "Types": { "Strs": [ - "Center", + "Body", + "Text 1 50", "Left", - "Body" + "Center" ] }, "CellStyles": { "1,0": 0, - "3,0": 1 + "1,1": 1, + "1,2": 2, + "3,0": 3, + "3,2": 3 }, "RowStyles": { - "1": 2 + "1": 4 }, "SheetStyle": { - "FontFamily": 2 + "FontFamily": 0 } }, + "Spans": [ + "3,0,1,3" + ], "PageInfo": { "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", "PropertyDefinitions": [ @@ -252,4 +329,4 @@ "PaperSize": {}, "Margin": {} } -}//YiAwBCpZjuAC9aTNFYDlbPwieS/lR4OXc5widYOiMQjHfzsDqzo9B3qaMvg6DZx8f7OF97v6fuU8RfVbUYNi4XZectZOkdQWyjGcfbFWtvxN4ZnNxVIxdDoUbgX1vpGWCZ1u/DiLtm+7CRXejquVVFLi12JbSQWe/p8Xque2/F0CnvnfbXrAkl4H+aEu29PXSarOuzFP89M8Ww3hn2AnWuvGOR+I9TPqcLRhA5JaZYE9SNcZeDDedOp90RIgU93qjOR4HVoH2WU/Lymkbvw6PfYoS16LBDOCRR8cwH1VyfkjhYnyUVOiqEhDg0cwi2YkD7NT07TzX+Fx/kAn1V0VOUGkSPsVFKJAz06YiFyJOCC3Veo35E151bQ0jCvJAURDhxJmBdMTfIBTeGHDzr1UL4yV5ojlLng3LYE9RSJqQMfSqzfMYx9Q+oI7FhQSdnZ/AszXUa5L25lClonvwKoYYqBKJ3OCkTwQMdZEWiux+ikxNS5tCbwBsXUCYUBwJI6TIO9crT+ymRkdA0kwQLa0QwUecqVbZkrueVEnWU02ZBDh4dKkkO32vjTz0xUzv6KNIYU5sKGkBd9TEjbwZMKxsVuUSBl/EMYLg9MUgbMNtq+QFO5GdE/CS5tWOKFT6ms1hTa8UvHcK77nHV5ZvPWoE4+vs3ETChOgxciC7fcFErIsKoLz7Cyo144Y43eLVIV8outUV80mJOu1A8C8jq/mWPHi2FgG9sutu7bWZGL99Lsys/RGf4LzjbzRb0eDaQiShCAM3Jp3L2UE8TUiKX14cKlTstWFkxntGsu/CZNJ78C0asbiBHh/TqQ5ns6cny2XEk6LtYcHp6jaLXzHxAtC8UYb6l9c05YlCHIYmPMbeTB54BfhaNP480DJFLxF8Wmu2JNmqDhdRaX37up8mZH8HQ==|920 \ No newline at end of file +}///0U2bQj0oXQL2HCBdMmajvYhY4xnxja8wLfDurbBcKd0MrslJ8BMTcoH77Ruxr+JVDKHgGMltevJcAQHdc9friNGCtOWIaIs5MbI61VJE+rujczHkcS11MVKLWHWQJLIHH+ZhvzmIgLqVQjRMQHlmDzzRiu2Q6ibIGXOVyoeG1vwpyUDSsCsHiB0BWvMB9eQH3HzdvnWwFNE5lxxETsSA6GOTtvSXdGbsCM36+5ZxRtPsl2MH2Vx3OT0Ndp65pY7JeiOLU2bJMl1TG14vR57j25uas9WRTPabObt7n65Kcvz/qJ5Q7412d0GmchrZIREqGNyZL90oBydeeC/85ZMjpP8PUH2YSbUTGHmuFIaKauwCuD+wffpMX7bHkWNriG5dJYr9wN/yLbYJDbjTAmBrGejRST40Pd+JqJdcytrWmPzvZQWVhQVB08apyKGSo1ERxnnR2n2uF3Nl2vYp/gLi4hNxf/4L3WQUk6qRu2HaPdt/cBT+0/dhZrx1XtFAloVLfJO9WvGFkWNSi59Mg95tqhVxmHEf9Uo0RmmrrITPoGzzCSnpIm7zTnsYvQX76wX+6j3zf0/4p+nzTt5wl8kkJUa5rmO/0Ks7LdiB5IRvB3zUxnzv47ZI3ZAF0urTg+8G5VD2sUQm9kBBOWgklCjYWTMbKEbulPf5Qk7bBJkkMwgGJlyUblfJp7f3PSB2Tp/V9l3yPHznbbSp6DupQKlibXq9EMGr7X0vVr6pGjK9tzaz/GwDIutwGoevwscKOT1Lmo8fYVD6fibegYfnom+3b+iTawgLyA3q4KCU/kUHmJ2lNnKtZBzKl7CeENktJ+RLdeMxdsRTARg4sg4EsXadRNvPtR8DuzZCWy0CODg5s/FqXE+OfoKQfsGELjfI3pYof0aV7ljmUXITJ/g4l544Q==|920 \ No newline at end of file diff --git a/UserControlPages/Gitee事件记录列表.rd b/UserControlPages/Gitee事件记录列表.rd index 1c53671e..72d65c76 100644 --- a/UserControlPages/Gitee事件记录列表.rd +++ b/UserControlPages/Gitee事件记录列表.rd @@ -1,5 +1,5 @@ { "PageType": 3, - "ColumnCount": 1, + "ColumnCount": 3, "RowCount": 4 } \ No newline at end of file diff --git a/image/项目图标/下载.svg b/image/项目图标/下载.svg new file mode 100644 index 00000000..55be3fa0 --- /dev/null +++ b/image/项目图标/下载.svg @@ -0,0 +1 @@ + \ No newline at end of file