From 3faea63106cfdbfc7597f285699f5cf7e3a7989c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Wed, 19 Jun 2024 23:17:17 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E2=80=9C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E2=80=9D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C","MessageType":2,"Modules"?= =?UTF-8?q?:[{"State":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=AF=A6=E6=83=85"},{"State":1,"Type":31,"Na?= =?UTF-8?q?me":"UserControlPage/Git=E4=BB=93=E5=BA=93=E5=8D=A1=E7=89=87"},?= =?UTF-8?q?{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81"},{"State":1,"Type":31,"Name":"UserControlPage/Gitee?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=80=89=E6=8B=A9"},{"State":1,"Type":31,"Na?= =?UTF-8?q?me":"UserControlPage/Gitee=E4=BA=8B=E4=BB=B6=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 66 +--- Pages/cb2a6325e1334f5fbcb7270deba57ec.json | 348 ++++++++---------- Pages/cb2a6325e1334f5fbcb7270deba57ec.rd | 4 +- .../项目首页-容器页面/任务版本详情.json | 59 +-- .../项目首页/项目首页-容器页面/项目代码.json | 227 +++--------- UserControlPages/Gitee事件记录列表.json | 5 +- UserControlPages/Gitee仓库选择.json | 8 +- UserControlPages/Git仓库卡片.json | 70 +++- 8 files changed, 295 insertions(+), 492 deletions(-) diff --git a/.collaboration b/.collaboration index 7c406520..6ea10b3c 100644 --- a/.collaboration +++ b/.collaboration @@ -602,17 +602,7 @@ }, { "ModuleName": "PCPage/任务版本详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:53:43.9335613+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", @@ -1683,17 +1673,7 @@ }, { "ModuleName": "UserControlPage/Git仓库卡片", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:55:17.5675676+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\Git仓库卡片.json", - "UserControlPages\\Git仓库卡片.rd" - ] + "ModuleType": 31 }, { "ModuleName": "Image/gitee.svg", @@ -2001,19 +1981,7 @@ }, { "ModuleName": "PCPage/项目代码", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:48:59.1318086+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.rd", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.json", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.rd" - ] + "ModuleType": 1 }, { "ModuleName": "image/登录方式", @@ -2093,19 +2061,7 @@ }, { "ModuleName": "UserControlPage/Gitee仓库选择", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T22:51:03.033336+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\Gitee仓库选择.json", - "UserControlPages\\Gitee仓库选择.rd", - "Pages\\5ba5873ce5a446a5a64cd0a9484f4a9.json", - "Pages\\5ba5873ce5a446a5a64cd0a9484f4a9.rd" - ] + "ModuleType": 31 }, { "ModuleName": "PCPage/选择Git仓库 (BackUp)", @@ -2189,18 +2145,6 @@ }, { "ModuleName": "UserControlPage/Gitee事件记录列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T23:13:31.1813675+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\Gitee事件记录列表.json", - "UserControlPages\\Gitee事件记录列表.rd", - "Pages\\8fc0150152814864a2f1c5fda59114d.json", - "Pages\\8fc0150152814864a2f1c5fda59114d.rd" - ] + "ModuleType": 31 } ] \ No newline at end of file diff --git a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json index 36ff1462..b3310a35 100644 --- a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json +++ b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json @@ -16,38 +16,33 @@ "DesignLengthInPixel": 10.0 } }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 17.0 - } - }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 12.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 12.0 + "DesignLengthInPixel": 24.0 } }, "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 12.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 12.0 + } + }, + "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 26.0, "Mode": 1 } }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 26.0 - } - }, - "8": { + "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } }, - "9": { + "10": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -55,11 +50,10 @@ } }, "InLogicalVisibleIndexes": [ - 6, - 9 + 10 ], - "Count": 10, - "DefaultSize": 12.0 + "Count": 11, + "DefaultSize": 24.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -70,91 +64,37 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 19.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 113.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 21.0 } }, "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 21.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 59.0 - } - }, - "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } }, - "10": { + "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0 + "DesignLengthInPixel": 112.0 } } }, - "Count": 12, - "DefaultSize": 32.0 + "Count": 6 }, "Values": { - "1,1": "版本号", - "1,9": "创建人", - "3,1": "立即绑定", - "7,4": "立即绑定" + "1,1": "加载中" }, "AttachInfos": { "1,1": { - "TemplateCellSource": "名称加版本号" - }, - "1,8": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "TemplateKey": "圆形", - "ImagePath": "默认头像 .png" - }, - "TemplateCellSource": "创建人头像", - "RulesGuidList": [ - "1db67ca9-ca8f-4621-8730-b7daa0920e07" - ] - }, - "1,9": { - "TemplateCellSource": "创建人", - "RulesGuidList": [ - "1db67ca9-ca8f-4621-8730-b7daa0920e07" - ] - }, - "3,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -168,7 +108,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!B10" + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!B11" } ] }, @@ -186,26 +126,80 @@ ] } ], - "Text": "立即绑定", + "Text": "加载中", "TemplateKey": "链接样式", "Icon": { "Name": "gitee.svg" - }, - "IconSize": 12.0 + } }, - "TemplateCellSource": "副标题" + "TemplateCellSource": "仓库名称" }, - "3,10": { + "1,4": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "复制仓库地址", - "Size": 12, - "ImagePath": "Application/147_copy_1.svg", - "BuiltIn": true, - "Color": "Accent 1" - } + "ToolTip": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!B11" + }, + "TemplateKey": "圆形", + "ImagePath": "默认头像 .png" + }, + "TemplateCellSource": "创建人头像", + "RulesGuidList": [ + "1db67ca9-ca8f-4621-8730-b7daa0920e07" + ] }, - "6,1": { + "3,1": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "Text": "", + "ClickMode": 1, + "TemplateKey": "_RS_Main" + }, + "TemplateCellSource": "空间名称" + }, + "4,1": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "任务版本详情", + "LoadBindingDataOption": 1 + } + ], + "Text": "", + "ClickMode": 1, + "TemplateKey": "_RS_Main" + }, + "TemplateCellSource": "版本名称" + }, + "5,1": { + "CssName": "ec-label", + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "复制到剪贴板.复制到剪贴板, 复制到剪贴板", + "ObjectiveCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!B6" + }, + "IsAlert": false, + "AlertData": "复制成功！" + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "复制成功" + } + ], + "Text": "", + "ClickMode": 1, + "TemplateKey": "_RS_Main" + }, + "TemplateCellSource": "仓库URL" + }, + "8,1": { "CellType": { "$type": "ElementUI.Tag, ElementUI", "CommandList": [], @@ -247,28 +241,14 @@ }, "TemplateCellSource": "仓库成员" }, - "7,4": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "任务版本详情", - "LoadBindingDataOption": 1 - } - ], - "Text": "立即绑定", - "TemplateKey": "_RS_Success3", - "Icon": { - "Name": "git-branch.svg", - "Color": "Accent 1", - "UseCellTypeForeColor": true - }, - "IconSize": 12.0 - } + "10,1": { + "TemplateCellSource": "创建人", + "RulesGuidList": [ + "1db67ca9-ca8f-4621-8730-b7daa0920e07" + ] }, - "9,1": { - "TemplateCellSource": "仓库ID" + "10,2": { + "TemplateCellSource": "ID" } }, "StyleDatas": { @@ -276,10 +256,9 @@ { "FontFamily": 0, "FontSize": 16.0, - "FontWeight": 1, - "Foreground": 2, - "TextIndent": 3, - "HorizontalAlignment": 3 + "TextIndent": 5, + "HorizontalAlignment": 1, + "WordWrap": true }, { "FontFamily": 0 @@ -287,24 +266,27 @@ { "FontFamily": 0, "FontSize": 12.0, - "Foreground": 4, - "Formatter": 5, - "TextIndent": 5, - "HorizontalAlignment": 3 - }, - { - "FontFamily": 0, - "FontSize": 16.0 + "Foreground": 2, + "Formatter": 3, + "HorizontalAlignment": 1, + "Underline": false }, { "FontFamily": 0, "FontSize": 12.0, - "TextIndent": 5, - "HorizontalAlignment": 3, - "WordWrap": true + "Foreground": 2, + "Formatter": 4, + "HorizontalAlignment": 1, + "Underline": false }, { - "Foreground": 4 + "FontFamily": 0, + "FontSize": 12.0, + "Foreground": 2, + "Formatter": 5, + "HorizontalAlignment": 1, + "WordWrap": true, + "Underline": false }, { "BorderBottom": 0 @@ -312,31 +294,35 @@ { "FontFamily": 0, "FontSize": 10.666666666666666, - "Foreground": 2, - "HorizontalAlignment": 3 + "Foreground": 7, + "HorizontalAlignment": 1 + }, + { + "FontFamily": 0, + "FontSize": 12.0, + "Foreground": 7, + "HorizontalAlignment": 1 }, { "FontFamily": 0, "FontSize": 12.0, "Foreground": 2, - "HorizontalAlignment": 3 - }, - { - "FontFamily": 0, - "FontSize": 12.0, - "HorizontalAlignment": 7 + "Formatter": 8, + "TextIndent": 5, + "HorizontalAlignment": 1 } ], "Types": { "Strs": [ "Body", - "Bold", - "Text 1 0", "Left", "Text 1 50", - "General", + "\"空间名称：\"@", + "\"绑定版本：\"@", + "\"仓库地址：\"@", "Background 1 -5", - "Center" + "Text 1 0", + "General" ], "Borders": [ { @@ -346,58 +332,34 @@ }, "CellStyles": { "1,1": 0, - "1,8": 1, - "1,9": 2, - "1,10": 2, - "2,2": 3, - "3,1": 4, - "3,10": 5, - "4,1": 6, - "4,2": 6, - "4,3": 6, - "4,4": 6, - "4,5": 6, - "4,6": 6, - "4,7": 6, - "4,8": 6, - "4,9": 6, - "4,10": 6, - "6,1": 7, - "6,10": 7, - "7,1": 8, - "7,2": 8, - "7,4": 9, - "7,5": 1, - "7,6": 1, - "7,7": 1, - "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": 8, - "8,9": 8, - "8,10": 8, - "9,1": 1, - "9,2": 1 + "1,4": 1, + "3,1": 2, + "4,1": 3, + "5,1": 4, + "6,1": 5, + "6,2": 5, + "6,3": 5, + "6,4": 5, + "8,1": 6, + "9,1": 7, + "9,2": 7, + "9,3": 7, + "9,4": 7, + "10,1": 8, + "10,2": 8 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "1,1,1,6", - "6,1,1,10", - "7,4,1,4", - "1,9,1,2", - "4,9,1,2", - "3,1,1,9", - "9,1,1,2" + "8,1,1,4", + "5,1,1,4", + "3,1,1,4", + "10,1,1,1", + "6,1,1,2", + "4,1,1,4", + "1,1,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -408,7 +370,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!$J$2=\"\"" + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!$B$11=\"\"" }, "GUID": "1db67ca9-ca8f-4621-8730-b7daa0920e07", "StyleInfo": { @@ -426,4 +388,4 @@ "PaperSize": {}, "Margin": {} } -}//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 +}//lzXWO5ul+J0JVpULwoZGZ3PTfykLML1Gh+8YwS6puF0rTY1IU8etM7PLDR5FhIq/W7h5hic+Y4+H2ySM8Vv9sl8oDAx3v7hpJ7exg0vjJ3zCPi+HDuQqx3xGZ0qcxPrPojCHBpJtFP7+qVMiy4/4u413Fubzr44aDf/BuZkBxh4NA0Wg/aV48E3wcPNQVKCg8d+BiT8uLAzH3bHjDW6KIkyVIXo9owBKTgIj439oIvrIxFirX08clmzUvhUVzIV+iCsJtzS64qJhZlrOBbV4kZqOQKhC41Xz+M6WfNoPZ6twHHiAO535a9QbCpe9G8JDk1PoTcN2gPO1iSuQLCUHpI3CqnjxipmrrGdKjPKNJEGLeA0UsbT5guOY31uSW/UZNCJcWYLNtGhZbLcfRMFp6gq0ba/EUCMpcGPQFwUDs33BFxy+b9jvYiba+d/vQpN7yfbhHjufYh2AF98F+yN9I1oJTPKXbiOCzPzA+eMKds9FM7mMTCebSev5EKLtcnUC6fZXtr2PxLkPgh38EQNuZJyF7PeRwNqcf2mdEf1+JUXPjt0BUQuxcudBxN8kwMcWFHqCHf1uQNMspzp6K6lNet1+obFo+hUhA+mjgC8o8+CLJy6cSvCgSOIbID7eYxmW1GkwGjc4bDkZgRlB2sJQ49YcCv71U9Ladb0WLXHwJgS/Zin2JWiWxGLPwWBcgXYhwjF1i0f3HKambBtirucN+iUe+EGrfmp6hAoaUY8zO7PxBK0Xr/H4tiqmlw4F6ZRbgkr9YWb1fJHgcAWWzi93FIh0XJGzIAoIkAAt7664YCCFAXHydQjOYtTLnflQ8TMhTOh8V3xAWjS5TZZioSiUh+9QcFafsgyCRypjIFcpqGGQov+MSn/JXyFHjabdAcXAcR0nJ1BFLoX62x0g2JhOsA==|920 \ No newline at end of file diff --git a/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd b/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd index 637c3dca..a7e7cf17 100644 --- a/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd +++ b/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd @@ -1,5 +1,5 @@ { "PageType": 2, - "ColumnCount": 12, - "RowCount": 10 + "ColumnCount": 6, + "RowCount": 11 } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json index 5604f50c..fd548b1e 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json @@ -569,7 +569,7 @@ "Title": "加载中" } ], - "ID": "2910867b-0ae8-44aa-99c0-0fd7cf3719a3" + "ID": "8742fa4c-a011-4ad2-85b8-4ed882a44f12" } ] } @@ -594,7 +594,7 @@ "PageName": "选择Git仓库" } ], - "ID": "ad919926-926d-4709-9609-cb2abbdd08b0" + "ID": "8b77be3a-2a2c-4e4b-9aa2-22a7bb7728dd" }, { "CommandList": [ @@ -770,7 +770,7 @@ ] } ], - "ID": "f664237b-09d5-4f29-a7d8-e0a30e3cd657" + "ID": "b137d752-e09e-4fa2-8af4-1e5124640a26" } ] } @@ -784,7 +784,7 @@ "PageName": "完善Gitee资料" } ], - "ID": "1825bd83-a2d1-4215-a386-36fa699d797b" + "ID": "b0dd1142-85bd-4ce1-89b6-dfa8cf088ebc" } ] } @@ -1107,38 +1107,17 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "项目版本", - "ColumnName": "仓库ID", - "GUID": "89a84a50-7725-47eb-8de3-feee1729b3da" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { "SerializeProperty": "=任务版本详情!B5" - }, - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=任务版本详情!B5" - } - ] - }, - "value": "%Null%", - "compareType": 1 - } - ] + } + ] + }, + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { @@ -1389,12 +1368,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "0d7f5e58-da65-41a4-ad74-034bbd6ced2f" + "ID": "20256847-269b-42dd-9cf6-0f2a5458fead" } ] } ], - "ID": "fd2dd89f-60d2-4a3f-b80d-df7bc80f4607" + "ID": "ab9413b1-2136-435a-bc3d-ea6821d73d2a" } ] }, @@ -1423,7 +1402,7 @@ "ReloadAfterSucceed": false } ], - "ID": "b40d16e7-506c-4263-9e5b-4df59a2f119c" + "ID": "12b46ed5-e55a-4e4a-b047-1cef0fcccc1f" }, { "CommandList": [ @@ -1434,7 +1413,7 @@ "ReloadAfterSucceed": false } ], - "ID": "a3b7b232-feaf-4aaf-ad97-b350badbe00e" + "ID": "d6ade6e8-6c7f-49d0-b0f8-ef65d168b6fd" } ] }, @@ -1625,4 +1604,4 @@ "Formula": "任务版本详情!$L$10" } ] -}//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 +}//vDL8ewz/gqf0UreIk6/8NYYLv7t8f0r97nx/iU8ySpNyw0VJw3oz4iOxKu45CY1boO5OLZF3cXqNcHxGlLZDpbxhfEuoBOAcboCkoG9xGYDtrwN53mq/sSOF5lyuCmnbqkuysviD5zILZr9AqbCPd0XtQgDNoRufkpP48PmabBS/ztF21aN6dOl+OdK7nGKjRe/JV24j1t8dfOQhsIHggzaDzq8MzQDkl/kUi8niYpqxbVneCG7V/sR20ctwLwiDgrHSEkBcO2gaAr8oGZoVAy8VB3230s/yCJvnC9yQZMviduGAsxQcvIknVdMkDyb4gl9yuh5ONRa3keIENT7glecDgpxwmnCKTR4/Fq3NtfadYF2JefZoCXArZrn+tiAyPD8a0a4OuoRWs59QsvhuyrlEKY+GQz1/rY45CaA4zLDKqhjataDX2qncbP3bA8hu4vjsz0OnqdpLG2va6bCGoI/3oMzgqMRmh4fwujC/tAiSn5eqkCh3W6AdzWaQgsA0eAjFP1RTJzLjLjpnVixcuh/Mtzx2DftzJz1QBK2p+RQGBxn6MHkqDlB1IOOxXhQFawuF2Pl0Ow3mRwImMXgjf+F06tQeGK+cwzl1DsU3uX3JhouuEgEBCesDnRdqX4aadbaPBRWmdDgVrGz4zm0j65dGIfQ2E4uBoMrSfpqiG8mvWv8RA9GIazGM+Zz2D/CoINE7RFsYtFGkB8qGbvyH/nyhYtiFjRM7r46hDcQ9f7Se3n74CtUVhY1rmEz71tyELnfoy2fPNo3qPI21mS0hYcs/C14IKFe09KVb3etIrlwRNtyEy1JOB8sVSfxbOfUlTJ/VO24C74MQaZZN2ex2sZEw1xOen73P8hAWym3tRJU3rHfUJuni1nDggvPa+604Esbwquf0zeivroMr6/gD+w==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目代码.json b/Pages/项目/项目首页/项目首页-容器页面/项目代码.json index 7ad01ff9..d1e7f2c5 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目代码.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目代码.json @@ -383,95 +383,6 @@ "clearable": true } }, - "1,33": { - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "useBinding": true, - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目版本", - "BindingInfos": [ - { - "GUID": "ded7a2ac-18c2-422d-b5fe-ead9fbb8027c", - "BindingInfo": { - "TableName": "项目版本", - "ColumnName": "ID", - "GUID": "98f272fe-f469-4e2d-b237-04f5e6cc21c8" - }, - "ColumnName": "value" - }, - { - "GUID": "2e90c09f-53e9-429b-8152-729cdb90e0fa", - "BindingInfo": { - "TableName": "项目版本", - "ColumnName": "版本名称", - "GUID": "1adfe4c6-0e9e-4b59-85e9-2ef8fc4ca174" - }, - "ColumnName": "label" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目版本", - "ColumnName": "项目ID", - "GUID": "05c34adc-5622-4741-9083-a2330b9caeb8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目代码!项目ID" - } - }, - "NullFormulaValueQueryPolicy": 1, - "CustomColumns": [] - }, - "placeholder": "请选择", - "noDataText": "无数据", - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true - } - }, "3,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", @@ -513,15 +424,6 @@ }, "ColumnName": "ID" }, - { - "GUID": "401c0a45-9b98-48b6-8d07-a3b500238519", - "BindingInfo": { - "TableName": "项目版本", - "ColumnName": "版本名称", - "GUID": "d97090cf-ad10-449c-80e9-84c16cdf3ad1" - }, - "ColumnName": "版本名称" - }, { "GUID": "dfac1f08-6c44-4e81-ba2a-7e829fbe6d99", "BindingInfo": { @@ -532,44 +434,41 @@ "ColumnName": "仓库ID" }, { - "GUID": "8653af12-3809-4589-b0f6-cd2ed04dba47", + "GUID": "401c0a45-9b98-48b6-8d07-a3b500238519", "BindingInfo": { "TableName": "项目版本", - "ColumnName": "Git订阅", - "GUID": "44fd359c-12fd-413c-8fc8-4ed0770c8c42" + "ColumnName": "版本名称", + "GUID": "d97090cf-ad10-449c-80e9-84c16cdf3ad1" }, - "ColumnName": "Git订阅" - }, - { - "GUID": "aae13f30-4d9c-4c3f-a07e-254f8e404dca", - "BindingInfo": { - "TableName": "项目版本", - "ColumnName": "名称加版本号", - "GUID": "f3c2477a-5206-43d9-a41b-77ada4adfced" - }, - "ColumnName": "名称加版本号" + "ColumnName": "版本名称" }, { "GUID": "fa2588cf-b648-4475-8553-a03808c4b0e4", "BindingInfo": { "TableName": "项目版本", "ColumnName": "仓库ID", - "GUID": "f5d353cd-7d99-4fe0-a6c0-40130ffd412d", + "GUID": "eb3ed463-a4ac-400a-b951-3cc4fef0a1fd", "RelationBinding": { "RelatedTable": "Git仓库表", "RelatedColumn": "仓库ID", - "DisplayColumn": "空间路径加仓库路径" + "DisplayColumn": "空间名称" } }, - "ColumnName": "空间路径加仓库路径" + "ColumnName": "空间名称" }, { - "GUID": "b0e59c53-50f0-4c05-b130-b126318af202", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目代码!仓库ID=\"\",\"未绑定仓库\",项目代码!空间路径加仓库路径&\" -\"&项目代码!分支名称)" + "GUID": "eb251787-5a85-4cd8-aeb8-9ca768c2f6c1", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "仓库ID", + "GUID": "3fd13515-f100-4684-9cd9-a38cf55e6253", + "RelationBinding": { + "RelatedTable": "Git仓库表", + "RelatedColumn": "仓库ID", + "DisplayColumn": "仓库名称" + } }, - "ColumnName": "副标题" + "ColumnName": "仓库名称" }, { "GUID": "713887b8-3999-4945-9ac5-2ce140aa3df2", @@ -599,15 +498,6 @@ }, "ColumnName": "创建人" }, - { - "GUID": "bc1623b6-868e-48f4-bbdf-9aaa95bfb417", - "BindingInfo": { - "TableName": "项目版本", - "ColumnName": "分支名称", - "GUID": "c5d0afcd-681d-45ec-b9c1-cf8412428723" - }, - "ColumnName": "分支名称" - }, { "GUID": "3364c43b-3c41-43e4-91eb-909da0e56637", "BindingInfo": { @@ -621,28 +511,38 @@ } }, "ColumnName": "仓库成员" + }, + { + "GUID": "0e50d864-3057-4bb8-89be-4944b5a7e889", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "仓库ID", + "GUID": "b1d99bd8-bfbe-4153-a894-6f0c9190f8cf", + "RelationBinding": { + "RelatedTable": "Git仓库表", + "RelatedColumn": "仓库ID", + "DisplayColumn": "仓库URL" + } + }, + "ColumnName": "仓库URL" } ], "SqlCondition": { "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "项目版本", + "ColumnName": "仓库ID", + "GUID": "e8a39a20-5353-46c0-a295-bfb2f49aeb41" + }, + "Value": "%Null%" + }, { "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", "SubConditions": [ - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 6, - "ColumnBindingInfo": { - "TableName": "项目版本", - "ColumnName": "版本名称", - "GUID": "0d100d7e-257c-488a-be9c-e11dfeb193b1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目代码!搜索框" - }, - "LeftBracket": 1 - }, { "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", "CompareType": 6, @@ -659,7 +559,8 @@ "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目代码!搜索框" - } + }, + "LeftBracket": 1 }, { "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", @@ -682,18 +583,6 @@ } ], "RelationType": 1 - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目版本", - "ColumnName": "ID", - "GUID": "21736196-1eb0-435f-af17-d7d7dd102240" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目代码!AH2" - } } ] }, @@ -717,10 +606,10 @@ "DisplayMode": 2, "NoItemSetting": { "ImageForNoItem": { - "Name": "暂无内容 (1).png" + "Name": "无数据插画.png" }, "NoItemImageSize": 160.0, - "TextForNoItem": "暂无内容", + "TextForNoItem": "未绑定任何仓库", "Orientation": 1 }, "TemplateKey": "BlackWhite", @@ -773,13 +662,19 @@ "FontFamily": 1, "HorizontalAlignment": 2, "BorderLeft": 0 + }, + { + "Background": 3, + "FontFamily": 1, + "HorizontalAlignment": 2 } ], "Types": { "Strs": [ "Background 2 0", "Body", - "Center" + "Center", + "#FFFFFF00" ], "Borders": [ { @@ -792,13 +687,6 @@ "0,41": 1, "0,42": 2, "1,5": 2, - "1,33": 2, - "1,34": 2, - "1,35": 2, - "1,36": 2, - "1,37": 2, - "1,38": 2, - "1,39": 2, "1,40": 3, "1,41": 4, "2,40": 0, @@ -1276,7 +1164,7 @@ "24,39": 5, "24,40": 5, "24,41": 7, - "25,1": 5, + "25,1": 8, "25,21": 5, "25,25": 5, "25,26": 5, @@ -1302,11 +1190,10 @@ }, "Spans": [ "3,1,21,39", - "1,33,1,7", - "1,5,1,27", "1,1,1,3", "25,1,1,5", - "0,42,24,1" + "0,42,24,1", + "1,5,1,35" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1368,4 +1255,4 @@ "Formula": "项目代码!$B$26" } ] -}//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 +}//SzynQSMpDj1QuZWchxnxLaf1MM+wFQPlrqbTxFamc9aBfWOn1R7VVYbKFNbuwvJiDAQW9weHQgiVf0KBLqvb3jyHFPwkppF84E6a8eYCXAAgMvFw0RgIs9JhWymN967rOAVyj9n2C1m45AVaWc07UO4mOOsbfEbPV37FOZL55NRoYgv1s54MMPeLAdlFUE+N6vKWYE0TesQTsT2db3Au/IO1uSjtzqGxzi9Z8jt8mL89pEFBre4eyzO+ejqHosw+zJAqPnAUpcEWUpCq5QAOTZX1xhIc+ZtC6Fx4w//LuzrxrjxyTv3vocNa2y/uEUCRkzsXORA2fzhqz3TvbhQ32Lf+iilWOzPb0z4qB8g+fxuEkJOka7DsdaeOOdOh6AXBmADJfz/737fHR2XcodZfvx2i7SoECmavxjbjhbeKfohbePv7IKfKOGRn2q5Fa5W+aqPJK0rrhhE6+ESKUULiug91gH03MPLVQgFzyif/HDiUcKEwjguKSmBSpTi6f+YwfLvp53DHes3pGmRL46cX2/Qp2m0hUVKCH7PPpLbQscjbB4jQ1mpllPvilpo5xQrZgjCxiuJW9I3EdzUzy0pfAYv5WD9Ugx+d6qNajbxd0seCI2Moyo7nBq813IJysmofOJiTqVbc8nmTBXvyYtc4TYNUHxEzMsbqoNyot8tbszkPpU4CtcZytf7boH8t0m0UqV1RT7Bl/ZAeb6SKgW/zSPvV/XnCA2J1mYN2sEHrlTojXko+jmX4H1W7iq2Cf7qnQmsKvHByjSMOTbgCeJeT0fwYfr37T6zZIzuNuCV/HSbiwotRvt05hOZ0I8MqLiFuXK9yC5uZsCsKKbOov+VFH84/ukDgmW7UCQrFoYTWdn33Nc7qw8SHqdMVoqraUpSMW/TAi7BpwpXYhCdzfY7QwA==|920 \ No newline at end of file diff --git a/UserControlPages/Gitee事件记录列表.json b/UserControlPages/Gitee事件记录列表.json index 6f93d52e..b977b275 100644 --- a/UserControlPages/Gitee事件记录列表.json +++ b/UserControlPages/Gitee事件记录列表.json @@ -171,7 +171,6 @@ "SerializeProperty": "=Gitee事件记录列表!仓库ID" } }, - "NullFormulaValueQueryPolicy": 1, "IsListviewDataSource": true, "CustomColumns": [] }, @@ -183,7 +182,7 @@ "ImageForNoItem": { "Name": "暂无内容 (1).png" }, - "NoItemImageSize": 160.0, + "NoItemImageSize": 60.0, "TextForNoItem": "暂无记录", "Orientation": 1 } @@ -253,4 +252,4 @@ "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 +}//YiAwBCpZjuAC9aTNFYDlbPwieS/lR4OXc5widYOiMQjHfzsDqzo9B3qaMvg6DZx8f7OF97v6fuU8RfVbUYNi4XZectZOkdQWyjGcfbFWtvxN4ZnNxVIxdDoUbgX1vpGWCZ1u/DiLtm+7CRXejquVVFLi12JbSQWe/p8Xque2/F0CnvnfbXrAkl4H+aEu29PXSarOuzFP89M8Ww3hn2AnWuvGOR+I9TPqcLRhA5JaZYE9SNcZeDDedOp90RIgU93qjOR4HVoH2WU/Lymkbvw6PfYoS16LBDOCRR8cwH1VyfkjhYnyUVOiqEhDg0cwi2YkD7NT07TzX+Fx/kAn1V0VOUGkSPsVFKJAz06YiFyJOCC3Veo35E151bQ0jCvJAURDhxJmBdMTfIBTeGHDzr1UL4yV5ojlLng3LYE9RSJqQMfSqzfMYx9Q+oI7FhQSdnZ/AszXUa5L25lClonvwKoYYqBKJ3OCkTwQMdZEWiux+ikxNS5tCbwBsXUCYUBwJI6TIO9crT+ymRkdA0kwQLa0QwUecqVbZkrueVEnWU02ZBDh4dKkkO32vjTz0xUzv6KNIYU5sKGkBd9TEjbwZMKxsVuUSBl/EMYLg9MUgbMNtq+QFO5GdE/CS5tWOKFT6ms1hTa8UvHcK77nHV5ZvPWoE4+vs3ETChOgxciC7fcFErIsKoLz7Cyo144Y43eLVIV8outUV80mJOu1A8C8jq/mWPHi2FgG9sutu7bWZGL99Lsys/RGf4LzjbzRb0eDaQiShCAM3Jp3L2UE8TUiKX14cKlTstWFkxntGsu/CZNJ78C0asbiBHh/TqQ5ns6cny2XEk6LtYcHp6jaLXzHxAtC8UYb6l9c05YlCHIYmPMbeTB54BfhaNP480DJFLxF8Wmu2JNmqDhdRaX37up8mZH8HQ==|920 \ No newline at end of file diff --git a/UserControlPages/Gitee仓库选择.json b/UserControlPages/Gitee仓库选择.json index a797bfcf..ce628504 100644 --- a/UserControlPages/Gitee仓库选择.json +++ b/UserControlPages/Gitee仓库选择.json @@ -1019,7 +1019,7 @@ "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": "26dae2a0-3e8f-49df-9867-ca9e60e8ff46" + "ID": "6f2c9ccc-b6cb-4835-84dc-76e77dab990c" }, { "CommandList": [ @@ -1032,7 +1032,7 @@ } } ], - "ID": "c9a30b0f-8303-40bf-a35d-54fdde5a3e48" + "ID": "96777764-8a66-4090-a8fd-79769106d916" } ] }, @@ -1126,7 +1126,7 @@ ] } ], - "ID": "2458ba9e-4377-4268-b9c8-99cbf8ee6893" + "ID": "4a94e0b6-bd34-480f-af4c-446574ea9930" } ] } @@ -1148,4 +1148,4 @@ "Formula": "Gitee仓库选择!$B$2" } ] -}//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 +}//uqE1GNWKv137Ew+vSx1yjkBV5ibjfojWwsZjywINfZ5TzcY2qZ7l0F5BnG+HTZfYQTPedEWpUl0yqDMdhuann05PawYgVzAsEcSELwySgQPZOqo79FjUvnf2FhmiRWc6TVxmSawoLtiNMb3xVC5aIDYPl2Gi//NFD/h88DvNUAVUEnmWT6w+tfFP3wTZxwaKr2nrAKavFKf2LpYFzHYARQiTPXEK1EBKOHeCOHoPNmHxZBF6fQwoHUaXlYTF1ZenPnKcw3xkUT5MGqFwrhLF+eFH45abbuEpc+GFVXgfn+B/RrFrp03GqEpvADuspP9TAlRWR9cL+rwLk/oWyr6S6G9h6tzXTvsxXemlCRYT+iW1wCFxZlKwGNzbTgjMxWukXnA//lq7SKUSTxwEm12RNC3ibdnc6OgNtxfUuLjw9eAEsVYsD94S8toyZUfNWbHdXT9uQdyoOLHzoJCyZ/h2jyMjfCKvLVv1pHy2ZFPIq/zO1FeHkMm3xy5CmQNvUCngYLYV7ldDWKMppdJLfMZ5CyJF02UuqE1KQd38zYLrEnb503N9RwDeqtoJaDa4C8WlhY5cJswejNuMZ7lIIBmoPh+wm7IECxcKRRsL986Z/AYxfwd6UXU6Pi0wQk6mLNlNtHB3jXrQDcpdlwqKhSx+A+yBI6BKVWfrzRWUqLCJTGc0XGiD8OitaI0HXHQdDrsaKOpH2xRmWVpa6Th1MVVWHO/lQWS407fP1dQhRJmIFptEUdvBRWxp/uqe2QIUzxUM/sTotvdv6jUJeeOSFwd2k/TfRIQTyb+4LLVJnguV0+A7Zn3DqDIahIT3mPYZv5HIQnLDe1cNpc4wNkZ0FK00+0PuLO/VB6DgQIpru9keksRjEr1O5M6bDUbiUvkBffHg11un3srLbpqFFxfDrxQiDg==|920 \ No newline at end of file diff --git a/UserControlPages/Git仓库卡片.json b/UserControlPages/Git仓库卡片.json index 526b74f1..c84370e3 100644 --- a/UserControlPages/Git仓库卡片.json +++ b/UserControlPages/Git仓库卡片.json @@ -226,7 +226,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "d769433c-d8ef-415a-aa52-52ac845f044d", + "GUID": "b20020ad-19b7-4924-8a05-8c700013220c", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库ID", @@ -235,7 +235,7 @@ "ColumnName": "仓库ID" }, { - "GUID": "b4eea9c2-20b9-4c9b-b494-1ba60ab1eaac", + "GUID": "132466bf-8298-4791-bc84-74b3853d2f68", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", @@ -244,7 +244,7 @@ "ColumnName": "空间路径名" }, { - "GUID": "49ad8cfe-4fcf-4fcc-9d92-d1d1e1cc72d4", + "GUID": "9f0375e2-9177-4721-bfbb-367d879fb826", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间名称", @@ -253,7 +253,7 @@ "ColumnName": "空间名称" }, { - "GUID": "59fb133f-9d50-4054-9733-94dabb049560", + "GUID": "42671770-6ca0-49d1-a758-2e95b5433413", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", @@ -262,7 +262,7 @@ "ColumnName": "仓库路径名" }, { - "GUID": "6175ca16-7193-4eb1-829b-0bd97a027db7", + "GUID": "3a20a528-b1a4-44d4-962a-857d2b46c965", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", @@ -271,7 +271,7 @@ "ColumnName": "仓库名称" }, { - "GUID": "664a892a-9cb1-4eec-90c2-42cda63abd2f", + "GUID": "5d3315e1-f672-4592-b6e5-0c0cb13d4c9b", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库地址", @@ -280,7 +280,7 @@ "ColumnName": "仓库地址" }, { - "GUID": "6cb84b97-99e3-4d9e-b765-34d898c7e0fe", + "GUID": "0ab5475a-dc98-4e18-9591-5702e78d79e8", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库描述", @@ -289,7 +289,7 @@ "ColumnName": "仓库描述" }, { - "GUID": "e94bfc35-18e5-41de-ac5d-22f5f30ba3b3", + "GUID": "bea3f6f3-84dd-439c-8a49-a40de4224032", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库成员", @@ -298,7 +298,7 @@ "ColumnName": "仓库成员" }, { - "GUID": "7828b68a-be16-4d9a-b716-40dc571ad50e", + "GUID": "e25746ef-1454-4dae-836b-9ec3f4633fb2", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人", @@ -307,7 +307,7 @@ "ColumnName": "创建人" }, { - "GUID": "895d9053-008a-459b-b028-4064ec798d1a", + "GUID": "70714a65-c3b9-4034-b9d5-b93569ba6ea6", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人头像", @@ -316,13 +316,31 @@ "ColumnName": "创建人头像" }, { - "GUID": "8d24b52e-b16c-4e8a-8a1a-ecd57a60cee6", + "GUID": "84c38c4b-7665-48b1-95ae-278d31e663e5", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "hook_api_url", "GUID": "64786d92-6b75-4495-92b3-a9205f57e35a" }, "ColumnName": "hook_api_url" + }, + { + "GUID": "86fb013b-18ec-46c3-be9a-10f833b69836", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库URL", + "GUID": "4c7bfccc-dcff-49f8-b6e4-d3c09a31be4e" + }, + "ColumnName": "仓库URL" + }, + { + "GUID": "f738afe4-5429-46ad-a9f7-7878e254a704", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "默认分支", + "GUID": "16b350ba-242c-40d2-9454-ddefdc51b73b" + }, + "ColumnName": "默认分支" } ], "SqlCondition": { @@ -340,7 +358,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "8477300eae6e4e389e63ac01c31ebe99" + "ID": "d7958ba367ae449a98f4e5a12f9f8d2f" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -446,6 +464,20 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=Git仓库卡片!仓库.空间路径名" } + }, + { + "PropertyName": "默认分支", + "PropertyValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Git仓库卡片!仓库.默认分支" + } + }, + { + "PropertyName": "仓库URL", + "PropertyValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Git仓库卡片!仓库.仓库URL" + } } ] }, @@ -477,12 +509,12 @@ ] } ], - "ID": "fbb5c218-75d2-496a-8f68-546144733178" + "ID": "44c2ef66-0e6d-49c3-a44a-32165423ff13" } ] } ], - "ID": "25576e28-613e-45e1-aced-07cb728d68a0" + "ID": "a8b8edee-2d55-485c-b577-a722a31e78c9" } ] } @@ -668,7 +700,7 @@ ] } ], - "ID": "62d8c5b0-44a0-420e-8dc7-892561e156ca" + "ID": "0589e863-d21a-4829-b44b-06e333e35298" }, { "CommandList": [ @@ -692,7 +724,7 @@ ] } ], - "ID": "e2ec1747-a229-42a7-855c-0f4cedbe9f42" + "ID": "c58f2529-1f0f-4ffd-bb36-24694a4a4396" } ] } @@ -753,7 +785,7 @@ ] } ], - "ID": "4e616781-a743-4306-ba55-8e4c8c80e115" + "ID": "698e1f5d-2d2e-4a8f-a8b3-a5551e93faac" }, { "CommandList": [ @@ -777,7 +809,7 @@ ] } ], - "ID": "73f2897a-400e-4935-ac58-8a54f4f0c8f0" + "ID": "3f42b433-9a3e-4b0e-913f-b8e7e7b842df" } ] } @@ -837,4 +869,4 @@ "BoxShadowString": "3 3 0 7 #04000000" } ] -}//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 +}//65tI+TGJkTpilrTRsKCzyezw0NncmKQI7fwRpc4OToH0fPRynyzp5jvzfOWXIYpqCMkXHN1xuMIoVf/mO0ERJCEmcNS4l2OQ/jYiesBa7zGQ1UY5VC00PPDeF0SFbAYkYYSCOGs/hS7FfcTPGf1RTfYQyKfA+8hOZT5jvM9hiBOYnXIYagXmLJHtKxdNrQDZ9fzRD1ECWaqkRO2eJtjv4QfNSYfhh+O1Hc1tf+3X+qdwToyeyQGedA/fDODm9tMuluu0rj4BjjzkSUcFPUIeBV/aj8Mrj7qOFJVQTTv+RPCFyWkx3BKaF6bd+fb1PjT94t8sCzrilrkgSuBA2nczgoFzr55IbtZQ0Y+y6S4e/lV0zrJIDtBFWkbONTz/CQqSlZiCuQdqbLJpSdMF232uFRFQfJ8rnZF3YjaTm3ppjV+ySbZPJ5GRGYr5vBdufYDUEKxMZyZDSWDYC8J3ayUckkAB7vIFIk+aCNDc1g5wJamjaqftowY7Ixeh8M3zGo0rei65w4L+11h9JNKiaqO3tVdASFw899CyBNZl2Sn0Fk/wWiS2C44IXsvyzEVXt8sB5ol+Sy6P9zY1pcIBrx4z9d2yjbsECCxuh/XOwVqhPwd7VY1FOmmzzX5C/cLXt9ki2NFiEGVDsRwFsfHkCjyHavf37aU+5uh6s4q10xKYSz8V3ysEnnCMCkKu7SxsvW0LB2W+QkuNfbS3xwehieuGdft/zE5HXuWH08I1GBg2to7uE5/1KbfGXlQBtPYRBieuonEHr5wEedBlel9DWB7GNrP80/jjQnHVXJMKzFgdy1w/Rf9OWd0cUN3M/f8B9fjF732oYi5aARXwgOCtVBbE33JiwUCXJHUF9xOqHJvI/P7LFK9xvS9lg2C9F3a85WeVZgCA0X56M2WMwPEt/Uzrhg==|920 \ No newline at end of file