diff --git a/.collaboration b/.collaboration index 168d08d1..6ea10b3c 100644 --- a/.collaboration +++ b/.collaboration @@ -594,19 +594,7 @@ }, { "ModuleName": "PCPage/项目版本管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:27:21.1100365+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.rd", - "Pages\\97bdc47834844e0d8f3a5aef747785e.json", - "Pages\\97bdc47834844e0d8f3a5aef747785e.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本配置", @@ -614,17 +602,7 @@ }, { "ModuleName": "PCPage/任务版本详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:42:55.382909+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", @@ -1623,16 +1601,7 @@ }, { "ModuleName": "Table/Git仓库表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:38:55.6203306+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\Git\\Git仓库表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/Git_WebHook", @@ -1644,16 +1613,7 @@ }, { "ModuleName": "ServerCommand/GitCallback", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:30:20.8771212+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\GitCallback.json" - ] + "ModuleType": 15 }, { "ModuleName": "Table/日志表", @@ -1665,17 +1625,7 @@ }, { "ModuleName": "PCPage/选择Git仓库", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:41:03.9904476+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\Git\\选择Git仓库.json", - "Pages\\Git\\选择Git仓库.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/Git", @@ -1683,16 +1633,7 @@ }, { "ModuleName": "ServerCommand/同步一个仓库到表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:42:55.38253+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\同步一个仓库到表.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/搜索仓库列表", @@ -1700,16 +1641,7 @@ }, { "ModuleName": "ServerCommand/搜索仓库", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:44:19.7509403+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\搜索仓库.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/列出仓库的WebHooks", @@ -1741,17 +1673,7 @@ }, { "ModuleName": "UserControlPage/Git仓库卡片", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:41:28.30821+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\Git仓库卡片.json", - "UserControlPages\\Git仓库卡片.rd" - ] + "ModuleType": 31 }, { "ModuleName": "Image/gitee.svg", @@ -2059,21 +1981,7 @@ }, { "ModuleName": "PCPage/项目代码", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:23:51.5695832+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.rd", - "Pages\\557031284d494486b3b32eb2329c19a.json", - "Pages\\557031284d494486b3b32eb2329c19a.rd", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.json", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.rd" - ] + "ModuleType": 1 }, { "ModuleName": "image/登录方式", @@ -2153,19 +2061,7 @@ }, { "ModuleName": "UserControlPage/Gitee仓库选择", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:39:35.1036573+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\Gitee仓库选择.json", - "UserControlPages\\Gitee仓库选择.rd", - "Pages\\5ba5873ce5a446a5a64cd0a9484f4a9.json", - "Pages\\5ba5873ce5a446a5a64cd0a9484f4a9.rd" - ] + "ModuleType": 31 }, { "ModuleName": "PCPage/选择Git仓库 (BackUp)", @@ -2245,22 +2141,10 @@ }, { "ModuleName": "UserControlPage/Git提交记录单块", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:14:14.3649738+08:00", "ModuleType": 31 }, { "ModuleName": "UserControlPage/Gitee事件记录列表", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:23:51.5693924+08:00", "ModuleType": 31 } ] \ No newline at end of file diff --git a/Pages/5ba5873ce5a446a5a64cd0a9484f4a9.json b/Pages/5ba5873ce5a446a5a64cd0a9484f4a9.json index 14d6d652..21ab3983 100644 --- a/Pages/5ba5873ce5a446a5a64cd0a9484f4a9.json +++ b/Pages/5ba5873ce5a446a5a64cd0a9484f4a9.json @@ -47,6 +47,11 @@ }, "Cols": { "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -97,11 +102,6 @@ "DesignLengthInPixel": 32.0 } }, - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 @@ -316,4 +316,4 @@ "PaperSize": {}, "Margin": {} } -}//Ufnqn5JzbCpE6d+8mgQDHce8+CseEaBfT8aBRiyprzhnf5k4zOOjyRJj0BV7khqdGdOlYCUMBX9aSEQ6pPqD4JVD22ONl+5VgVbuR3yYyU80nOAQPfcWToKsPpxjm6wJli0rvncHYK9rhVzledeMhom1b5j56j79/ltRvQBoJ/zS86b2+bq5g3NXK2Kpe40GpHUKLe22Q5VMNamBBEv3tb/fzYPca0XG4rQpHx0SsPMKECqWJbqtMFTgbiocqnStGK/IEahKXkltpZ1UIV09XKMedBt3xu3I2oV1RVU7jmvwyeICKtIKj+04uZ0xerrxlYzyQrjCnOqTTNWs4aNkaNFAawU2nVz64nlt/2wxJ4Ma02V994M5MFekQGHym95APs/fI4j/PK3Zao/BVfviclfPW94ld5I9mMAP421/A34X65BbAtQ1ZFzsUgeQ7QEHWdQ1/xV4LnTDphmGf2CULBVso0Pec84P/pJajkry58HITaBnVfzPTqRb2ONymE66Km2gTedKm5uSoBlq4EiXMzTZ36xknG5PbDAlSjKidp83u81H1nvyGXQhHMnYU//jtylMEQcrPCRyJtzXOofzXwyOCfdTalNibQJCNJ73V3xWdOLJ//Bz+W84wVkV2edDLZPN0/+b/HtBVzLtLphuQBm8vqQzAyRugRY25/0NgqFC+fFubAVocoxvZaniunzcpw5yGCdbu8Gmwefxu1PIJb0EZu8L7IySraxzo42gD2hmFNr9UULyBDvPdYL/+uTAfiyZwLxx2YKW3GZ0qqwjnyT3Wk/ogKNNp3hFXHIcTOq22u2zHGshptSisSWWI3GGB8igJ7kdDEkVsZBGwPTty9QTVBVkc2WwI8f+EwRNdpAuwO98Psp62Mx93EFOh82t7J+Vgcdt/KUg3zmWz0WkXQ==|920 \ No newline at end of file +}//Tpgb3HrHNamWEq2HdE8oTmdydK/f3i9MFACZaxePwC1IeX+EN0+myYcdKeTAptnRvXEq9D8cRnBaGK28NoqPZG+B2lXD716ysQBNssE8pgD1ePsvrhbj7inW3f0ZZuQYEQ7MROq1zQ8OmW+nl7xXqcslaM/RktRGL58Rj2KOmus8iDc82znDJaKlmjCdOIa3mD6skFMqKQKvT3t0s1lmZB+8G6M9/TiBLg7Mw4yz9M2VgNIZibEmF+wCCbjNd/AxbYs7jOsiLEV95/lbtJqS208y22WK8C6ix2H5GU1dqzQH4Ciq5ZsxMWHsyOsz5oAvOGB71aolc9el/ni5GxllXKFlLFN1gHWsXfFPuV6YQys8dTDQUn2vUE2W6+Oc8crbuBk32RN1MHKR2a+kkYXqcsjBAXwBiu0ulcUReiRDIg6rfsajmuTbgi1HtPg4Uj1rLDB/n1j6mYDtN1ADlEvX2C8tvafwhYmhQ1WgV/69/PGpHu6AEov9vJ506eBFxK4q/R/yqxrzOMZn2Tdl4s9qYLu6LvJIPM7OJGozWfBMfs4wT36kOtBV+7mecfC/+hv5GII8Pj5RsKaYhplgmuzNH886IsXM79Yn4vvgBUOJeUVqlxQFHayxvbS3rDgunGscjFh7F0sqo54EBQgJQOaXUMf5gsx5vumWtG4L7si7AiGz7nsd4mbclVPeEYJNpgslKCnHrv2XY0TnCT4ctbxCzb7L+AAMpiHOGo0a5BT60awSUntudRWfqndfo2A+OxGNR24I/HKDEUXaXNIchebWPFPo5o23NTuSKm/5zXbLbbgsoDPoilQvJs5exoMGNVqvx8codooaZL6x5VGYkSLW8jY8JLb4/mkdb9El4XU2tG1kjz3USYFrMnIpxzHZybU2jixUY/MT/8B6untTLYUmAg==|920 \ No newline at end of file diff --git a/Pages/8fc0150152814864a2f1c5fda59114d.json b/Pages/8fc0150152814864a2f1c5fda59114d.json new file mode 100644 index 00000000..62012be2 --- /dev/null +++ b/Pages/8fc0150152814864a2f1c5fda59114d.json @@ -0,0 +1,113 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 96.0, + "Mode": 1 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 1 + ], + "Count": 2, + "DefaultSize": 96.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 90.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 4, + "DefaultSize": 43.0 + }, + "AttachInfos": { + "0,0": { + "CellType": { + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "Git提交记录单块", + "PropertyValues": [ + { + "Name": "时间", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='8fc0150152814864a2f1c5fda59114d'!A2" + } + }, + { + "Name": "内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='8fc0150152814864a2f1c5fda59114d'!D2" + } + }, + { + "Name": "分数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='8fc0150152814864a2f1c5fda59114d'!B2" + } + }, + { + "Name": "ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='8fc0150152814864a2f1c5fda59114d'!C2" + } + } + ], + "OverflowMode": 2 + }, + "TemplateCellSource": "ID" + }, + "1,0": { + "TemplateCellSource": "日期" + }, + "1,1": { + "TemplateCellSource": "内容得分" + }, + "1,2": { + "TemplateCellSource": "ID" + }, + "1,3": { + "TemplateCellSource": "姓名加内容" + } + }, + "StyleDatas": { + "Types": { + "Strs": [ + "Body" + ] + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "0,0,1,4" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", + "ParentPageName": "Gitee事件记录列表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//3jXiyn8R3Qkmf/yVgzHHRIwb37/3lO/Z2C7b6lW8Y2WBeoMV8XFoUexR+fgLpsTpPniwY/qe8qYTE9MwnhME9vEFxBx2siAA24StLk4KIU7TcFZteQiO4MzFLUXNw3lXW860HSrVifmy5I1qkEhSGrlB/JSpy/8YVf8MggZyA8rGOJ/qCop6OcNbcXC6Y332qfDEuOToDLRU7SnqZZQJI7AIS5IIfmw5ta3kMmhfwkONqhlJJWj+UXQgpS7YUeqfqdS5oheFJe6IiNVh7voN/J4WtbkqMkPiDakblQRVMYSfIrHwjTUslEDDBP0AH5Tza/W2ixTo18fks+z3I+IF6KnIaMzIqQYxhLl38yC7O19fFGmWoDDmMUSsk3eGMLSbr8NkGZbBEH/1DuGy78xsXrvZAsUByFaFWs7QUrtvSdO67DCgVHPoD2758otjL3kRH32OUqttsqtTsh3ZdypxVpnKw46IaYDrUY1OzDO29ysiSNVH8W/2TtNb4+AC5sT8YWOtmlmyy1zC2BT5IlMzKC6TBiJhRNGow0OcrPa1tUDCP/616XCXnZjx0wnJezMMLsyMzie9iQrEGkRpQskajTJNqF1OTz9tXQ6zy3tVffoz9+DFRyEgtoxXE4AGRoowTkY5ZCmqaflc03J5Cvp2YvRnK8w8sK5IKZ4D8wA2dOpwrntTACiT/NRWV0lXjYyUENa9zIEiXnxltOV1FVw/jc+LqOUPQvH5xEQTcmb6OGaApGe9K83udhPls0bK4D2AGo7y27XHHmTShsGrA2qHPVYOeosVoDbB6685WbI1g9F5ZWDIzXO4O7fWApKwwwQtPKK0AM0X21R4f9ushP1BtMkOvzYVVYOFAml7dg+pk/aPAjFt03QHooLGvasLyOZVBQoNJUolXZ7P8zSSqUO6fQ==|920 \ No newline at end of file diff --git a/Pages/8fc0150152814864a2f1c5fda59114d.rd b/Pages/8fc0150152814864a2f1c5fda59114d.rd new file mode 100644 index 00000000..0820c4ac --- /dev/null +++ b/Pages/8fc0150152814864a2f1c5fda59114d.rd @@ -0,0 +1,5 @@ +{ + "PageType": 2, + "ColumnCount": 4, + "RowCount": 2 +} \ No newline at end of file diff --git a/Pages/97bdc47834844e0d8f3a5aef747785e.json b/Pages/97bdc47834844e0d8f3a5aef747785e.json index 8936c832..f5191f66 100644 --- a/Pages/97bdc47834844e0d8f3a5aef747785e.json +++ b/Pages/97bdc47834844e0d8f3a5aef747785e.json @@ -8,7 +8,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 33.0 + "DesignLengthInPixel": 29.0 } }, "2": { @@ -108,6 +108,13 @@ }, "StyleDatas": { "Styles": [ + { + "FontFamily": 0, + "FontSize": 16.0, + "TextIndent": 5, + "HorizontalAlignment": 1, + "VerticalAlignment": 2 + }, { "FontFamily": 0, "FontSize": 18.666666666666664, @@ -146,12 +153,12 @@ }, "CellStyles": { "1,1": 0, - "1,3": 0, - "1,4": 1, - "2,1": 2, - "2,2": 3, - "2,3": 3, - "2,4": 3 + "1,3": 1, + "1,4": 2, + "2,1": 3, + "2,2": 4, + "2,3": 4, + "2,4": 4 }, "SheetStyle": { "FontFamily": 0 @@ -168,4 +175,4 @@ "PaperSize": {}, "Margin": {} } -}//DTSbQH5lvBUK+C75TB1UTbWtl7G0gIqBi89A/Vmhf28thNfWmwHwWoCc0pOMalpMCS35uoa8S9FDfN8lZn+sexbEXXch604Tl/WWlPf88HXAp7PcHbdwu0YpAJpE9Um0vpKDLoNn0n5yN9v+Ci5NU1hAywfz4Qz+IDtZw/SOMIx8hC9xSdhurE6VOvYmO3mBPZZ8of1wCIaXiRZWb6V+cKN+yt6woejdX68uKpsM6CvgI8afH85HkffVc7tAsL3lYpvFU8JPlusQturdkT9sszCpUDljFr6mHFwZFND/9a1ocwEXIQ3OD6H7tqjEyqCr+mZc0yMTbDAr6VJyGARWIghiUN/3gmci9puUo+OUaMTzDJyhZ6uM7jua2VFGMksXfyhieMacN8edAuoYutGQJiODow43sUi8529gNy12nTu7x/9JPjGeyo1QjZznEYgBBOIjErI8vN+Tsv5JEySDZ+k9zXN3IUjj109M58Eep1gNBx8/yndGqThhGkHsA46tOiJBdhSj/nUOAWPaqVYAQGE9z0K8K5nDdJkF3FVVRu+0ui8DgU+C80ej/3d35LmA6c88OhppTskpdVYWcYoHlKYE1/REXQH8meIBrVzpVGA55VvYNG/HTVfawGkITmY2mw21CrzUUKxNS1K3uPdu6WUNs0ehAP1iX+lDKyEw9u7+U3nBY0kMy03i68NBeEEe8527/jKBDVATDu/ug0jiEdB/EtacUylyMBL/FUYBzg0sTOGWO7LEYeEPGNynpgujXjT6DVPXcRE9TJz3oqBWGOfYlpFCYlb9mYq8/bqRm2l1UlB0MjrFbxdngASF4s7aex1xNI+4e+qfaefiaoGMNSnaCYzPErbi7qIjKeA2A2983uWZWwPLiHR/tfE1TxBj9VqKL20sIse8P6Am0pXclQ==|920 \ No newline at end of file +}//AYlu/3bttD1fDI4QpiH7KnoTq3Uh53iPnyU7zifg5ffUvrnKasJEcY1ubTByNY4fiCqautzmr58gfFECgeKjhyDAT/moD+BJNnphluTRjdbbBp5w9SIPuOf0A7iQ/0isMabHbkzTi+8x1EMn/tXMmNCMvZauNjb/KpkMjhOmQGIcWkvFXSLQIVeV36g1cSQEXNqn/fsAPLq3szOnIHAE6xb7vU8BIBxBxCNaIrjSyu0t/+5QLbNTFloK9StyYk4ljibRaeh6dMzaNMRvZSlCIJFpVQ4bTHgd7yqS/9C63oZBVLDlYywtwBcya8yWnuci6/ubZ53tpSQoFb40dfatuC5SfldoGpsOWOqadKuHunR38zmkuVqSAj7fuFbY2xovEDvOxzdmOYheyvQnbTMTQxUC3Dkumyl3MqUvIU9+uy0pbJgCajmOUZIMZLNzZyktgpiF7dsinCyYR2OQrNlJZuHE/BAmp3s4Hot7QiFv6niwgpTGFO2vb9gFHzW2QWkTOFkkcs4zRWxW/WnYVqLyO3N7+m6N1D6Km7rK2fU0tupsZh6YUeyDteIgJOwMn+i5ruELoa5vEm7wf9Xq6EupQn07UUL3UTq/sOKKbulq15rGUv/E+N+kFJT1FEjUWVvL3XcITkH7k6tDN7OyGvIeFn/8ixd4SwAyB7nWP9vqkRcpqTo9wCSynSpkcAy0cFZw6C/T5U3mnfC1bezbW/xsU1BDOb7vAUrpkkk+/2kIvlLfbUITYB9j3VVBXzNUsMUGUl7O8UOiGc979r7ntvSotP7eniv6+gDxY1c9WJNsmgasTUTJ4ADkNHJuHhoNbmYfGkR2G/e2gUYG9cwV8piK1QiF3PWpAufU9gh1TvK9TmK9dFguq5VaYRPpdEIoIdmHJfNmfjQjg/l7ti1zu3n0VA==|920 \ No newline at end of file diff --git a/Pages/Git/选择Git仓库.json b/Pages/Git/选择Git仓库.json index c0f14a48..606b822a 100644 --- a/Pages/Git/选择Git仓库.json +++ b/Pages/Git/选择Git仓库.json @@ -210,6 +210,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=选择Git仓库!hook_api_url" } + }, + { + "Name": "仓库URL", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择Git仓库!仓库URL" + } } ] } @@ -226,7 +233,8 @@ "创建人": "创建人", "创建人头像": "创建人头像", "默认分支": "默认分支", - "hook_api_url": "hook_api_url" + "hook_api_url": "hook_api_url", + "仓库URL": "仓库URL" } } } @@ -279,4 +287,4 @@ "PaperSize": {}, "Margin": {} } -}//jHri6PGZYRrKprtAeRvt9xtmdJTj/tZR0EnwdgPkhiVvH37iYexuAeU3IvhdppH2UWAo+thDhfPcV29LTgzSOwrqm8vkXcb2hDAefdAKU/rauA6urAx2CYKCyANhOFoGEDZXoqhWviFobw39osxs2wbr6jqU7xwjtP8cnPwQ1ndYqvqiVV0Es3j4inGmnHlN7CGwUKaqc5dSraIJULzyZ/cFY2Mlixk8iLrYU+AhPidEj2cWdha8JNlAN6X4Rw5cdDir4ebxziHhvqlmmNz7AbnHdyBlky1a3V0qNUbrXLdvulgh7eIqgzapcJI22umHsXnXHj6rO2e2Xou8oTahtic4ilx71wwif62dSql+zlhylzXR+Rbf2FJzYp0eg+rEkZXAdxsJgyUVLVGO8yjtwzJeFGhn7hg1BWmZspjsHLUqai6RMhCN8V+6LywWreW0LwhYhdr9L2TN4CxtLNBnFflHDcD/2fxCi1efGA/mJ3Uh/5gmqjoCRfT/sa+4xXFzwXgW8B8hQFmfQjCvlEppFeVJKgyeyjB1iWBIskotXlezLaY+xlDasjIXd7LxPIPV1+ukNbgRQSjtNNqYCAB7iQDaF7yYeRwLFrU5EM11KTvKNRqyedOlP5DHQTR2b8AM6k4ozDqo58gHyYj6TOroLOLcF85MvxmBMRsQ/QJITfF+CsAf8LfHvIKsB/caY66bIIJ+nGYdAKg1SCSEeAEPWAXIXz7wyt/NTlPO7fXfqhVecQs4ILKAc4tv/15Hh1uULaqdPKMYITFLVd9bexnTyh3WV4RRoDt2WNz0lZePS5Zp9+showUBc44+cwB61zlntUvMVmisuDWpeqjk+CkoInwkNDqXgyM1x/X7Gv90iSDH0YaXINa81lsbSHQRUjWj3PnBVDcxAHV7R/ENoL+AoA==|920 \ No newline at end of file +}//fq/bLsb57FB0VNdKozKz3oZh2b4EKOvXPK5kccyu0OLWDFMN8Z33oPnnAMlB8+sAUYrEj1lVkKMe+96YSqzCijrZo1Vh+LhNoKdhzfKrp5w9Im8VBdor+pa/Y0gUpgwLwHKh3R/mlU6onBfD/rbadWfZPmxzVqQzPGWOpRUpgj8zHXC0VP9eKmWAbdkqqF8dt9qpdZxuxfMRs+JR9mAtqK22H9l2NAvom6YFYEaWn1FeQucsl6tkqzfatyE7svnfb7WdtaY/ClCL0igqtwSm/7T0gJ/lbLAqO2DWNBiQyyfJ61XJIcgrIJCqznqIIHji8fw4UwPeCCUFYMhBMckDXAhF8YohI2NXrs1bqzbak0fZ3xUf7LKolTA+XUMoewxffamhG2iiU7SvOyKIdTCaGSMJlooTjf3HPvQPEgbQESWvpkYoevvOv8berWqEbGcxYphKPBp6hJtX41p7I5gTjXJZFTwN42A/+pGgKhlIL5ixi4ucdyYK7e5mkKjxPL9CUGlAAF3ZD3tGjOjMeLhfuKNSE5qrBbG0ybOx03e+RXrumEmV7AsAHHbtbNd8YuQiHu1meVGxi1vPvEuSEMC+YeFWXY2/Q3WrVwtAoajuj97FrBZpRXLsMZr+9tApmhbx/mv+DxoKDBPlGw5I0fAjh78M+E8EthirYlm5k6OqBPmG29SyFhQ1NBw8ZuhUX7b/Uqy0wiicle9btzCEGnHnT2IIATY1HseM+C89sbQyvUm5HeO7MdqumgnV+2xIbi6/UHjUaJDBQsHXDWSrGgfWSJDjA5dgM0uaV/nnOpTvFPV7F0lgGDbhunS25/nVkIla+v3eXIOTcqmGRd5kKkD79lKOG/ZBpVQx4OyRBeEc3HA9z4pwe7I13I7vbeVpmQ5y0+G3bY8aTWtyC9kNNM/L8Q==|920 \ No newline at end of file diff --git a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json index 90a08fbe..36ff1462 100644 --- a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json +++ b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json @@ -18,7 +18,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 + "DesignLengthInPixel": 17.0 } }, "4": { @@ -34,7 +34,7 @@ "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 26.0, - "IsHidden": true + "Mode": 1 } }, "7": { @@ -59,7 +59,7 @@ 9 ], "Count": 10, - "DefaultSize": 16.0 + "DefaultSize": 12.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -100,28 +100,28 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 21.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 74.0 + "DesignLengthInPixel": 59.0 } }, "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 18.0 + } } }, "Count": 12, @@ -129,16 +129,15 @@ }, "Values": { "1,1": "版本号", - "1,10": "创建人", - "3,2": "空间名称/仓库名称", - "3,9": "master", - "7,5": "立即绑定" + "1,9": "创建人", + "3,1": "立即绑定", + "7,4": "立即绑定" }, "AttachInfos": { "1,1": { "TemplateCellSource": "名称加版本号" }, - "1,9": { + "1,8": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "TemplateKey": "圆形", @@ -149,7 +148,7 @@ "1db67ca9-ca8f-4621-8730-b7daa0920e07" ] }, - "1,10": { + "1,9": { "TemplateCellSource": "创建人", "RulesGuidList": [ "1db67ca9-ca8f-4621-8730-b7daa0920e07" @@ -157,16 +156,54 @@ }, "3,1": { "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "Size": 12, - "ImagePath": "gitee.svg" - } - }, - "3,2": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!B10" + } + ] + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "任务版本详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "f60bf190-4898-4a45-b621-3235783e3a61" + } + ] + } + ], + "Text": "立即绑定", + "TemplateKey": "链接样式", + "Icon": { + "Name": "gitee.svg" + }, + "IconSize": 12.0 + }, "TemplateCellSource": "副标题" }, - "3,9": { - "TemplateCellSource": "分支名称" + "3,10": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "复制仓库地址", + "Size": 12, + "ImagePath": "Application/147_copy_1.svg", + "BuiltIn": true, + "Color": "Accent 1" + } }, "6,1": { "CellType": { @@ -206,12 +243,11 @@ "width": 100, "text": "添加标签" }, - "distinct": false, "ReadOnly": true }, "TemplateCellSource": "仓库成员" }, - "7,5": { + "7,4": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -231,43 +267,7 @@ "IconSize": 12.0 } }, - "9,2": { - "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" - } - ], - "TemplateKey": "_RS_NewLittleRoundCorner", - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!3:4,cb2a6325e1334f5fbcb7270deba57ec!7:7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT(cb2a6325e1334f5fbcb7270deba57ec!C10=\"\")" - } - }, - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!8:8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!C10=\"\"" - } - } - ] - } - ] - }, + "9,1": { "TemplateCellSource": "仓库ID" } }, @@ -277,7 +277,9 @@ "FontFamily": 0, "FontSize": 16.0, "FontWeight": 1, - "Foreground": 2 + "Foreground": 2, + "TextIndent": 3, + "HorizontalAlignment": 3 }, { "FontFamily": 0 @@ -285,10 +287,10 @@ { "FontFamily": 0, "FontSize": 12.0, - "Foreground": 3, - "Formatter": 4, + "Foreground": 4, + "Formatter": 5, "TextIndent": 5, - "HorizontalAlignment": 5 + "HorizontalAlignment": 3 }, { "FontFamily": 0, @@ -297,32 +299,32 @@ { "FontFamily": 0, "FontSize": 12.0, - "Foreground": 3, - "HorizontalAlignment": 5, + "TextIndent": 5, + "HorizontalAlignment": 3, "WordWrap": true }, { - "FontFamily": 0, - "FontSize": 12.0, - "Foreground": 6, - "HorizontalAlignment": 7 + "Foreground": 4 }, { "BorderBottom": 0 }, { "FontFamily": 0, - "FontSize": 12.0, + "FontSize": 10.666666666666666, "Foreground": 2, - "HorizontalAlignment": 5 + "HorizontalAlignment": 3 }, { "FontFamily": 0, "FontSize": 12.0, - "HorizontalAlignment": 9 + "Foreground": 2, + "HorizontalAlignment": 3 }, { - "Formatter": 10 + "FontFamily": 0, + "FontSize": 12.0, + "HorizontalAlignment": 7 } ], "Types": { @@ -330,29 +332,26 @@ "Body", "Bold", "Text 1 0", + "Left", "Text 1 50", "General", - "Left", - "Accent 1 0", - "Right", "Background 1 -5", - "Center", - "@" + "Center" ], "Borders": [ { - "Color": 8 + "Color": 6 } ] }, "CellStyles": { "1,1": 0, - "1,9": 1, + "1,8": 1, + "1,9": 2, "1,10": 2, "2,2": 3, - "3,2": 4, - "3,9": 5, - "3,10": 1, + "3,1": 4, + "3,10": 5, "4,1": 6, "4,2": 6, "4,3": 6, @@ -364,38 +363,41 @@ "4,9": 6, "4,10": 6, "6,1": 7, - "7,1": 7, - "7,2": 7, - "7,3": 7, - "7,5": 8, + "6,10": 7, + "7,1": 8, + "7,2": 8, + "7,4": 9, + "7,5": 1, "7,6": 1, "7,7": 1, - "7,8": 1, - "7,9": 7, - "7,10": 7, - "8,1": 7, - "8,2": 7, - "8,3": 7, - "8,4": 8, - "8,5": 8, - "8,6": 8, + "7,8": 8, + "7,9": 8, + "7,10": 8, + "8,1": 8, + "8,2": 8, + "8,3": 9, + "8,4": 9, + "8,5": 9, + "8,6": 9, "8,7": 8, - "8,8": 7, - "8,9": 7, - "8,10": 7, - "9,2": 9 + "8,8": 8, + "8,9": 8, + "8,10": 8, + "9,1": 1, + "9,2": 1 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "1,1,1,7", - "3,9,1,2", + "1,1,1,6", "6,1,1,10", - "3,2,1,7", - "7,5,1,4", - "9,2,1,3" + "7,4,1,4", + "1,9,1,2", + "4,9,1,2", + "3,1,1,9", + "9,1,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -406,7 +408,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!$K$2=\"\"" + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!$J$2=\"\"" }, "GUID": "1db67ca9-ca8f-4621-8730-b7daa0920e07", "StyleInfo": { @@ -424,4 +426,4 @@ "PaperSize": {}, "Margin": {} } -}//QYMZTQAfHVZIJBuGZQuCYwouJ/WoEGogOw3OvVpn8s6+MXSi7nqkrWpjog8OqQToou/UUO19SFr584EEp9l5LkpTQEBfxUqzcEZyiC98HdN8mz6CqRx41bCT84wSLE38HiRiFy6SzmMTDDcPRv4J7YwGjwzvGL8p3bMx1MFtgFC1K/BXTNoYY4rPUJdpL+ADzyrvyUebzomDA2/ZdOs2Gl7A2viVTXHpGW8y4lJpMwzsiHqveA20WspAkH04S0ABhLnXK9/SeZgopLkeUJ4M+ivYC+3bmyYsltUGtS6TmdWkAl4uHjPxicf4y7D7aZHOcAKxSxXpynUrNI2+sfc5/ldquI6WSpV27+2AKtaqob7KBuLPoJYEYQ+yWoTZdEFU5PhcYXzzWAsyWY19nbVzWj0BObwSKyIN0EnDXVcx5DLHRH/bH5nGmxxk+mk6H9LgxhEDHRTo/RIjPAAZqAcFmO95W6tzPrvtZUf+vclLFpqXzHnu996a3ICvk1N6RIYhNGHSEo1g50aYOHAOQ8ZAQ7d3zpyWeGmlksuSP/C67EFh5Yrw1A4KLrSz9HIlg/8UDbmy0KlscKpF0h+GdpNOVZHh39YInfFXtEvSHDLVOee8ATiZLBhrzVZZe4W60IWbmmaz+OqmJZX/Zfv7RNEg9frTaT231zI89FSJOF1bfXzB3DbAHzDDz1WrFcSevf9uWu5YEAKcuT+cS/2kxCK1sgONr3hXCoMXfRst83RGF9Y2Ln4FOrKSHOLRSsyJZcaIIXOeUdiMEIWMcvKJLMHaSvrexfU5ycia7EExnjKv5UcRZK0bnzUPPbOkyez0FJqrj2QF6Q3TiWgGW2oJYmzoSVoHHwmjdeAifX0zKdp50v1K6BvEMJ2aKDs+QQnWxbjKoDYkSSUPYNSe9j90/FhsJw==|920 \ No newline at end of file +}//s6TbsvnboIKePkQGPA+JDTuMj69w8GCkQmbhhz+V2+TtQhoQ8bHIfgHrD4sBOxKztculCb55vIL5vOWzefrPII56CJN7qr1BYa5SAoiXk0IbBY6hNy2bO+0YFHOCQ1x32hOzckp4huPrERHn9ubjZvFOJlnTD+AVHIjjtdILsQJv4mv550qqM2EFrQu5HlDBzW1WA2gggDlAKSwD4BkEkh/5nzihNFbzjElKbQFStE2rXQcbzDTvSTQbO1qb70pqqK48S7xp4IaX++bCmr5gqgLppcoDzKG7PiL1oIU8fe6NwthEQqesxUo2AR0yoYsOSuxb1YEmZ7rRiJ2KX0dJrrSS4Gn+9I3tKu16dFCjqc0ZJIdGMzmgSMB+cV3j09zIIaI5U/re4oTvXkn+XH8sS7TsAGAzOZvLaIBVDyPFZDKyT8hd9bSBzRI4AaMAA8upMC4FIJy+kNYGwv5vl/DetF2V2KQYVJzmuZTHXaEm/QMdViwfrxhodMgKQXneSb0Be9qEPUP6KOIL4si+NkU5qON/iSEX484+/NrJKXm/FKXMZ7R/bHGUvM2z4WNiGIaWchoYCTABqxn5hLYV33LeCtQwRbLbgDo+3GXqSYKnTHV8B3g5cjtM56tjG2xtSS8bqqylBGghThWT1qdQq8U2fmoWjgUso3WiNfpRJOB8UKRLcUi5p0Wc1UhRmKKXnfFZTRtS0S2jk6t0jJZ22t6exgA5cgy1ouPxdn1Wg14oDYKIbOd00U7vWFBm5OkWfDwDN5rM+bZeRovZyq4VYGdexl1W3/W8G8NsSoU6zq+lkaX35ArCpHsLxv0Cqd99lWUAOhRDN8jaQFJk1XG5tD7siY3GBNAQoBHJ7aXlKVf+u/17sOI7avgSxRyH2uMGbQPe9+ofAcSQWvMcf6FsrGoyuQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json index 0f9cd939..5604f50c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json @@ -500,6 +500,13 @@ "SerializeProperty": "=任务版本详情!默认分支" } }, + { + "PropertyName": "仓库URL", + "PropertyValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!仓库URL" + } + }, { "PropertyName": "显示删除", "PropertyValue": "1" @@ -562,7 +569,7 @@ "Title": "加载中" } ], - "ID": "183af7e8-aa68-4820-baf2-e3895d9e2d19" + "ID": "2910867b-0ae8-44aa-99c0-0fd7cf3719a3" } ] } @@ -580,13 +587,14 @@ "创建人": "创建人", "创建人头像": "创建人头像", "默认分支": "默认分支", - "hook_api_url": "hook_api_url" + "hook_api_url": "hook_api_url", + "仓库URL": "仓库URL" } }, "PageName": "选择Git仓库" } ], - "ID": "941371e9-e17d-45a7-b08d-5ffa131aed0d" + "ID": "ad919926-926d-4709-9609-cb2abbdd08b0" }, { "CommandList": [ @@ -762,7 +770,7 @@ ] } ], - "ID": "4c12b112-0c87-4f69-b4b7-5887a8bf9074" + "ID": "f664237b-09d5-4f29-a7d8-e0a30e3cd657" } ] } @@ -776,7 +784,7 @@ "PageName": "完善Gitee资料" } ], - "ID": "03957474-fdab-4056-9e0e-e87fee79ad12" + "ID": "1825bd83-a2d1-4215-a386-36fa699d797b" } ] } @@ -998,7 +1006,7 @@ } } ], - "ID": "a85b1176-a43b-4998-8bee-2e23d16265f0" + "ID": "09082ce7-e18b-4778-b74d-09bb6fcdc157" }, { "CommandList": [ @@ -1015,12 +1023,12 @@ } } ], - "ID": "990e85c0-a679-45e0-963a-29f6ceb478c4" + "ID": "3f850ee0-6ed4-4801-a85f-2494f6544f6b" } ] } ], - "ID": "115d8fda-45ba-448f-90df-d32bcbd08d2d" + "ID": "358f5c55-71b7-4989-b650-963487fc28bd" } ] } @@ -1222,6 +1230,12 @@ "PropertyValueTo": { "SerializeProperty": "默认分支" } + }, + { + "PropertyName": "仓库URL", + "PropertyValueTo": { + "SerializeProperty": "仓库URL" + } } ] }, @@ -1327,6 +1341,14 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务版本详情!默认分支" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库URL", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!仓库URL" + } } ], "ResultErrorCodeTo": { @@ -1367,12 +1389,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "8113f8f7-e54a-4d61-b9b4-97ec290ce35d" + "ID": "0d7f5e58-da65-41a4-ad74-034bbd6ced2f" } ] } ], - "ID": "f0bce2dd-a9a0-4d02-8e08-bb3b6be248e0" + "ID": "fd2dd89f-60d2-4a3f-b80d-df7bc80f4607" } ] }, @@ -1401,7 +1423,7 @@ "ReloadAfterSucceed": false } ], - "ID": "4c1f2b57-bf0d-456c-a7d5-b258cea260e3" + "ID": "b40d16e7-506c-4263-9e5b-4df59a2f119c" }, { "CommandList": [ @@ -1412,7 +1434,7 @@ "ReloadAfterSucceed": false } ], - "ID": "3d2c6d7b-809c-4177-97ee-d5f60c916e63" + "ID": "a3b7b232-feaf-4aaf-ad97-b350badbe00e" } ] }, @@ -1603,4 +1625,4 @@ "Formula": "任务版本详情!$L$10" } ] -}//s+/8+S4JXZ/FAwgyjsfxRRQLzcl2z7lY/xKJcpvMldhLoCVV5v+Y5evZirwCJ9nGoafekoCboUljJo56w2wSQqpV7c2JJpNFEL0+YYDFEYJF9r/Xh/yH6+trdVMhhBjI9dull0kF0A+eDOjPBn+rLRTKX0CBxXSl8n3AjxxTVReL3QKk3zm3Q/CKlTabMThofbcPk54D24DeYhsTeDOBgdOmQnMUE4fbfBN2KIfn0crggvoWWfmHX+oKUL8nniL7Jcoy+dQr/BgCt5D0dXfDzbK0jdhvcp4jpcnDi3s29PXICHPlyrsxXk7tv/eaLcPOmWMWZ6toipMAChYu2rmwPz8KYVEZF9nFvTCCISo8jtoJQnUQ+FYjwK1U+k7HYOhkwCrHNYfTTIwZlLKCSWq4YOQcnhit7l6FmbQDFAQpJ/9kflsldvySCIDKs8IVHI+nkLPLgeVW8jnmqt4mW6023kUdmnFO0LpAqEYYFnpcs3dMyCPweIiaL74AYRlXyHyj3y7i+PVpb7TBzxN/RC4AkQTQblfE2Y1GZJhDk3hwsQOYSAT59zAaExD/WWvGl0Gcq7AT8iu/g+V6h1h3whz0FpwIXMpsHPL8d2pmWF6AhduH6cjqgVjiZ8y+jzcKG7u0oWH4g7j6lisQWwCk18TCkDdREkEW4eF3IEqZemi0lL5S1A1Gd9zTXte8Ut9O8GYahJRV+uNyN9wMtbm9EhkdOFCCDwv4qN+CxX/MOMBCdd4yRAy6BowurSqkJUk+V6K3+L8UiJCzH9mp94n1m7kBOa9FkvBwckXuRrURukPQiJ7svG10Bh4ntqA3am85w/M8VJj4qrKmJ3q9vd1NXr4pSC/M1kBZHQiTnDDysoCjddt/r5rJ7yeTT1e2caTsDtNWSDQImRqxF2n4zbMKHOT5fg==|920 \ No newline at end of file +}//BGil347lnMXhuKCdHMcLNF1CCPndZiblcinKzDVqbKAP4gclzEDffmXskotZSZ+kEpSmuHZvQNUiIZTJDebgxd82QRs4T7MzYJncxaA3EWdVcpmfWFI6YNzWqzAzbOAQ2chbRv8WZaCx5IrAoK7roa576WsILbI6UDiYf+OwiquRWKFpbyhCnVd2Hocc3O+cTh1hOPj8C0XGo6nS17wtE2Y4VNci9jyuVuLwkgFElodVmZBhgtGHT4CMbUD5x8MwWJkFhL3+8Yff7PKpj4UJ9BDOxSrHrkNW9S2ldcCDkRZ5atBVtx5A8Gd3i0uFyWFU+6B34FDntZf7zvykrgLBGjZLwP1PxhtnPfroYwVbLKP+POAsjW56Diqtz/pp/r49xq7vPQ2cCqxL43wqodgWq9vKQwvyGmMawbN9S6yp/2nJMf0rqrBMGmk5ajQhx0nz4TSQZg9xqTc3ylK/0tg/hYv+Du9LWwfX+JDvFq5dr21E6NP82bB5SM8n57/fcYWDBOJZIMQ5U7EL8jWCOgdA62UaeESBtwA8kKfOm2NbEkFEy4ExGiYotFxjKz5/mncFvCv7jGdH+TVubERhwB48m5YEEDm0Sx0NW76KuaKxlS7ARZ9CIIOqzFMDZs9riJ0b0zz+WNxS/2lAGY9SMxbApeASOZqHaCTOxmBeO1wwbnsoaAp501cY9WT3hQXfVmstfF5k/F1UpqnwF3KmdtLpwVpbPywVigWeFsNxthlYljaIs6RHCMJdMiQapRCyMpIGKDSLG6zvit3KI2a/WA6il6ekk8+BbuwTl9TmiXfZNwUuBVdIPr2ALTuxmGCxRFCpQK35cB/7iVUkp2pumCqY/Igj8ZLD6tENZrLtdEGFv6xXQgTWTekeem1zClw/oVl4VSN7lILz90INm/78Mk9/rA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目代码.json b/Pages/项目/项目首页/项目首页-容器页面/项目代码.json index 0a898f20..7ad01ff9 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目代码.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目代码.json @@ -75,20 +75,10 @@ }, "24": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 24.0 } }, "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 44.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { "GridRowColumnDefinition": { "DesignLengthInPixel": 36.0, "IsHidden": true @@ -96,9 +86,9 @@ } }, "InLogicalVisibleIndexes": [ - 27 + 25 ], - "Count": 28, + "Count": 26, "DefaultSize": 32.0 }, "Cols": { @@ -317,7 +307,7 @@ }, "41": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 + "DesignLengthInPixel": 24.0 } }, "42": { @@ -337,79 +327,18 @@ "AttachInfos": { "0,42": { "CellType": { - "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", - "TemplatePageName": "557031284d494486b3b32eb2329c19a", - "DataSourceType": 1, - "DataSource": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "Git_事件记录", - "BindingInfos": [ - { - "GUID": "93f22a5b-a7ea-45a0-9286-b38899abff4c", - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "ID", - "GUID": "2d0920d7-9cc5-4dfa-8231-dee933a39190" - }, - "ColumnName": "ID" - }, - { - "GUID": "3618a6bb-83de-4705-94a5-4db32b0c873d", - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "日期", - "GUID": "0018b3fc-33de-4c39-93f1-611185772d3b" - }, - "ColumnName": "日期" - }, - { - "GUID": "4c20692c-aef0-424c-8808-45b64a12b9d0", - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "姓名加内容", - "GUID": "29e0bc7c-5cb8-42f1-8ba0-87f181f722b2" - }, - "ColumnName": "姓名加内容" - }, - { - "GUID": "5405f77b-165d-40b6-b510-29b905475468", - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "内容得分", - "GUID": "2a5d3916-0f44-409e-aecd-e91977474494" - }, - "ColumnName": "内容得分" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库ID", - "GUID": "c7a17c1b-02ac-4279-b084-e0558ed9c39b" - }, + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "Gitee事件记录列表", + "PropertyValues": [ + { + "Name": "仓库ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目代码!仓库ID" } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "日期", - "GUID": "b3fe1b72-6f8f-4283-8a71-7b74b52442f5" - }, - "Order": 1 - } - ] - }, - "IsListviewDataSource": true, - "CustomColumns": [] - }, - "DataSourceListviewName": "图文列表表格1", - "IsLoadOnDemand": true + } + ], + "OverflowMode": 2 } }, "1,1": { @@ -625,20 +554,20 @@ "BindingInfo": { "TableName": "项目版本", "ColumnName": "仓库ID", - "GUID": "af7a55f3-2274-4cae-a632-d0eebf321406", + "GUID": "f5d353cd-7d99-4fe0-a6c0-40130ffd412d", "RelationBinding": { "RelatedTable": "Git仓库表", "RelatedColumn": "仓库ID", - "DisplayColumn": "空间和仓库名" + "DisplayColumn": "空间路径加仓库路径" } }, - "ColumnName": "空间和仓库名" + "ColumnName": "空间路径加仓库路径" }, { "GUID": "b0e59c53-50f0-4c05-b130-b126318af202", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目代码!仓库ID=\"\",\"未绑定仓库\",项目代码!空间和仓库名)" + "SerializeProperty": "=IF(项目代码!仓库ID=\"\",\"未绑定仓库\",项目代码!空间路径加仓库路径&\" -\"&项目代码!分支名称)" }, "ColumnName": "副标题" }, @@ -805,60 +734,6 @@ } }, "25,1": { - "CellType": { - "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", - "ListviewName": "仓库虚拟表格", - "pageSize": 24, - "pagerCount": 7, - "layout": [ - { - "layoutItem": "sizes" - }, - { - "layoutItem": "prev" - }, - { - "layoutItem": "pager" - }, - { - "layoutItem": "next" - }, - { - "layoutItem": "jumper" - }, - { - "layoutItem": "->" - } - ], - "pageSizes": [ - { - "value": 12 - }, - { - "value": 24 - }, - { - "value": 36 - }, - { - "value": 48 - }, - { - "value": 60 - }, - { - "value": 72 - }, - { - "value": 84 - }, - { - "value": 96 - } - ] - } - }, - "27,1": { "BindingInfo": { "TableName": "项目版本", "ColumnName": "仓库ID", @@ -869,31 +744,40 @@ "StyleDatas": { "Styles": [ { - "BorderLeft": null, - "BorderRight": 0 + "BorderLeft": null }, { - "FontFamily": 1, - "HorizontalAlignment": 2 + "BorderLeft": 0 }, { "FontFamily": 1 }, { "FontFamily": 1, - "BorderLeft": null, - "BorderRight": 0 + "BorderLeft": null + }, + { + "FontFamily": 1, + "BorderLeft": 0 + }, + { + "FontFamily": 1, + "HorizontalAlignment": 2 }, { "FontFamily": 1, "HorizontalAlignment": 2, - "BorderLeft": null, - "BorderRight": 0 + "BorderLeft": null + }, + { + "FontFamily": 1, + "HorizontalAlignment": 2, + "BorderLeft": 0 } ], "Types": { "Strs": [ - "Background 1 -15", + "Background 2 0", "Body", "Center" ], @@ -905,7 +789,8 @@ }, "CellStyles": { "0,40": 0, - "0,42": 1, + "0,41": 1, + "0,42": 2, "1,5": 2, "1,33": 2, "1,34": 2, @@ -915,9 +800,10 @@ "1,38": 2, "1,39": 2, "1,40": 3, - "1,41": 2, + "1,41": 4, "2,40": 0, - "3,1": 1, + "2,41": 1, + "3,1": 5, "3,2": 2, "3,3": 2, "3,4": 2, @@ -956,8 +842,8 @@ "3,37": 2, "3,38": 2, "3,39": 2, - "3,40": 4, - "3,41": 1, + "3,40": 6, + "3,41": 7, "4,1": 2, "4,2": 2, "4,3": 2, @@ -997,30 +883,30 @@ "4,37": 2, "4,38": 2, "4,39": 2, - "4,40": 4, - "4,41": 1, - "5,40": 4, - "5,41": 1, - "6,40": 4, - "6,41": 1, - "7,40": 4, - "7,41": 1, - "8,40": 4, - "8,41": 1, - "9,40": 4, - "9,41": 1, - "10,40": 4, - "10,41": 1, - "11,40": 4, - "11,41": 1, - "12,40": 4, - "12,41": 1, - "13,40": 4, - "13,41": 1, - "14,40": 4, - "14,41": 1, - "15,40": 4, - "15,41": 1, + "4,40": 6, + "4,41": 7, + "5,40": 6, + "5,41": 7, + "6,40": 6, + "6,41": 7, + "7,40": 6, + "7,41": 7, + "8,40": 6, + "8,41": 7, + "9,40": 6, + "9,41": 7, + "10,40": 6, + "10,41": 7, + "11,40": 6, + "11,41": 7, + "12,40": 6, + "12,41": 7, + "13,40": 6, + "13,41": 7, + "14,40": 6, + "14,41": 7, + "15,40": 6, + "15,41": 7, "16,1": 2, "16,2": 2, "16,3": 2, @@ -1060,8 +946,8 @@ "16,37": 2, "16,38": 2, "16,39": 2, - "16,40": 4, - "16,41": 1, + "16,40": 6, + "16,41": 7, "17,1": 2, "17,2": 2, "17,3": 2, @@ -1101,8 +987,8 @@ "17,37": 2, "17,38": 2, "17,39": 2, - "17,40": 4, - "17,41": 1, + "17,40": 6, + "17,41": 7, "18,1": 2, "18,2": 2, "18,3": 2, @@ -1142,8 +1028,8 @@ "18,37": 2, "18,38": 2, "18,39": 2, - "18,40": 4, - "18,41": 1, + "18,40": 6, + "18,41": 7, "19,1": 2, "19,2": 2, "19,3": 2, @@ -1183,8 +1069,8 @@ "19,37": 2, "19,38": 2, "19,39": 2, - "19,40": 4, - "19,41": 1, + "19,40": 6, + "19,41": 7, "20,1": 2, "20,2": 2, "20,3": 2, @@ -1224,8 +1110,8 @@ "20,37": 2, "20,38": 2, "20,39": 2, - "20,40": 4, - "20,41": 1, + "20,40": 6, + "20,41": 7, "21,1": 2, "21,2": 2, "21,3": 2, @@ -1265,8 +1151,8 @@ "21,37": 2, "21,38": 2, "21,39": 2, - "21,40": 4, - "21,41": 1, + "21,40": 6, + "21,41": 7, "22,1": 2, "22,2": 2, "22,3": 2, @@ -1306,8 +1192,8 @@ "22,37": 2, "22,38": 2, "22,39": 2, - "22,40": 4, - "22,41": 1, + "22,40": 6, + "22,41": 7, "23,1": 2, "23,2": 2, "23,3": 2, @@ -1347,125 +1233,80 @@ "23,37": 2, "23,38": 2, "23,39": 2, - "23,40": 4, - "23,41": 1, - "24,1": 1, - "24,2": 1, - "24,3": 1, - "24,4": 1, - "24,5": 1, - "24,6": 1, - "24,7": 1, - "24,8": 1, - "24,9": 1, - "24,10": 1, - "24,11": 1, - "24,12": 1, - "24,13": 1, - "24,14": 1, - "24,15": 1, - "24,16": 1, - "24,17": 1, - "24,18": 1, - "24,19": 1, - "24,20": 1, - "24,21": 1, - "24,22": 1, - "24,23": 1, - "24,24": 1, - "24,25": 1, - "24,26": 1, - "24,27": 1, - "24,28": 1, - "24,29": 1, - "24,30": 1, - "24,31": 1, - "24,32": 1, - "24,33": 1, - "24,34": 1, - "24,35": 1, - "24,36": 1, - "24,37": 1, - "24,38": 1, - "24,39": 1, - "24,40": 4, - "24,41": 1, - "25,1": 1, - "25,40": 4, - "25,41": 1, - "26,1": 1, - "26,2": 1, - "26,3": 1, - "26,4": 1, - "26,5": 1, - "26,6": 1, - "26,7": 1, - "26,8": 1, - "26,9": 1, - "26,10": 1, - "26,11": 1, - "26,12": 1, - "26,13": 1, - "26,14": 1, - "26,15": 1, - "26,16": 1, - "26,17": 1, - "26,18": 1, - "26,19": 1, - "26,20": 1, - "26,21": 1, - "26,22": 1, - "26,23": 1, - "26,24": 1, - "26,25": 1, - "26,26": 1, - "26,27": 1, - "26,28": 1, - "26,29": 1, - "26,30": 1, - "26,31": 1, - "26,32": 1, - "26,33": 1, - "26,34": 1, - "26,35": 1, - "26,36": 1, - "26,37": 1, - "26,38": 1, - "26,39": 1, - "26,40": 4, - "26,41": 1, - "27,1": 1, - "27,21": 1, - "27,25": 1, - "27,26": 1, - "27,27": 1, - "27,28": 1, - "27,29": 1, - "27,30": 1, - "27,31": 1, - "27,32": 1, - "27,33": 1, - "27,34": 1, - "27,35": 1, - "27,36": 1, - "27,37": 1, - "27,38": 1, - "27,39": 1, - "27,40": 4, - "27,41": 1 + "23,40": 6, + "23,41": 7, + "24,1": 5, + "24,2": 5, + "24,3": 5, + "24,4": 5, + "24,5": 5, + "24,6": 5, + "24,7": 5, + "24,8": 5, + "24,9": 5, + "24,10": 5, + "24,11": 5, + "24,12": 5, + "24,13": 5, + "24,14": 5, + "24,15": 5, + "24,16": 5, + "24,17": 5, + "24,18": 5, + "24,19": 5, + "24,20": 5, + "24,21": 5, + "24,22": 5, + "24,23": 5, + "24,24": 5, + "24,25": 5, + "24,26": 5, + "24,27": 5, + "24,28": 5, + "24,29": 5, + "24,30": 5, + "24,31": 5, + "24,32": 5, + "24,33": 5, + "24,34": 5, + "24,35": 5, + "24,36": 5, + "24,37": 5, + "24,38": 5, + "24,39": 5, + "24,40": 5, + "24,41": 7, + "25,1": 5, + "25,21": 5, + "25,25": 5, + "25,26": 5, + "25,27": 5, + "25,28": 5, + "25,29": 5, + "25,30": 5, + "25,31": 5, + "25,32": 5, + "25,33": 5, + "25,34": 5, + "25,35": 5, + "25,36": 5, + "25,37": 5, + "25,38": 5, + "25,39": 5, + "25,40": 5, + "25,41": 7 }, "SheetStyle": { "FontFamily": 1 } }, "Spans": [ - "25,1,1,39", "3,1,21,39", "1,33,1,7", "1,5,1,27", "1,1,1,3", - "27,1,1,5", - "0,42,28,1" + "25,1,1,5", + "0,42,24,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1504,11 +1345,11 @@ "CustomNames": [ { "Name": "当前页码", - "Formula": "项目代码!$J$28" + "Formula": "项目代码!$J$26" }, { "Name": "每页显示行数", - "Formula": "项目代码!$N$28" + "Formula": "项目代码!$N$26" }, { "Name": "卡片列表", @@ -1520,11 +1361,11 @@ }, { "Name": "临时_分支名称", - "Formula": "项目代码!$R$28" + "Formula": "项目代码!$R$26" }, { "Name": "仓库ID", - "Formula": "项目代码!$B$28" + "Formula": "项目代码!$B$26" } ] -}//mnvjNYQiLABdzeK1Ni3BpyjBtQn0ycywpUNCeXekXyTQhtgDroi7C0j+gbR0StS9bxrWxhUA8CsX4EL6PLoN1HTHE8dHXxvEZPRG/FUdw+m4FgJtfkyOq+PywXS1j2tTqzvGTS4ecBiTUSy3bVdqSlg4V1DaNfRlRHd7BWoXgpbGs9yqj5AA57HQ6tiSwZrwDdLsY4tmrK0k6VnQhPDpI3b8CqkJogmzpx/9rD3JoMyrbWBLonhqJSGX3cDTx6j1pCNT2kdD/Ub1VJNEwFnZEywDaL6x3QvbEN1VuQZn5SloxISCZFLlqsF2wg5wA5YDQe49KyfLKqCY8xhVEevx/RsBhgS03f4S+sguvjUrBGC5c7LSrQrDEeqSbHufnvHflEELHP9GIxwJTM4E0H7QSvzHCYCkgHg17Js6VF6vnBmA1hBIexfKb4SfMHLejv5L2Qdhrhd/FBMnBtoqOM9hWLTyQ+sJISx/KS7ZxRNUGv71FMkVytKblGacubvYGIBpTPZCaZR69dkTTOeUSvtKg6i5qAfslN5CAt3QKfZYouZLiONzYTVzsRi/uaf1TjyH0qHrCuT4gVBNuuXvp4N7/OsNaCfC1YnXZa7KXjsN9M4eOTuNYEpjesAOzC7jEUTujfok/7kCICVDwEmIl4Cf/bkj32TxZKf0NiwjQB0BBnMmjliW7EzEv4CaMlVdxG7DwKz3465qWJmJrHCBYNAQDu0RWR7r+MI7+N+jL56twhozXE+9yp/JdERFc6bV+x3DKz203WsQG4hp5qfA3+SqLvgcz6NE9fhoAVZWXg9uJLCynxG/0JxfyR7gjPdG4DKj6i5WCMbf3itDBI9EtKkqQT0BeLph6NkNGfGxBCSvCW+smmsy7mDv5JbHd9m4zH0kk/IlayX+wIfDkzRBZKnKiw==|920 \ No newline at end of file +}//Jo9Jgse3DV1/WkLxrCNv5GkFrYJIDbXfK74Y9tr+MySx7ZVCz4VRQdS8C/kgu5MId5EVv5DPerbwkBApX/yZ+A5qgXagbYs2+tX4LT0oHdOzNQJdn7SZsT3rQI/3IyE5+IItqOrknZcBUtu4MzH0sp8gLvadKg4MyWtg9aixGra2gl65EEmde8/s/yx7b1e2zUfHPj+QYIdpDajVib528Gm+QLCxbFr7XUJLccWlut3fvL1zGnLnpid6zEdDjVcH5x2JKhH6b4q8/DV85y7IlOGmHmWssY7S3uEKblspVdpLD/ugk9x5KEMdZD2ZpxeoazM0nJlSCGxfqb/5Ic5qO3FqdQX6iHwXxgBItfg1LkswpNbRYeV02DTxfgiCcFzWnAcYtMXVtX+zbNo37Vqr5v1L3nVDOXGJcbI7E2sLftj51wjvfFuOOUa37dQLkS7SffSTi6czzvdkUYTgXulwSKLe9xcYeOhFhbPjV0/YEQPTf2gHPGZ+lVdehsVJgJl+25WgK9FB4g/D7nTrrl3PVfRKpfJE3flB+jzwCRGLqtadg4MVh8bwORa9sxkbBM8iEnjl2844As8S83VdxttWCnuUVjFSowbhtiIHlTymQ7hC5dMXSI/6ncvsZp6jfrcSgnNrQDcGP8VGt8TiAvMmKPdI6p3SRoTOrNS1wmSNI5KmQpojCijEs0Jifxt1CiK+h+CkW7C1zObiw2If8fSI2/EyoT5V2A5h5XDd+CHQfAfexDf/hcY3pLFjwzXbhMtH5nk7ViTts8Mo/Q/xbZj9u9e+SIJPqwNXcV/qGKKCX3+U02rVjilLQi9hcWoXPzM0L15IDT+KaAhEtjh/Ojh5wy41LSU8+DKfUg6jUyMlG5qut90duI8pDblKyaleU2TcFB8hChuWy8KvsLjJjCmxKQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目代码.rd b/Pages/项目/项目首页/项目首页-容器页面/项目代码.rd index 88e5b03f..92e4935b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目代码.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目代码.rd @@ -1,15 +1,15 @@ { "PageType": 0, "ColumnCount": 44, - "RowCount": 28, + "RowCount": 26, "CustomNames": [ { "Name": "当前页码", - "Formula": "项目代码!$J$28" + "Formula": "项目代码!$J$26" }, { "Name": "每页显示行数", - "Formula": "项目代码!$N$28" + "Formula": "项目代码!$N$26" }, { "Name": "卡片列表", @@ -21,11 +21,11 @@ }, { "Name": "临时_分支名称", - "Formula": "项目代码!$R$28" + "Formula": "项目代码!$R$26" }, { "Name": "仓库ID", - "Formula": "项目代码!$B$28" + "Formula": "项目代码!$B$26" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json index 6aecb441..2ba6bfcf 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json @@ -18,14 +18,8 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 620.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 426.0, + "Mode": 1 } }, "4": { @@ -40,10 +34,22 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 30.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -51,10 +57,10 @@ } }, "InLogicalVisibleIndexes": [ - 7 + 8 ], - "Count": 8, - "DefaultSize": 24.0 + "Count": 9, + "DefaultSize": 16.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -192,21 +198,26 @@ }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 + "DesignLengthInPixel": 24.0 } }, "31": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 268.0 + "DesignLengthInPixel": 24.0 } }, "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 268.0 + } + }, + "33": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 33, + "Count": 34, "DefaultSize": 32.0 }, "Values": { @@ -275,78 +286,20 @@ } } }, - "1,31": { + "1,32": { "CellType": { - "$type": "ElementUI.TimelineCellType, ElementUI", - "useBinding": true, - "options": [ + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "Gitee事件记录列表", + "PropertyValues": [ { - "content": "活动按期开始", - "timestamp": "2018-04-15" - }, - { - "content": "通过审核", - "timestamp": "2018-04-13" - }, - { - "content": "创建成功", - "timestamp": "2018-04-11" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "Git_事件记录", - "BindingInfos": [ - { - "GUID": "3533c024-781f-48ae-8ec7-f30324309f48", - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "事件内容", - "GUID": "d7e28e24-ca7a-4211-815a-467e6d67e593" - }, - "ColumnName": "content" - }, - { - "GUID": "b1b57bb5-e864-455e-8beb-857c01135e71", - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "FGC_CreateDate", - "GUID": "4997ed62-dfd5-4c98-bfcc-fe949397ecd1" - }, - "ColumnName": "timestamp" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库ID", - "GUID": "48a02598-ced3-4676-b0ca-c33f276684c0" - }, + "Name": "仓库ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目版本管理!当前版本仓库ID" } - }, - "TopCount": "30", - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "FGC_CreateDate", - "GUID": "1b25e6a1-f57a-46ad-8c28-7ff2dfb6b2f8" - }, - "Order": 1 - } - ] - }, - "CustomColumns": [] - }, - "sort": "descTimestamp", - "NodeSize": "normal", - "placement": 0, - "format": "yyyy/MM/dd HH:mm:ss" + } + ], + "OverflowMode": 2 } }, "3,1": { @@ -661,7 +614,7 @@ } } ], - "ID": "be753c56-2cd5-4364-961a-7d2dca56e37b" + "ID": "ad7b78f2-3574-430c-9382-9c8637b2a56a" } ] } @@ -764,7 +717,7 @@ } } ], - "ID": "da61f893-a7f5-42de-9861-3b8f2963faf9" + "ID": "efabd3de-d18c-46c8-9653-6c06fc83b236" } ] } @@ -801,7 +754,7 @@ } ], "Text": "添加版本", - "TemplateKey": "_RS_Minor3", + "TemplateKey": "灰色圆角", "Icon": { "Name": "Application/001_add_1.svg", "BuiltIn": true, @@ -811,14 +764,14 @@ "IconSize": 14.0 } }, - "7,1": { + "8,1": { "BindingInfo": { "TableName": "项目版本", "ColumnName": "ID", "GUID": "ae0290f0-a846-43e4-8f26-02b5ae169d39" } }, - "7,6": { + "8,6": { "BindingInfo": { "TableName": "项目版本", "ColumnName": "仓库ID", @@ -832,53 +785,58 @@ "BorderRight": 0 }, { - "BorderLeft": 0 + "BorderLeft": 1 }, { "FontSize": 16.0, - "Foreground": 1 + "Foreground": 2 }, { - "FontFamily": 2, + "FontFamily": 3, "BorderRight": 0 }, { - "FontFamily": 2 + "FontFamily": 3 }, { - "FontFamily": 2, + "FontFamily": 3, "FontSize": 16.0, - "Foreground": 1 + "Foreground": 2 }, { - "FontFamily": 2, + "FontFamily": 3, "FontSize": 13.333333333333332 }, { - "FontFamily": 2, + "FontFamily": 3, "FontSize": 13.333333333333332, - "BorderLeft": 0 + "BorderLeft": 1 }, { - "HorizontalAlignment": 3 + "HorizontalAlignment": 4 }, { - "HorizontalAlignment": 3, + "FontFamily": 3, + "BorderLeft": 1 + }, + { + "HorizontalAlignment": 4, "BorderRight": 0 }, { - "BorderBottom": 1, - "BorderTop": 1, - "BorderLeft": 1, - "BorderRight": 1 + "BorderBottom": 2, + "BorderTop": 2, + "BorderLeft": 2, + "BorderRight": 2 }, { - "BorderLeft": 1 + "BorderLeft": 2 } ], "Types": { "Strs": [ "Background 1 -5", + "Background 2 0", "black", "Body", "Center" @@ -889,6 +847,9 @@ }, { "Color": 1 + }, + { + "Color": 2 } ] }, @@ -905,13 +866,14 @@ "1,29": 4, "1,30": 6, "1,31": 7, + "1,32": 4, "2,8": 0, "2,31": 1, "3,1": 8, "3,8": 0, "3,10": 4, "3,30": 4, - "3,31": 1, + "3,31": 9, "4,1": 8, "4,2": 8, "4,3": 8, @@ -919,82 +881,53 @@ "4,5": 8, "4,6": 8, "4,7": 8, - "4,8": 9, - "4,10": 4, - "4,11": 4, - "4,12": 4, - "4,13": 4, - "4,14": 4, - "4,15": 4, - "4,16": 4, - "4,17": 4, - "4,18": 4, - "4,19": 4, - "4,20": 4, - "4,21": 4, - "4,22": 4, - "4,23": 4, - "4,24": 4, - "4,25": 4, - "4,26": 4, - "4,27": 4, - "4,28": 4, - "4,29": 4, + "4,8": 10, "4,30": 4, - "4,31": 1, + "4,31": 9, "5,2": 6, - "5,8": 9, - "5,10": 4, - "5,11": 4, - "5,12": 4, - "5,13": 4, - "5,14": 4, - "5,15": 4, - "5,16": 4, - "5,17": 4, - "5,18": 4, - "5,19": 4, - "5,20": 4, - "5,21": 4, - "5,22": 4, - "5,23": 4, - "5,24": 4, - "5,25": 4, - "5,26": 4, - "5,27": 4, - "5,28": 4, - "5,29": 4, + "5,8": 10, "5,30": 4, - "5,31": 1, - "6,1": 8, - "6,2": 8, - "6,3": 8, - "6,4": 8, - "6,5": 8, - "6,6": 8, - "6,7": 8, - "6,8": 9, - "6,31": 1, - "7,1": 10, - "7,2": 10, - "7,3": 10, - "7,4": 10, - "7,5": 11, - "7,6": 11, - "7,31": 1 + "5,31": 9, + "6,2": 6, + "6,3": 6, + "6,4": 6, + "6,5": 6, + "6,6": 6, + "6,7": 6, + "6,8": 10, + "6,30": 4, + "6,31": 9, + "7,1": 8, + "7,2": 8, + "7,3": 8, + "7,4": 8, + "7,5": 8, + "7,6": 8, + "7,7": 8, + "7,8": 10, + "7,31": 1, + "7,32": 4, + "8,1": 11, + "8,2": 11, + "8,3": 11, + "8,4": 11, + "8,5": 12, + "8,6": 12, + "8,31": 1, + "8,32": 4 }, "SheetStyle": { - "FontFamily": 2 + "FontFamily": 3 } }, "Spans": [ "3,1,1,8", - "7,1,1,4", - "3,10,1,20", + "8,1,1,4", "1,26,1,4", - "1,31,6,1", "5,2,1,6", - "7,6,1,5" + "8,6,1,5", + "3,10,4,20", + "1,32,6,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1048,11 +981,11 @@ "CustomNames": [ { "Name": "当前版本", - "Formula": "项目版本管理!$B$8" + "Formula": "项目版本管理!$B$9" }, { "Name": "当前版本仓库ID", - "Formula": "项目版本管理!$G$8" + "Formula": "项目版本管理!$G$9" } ] -}//G47dBwTpU8Z/f8eElrASPKn7uU6kKki5yxu5ePyGQT+38sYttW0XWy8Cc7/vGuM+J3hjidi+Y5hqBwxhcbh1bycgHfyO8pGr3N6U+0Bza7Sr1bqktedjs9oadVBoM3PFLbbHgoB9AtbS9E2NvKX0vnV6UWcQXqLDT6ZaDaIVUFHL4r26HX8ZNIR8OsKRcis9J+SGmbpNOl7fjkil3YUz1rPLkiSt2TBdUsNT3s0knM7a13IfGLw26UQy7Z4IgXD+s81O1mssAhxkezY4utAgEECraSx8G+aSE8q7NA3HASTeMphrj8DNklAfeZNNb4PJI2ukeqv8nU8aUDn/Nw/Y+g3Zz+TRz88NE7fco3sG1n+zvKjTmRNQfC9yPHk0ldJkwl6j8aRoFgpr09izN1b/keleT7x+vj1qHdcgZtGzvPWBEaDoCMPWs76zaslu3T+cN/DDBc1+vz1FNSbIOoI50XJpgyTX30BPaQ11Fo0pxZijk0MJdtLaLKxjgshsj0vrcyl1eeHNwglmQx+hhmO2uGvnOWmPBx3KTej3SVOjpxMxzsPOq0nqz51bW2KJupjXLKq68umHOBT5qXaMeb29YL57MMXsFqR78wCAPrx+bMYhpNiLSUdnmBLLHUkvupG0cAORk+1UC5QzzO16t8Y5IMwjyCsFHH700wSLNpq+BawytquG+7S1jqDc+oF9uOt1/ELh6VEnlcz9Nhl27hV43DelidFgfjlYgCNnfamiLuse78Cv31yhApq4Wg5MATX5D9vIL5WCxZAhR6DjSq0FWZyL6hi+iFRY8T2Oel73RbzqnYSC5RNuzjJU8Vot/yg0jEHGuEnAm5hpA4u2vBQxFhGO34sK5EE3AgTmUyEB6PYsjb7hR3qCsRg9mD6/mgTbZCY9cMQ3me9NTSj/hKpcdw==|920 \ No newline at end of file +}//dkprZx8t5IHEQIREClMYM4hcCLHCksjaSXu+qrZOsiF006P/TVavcamktt5++8mnnzQLXFT9YuG1QUu1D2kwHjncvewQMNoe26+DHbxcgeq9lEvAI85WahsZ00xO1UPCgbKkhkb6ZF0LmDf4otwZ6Fhj8JeUucVdNhMtwklGR/hEgxktFdSZSMf7x6g0pkS58PcGqN9JkmEr8tiGgf+xXSC7iVvvQF55Dtl04mFf2q2BwUp/fF0HT1Uu7xjRNfxSwfENkDeClqaq2mmORzIxmQmLiefXWhFppzvQ6jZ3y3UKXokMwBV+Mk3G6uantbCn6TjF/XRwFNxXvfbp7xQ50DwYkItzUKlje/dcDBiTvFykshda0+8FPlb+b8vsnLRpiYKs2HE5uJ3Y3d+dmehz12KWDwb7q8HxaFVk1IJZ5z1VB9bS4qIF58zhXcB6FQQY5iJjXGHzmMfEQR5WbSsjNfrXpbcvKRhv25Y/PxqvdU1Sves5/UfuNm1u5f1cysHK/X0/Wf0yq+jvEufwEZFmJ74tmfaGTnInahzC8hUB6x4DCoiTP5OozHQoeITNNFJAVZoJ4MlruC9Z/O2iIa/QOolBIEUWg1h6afwX9mWaIH7vXhUSAiY8F7hoJdwlR1dbWd/MrZpVI6vYVuEdFd+QFvhgD9jt7tp/HKcsXm9D1gM4On1n7d1wkoO+HRbtQAbkj/0b3IbkiRJVsCTcV9wkiiP+K6kundiZbFWdjO+HPzcraILk0Fx3C3zw3c5/I6WG9XV2n2bZWZ1otTa+nXDOoy7KrMd/nRVn+gBTN7At6f9NiwAgOqhsFPuZHKj9Es/3dd3yeE9tGp4cdPQq7SHhUCTfBTWwaxHvnLi/3JHaJBzgXzuOW3aCPyj40Vih1R8Ia2mO1Zq9Uys7U/QUO2YM8g==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.rd b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.rd index c6ede994..394eee9e 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.rd @@ -1,15 +1,15 @@ { "PageType": 0, - "ColumnCount": 33, - "RowCount": 8, + "ColumnCount": 34, + "RowCount": 9, "CustomNames": [ { "Name": "当前版本", - "Formula": "项目版本管理!$B$8" + "Formula": "项目版本管理!$B$9" }, { "Name": "当前版本仓库ID", - "Formula": "项目版本管理!$G$8" + "Formula": "项目版本管理!$G$9" } ] } \ No newline at end of file diff --git a/ServerCommands/Gitee/GitCallback.json b/ServerCommands/Gitee/GitCallback.json index e0e3b88b..a0551e2d 100644 --- a/ServerCommands/Gitee/GitCallback.json +++ b/ServerCommands/Gitee/GitCallback.json @@ -107,7 +107,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(内容有效性,-1,IF(LEN(message.Message)<4,0,LEN(message.Message)))" }, - "ID": "613428f86fac4f55adaeea6a94291b96" + "ID": "e9a9309656da40e8b972d75a529aada4" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -116,164 +116,185 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(内容得分>100,100,内容得分)" }, - "ID": "2ad2df5fcbb54f149af83f3f427a79d4" + "ID": "f0c40e1a767a47f59d53c4cf2de66cb8" }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "Git_事件记录", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "事件名称", - "GUID": "d175cffd-1593-44b1-94d7-996f36a53a26" + "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": "签入工程" - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "hook_id", - "GUID": "4fde34c9-8af1-42e9-9474-69950de17aa6" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.hook_id" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "事件内容", - "GUID": "b6cb65ca-1c44-4977-b713-816f9415ee8c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=message.Message" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "空间路径", - "GUID": "32a4375c-29c6-4aa5-b0a2-082968cd92f3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.repository.namespace" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库名称", - "GUID": "bab21397-8651-4e95-8fbd-f5a8c5113e82" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.repository.name" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库路径", - "GUID": "9a1d7fd4-1fed-4ecc-81a1-172a80068423" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.repository.path" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "url", - "GUID": "8c3e6194-355d-4130-b1c5-c40af9504332" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.head_commit.url" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "提交人", - "GUID": "dcf401d6-3247-4733-938d-1dd302903fc6" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.pusher.name" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "git用户名", - "GUID": "772df5bf-0766-47d8-99f0-0d938d94e687" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.pusher.username" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库ID", - "GUID": "4f5a4c02-fd88-42f5-85c9-b6cdd966b214" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.repository.id" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "日期", - "GUID": "9ce6c120-a5c6-4f9a-a73c-3b50189eab84" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.head_commit.timestamp" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "内容得分", - "GUID": "82e94bff-8b76-4af7-bfef-b829363f96f4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=内容得分" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "sha", - "GUID": "5b3b4e79-66a0-4440-aa47-ca9c646f131d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.after" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "分支", - "GUID": "93935bb9-959b-45a0-af58-5b53e844636f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ref.2" - } + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "Git_事件记录", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "事件名称", + "GUID": "e3d8237d-2981-42d5-9fc2-5d2bfd05bf60" + }, + "Value": "签入工程" + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "hook_id", + "GUID": "00547c56-457a-494c-8f96-86022934bf14" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.hook_id" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "事件内容", + "GUID": "a109b9ce-1bbd-4622-8d16-cef097c1bc2a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=message.Message" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "空间路径", + "GUID": "17a84b21-4818-4889-8fe3-fcdceb91dade" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.repository.namespace" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库名称", + "GUID": "59a0cc7f-f8b0-4685-a121-551f723c439e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.repository.name" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库路径", + "GUID": "784bdb0b-55ad-4910-b4ec-bafa65529fc0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.repository.path" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "url", + "GUID": "f590a2d6-b93a-4089-bdec-2c30c471398c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.head_commit.url" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "提交人", + "GUID": "00485f10-6feb-4fa0-b027-099ff6eac91b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.pusher.name" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "git用户名", + "GUID": "07059c00-6828-4e30-b89e-ecad8c7045cd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.pusher.username" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库ID", + "GUID": "0ad23830-fd5a-4d97-ab30-d2278de68da0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.repository.id" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "日期", + "GUID": "24992ce1-4463-45da-b635-2d7d35ffd8d2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.head_commit.timestamp" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "内容得分", + "GUID": "012c118f-89d1-4f0b-9926-7c7e53c3359e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=内容得分" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "sha", + "GUID": "88a1499b-a29b-4891-9aa8-8946c7aaff38" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.after" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "分支", + "GUID": "5abe4aec-eaaf-4a67-b05b-b1b768d6c08a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ref.2" + } + } + ] + } + ], + "ID": "f5d81c7a-11ef-4056-a912-a74c9fd0e656" } ] }, @@ -285,7 +306,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "85ebcff8-97d6-41c0-85e8-fffcef940c40", + "GUID": "00bbebd3-cf38-47e0-9cd0-cd5011d2244c", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -309,7 +330,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "3bce84654ac34772b4c9c89f1d9f5f45" + "ID": "cacecf37904549a7b959662d7894f91d" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -338,7 +359,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "用户", - "GUID": "a66c9c34-e22b-4dee-90cd-d7a287f31e70" + "GUID": "dcc2eab7-f5f9-401a-a00a-e3b035448c6c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -349,7 +370,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "类型", - "GUID": "d15df832-bbac-4306-b211-bf4233d92ebc" + "GUID": "fd54a12e-68cd-457e-8db9-5893395f298e" }, "Value": "GitPush" }, @@ -357,7 +378,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "分数", - "GUID": "2d42ca3e-4b2c-4162-9551-55aff67fe13e" + "GUID": "6efe5a8a-03b2-49bc-b902-1321173a9347" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -368,7 +389,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "变动日期", - "GUID": "ae60b68b-e01e-43cc-b911-315f71d61185" + "GUID": "85db9acb-4983-44e1-b01b-7ada81a3a897" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -379,17 +400,17 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "备注", - "GUID": "05624087-0575-475f-a08d-84d7966645b0" + "GUID": "de778986-632b-4cab-bf90-621fc732e6fa" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"用户对Git仓库[\"&钩子数据.repository.name&\"]的签入，被系统自动评分\"" + "SerializeProperty": "=\"用户对Git仓库[\"&钩子数据.repository.name&\"]的签入，被系统自动评分。\"&CHAR(10)&\"签入内容：\"&message.Message" } } ] } ], - "ID": "7c0ba71f-3010-447b-89fe-d1b1ccf27e0c" + "ID": "3548ce71-6182-4937-afb5-3549ee527715" } ] }, @@ -399,7 +420,7 @@ "Message": "签入已被记录" } ], - "ID": "1c211a9f-b7b2-435f-8e6d-64c1e9a2346c" + "ID": "0f88bf34-7490-4db0-8038-a5dac125d48e" } ] } @@ -407,7 +428,7 @@ } } ], - "ID": "a6f6cb54-5225-4a1e-ac4e-6f53ba014f4a" + "ID": "43e74129-e99a-4c4e-9c83-23616e386428" } ] } diff --git a/ServerCommands/Gitee/同步一个仓库到表.json b/ServerCommands/Gitee/同步一个仓库到表.json index 6c04771c..57abb3ad 100644 --- a/ServerCommands/Gitee/同步一个仓库到表.json +++ b/ServerCommands/Gitee/同步一个仓库到表.json @@ -70,6 +70,10 @@ { "Name": "默认分支", "DataValidationInfo": {} + }, + { + "Name": "仓库URL", + "DataValidationInfo": {} } ], "InvokeTriggerTestData": { @@ -156,7 +160,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库ID", - "GUID": "6adb9f20-7e82-4699-b558-6ecee2653c09" + "GUID": "5252fab0-cb4d-446a-9693-8991b3100509" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -167,7 +171,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", - "GUID": "94846f43-0a6f-40ee-b2e6-83f59c05a4a9" + "GUID": "dd0162bf-1a2e-4674-9624-1fc45c02ff87" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -178,7 +182,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间名称", - "GUID": "e82b75f1-2032-450f-b0ee-ab508bc0fa1d" + "GUID": "440536f5-b3cd-4156-b0f6-b6a64d1afd81" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -189,7 +193,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", - "GUID": "eea7bc5d-66a2-44cd-9c1b-4c898fd49c6a" + "GUID": "b1b76a67-9ca6-4f8c-9a1e-1f22665f2cf4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -200,7 +204,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", - "GUID": "561f1d4e-38b7-4e26-8098-c56a8d4c9c8b" + "GUID": "be307fcd-4ac7-4982-9330-cf2df0e12dee" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -211,7 +215,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库地址", - "GUID": "b79b52bd-1ccc-40b7-8fe3-6739e34398f5" + "GUID": "790e4a41-e053-414e-905f-9fea0925e6a0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -222,7 +226,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库描述", - "GUID": "a6b61d0f-c37c-4e38-b24c-a06a10911842" + "GUID": "8bbcb300-91ff-459c-b0b2-7af867cfe95c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -233,7 +237,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库成员", - "GUID": "4ebd6aef-84f4-4d04-abe4-e0c4ce78a14c" + "GUID": "d16d40ca-2348-48e1-b556-487ce8667130" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -244,7 +248,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人", - "GUID": "68ffe807-9d1b-419a-b8e5-88977ab05b7b" + "GUID": "4a5d2361-bcff-4aaf-8cd0-1c7518461ca6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -255,7 +259,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人头像", - "GUID": "fe861d19-f466-4e43-96a5-bff6c89ed158" + "GUID": "642aa423-344d-4ecd-b322-36171bd0b405" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -266,7 +270,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "Callback_url", - "GUID": "b01b60e0-20cc-40bc-877b-75d84018c6de" + "GUID": "49ca0165-39cd-4d54-998a-c687ede21e3c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -277,7 +281,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "hook_api_url", - "GUID": "b87fb425-c4bb-407c-bbd9-d90d5cfea992" + "GUID": "832bb491-3904-490d-8949-7c5e5316e8a1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -288,7 +292,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "订阅成功", - "GUID": "fd497669-e4c4-463a-bef4-b4add036384f" + "GUID": "364b9e00-7988-422d-9fab-151c222ccf2c" }, "Value": "0" }, @@ -296,7 +300,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "默认分支", - "GUID": "9c785663-d269-413e-9b3b-1d8163dc2e78" + "GUID": "e928a3b2-2e28-4c40-8cd4-fb5ad6423d6b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -307,17 +311,28 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "拉取人员", - "GUID": "f4a55dcb-d85b-4263-bbfe-1e990a39c69c" + "GUID": "144431fe-7ee2-4a9c-9a7a-1804fe29efcb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=当前用户" } + }, + { + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库URL", + "GUID": "8b3bd8d8-849d-4618-ac62-eeaa67a12fc5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库URL" + } } ] } ], - "ID": "ca71c4d3-299e-446c-8353-3cbe10d02cf9" + "ID": "58ea9c64-95c7-4dd0-bd6b-b175530c68fe" }, { "CommandList": [ @@ -343,7 +358,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", - "GUID": "e95ccec9-8e00-4478-8e7a-b18dfd6bc83e" + "GUID": "75112a8a-9848-4940-877c-ac9a006f4c66" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -354,7 +369,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间名称", - "GUID": "ad7a894a-8c65-44a7-a70e-a0593e038866" + "GUID": "54601920-1b2b-4ca4-93ec-d3898450f25a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -365,7 +380,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", - "GUID": "1edfa77c-92a3-430e-965f-15afd1212d09" + "GUID": "2f4a3893-cf6d-4503-83ee-7b148ce04e98" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -376,7 +391,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", - "GUID": "fdd8cb58-5f17-4e26-a3d3-a73b985fefa7" + "GUID": "b1daf34b-60b6-4436-a24f-e8470bcc48e4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -387,7 +402,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库地址", - "GUID": "33ae0ef1-12c5-4727-8561-2dbbc96e67ef" + "GUID": "2971fcde-5e57-4121-b47f-5c4a355aeced" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -398,7 +413,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库描述", - "GUID": "fbd8e474-2010-4e5c-8295-0f5ae0092af1" + "GUID": "27085df6-39e2-46e7-8791-662a474bcb21" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -409,7 +424,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库成员", - "GUID": "994e6d2d-9eed-47f9-bc3e-62973495c45d" + "GUID": "6bce128e-2c75-421c-9950-6dbaf5999d7e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -420,7 +435,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人", - "GUID": "c4546402-cef1-4b98-ada8-1856a410496c" + "GUID": "1be66450-577f-40de-a23c-85ee770e67b7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -431,7 +446,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人头像", - "GUID": "910d2883-d6d7-49b7-b730-c8bd24df1f12" + "GUID": "5d8597e6-21c3-4a1c-9f48-1202675fb0eb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -442,17 +457,28 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "hook_api_url", - "GUID": "d8990b5c-4417-49e7-a5f7-8d8d9a24f7cb" + "GUID": "192ef3fe-59f1-46db-aa58-84dd1777030e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=api_url" } + }, + { + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库URL", + "GUID": "e33d2bcd-002e-4787-8914-b4003e2ed5a6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库URL" + } } ] } ], - "ID": "b433409a-d06e-4b6e-9c2c-bfa80d8d309a" + "ID": "e750b3e5-166a-4ad3-9590-995560d6f30c" } ] } @@ -535,7 +561,7 @@ "Message": "仓库创建并订阅成功！" } ], - "ID": "716dc202-3922-45da-9fd3-e013b582bfd6" + "ID": "fe3813d2-c7d1-4048-8ca8-4fc0e5ed16f6" }, { "CommandList": [ @@ -548,12 +574,12 @@ } } ], - "ID": "ebc5303a-73aa-4cab-82c1-9c3b31bd4790" + "ID": "0123b316-0351-483f-896b-64ccc0dd4dd2" } ] } ], - "ID": "c99f5e6b-f975-4b3f-8ebd-ca9feac5ad27" + "ID": "a06a4963-f475-411e-9088-f5c1ea186675" }, { "CommandList": [ @@ -563,7 +589,7 @@ "Message": "仓库创建成功!" } ], - "ID": "084ac9fe-56a6-4e20-bdaa-510ec487c06a" + "ID": "0f441038-adfb-4249-a8e4-aff523c539d0" } ] } diff --git a/ServerCommands/Gitee/搜索仓库.json b/ServerCommands/Gitee/搜索仓库.json index a8f35ca7..5aa6bb8c 100644 --- a/ServerCommands/Gitee/搜索仓库.json +++ b/ServerCommands/Gitee/搜索仓库.json @@ -58,7 +58,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "7e651c76-bd21-4591-adf6-ba5f58e32593", + "GUID": "d729d953-26ba-47db-932c-1c1c03d82582", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -67,7 +67,7 @@ "ColumnName": "GIT用户名" }, { - "GUID": "6d6a4540-718f-40ee-8ed7-68e6e101e825", + "GUID": "8d265c7d-5038-4665-9bf7-56b3c74628db", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT密码", @@ -91,7 +91,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "051b837a611446279c14a2abdfe7a6f5" + "ID": "9f4a9b7507724d0fa549ff7383b33525" }, { "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", @@ -339,6 +339,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=Item.default_branch" } + }, + { + "Name": "仓库URL", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.url" + } } ], "OutParamaterName": "仓库信息" @@ -400,7 +407,7 @@ } } ], - "ID": "077de884-7251-41d4-8220-a572e502a4d0" + "ID": "ca1593dc-1d1c-4810-bee9-9310800c6cba" }, { "CommandList": [ @@ -428,7 +435,7 @@ ] } ], - "ID": "24637197-89a2-4a0e-aa3f-fc44834e71be" + "ID": "4a0b435e-9453-4155-96d9-7b28cc755a87" } ] } diff --git a/Tables/Git/Git仓库表.json b/Tables/Git/Git仓库表.json index 51b3c28a..7942f6b3 100644 --- a/Tables/Git/Git仓库表.json +++ b/Tables/Git/Git仓库表.json @@ -115,6 +115,13 @@ "Name": "hook_api_url", "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": "仓库URL", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", diff --git a/UserControlPages/Gitee事件记录列表.json b/UserControlPages/Gitee事件记录列表.json new file mode 100644 index 00000000..6f93d52e --- /dev/null +++ b/UserControlPages/Gitee事件记录列表.json @@ -0,0 +1,256 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 775.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 4, + "DefaultSize": 10.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 270.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 1, + "DefaultSize": 270.0 + }, + "Values": { + "1,0": "Gitee提交历史" + }, + "AttachInfos": { + "1,0": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "Gitee提交历史", + "TemplateKey": "链接样式", + "Icon": { + "Name": "gitee.svg" + }, + "IconSize": 12.0 + } + }, + "3,0": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "8fc0150152814864a2f1c5fda59114d", + "Command": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon", + "CommandName": "点击", + "CommandParamValue": [ + { + "Name": "ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Gitee事件记录列表!ID" + } + } + ] + } + ], + "ParamProperties": { + "ID": "ID", + "日期": "日期", + "内容得分": "内容得分", + "姓名加内容": "姓名加内容" + } + }, + "DblCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon", + "CommandName": "双击", + "CommandParamValue": [ + { + "Name": "ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Gitee事件记录列表!ID" + } + } + ] + } + ], + "ParamProperties": { + "ID": "ID", + "日期": "日期", + "内容得分": "内容得分", + "姓名加内容": "姓名加内容" + } + }, + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "Git_事件记录", + "BindingInfos": [ + { + "GUID": "5515d0f7-d7ac-44c6-b65e-1d3a6edcc391", + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "ID", + "GUID": "c213e617-340b-4b00-9b63-8c6b89dc4a65" + }, + "ColumnName": "ID" + }, + { + "GUID": "6d40113c-5e07-4389-a1e4-6079e4a5f9d0", + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "日期", + "GUID": "47e43bc0-8f9b-4466-b22a-291948cd7c36" + }, + "ColumnName": "日期" + }, + { + "GUID": "bca63fc4-0604-4eeb-9602-a5cb04b185a8", + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "内容得分", + "GUID": "09dde83f-de2d-4023-900e-301fbbdf0d2a" + }, + "ColumnName": "内容得分" + }, + { + "GUID": "c25a174e-c5af-42f8-b24f-934f031736e4", + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "姓名加内容", + "GUID": "bd43c0fb-f6fc-4f51-a632-0c390e690a23" + }, + "ColumnName": "姓名加内容" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库ID", + "GUID": "5e6793fd-3e7f-43bc-91df-d0ad56fab677" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Gitee事件记录列表!仓库ID" + } + }, + "NullFormulaValueQueryPolicy": 1, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格1", + "TopCount": 24, + "IsLoadOnDemand": true, + "LoadOnDemandCount": 24, + "NoItemSetting": { + "ImageForNoItem": { + "Name": "暂无内容 (1).png" + }, + "NoItemImageSize": 160.0, + "TextForNoItem": "暂无记录", + "Orientation": 1 + } + } + } + }, + "StyleDatas": { + "Styles": [ + { + "TextIndent": 10 + }, + { + "HorizontalAlignment": 0 + }, + { + "FontSize": 13.333333333333332, + "HorizontalAlignment": 1 + } + ], + "Types": { + "Strs": [ + "Center", + "Left", + "Body" + ] + }, + "CellStyles": { + "1,0": 0, + "3,0": 1 + }, + "RowStyles": { + "1": 2 + }, + "SheetStyle": { + "FontFamily": 2 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", + "PropertyDefinitions": [ + { + "Name": "仓库ID" + } + ], + "CommandDefinitions": [ + { + "Name": "点击", + "CommandParameters": [ + { + "Name": "ID" + } + ] + }, + { + "Name": "双击", + "CommandParameters": [ + { + "Name": "ID" + } + ] + } + ], + "MethodDefinitions": [], + "PageLoadedCommandList": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//Lb1Eu5vWZTGzO5vErbvFc5BDrYt4Wqv3aBv2Eukrqpk00+tVC20GeOYXelUUwWtBB4N+UtzyGNT5EejjXy0Yithm6HvEhU+QZQxkhb7HMk70zhNpVZyPIar2QlfAQFCmOB9GB+M3RwwK82jBXpuHVlx+uHuLF8bMdh8HrlAF1FzeYw/4OBI/WgWd4biiG7g2MQKbd4zrbrYF7MJNqRtT0yMfxwGvCtuOQZg/kUYun7M4yesEZ93VgLt2sat01WJLgpscsfSwda+I4JVcnzwe1ejnZ5hxMgGzgkglcZeNvgws+gnQyoS2W+x09oJbnuimzceSgnOtaBa1OwWltq1CcdUVhd7zKsHGzcRHE5yruvh9604j5fmbYqYSSr9rJK9PhXzMk8YISAOSMxjnqdS841r6p5KRBFZ9LwwIiixrq87+KwnehQCPDq3m5i+5lj2KLtN/tfMzcN3UasoKB2SAYsE4HszRmsRq/F/RfI3+ywWzycBkYubf1LllsDwb0AQuPUL3hp8A16+jJreWH23Mwm8fuPpFhodN2D89hSrUO3ayMkuk2YrZQRfV4u9j8GgHOc+dAK8FoLSOLCZkHDRK1czZIvkOZdxhgUc6F5flBSYSbYnsQCNlgUrvjS3HYRghfrFmKrOOxl65j8gCfluqiiciFSsLWYlEg6XQVZIc0QiFXuy0eFMMj9/HeN7nOcj5kMkq3GcBa0xhbxhczA6SDdyCXeKigqP16oCwdrg8bO9U4buRWxbCBNuIRl2V2BaCjaoN6+WLwcG8dqwodxXAwCwD5fEaMWGrSQUEVez1ZjU5449VgdHvj+MPB25JKdmP4in5JL8UvwP73yctl+D7BUQyHaKvf5tuwUo8jz0zglYcelKIM7IzVBankUPMP7mFbFD2N0c54aPWgkw0N2a4aw==|920 \ No newline at end of file diff --git a/UserControlPages/Gitee事件记录列表.rd b/UserControlPages/Gitee事件记录列表.rd new file mode 100644 index 00000000..1c53671e --- /dev/null +++ b/UserControlPages/Gitee事件记录列表.rd @@ -0,0 +1,5 @@ +{ + "PageType": 3, + "ColumnCount": 1, + "RowCount": 4 +} \ No newline at end of file diff --git a/UserControlPages/Gitee仓库选择.json b/UserControlPages/Gitee仓库选择.json index 80b67621..a797bfcf 100644 --- a/UserControlPages/Gitee仓库选择.json +++ b/UserControlPages/Gitee仓库选择.json @@ -158,6 +158,7 @@ "1,1": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -336,6 +337,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=Gitee仓库选择!hook_api_url" } + }, + { + "Name": "仓库URL", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Gitee仓库选择!仓库URL" + } } ] } @@ -352,7 +360,8 @@ "创建人": "创建人", "默认分支": "默认分支", "创建人头像": "创建人头像", - "hook_api_url": "hook_api_url" + "hook_api_url": "hook_api_url", + "仓库URL": "仓库URL" } }, "DblCommand": { @@ -445,6 +454,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=Gitee仓库选择!hook_api_url" } + }, + { + "Name": "仓库URL", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Gitee仓库选择!仓库URL" + } } ] } @@ -461,7 +477,8 @@ "创建人": "创建人", "默认分支": "默认分支", "创建人头像": "创建人头像", - "hook_api_url": "hook_api_url" + "hook_api_url": "hook_api_url", + "仓库URL": "仓库URL" } }, "DataSourceType": 1, @@ -576,6 +593,15 @@ "GUID": "7af8e9e2-29fe-4cfa-807c-fb378e9a4c04" }, "ColumnName": "hook_api_url" + }, + { + "GUID": "ec0b29a9-06e5-4009-8bb9-696c8ac23ef9", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库URL", + "GUID": "5e3c2bbb-9fec-4dbd-af8a-39141f0035ec" + }, + "ColumnName": "仓库URL" } ], "IsListviewDataSource": true, @@ -764,6 +790,9 @@ }, { "Name": "hook_api_url" + }, + { + "Name": "仓库URL" } ] }, @@ -805,6 +834,9 @@ }, { "Name": "hook_api_url" + }, + { + "Name": "仓库URL" } ] } @@ -974,16 +1006,20 @@ { "ListViewColumnCell": "默认分支", "PropertyName": "默认分支" + }, + { + "ListViewColumnCell": "仓库URL", + "PropertyName": "仓库URL" } ], "SourceCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=Gitee仓库选择!仓库列表" }, - "SampleJson": "[\r\n {\r\n \"ID\": 28499535,\r\n \"空间路径名\": \"GridStudio\",\r\n \"空间名称\": \"罗田县格友软件开发工作室\",\r\n \"仓库路径名\": \"lodop-plugin-application-demo\",\r\n \"仓库名称\": \"LODOP插件应用DEMO\",\r\n \"仓库地址\": \"https://gitee.com/GridStudio/lodop-plugin-application-demo.git\",\r\n \"仓库描述\": \"活字格前端插件\",\r\n \"仓库成员\": \"cuckooent\",\r\n \"创建人\": \"超哥\",\r\n \"创建人头像\": \"https://foruda.gitee.com/avatar/1677043949039184563/5267986_cuckooent_1646218684.png\",\r\n \"hook_api_url\":\"\",\r\n \"默认分支\":\"\"\r\n }\r\n]\r\n" + "SampleJson": "[\r\n {\r\n \"ID\": 28499535,\r\n \"空间路径名\": \"GridStudio\",\r\n \"空间名称\": \"罗田县格友软件开发工作室\",\r\n \"仓库路径名\": \"lodop-plugin-application-demo\",\r\n \"仓库名称\": \"LODOP插件应用DEMO\",\r\n \"仓库地址\": \"https://gitee.com/GridStudio/lodop-plugin-application-demo.git\",\r\n \"仓库描述\": \"活字格前端插件\",\r\n \"仓库成员\": \"cuckooent\",\r\n \"创建人\": \"超哥\",\r\n \"创建人头像\": \"https://foruda.gitee.com/avatar/1677043949039184563/5267986_cuckooent_1646218684.png\",\r\n \"hook_api_url\":\"\",\r\n \"默认分支\":\"\",\r\n \"仓库URL\":\"\"\r\n \r\n }\r\n]\r\n" } ], - "ID": "9d10ade4-62f4-4c13-977d-d35c38d4dc38" + "ID": "26dae2a0-3e8f-49df-9867-ca9e60e8ff46" }, { "CommandList": [ @@ -996,7 +1032,7 @@ } } ], - "ID": "1ab41c8d-cbdd-4eff-ba07-3a14841d387b" + "ID": "c9a30b0f-8303-40bf-a35d-54fdde5a3e48" } ] }, @@ -1090,7 +1126,7 @@ ] } ], - "ID": "1588be1a-be3f-4650-9d5a-1300914ff421" + "ID": "2458ba9e-4377-4268-b9c8-99cbf8ee6893" } ] } @@ -1112,4 +1148,4 @@ "Formula": "Gitee仓库选择!$B$2" } ] -}//5D1NTJeeWokeBNHCj3RgFSUTWOdflwCrvmRPCnLh+utksUY3gkGlKYRAsKzdEBRsJaetUNba5lC9UKRQkZu4nkMKayBkhZI/NeE2PtpU3wTnSqxtuuadPdTFH6IrEVwnOigWna6k4BsPfUdYkKK+4vpFGYipB6jrgZkaaexA4fPSjMhbNOOjGL9vcsYeE1FQvHV1jY0yh2tr98jgDxHFMBn4ul5FVzkCVQ11Us+k6TkPGXVntn/b0zrsj+J/g+mq/gsQ01R6QoMxeiBOhdlvYl9uU06hVEaFdiyHtTha6kMx7N0Pyi4hcNQpaRYf6K2L5D4dkZnx+qnS7NOS3XONchpIGDb8k1IFVUcrLsRW4Vv8yRM4lPzFr7ihOc1MV4YApgFeKmmJtq/t9MDGgxCmVz+EAxGS2p4HSttgBCEFHq4xVeqsXAGapD29yFByPkVuioA3si7zedbhwbDLHoGmgg8mmwVsGaUWly790JTb37t0ojDasCj6DY+XazUylnNCz8nYt7gzjMDt/MYbEl62u/FF/rN+sX9WWtHK0wQCZd5e1o7+R5yMoba1X6W50PA/Cuy/nG2yV6p2ROUsx95XyqHSYg71b8YtbbgEZb3fHgNKKpTP85WYsxIWNb9KgRqqo/KKcgKphHaCaDaC4+l4tzx7x+oj4Hs+ezMHeWiUt3I0krzK0RecbV8tlvmWKw3QNWF1l4y4KQ2KKWQg0WMRAkDxL189qguTwtG+AblTNzAVhb54AXeA/101WfN4zgQwyIFFRa4NCFJSX2cTwRUxhX8YkqK+wC4jMTW7qByOa5iAuTLmq+HDG9U4VYV0Fl3cJNo6Wmp3DjOQzNckn2P5EKQBqdaCRZZXGrFjOkgdx8+qQdaUw5OkSZeWfM/2h42uegtIM12TIotJZ1QVju8REA==|920 \ No newline at end of file +}//zh7ROrpNQn43cqxGZzCZdOi/+xv8du17wwk9U5uHCao5k27vK2t4059w/iFhWww+vshO+lteG9EdVzllYPFvQ1Zz1xyejz+mIjt3712FTjZ1JKedm+It6LM5Ebhpm0F5QpVI/xT8QyaBgZEFGE3Uk436T+bd9HqsYECj7IQcRsJul9jxVtx6TLGt87ibe/i9+ctDy/lkbhDQb1swds145nlqxI/beUOKwQuX0HEpZQ9Ap/5OIW9lEoBOX8LwbK2Avi6Z77mgDWQOT+3A4rdlw9APziVw6Zqb09oVl+a36b4NafC+ltzQI1yuhB0b+QdWhXu45445C1PDla4UWqZzqh7GL1JF+ZheUZUvS6ylPejD9xppiDIBFvdWGNKgmtXoZBy7nAra3fHzv12xncaLgykG0S9FrN2TBUj93sxHUuKCJ/U2c/azHyqvQWoARWQRWWeAtkTRUH2iQvGlJjKvzUyEddPsIpifofUEH4sD4a1Cnmv2hYEDiVYF9/jEYxUHxt0v4hMouacSKydtEmGV2f27L2ZIsFVRtN7sg+tuEB4aNlWtOK4sUHiOXmONaLDXEthiWVIOMTChNIJilLp2BISlkSpf2H/GQhw5qS1XqzFVmTVa+uV4INRAuowaKGR+xL6seBCm19yFCDsbQjzbpKJmgr8Z25i/QRMbzymJ6BjIWaY4+iaxTfJE5S7+jGHTKF2680cI3hjcSmWpJouedhld0QCt/uOeWi/pUtanpnCRrCTFBIlmb2C7T2rww5lxWWZgD2lo6ReEzXj9tjoR+yk0R6DklsnlFIQ+jPxzSDGev9exUBXPUy5+DGZpxVEqnpJOxQ4XF8o2ePRNMLJJwpquePkINrY7bzr+ztBPIk2eRLgbOt7VbPnVgXLRawXF0N7ECI7m+2eTaBnhIZs8mQ==|920 \ No newline at end of file diff --git a/UserControlPages/Git仓库卡片.json b/UserControlPages/Git仓库卡片.json index 4ecf9910..526b74f1 100644 --- a/UserControlPages/Git仓库卡片.json +++ b/UserControlPages/Git仓库卡片.json @@ -477,12 +477,12 @@ ] } ], - "ID": "94022866-18f8-4658-a43d-bd1c61762150" + "ID": "fbb5c218-75d2-496a-8f68-546144733178" } ] } ], - "ID": "cb2a0de7-cd82-4225-a19d-66ee4f5ddfb6" + "ID": "25576e28-613e-45e1-aced-07cb728d68a0" } ] } @@ -585,6 +585,9 @@ { "Name": "按钮文字", "DefaultValue": "选择仓库" + }, + { + "Name": "仓库URL" } ], "CommandDefinitions": [ @@ -665,7 +668,7 @@ ] } ], - "ID": "cc11c213-d058-47ff-9281-65bb92947779" + "ID": "62d8c5b0-44a0-420e-8dc7-892561e156ca" }, { "CommandList": [ @@ -689,7 +692,7 @@ ] } ], - "ID": "af2c74ec-c373-4218-a11d-2c457a991054" + "ID": "e2ec1747-a229-42a7-855c-0f4cedbe9f42" } ] } @@ -750,7 +753,7 @@ ] } ], - "ID": "da403814-470a-4862-a178-44988b31bd0c" + "ID": "4e616781-a743-4306-ba55-8e4c8c80e115" }, { "CommandList": [ @@ -774,7 +777,7 @@ ] } ], - "ID": "176d73f8-9e12-49c5-b0c6-a4e6520c4bc4" + "ID": "73f2897a-400e-4935-ac58-8a54f4f0c8f0" } ] } @@ -834,4 +837,4 @@ "BoxShadowString": "3 3 0 7 #04000000" } ] -}//i7do/Kk49KxfRp9+5xW7duK3PzA7MwIXjBc34X9V5rjZtJn3NE47zLBAwOOvXOnbqG7p/8pOVeULp4RO5tcxvHp22Vm4VXAp70d7Gf3m8YFTymZnmgwcD6Xct82G6WaPZDr+ddQ1CM4QqDvMV3SOEAsU1yj32Si2mNWos2KwyucR9nvDwjNe1O6gh7eKISdA6wY4/hQ/Ldlgyheun43GGO44MN3NckksSGReMmaYQxbm7mj3WCGe02KMGZsLkbXulK1eS9sJSfCxcQymeIOFBasVYMAhsMaGyOGtzGWlKIn1twJCu9G1SouQ7KZE1cMaR7MMVNIsUsnHzwF2JqzZvhXrEzcFK3m5w4/McmA/zbzvQgWhTOIKzdIYLtUMFg2lc1FaW/FWdl2J+YuRb3pIq3RosbK/BmHGEDpisYg7CbP7YZUDccWBOPZrTKlGj7DM9Y7TF8jAKfrqzFpwi1hHwvr5uCYhlZLSC8Npiu7lfwRQiWB9lSVH497H0oKwuP4RwhSMafMqYRrPoSjw1rGn39+UZ2F3pwwceR9Q9uDjAbuPZqEdsXTUmbyOE7Pv47DmMMmwyffntJzy6zLgoZuDDpW3jmI2xxw+RyLKNpBn1me63Gh169uvi8mNjey6WFGNDtjtxMeOD2JzClS4fGyKOQYgGUkYA9uN3TjzlGlhqkMhlrf1+BNH7BQ4BwyDlg+q4nRDd9QhhLjpU8qNrECxodVaxy+a5nh3S/qgTpws4P8q0QbHN9CmyLW7tflCXyT87mI9ubjWRG2vK3nNjN7U2fqiCPes/s3nXgmwkN1drL37ROkv7XRstILWJkGkB7K4ycEZ7frQve3QrQF1RgdI48NdEYNS9dA8rCd7oDl/maDjCuvCjEKb83jctRmLujnXbZqq1egod/Y3Cb6Tu529iA==|920 \ No newline at end of file +}//LqRKGKCWQLR80fc+D10OL43VeU+hVETpwuFDeDZVZkvv+8KHsL/InK+ABH6tPquLF6rrdmVHcuyzlGDfIDMueGRZektUQQOtkfdAjpGmqdKmgEtgqw7YxFtdb1FepeNLlnpHF1v39aeD094ARnWXEipe97hox+FxWNd0TuJzSECz2MK6E0u7jbJxEaw3x7Y32JMlYnw5gNLK0m6HCcndU8bJeYEqccGFiCtL+3KWTz6Mmgllukl2slJR8kehgElrPoB6+iREQF8jUD8sqTHzCZgwBlnnKgkerNjBlWE+zdCA9KQsCFG7g0LFut+egjRwNRLNzlsV9rfwi4eyegpD+6MoMp4rowjT2QodcBb/yvEpbkL1Ug8ao/b6Pkxn6lYBODLaOl+skYzft4r6AOs8FQSJYgqDLMY+hOY0FDUdh+DBAPV5DIQfFI0pujxzkToNUIZRexhRmcow/YEjmyIIyIeUwmqz2iWEYiwJ/rzk2pHF0ldDxM3YbLT1ilSvHuTtIv4Z5I2NbH3sJ/CZxnlhRl4HoQkWqbR1EtefsujLII1MDVK7p2cvRahB6u10ePvaqBixPC32lEf/8ya+6dxESjw5cz7fTNyqN8w+0KK4SSUYwZRjATeH99nOD6EiXpDMKpSxljS7LLiwCCnPOO7lgBvBrMJv3YWybraSKXgYCcPgWjkZKnggZ9O3aKjjjizVvR+BoLA1l+9qPlu7mZTJKSLEgWw4EyRQ7Mfoug1udz6/3nvTukrScPdKGXoPI7vzv+QEpGtnWUlO711A3qEOzCQc/p8xBvYR61m/WLImnPkTVkDyyWX7Vh8zDp/qxSOR3bIC8yFtdiXfaYrd6safic6MpA0jqp3QGNkWYWEk3GTSnQBlr7ch3osHsjr/9SRFzjFsGSzuY8AUKyPKVs7+BA==|920 \ No newline at end of file diff --git a/Pages/557031284d494486b3b32eb2329c19a.json b/UserControlPages/Git提交记录单块.json similarity index 56% rename from Pages/557031284d494486b3b32eb2329c19a.json rename to UserControlPages/Git提交记录单块.json index 672cacf7..7e1507d7 100644 --- a/Pages/557031284d494486b3b32eb2329c19a.json +++ b/UserControlPages/Git提交记录单块.json @@ -45,7 +45,7 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 188.0, + "DesignLengthInPixel": 166.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -69,120 +69,156 @@ "Count": 5, "DefaultSize": 15.0 }, - "Values": { - "1,2": 0, - "1,3": 0, - "3,2": "姓名：内容" - }, "AttachInfos": { - "1,2": { - "TemplateCellSource": "日期" - }, "1,3": { - "TemplateCellSource": "内容得分", + "TemplateCellSource": "分数", "RulesGuidList": [ - "de63cbba-df2e-46c5-a014-b7ee9388fa6e", - "73e1124d-fa1a-4371-919f-7130cdf6c804", - "acbafd50-5707-4f5c-82b2-3113120380cb" + "cfc83b5d-2605-46b9-9ffe-273027bfe707", + "6d61c18f-69ac-4e32-82dc-c42f4a3c2359", + "26618ea5-0fe2-49d7-9b5b-e37a3d334427" ] }, "3,2": { - "TemplateCellSource": "姓名加内容" + "TemplateCellSource": "内容" } }, "StyleDatas": { "Styles": [ { + "FontFamily": 0 + }, + { + "FontFamily": 0, "BorderLeft": 0 }, { + "FontFamily": 0, "FontSize": 12.0, - "Foreground": 1, - "Formatter": 2, + "Foreground": 2, + "Formatter": 3, "TextIndent": 3, - "HorizontalAlignment": 3 + "HorizontalAlignment": 4 }, { + "FontFamily": 0, "FontSize": 12.0, - "Foreground": 4, - "Formatter": 5, - "HorizontalAlignment": 6 + "Foreground": 5, + "Formatter": 6, + "HorizontalAlignment": 7 }, { + "FontFamily": 0, "FontSize": 12.0, - "Foreground": 1, - "Formatter": 2, - "HorizontalAlignment": 3 + "Foreground": 2, + "Formatter": 3, + "HorizontalAlignment": 4 }, { + "FontFamily": 0, + "FontSize": 12.0, + "Foreground": 5, + "Formatter": 8, + "HorizontalAlignment": 7 + }, + { + "FontFamily": 0, "FontSize": 13.333333333333332, "TextIndent": 3, - "HorizontalAlignment": 3, - "WordWrap": true - }, - { - "FontSize": 13.333333333333332, + "HorizontalAlignment": 4, "WordWrap": true } ], "Types": { "Strs": [ + "Body", "Background 1 -15", "Text 1 50", "yyyy/m/d", "Left", "Accent 5 0", - "\"+\"0\"分\";\"-\"0\"分\";0\"分\"", + "0\"分\"", "Right", - "Body" + "\"+\"0\"分\";\"-\"0\"分\";0\"分\"" ], "Borders": [ { - "Color": 0 + "Color": 1 } ] }, "CellStyles": { - "0,1": 0, - "1,2": 1, - "1,3": 2, - "2,2": 3, - "2,3": 2, - "3,1": 0, - "3,2": 4, - "3,3": 5, - "4,1": 0 + "0,0": 0, + "0,1": 1, + "0,2": 0, + "0,3": 0, + "0,4": 0, + "1,0": 0, + "1,1": 0, + "1,2": 2, + "1,3": 3, + "1,4": 0, + "2,0": 0, + "2,1": 0, + "2,2": 4, + "2,3": 5, + "2,4": 0, + "3,0": 0, + "3,1": 1, + "3,2": 6, + "3,4": 0, + "4,0": 0, + "4,1": 1, + "4,2": 0, + "4,3": 0, + "4,4": 0 }, "SheetStyle": { - "FontFamily": 7 + "FontFamily": 0 } }, "Spans": [ "3,2,1,2" ], "PageInfo": { - "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", - "ParentPageName": "项目代码", + "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", + "PropertyDefinitions": [ + { + "Name": "时间" + }, + { + "Name": "内容" + }, + { + "Name": "分数" + }, + { + "Name": "ID" + } + ], + "CommandDefinitions": [], + "MethodDefinitions": [], + "PageLoadedCommandList": [], "ConditionFormatRulesCollection": { "Rules": [ { "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", - "Operator": 6, + "Operator": 3, "Value1": "=0", - "Priority": 2, - "GUID": "acbafd50-5707-4f5c-82b2-3113120380cb", + "GUID": "cfc83b5d-2605-46b9-9ffe-273027bfe707", "StyleInfo": { - "Foreground": "Accent 5 0", "Underline": null, "Strikethrough": null - } + }, + "IsDisabled": false, + "IsInvisible": true, + "IsReadOnly": false }, { "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", "Operator": 5, "Value1": "=0", "Priority": 1, - "GUID": "73e1124d-fa1a-4371-919f-7130cdf6c804", + "GUID": "6d61c18f-69ac-4e32-82dc-c42f4a3c2359", "StyleInfo": { "Foreground": "Accent 2 0", "Underline": null, @@ -191,16 +227,15 @@ }, { "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", - "Operator": 3, + "Operator": 6, "Value1": "=0", - "GUID": "de63cbba-df2e-46c5-a014-b7ee9388fa6e", + "Priority": 2, + "GUID": "26618ea5-0fe2-49d7-9b5b-e37a3d334427", "StyleInfo": { + "Foreground": "Accent 5 0", "Underline": null, "Strikethrough": null - }, - "IsDisabled": false, - "IsInvisible": true, - "IsReadOnly": false + } } ] } @@ -211,21 +246,20 @@ }, "Pictures": [ { - "Name": "329c2c7f-55ea-41e0-abab-b195eae76cc2.svg", + "Name": "Picture0", "ForguncyPictureName": "时间.svg", "ForguncyPictureSourceType": 0, "Stretch": 2, "StyleInfo": { "Fill": null, - "StrokeDashType": 8, "Stroke": null, "StrokeThickness": 1.0 }, "ForegroundFill": "Background 1 -25", "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "8,16", + "Location": "8,19", "Size": "15,15" } ] -}//+BAylswERSQoVaWtxD5b2ceBtJtt8RQt9yHMNgiugnys3dePXcLwsqDINh1MIPlbak8xnx3qwr+tIIG/uzw70QwGiYIbqrBzsOp9SeHIl1sIdyBaxDiD8qO0gNpA/pDlY5Rvr8gntSYDh+QgSFHXDychZ59luphWA+xTQWZ/8BnHsdNILXT5PzYNEfdIRCdw1JD5YPEKt4M/o8/dgA+LGVFbYzjURea2rZJlwEfEerSSI+n6GVVXjgqy+Z63noPnmAGs8RR/PY/uF3BqirtAJ/WLhHg0MrYdNhdx/kC6QPWU7tzDAuIftSF7/2OCyrHug7ykPHsUKBDE7/hKvfVylT8Eh5hmajPfR8lzSdX315PEOuxGmeKIPz+e+qqV5C9H8rlihjzqb5ZuMA+7LxowXvLGJ42Hqa7MW1uD+uT7Cl46EOi26SNhYxOpTQu+E8nfn5M/BPf3plW5LesearMUug2b1k09k0ieLbyjpIFX2qFpFgIi3uxNObX/FqzJ+F+iurJqUDjfWVIaBoeroNxbL/Ev2xFl+Og3xRgfVWTRbCkTTkOA4O0GIprIFhidsIcAtMkrUwmbKl6xDlTCqr5sj49DGuWJfhk4v0/pjk1WFC/CwOd/bFCiIFSgZVehI5k6e6gLOLxZbfmjJwCp9yY96OxJs040v/HDwMfV6H0AkrjIrnaFP/cmbc12gKux69/B/o2teH6FmUTW1By4CGHPL0fXcT5swkiM4kVvwdIgwzufakaS0k2tc4EEtMDfm/7QL1BB2K20zGKaQblupOPgI3CB2Vvcad2BavgiYSAovL9bR6Yt0XJJ0cE3zFaKRI6H+8qV3PCQix3pnWXaEYmASI9cQAqabYpcqt0C9AUj9L+90OzkIDD3lrAaWPr/pv3i20b+7yXecF9BUfNczDauWg==|920 \ No newline at end of file +}//WM5JNfLvk2LGgDL9h9faBxFsLb8nzH2crVkKG4YnGUioxJVne4P/H0C3542brIvOK5Fq7/5kzDRH6H5tkktFslBNmyG75SVWZALWjOQr/KHmDNl/rko9yAcy8eSSRWRkN1oBZw07zmT2Vnh0srgyMyQHKopbRs7sSJBHQUHiyiafKc9r87YaSITxKxmT/pAlR0OGrvkVlx/0JsdbK8jXEyihencAMaV/D7dJjx+kb+en5d9bqTK6ZOlD50ohb3QPRMdhTAhssJyEQGuIqMJGb25dWxsWCrppza50qy4a1w7Ane3fSt3eFvOUuHq8nYzogEtgYVB64AIUgaX/oM5VQT+FPbhCXyq1Tlr4ykfEpe3XjV9LV6gzWc0sf/t3Mbmcl9XjgEkqKveOzMEVN8cuD5lr+ceeyfhugvRoC+g01M1j7KObhASJUushFz45ItI2ghnGXWTx/KvpATTdjWVPNnvJ6H6U+eVvq0vd0Gy5nEa3kB8lFSXkUHM9pfvBxWmDZFQLkc1fLpDsJ5eAV3pJiKHyRpwBXfdY3xjWxlbh8YU4WrS6ywCTYl4Og7jwpqwiDaQ3TQvL2mVfXlOpWFUTWUH+c7ZWL9WYUqhExvUsJOSDgLy8vZKlxiy9VuHaQ2iplWYatoE8gMnt1T2OEUSVhZCY8K3G7x8gm2XS/KhCBsGKsoSiwuISvSwzwpxkztIEjb4NqUlnmhVQrl+0pluZMAoyZzbknf8bzVuLLcM/3xU0BGPsOoH4WMYxHh0pprjewbm0bqYnJDjkiFu1IJkZuHwvMowIOvuF3TvboYrZNY92uVxwzoyRovrHEBOPZodsZmrdWQmeZh5UlJ14NW5KgNsZMAMqiqTL29fMRVNk86IhMKjy5XfSD58iOlsKQF5TIFGJdz1IJ2lrkHz9Y1I/Mg==|920 \ No newline at end of file diff --git a/Pages/557031284d494486b3b32eb2329c19a.rd b/UserControlPages/Git提交记录单块.rd similarity index 69% rename from Pages/557031284d494486b3b32eb2329c19a.rd rename to UserControlPages/Git提交记录单块.rd index cf2ec703..1a8f79a4 100644 --- a/Pages/557031284d494486b3b32eb2329c19a.rd +++ b/UserControlPages/Git提交记录单块.rd @@ -1,5 +1,5 @@ { - "PageType": 2, + "PageType": 3, "ColumnCount": 5, "RowCount": 5 } \ No newline at end of file