From bf6fcdc9db698579db2fbadd224cff666c4f6958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Tue, 18 Jun 2024 11:35:20 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E9=87=8D=E6=9E=84GItee=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=BB=91=E5=AE=9A=E7=89=88=E6=9C=AC=E9=80=BB=E8=BE=91?= =?UTF-8?q?","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage?= =?UTF-8?q?/=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86"},{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=AF=A6=E6=83=85"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E5=B2=97=E4=BD=8D=E9=85=8D=E7=BD=AE"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"State":1,?= =?UTF-8?q?"Type":1,"Name":"PCPage/=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF"},{"State":1,"Type":8,"Nam?= =?UTF-8?q?e":"ApplicationSetting"},{"State":1,"Type":7,"Name":"Table/Git?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=A1=A8"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/GitCallback"},{"State":1,"Type":7,"Name":"Table/Git?= =?UTF-8?q?=5F=E4=BA=8B=E4=BB=B6=E8=AE=B0=E5=BD=95"},{"State":1,"Type":1,"?= =?UTF-8?q?Name":"PCPage/=E9=80=89=E6=8B=A9Git=E4=BB=93=E5=BA=93"},{"State?= =?UTF-8?q?":1,"Type":15,"Name":"ServerCommand/=E5=90=8C=E6=AD=A5=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E4=BB=93=E5=BA=93=E5=88=B0=E8=A1=A8"},{"State":1,"Typ?= =?UTF-8?q?e":15,"Name":"ServerCommand/=E6=90=9C=E7=B4=A2=E4=BB=93?= =?UTF-8?q?=E5=BA=93"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E4=BB=8EGitee=E6=8F=90=E5=8F=96=E6=8A=A5=E5=B7=A5"},{"State":1?= =?UTF-8?q?,"Type":15,"Name":"ServerCommand/=E8=8E=B7=E5=8F=96=E6=9F=90?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=88=86=E6=94=AF"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E5=88=86=E6=94=AF=E9=80=89=E6=8B=A9"},{"State":1,"T?= =?UTF-8?q?ype":1,"Name":"PCPage/=E5=AE=8C=E5=96=84Gitee=E8=B5=84=E6=96=99?= =?UTF-8?q?"},{"State":1,"Type":15,"Name":"ServerCommand/=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=BB=93=E5=BA=93=E7=9A=84=E6=89=80=E6=9C=89=E6=8F=90?= =?UTF-8?q?=E4=BA=A4"},{"State":3,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=8E=B7=E5=8F=96=E4=BB=93=E5=BA=93=E6=9F=90?= =?UTF-8?q?=E6=97=A5=E6=8F=90=E4=BA=A4=E6=95=B0=E6=8D=AE"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 232 +----- ApplicationSettings.json | 4 +- Pages/Git/分支选择.json | 16 +- Pages/Git/完善Gitee资料.json | 11 +- Pages/Git/选择Git仓库.json | 345 +------- Pages/个人中心/个人中心-基本信息.json | 60 +- Pages/任务/任务-任务信息.json | 32 +- Pages/任务/工时/新增报工.json | 149 ++-- Pages/任务/新增任务.json | 14 +- .../项目/项目首页/项目配置/项目岗位配置.json | 55 +- .../项目首页-容器页面/任务版本详情.json | 503 +++++++++--- .../项目首页/项目首页-容器页面/任务版本详情.rd | 8 +- .../项目首页-容器页面/项目版本管理.json | 6 +- ServerCommands/Gitee/GitCallback.json | 70 +- ServerCommands/Gitee/从Gitee提取报工.json | 30 +- ServerCommands/Gitee/同步一个仓库到表.json | 77 +- ServerCommands/Gitee/同步仓库的所有提交.json | 125 +-- .../Gitee/在线获取仓库某日提交数据.json | 760 ++++++++++++++++++ ServerCommands/Gitee/搜索仓库.json | 15 +- ServerCommands/Gitee/获取某仓库分支.json | 74 +- Tables/Git/Git_事件记录.json | 7 + Tables/Git/Git仓库表.json | 7 + 22 files changed, 1625 insertions(+), 975 deletions(-) create mode 100644 ServerCommands/Gitee/在线获取仓库某日提交数据.json diff --git a/.collaboration b/.collaboration index 6dc017c2..8582ce32 100644 --- a/.collaboration +++ b/.collaboration @@ -604,19 +604,7 @@ }, { "ModuleName": "PCPage/项目版本管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:41:26.7572867+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.rd", - "Pages\\97bdc47834844e0d8f3a5aef747785e.json", - "Pages\\97bdc47834844e0d8f3a5aef747785e.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本配置", @@ -624,17 +612,7 @@ }, { "ModuleName": "PCPage/任务版本详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:41:26.7568833+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", @@ -658,19 +636,7 @@ }, { "ModuleName": "PCPage/项目岗位配置", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T11:34:52.2123309+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目岗位配置.json", - "Pages\\项目\\项目首页\\项目配置\\项目岗位配置.rd", - "Pages\\a6ecaec6b4e44f7abfc5c6e334c7246.json", - "Pages\\a6ecaec6b4e44f7abfc5c6e334c7246.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批", @@ -750,17 +716,7 @@ }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:41:26.7574+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-任务信息.json", - "Pages\\任务\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -788,17 +744,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:41:26.7571218+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -830,17 +776,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T09:39:00.0518375+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -968,17 +904,7 @@ }, { "ModuleName": "PCPage/个人中心-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T11:22:14.6120785+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-我的收益", @@ -1284,17 +1210,7 @@ }, { "ModuleName": "ApplicationSetting", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T11:09:46.619829+08:00", - "ModuleType": 8, - "ToRemoveFiles": [ - "ApplicationSettings.json", - "favicon.ico" - ] + "ModuleType": 8 }, { "ModuleName": "Theme", @@ -1742,16 +1658,7 @@ }, { "ModuleName": "Table/Git仓库表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:42:34.39548+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\Git\\Git仓库表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/Git_WebHook", @@ -1763,16 +1670,7 @@ }, { "ModuleName": "ServerCommand/GitCallback", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T09:43:59.062436+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\GitCallback.json" - ] + "ModuleType": 15 }, { "ModuleName": "Table/日志表", @@ -1780,32 +1678,11 @@ }, { "ModuleName": "Table/Git_事件记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T09:54:00.8470299+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\Git\\Git_事件记录.json" - ] + "ModuleType": 7 }, { "ModuleName": "PCPage/选择Git仓库", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:01:04.7006044+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\Git\\选择Git仓库.json", - "Pages\\Git\\选择Git仓库.rd", - "Pages\\4347ba70d904424d852fada4b0f0b0a.json", - "Pages\\4347ba70d904424d852fada4b0f0b0a.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/Git", @@ -1813,16 +1690,7 @@ }, { "ModuleName": "ServerCommand/同步一个仓库到表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:09:40.6767488+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\同步一个仓库到表.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/搜索仓库列表", @@ -1830,16 +1698,7 @@ }, { "ModuleName": "ServerCommand/搜索仓库", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:14:14.580927+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\搜索仓库.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/列出仓库的WebHooks", @@ -1879,16 +1738,7 @@ }, { "ModuleName": "ServerCommand/从Gitee提取报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T09:39:17.4659389+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\从Gitee提取报工.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/服务端命令2", @@ -1896,44 +1746,15 @@ }, { "ModuleName": "ServerCommand/获取某仓库分支", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:01:04.6995952+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\获取某仓库分支.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/分支选择", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T10:33:10.1885102+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\Git\\分支选择.json", - "Pages\\Git\\分支选择.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/完善Gitee资料", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T11:21:53.3568614+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\Git\\完善Gitee资料.json", - "Pages\\Git\\完善Gitee资料.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Image/gitee2.svg", @@ -2025,16 +1846,7 @@ }, { "ModuleName": "ServerCommand/同步仓库的所有提交", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T09:20:17.3359661+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\同步仓库的所有提交.json" - ] + "ModuleType": 15 }, { "ModuleName": "Image/d3148bd6742da6598200d24b4966ba9f.png", @@ -2264,12 +2076,6 @@ }, { "ModuleName": "ServerCommand/在线获取仓库某日提交数据", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T09:20:59.0955918+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/ApplicationSettings.json b/ApplicationSettings.json index 054db999..d5e7d607 100644 --- a/ApplicationSettings.json +++ b/ApplicationSettings.json @@ -15,7 +15,7 @@ }, { "Name": "全局_Gitee", - "Value": "{\"client_id\":\"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\"client_secret\":\"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\",\"回调地址\":\"https://develop.gridfriend.cn/sims/ServerCommand/GitCallback\"}" + "Value": "{\"client_id\":\"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\"client_secret\":\"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\",\"回调地址\":\"https://develop.gridfriend.cn/clue/ServerCommand/GitCallback\"}" } ], "WebSitePort": 26489, @@ -29,7 +29,7 @@ "BaseOnStartingMonth": true, "SuppressedWarningMessages": [ "选择Git仓库->按钮(AK2)->命令->条件->对象操作（SetPropertyValue）：选择行, 在命令条件之后的命令可能不会被执行，因为此时页面可能已经跳转到新的页面。", - "数据表, 有部分连接到外部数据库的数据表没有检查过连接状态，如果无法连接到数据库可能会导致数据无法在页面上显示。如需确认数据库的连接状态，请点击数据表右键菜单里的“刷新”" + "选择Git仓库->按钮(AK2)->命令->条件->条件, 在命令条件之后的命令可能不会被执行，因为此时页面可能已经跳转到新的页面。" ], "SyncUserInfoCacheForBuiltInView": false, "PageLoadingMode": 2, diff --git a/Pages/Git/分支选择.json b/Pages/Git/分支选择.json index d0829af2..a15bc55c 100644 --- a/Pages/Git/分支选择.json +++ b/Pages/Git/分支选择.json @@ -6,6 +6,11 @@ "DesignLengthInPixel": 27.0 } }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 46.0 @@ -37,11 +42,6 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } } }, "InLogicalVisibleIndexes": [ @@ -143,13 +143,13 @@ ] } ], - "ID": "46aa28b0-1e10-42aa-a822-7ce825b151bc" + "ID": "65774ea4-395a-4dae-9f28-9cde15212f06" } ] } ], "Text": "确定分支", - "TemplateKey": "_RS_Main3", + "TemplateKey": "_RS_Main2", "Icon": { "Name": "git-branch.svg", "Color": "Accent 1", @@ -267,4 +267,4 @@ "Formula": "分支选择!$B$8" } ] -}//ut3uaqkhoUkteC6AJFZUjaKU788D9iNrlPtaSKAeszGTLFTwUILVBY83CJ3kLHih25Yytlt6TvRnlgw6rZ23NUzijkBl1acut0rvqJEc3mJfTTvl9h4DLjP+wn6ibHC7Fiv0Y1SeVLYZ/DAwMaIgaxnY/ByBhDrJq8mS9rb5/MEUEFlY/delB0hvupg4QMSrcRdHj700Q8esU2Wpap6IjVCrLIj2nAM/IQ/iFn0tcdcUdAlRITffqfE6K5kJ0TlXoTNp6STBld7oOyZ3DnCZVdtYmq4+c2yvh0rwzG4nWWjZjsE56v9wAweKTHV8RxBugCoIpUUpGvrgeuRNuJVumBLE+yvpiyVzbWMtnKAQsZK5kEB1mdGBGYbcoB/HLGxkMy5vgLyp+FLop/AK4vG63R3NaVV+TZAfA7Fk/OY49AkJVefk37BtSFo6fKqV0yxQFAMwb8KVVJ1wShTBNEkMoUgpK0ioSzpCEMRE+Dv0aBo+bFahn3galtbvmpine0uc9fWCU8KkDA+vtbVeqnDu4ofoTo0hCCi8XAV1sIblxzEEzIe5L90pFFMtexdF4LcZSBMuBIat0bKADxQnfGkf0JIYBA8giyLFLIbzwlwKKBpzWrxR+uq50nJCl2VC5KxzmHBKYQ5Lt9IOCSHLj2bx5wXuusxa27cyNLsQ78BwwKBFXDDmz1Aez07GKs7lpKpV6UfKTP5Em5/MItE/2c70ifwv2N5KNXsR165UZ0P1RWKfC0woIO4K4u0h0HoNjhgw8N56IWAnJzSE6urOX3cDIbj8msL7xdXQ7wDGq5ViWGapMXgSzjyLtvu67R18NZ/AN17msnH7zQvSeRCUAI5KzMIj4B2gkFXH2gPobdE9Sdmi3aY6fbgsXPAJto3dD3lbjiRPouqdd++OS7P3EHrAag==|920 \ No newline at end of file +}//YKMRTnaDfnolmilD94BZn7fasKjzO60uYaqSjbkg/01kkGUbyDhxnC3b+5iTfRHdR4KApxXlsPXtg6F0HcdpZ6WRG/pWWjLR1xeLgdwpgLt9ltBXytQTGA/ge5vlrZ1/PQfb0xUosFz9bOGc2NHR0yIUH7105sJyzVxo4CEDE7JD21wFbOKV0f2Kj7dGCsPJUe6+9LeGZ4Z+ukbWqmI2Bl8YdmEU3HDAuwKj31CeTTK/JGjCRAoXaPFewjF6lLbGSkU/2bNd8gLiV+xf3g9jLKbJnXGLU6TcPL3U7FhVpUo8dF3HhvPH+rxjFy08XI9t3rAstmP/PSiZ7krsYqtmqV58w+7Zdddnq/bgxEm9fhpqZE1uL20pmG6DwSkJUDL904kI1QOec6yB7jXEUlcgCdy7TNYfkNw0Xw7QvSSSuKRSWhwyILG9qvcrDc1lKX1RYgV5tJ50eeO0JB8A9E/aCGI9Y+STLs9bX3PByCX2nQ/CyYeYY1IcDUsMBYobQx9APFNZzNO1ZRAisZq2Pm3/dJDXtbxxLHeWE0Nw9dr+zODF8ltkp7RXTvCTu8NCIGgGymK5M9DsHL8rtoI4OQPGgqaYYsmW6g7k8deRxiZXy1WDSW8WFboEku0XJBHe2LSHPnWyFVGzYkVZmLiik8edUcLQJAw8IWVP4SVSIqSo28D4zwpxGfE6YUpBxq1mHkip3UoKoBgCw5nMTcy6XP63G+bdsynHqxLVUWpREM1ZyBf0gHRpF8ATioI3GTiWMe6q6lCMqhnst4C4sd9Lbm1emWCCwpXD1pQBUDXdigndQWe/OjO1+xcf/xViZXPT0biuMEluvGkL+hk8PZECXsth6Dyw4HOVov63MKcnQOIK+IURnp4LODsCPJaQRXGvctARduyhnd7VHJpDNFfkqNMZZQ==|920 \ No newline at end of file diff --git a/Pages/Git/完善Gitee资料.json b/Pages/Git/完善Gitee资料.json index 5cc690d6..56d8cc7c 100644 --- a/Pages/Git/完善Gitee资料.json +++ b/Pages/Git/完善Gitee资料.json @@ -101,7 +101,10 @@ "resize": "none" }, "DataValidationInfo": { - "IgnoreBlank": false + "NumberType": 8, + "FirstParamValue": "^((([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])+(\\.([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])+)*)|((\\x22)((((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(([\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]|\\x21|[\\x23-\\x5b]|[\\x5d-\\x7e]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(\\\\([\\x01-\\x09\\x0b\\x0c\\x0d-\\x7f]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]))))*(((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(\\x22)))@((([a-zA-Z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(([a-zA-Z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])([a-zA-Z]|\\d|-|\\.|_|~|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])*([a-zA-Z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])))\\.)+(([a-zA-Z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(([a-zA-Z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])([a-zA-Z]|\\d|-|\\.|_|~|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])*([a-zA-Z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])))$", + "IgnoreBlank": false, + "SelectedDefaultRegularExpression": "邮箱" } }, "5,1": { @@ -234,7 +237,7 @@ "ReloadData": true } ], - "ID": "ad7da0ce-abd2-41e9-97a9-ec3cace0b01f" + "ID": "d38079fa-495c-41c9-979b-8d25f815b422" }, { "CommandList": [ @@ -249,7 +252,7 @@ "BtnText": "知道了" } ], - "ID": "bbfc6d44-37ff-4418-9f5a-0b0aa45758e0" + "ID": "1ca969cf-e54d-4163-bb6c-29080b8b71f2" } ] } @@ -344,4 +347,4 @@ "PaperSize": {}, "Margin": {} } -}//NPYHUij/Z0cN5jujtebvTYi3eJuhl9MzpeK9VAbfd+OSLoBe8jm6lq8ksSLs/EzBSfmZ20lz6YUG3dFrRUZOmJYkkhFRuF97siStvxIN/5BNdWjfFuFbvKT9dHIB1eas6c4pDYR8+7j4wTck/7ETG9E/oeb14QYP8xtlFYDN2FMjRxsZGRC0ihgrX4/Azr5twgwa4mD97DyiK/qM1deBuQ3dWWO/FnOAJMEd7/7J1eb7rzJNEyj4k3rXtEzfPJc2AxsopeldEoCSmLtUkzlzdbsvBWfqciyhfQIikMBqiG4jRmf9LHHTtj42zoOWKUGk4juHJBKDfkNygj7ibibPY3+MU971ZogmY5VoRgxxdKUutbbHnw6djTic4lAjyWLf1b/Xt6mnCUVG5Km638sc7Q3kEXyGc3JSXNAWxlW+ujvR4hhYDDJM0XBlXkPKHUzyHRr7gdQtbjouonZki/jJGbGfjXKw8bM4Z33aho4U/49KojKzKRV+yn2lVhrLKBjaqTMQAh0YulFrKd+jFuGDj/IwMQdRGkwxwCIeq1xwKf0GHgU3Vr38DeVxqXtWa8q2ElovQL872YGCXZPNz80fH0HaFbfeMqlF0bdS7oLY4Vd02cfm+afG/44IzNRpRcJuL2XLb2SCbUVeA+XFpC3DuRmYM9qg73IV7UhKj9X+PYS6r13LZFe3gHIRykhMn/c9gHqmjgajDJeMj1fHXxrZjCtxNCzuebasRhz5CG6pgR/1vp8gTaFLgaDoNQ4S4VB3TmmQQ+oRqKHhfLl20y9cCGCNFIOqsU/+SaPKkLjhXVOAen4qvKNkn3X4weupulq4ik2yhNZSltuDt6C0xKE519suZQq+AUBFxJonrJyAc+ex0hpewYLw3hTXUOgj1BdXDhRLKKFO9IHo2su07HWVJQ==|920 \ No newline at end of file +}//hGKJ+5sFud7h/kIB9wPPQHvf7z0ZN4Ftke/xIKkjspe27umTIw+q4ye6VTtdlT76h8mVhMkyTBnQgh2Wv126nDhKAXKHkbEelqRQ05ZDChgJ8BrcXrXqV2ctjZMxeOYsNEeXbLxiq9iPm5hG7musbeAWeKiZPPdrX7sSA2A537BrRwOsgvSWJObs/g1arNBbcg1rbln5A0EYYVtOVCJtBp0TuttlaZZQWF/8w3ruINSH+3UO42b960cVIJvb7aa+a+d6VCjRKIVB4pSHKeLONRWaN1+dxmntAdi+6X35SM3zT1KWIN6oO4tXQGuYcXEAaGSMwQ3edSpxz4BiqUJ9GAGRgCVOWHAS77b8hoB90gQUlO8BvRAHQ//y6t4Dz0EK7rfXZwTQdwWsYSeh145YG1C7h+drAX4loB2/dJ8gq4EkKaEr+DHHRqic5hnY62ZJZHcpNJ0JyRm2qvyc7yEv5N447wJxmS6s0+E3P0AOokXvDLGMMKPHseljGjZIrwfgPIGk4JwklEHvZ8wdBTLUqkpTZpsPNXpM44k5H3Uca5ELQDJepwzJLSv77TG4Fl+AagQQEoIB8ryu/K6owzOLm2J75BcsV6RJymTY08+sgMCUIJ5RIa+664Es7hmNf5JnYip8OMt3Tb7dI8TZTSUFBhO9DtIEg+8zEPSYF2gAvuh80E79AIJIy0QkTf1123S277XzuLHa9EIjgo76/Tiq5OWntHZZdiBz6lvrL+Kk9M3nCC/fLdikP6Xh1x9LIQPPr7GeBGVpceAmnO2xbW7QMX+tVR7QRq38aTPtXlv64420wwq+OQH9yc65vROxdBiLDbhEOBD2xknN4xCyuUu1gDtsN3TqHy2xgqGeWl3/QZeOcDzlxYP+/C/MNxNbtGCJvPhPkIgdLsed13S6HJkPdA==|920 \ No newline at end of file diff --git a/Pages/Git/选择Git仓库.json b/Pages/Git/选择Git仓库.json index b3131f5c..a2353de1 100644 --- a/Pages/Git/选择Git仓库.json +++ b/Pages/Git/选择Git仓库.json @@ -412,62 +412,34 @@ "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "选择行", - "ID": "4049a4c0873e46968fa2e60b5a0cf1fa" + "ParameterName": "获取选择行", + "ID": "24e84bcc483f49b187c012654e45accd" }, { "$type": "xTools.Commands.xGetTableSelectRows, xTools", "TableName": "仓库虚拟表格", "ToParameter": "选择行数组" }, + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择Git仓库!选择行数组" + }, + "SampleJson": "[\r\n {\r\n \"行号\": 1,\r\n \"ID\": 7,\r\n \"仓库ID\": 33487312,\r\n \"空间路径名\": \"cuckooent\",\r\n \"空间名称\": \"超哥\",\r\n \"仓库路径名\": \"pms\",\r\n \"仓库名称\": \"PMS\",\r\n \"仓库地址\": \"https://gitee.com/cuckooent/pms.git\",\r\n \"仓库描述\": \"新的PMS软件开发项目管理系统\",\r\n \"仓库成员\": \"linxi6432,tyfeikele,cuckooent\",\r\n \"创建人\": \"超哥\",\r\n \"创建人头像\": \"https://foruda.gitee.com/avatar/1677043949039184563/5267986_cuckooent_1646218684.png\",\r\n \"默认分支\": \"master\",\r\n \"hook_api_url\": \"https://gitee.com/api/v5/repos/cuckooent/pms/hooks\"\r\n }\r\n]", + "ToParameter": "选择行数组" + }, { "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", - "JavaScript": "var obj = JSON.parse(Forguncy.CommandHelper.getVariableValue(\"选择行数组\"))[0];\r\nForguncy.CommandHelper.setVariableValue(\"选择行\", obj)\r\n", - "ID": "34f47449d1ec4f669acb748841bc9c7d" + "JavaScript": "var list = Forguncy.CommandHelper.getVariableValue(\"选择行数组\");\r\nForguncy.CommandHelper.setVariableValue(\"获取选择行\", list[0])\r\n", + "ID": "3d5487119b54458881c60d0a84302467", + "Disabled": true }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", "ParameterValue": "%CurrentUser%", - "ID": "8635f75ce2e0426e88fe92b6c229c420" - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "获取某仓库分支", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!当前用户" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "仓库ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!选择行.仓库ID" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "分支列表", - "ResultTo": { - "SerializeProperty": "分支列表" - }, - "Remark": "[\r\n{\"分支名称\":\"\",\"最后更新时间\":\"\",\"最后更新人\":\"\"}\r\n]" - } - ], - "CheckDataValidation": false + "ID": "5fe02f5cda1540ba8f29f1a6e18278cd" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -479,250 +451,12 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=code" + "SerializeProperty": "=选择Git仓库!选择行数组.0.仓库ID" } ] }, - "value": "0" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=选择Git仓库!分支列表.length" - } - ] - }, - "value": "1" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "分支名称", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!选择行.默认分支" - }, - "ID": "3dd5369fe9fd4892bdfee20ba2131fbe" - } - ], - "ID": "257e23b2-b871-400a-93e5-1d792bd51951" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 2, - "ClosePopupCallbackCommand": { - "Commands": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=选择Git仓库!是否为确定" - } - ] - }, - "value": "1" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "选择行", - "ID": "53bebf01431e4b7e82a8cfd58e82c73c" - }, - { - "$type": "xTools.Commands.xGetTableSelectRows, xTools", - "TableName": "仓库虚拟表格", - "ToParameter": "选择行数组" - }, - { - "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", - "JavaScript": "var obj = JSON.parse(Forguncy.CommandHelper.getVariableValue(\"选择行数组\"))[0];\r\nForguncy.CommandHelper.setVariableValue(\"选择行\", obj)\r\n", - "ID": "7ee2d7095b2242b8820e6fec22c26e70" - }, - { - "$type": "CollectionOperationKit.ClientSideObjectOp, CollectionOperationKit", - "Operation": 3, - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!选择行" - }, - "OperationParamaterName": "默认分支", - "OperationParamaterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!选择分支" - }, - "OutParamaterName": "选择行" - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ClosePopupReturnValues": [ - { - "Name": "仓库信息", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!选择行" - } - } - ] - } - ], - "ID": "3431661f-4c41-4efa-9cd0-e66bcdfb9506" - } - ] - } - ], - "ParamProperties": { - "IsOK": "是否为确定", - "选择分支": "选择分支" - } - }, - "PageName": "分支选择", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!分支列表" - }, - "TargetCell": { - "SerializeProperty": "=分支选择!分支列表" - } - }, - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!选择行.默认分支" - }, - "TargetCell": { - "SerializeProperty": "=分支选择!分支名称" - } - } - ] - } - ], - "ID": "f2b89cca-2e74-40f2-8dec-95934e7a4cfb" - } - ] - } - ], - "ID": "649c3709-5700-4049-ba5b-31c8b3507be4" - }, - { - "CommandList": [ - { - "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", - "Title": "提示", - "Message": "请手动输入要绑定的分支名称", - "Type": "info", - "ConfirmButtonText": "确定", - "ShowCancelButton": true, - "CancelButtonText": "取消", - "ShowClose": false, - "DialogResult": "按钮结果", - "AdvancedSettings": { - "ShowInput": true, - "InputPlaceholder": "例如：master", - "InputBoxResult": "输入分支名称" - } - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=按钮结果" - } - ] - }, - "value": "confrim" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "分支名称", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!输入分支名称" - }, - "ID": "1db9e1be3657414792ff0d00e24a51c2" - } - ], - "ID": "8c47bdd1-0d3a-4345-b103-7b590c75f681" - } - ] - } - ], - "ID": "aee54461-fcf8-4fa4-a126-87426f830e53" - } - ] - }, - { - "$type": "CollectionOperationKit.ClientSideObjectOp, CollectionOperationKit", - "Operation": 3, - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!选择行" - }, - "OperationParamaterName": "默认分支", - "OperationParamaterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!分支名称" - }, - "OutParamaterName": "选择行" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=选择Git仓库!选择行.分支名称" - } - ] - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=选择Git仓库!选择行.仓库ID" - } - ] - }, - "value": "%Null%", - "compareType": 1 - } - ] + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { @@ -732,28 +466,28 @@ "Name": "仓库信息", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!选择行" + "SerializeProperty": "=选择Git仓库!选择行数组.0" } } ] } ], - "ID": "72e1b1a3-a27f-40d1-b82a-32b6c1154544" + "ID": "28dab77c-d68f-408e-9091-8a54412bf111" }, { "CommandList": [ { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "FourStandardStyle": "warning", - "Message": "请选择要绑定的仓库和分支" + "Message": "请选择要绑定的仓库" } ], - "ID": "4cd8c98c-cd50-4905-bccb-83e1a5ea1aa3" + "ID": "25a440fc-022c-48cd-a056-14c5d38f76dc" } ] } ], - "ID": "e131d3e0-3e54-4ae3-8ecd-4d74f1021cfc" + "ID": "dc3b81b1-0b8d-4c1b-bcec-b8fc01566c73" }, { "CommandList": [ @@ -763,7 +497,7 @@ "Message": "请选择一个仓库" } ], - "ID": "94236f0f-4de0-4996-9fd8-ea11251fae99" + "ID": "52850c0a-6041-4950-83d1-28f067d5439a" } ] } @@ -786,6 +520,12 @@ "Command": { "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "ParameterValue": "%CurrentUser%", + "ID": "aed1031562b343e1a1f19aef74b7bbaa" + }, { "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", "ListviewName": "仓库虚拟表格", @@ -813,6 +553,8 @@ "仓库成员": "仓库成员", "创建人": "创建人", "创建人头像": "创建人头像", + "默认分支": "默认分支", + "hook_api_url": "hook_api_url", "行号": "行号" } }, @@ -931,11 +673,11 @@ "ColumnName": "默认分支" }, { - "GUID": "0880909f-adde-4b4a-b1d5-c5c147d1cbab", + "GUID": "0b184db5-4b78-4f78-8194-11eeb7a7b0fa", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "hook_api_url", - "GUID": "898d75ab-e56d-4367-97df-96c036c6b403" + "GUID": "c341fccf-5444-49ca-83c4-70bfc6b99c33" }, "ColumnName": "hook_api_url" }, @@ -963,6 +705,7 @@ }, "TemplateKey": "BlackWhite", "IsSingleSelection": true, + "CommitDataWithCommand": true, "DoNotLoadDataWhenLoadPage": true } }, @@ -1075,7 +818,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", "ParameterValue": "%CurrentUser%", - "ID": "65852367dd294d6688e6a8ebb921bd21" + "ID": "4a18a11998494c7f8f6715d1e1735688" }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", @@ -1200,7 +943,7 @@ }, { "ListViewColumnCell": "hook_api_url", - "PropertyName": "hooks_url" + "PropertyName": "hook_api_url" }, { "ListViewColumnCell": "默认分支", @@ -1211,10 +954,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=选择Git仓库!仓库列表" }, - "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 \"hooks_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 }\r\n]\r\n" } ], - "ID": "2510eaf3-cc7a-4078-a243-a8283989cbc0" + "ID": "52e16d7a-c680-4c10-a00f-b497198384fd" }, { "CommandList": [ @@ -1229,7 +972,7 @@ "BtnText": "知道了" } ], - "ID": "fa393b76-6e11-4093-8b6c-2a6a35a8e74c" + "ID": "eb9eed33-e69a-4542-bf2e-88f8fd5d5147" } ] }, @@ -1727,14 +1470,14 @@ } }, "Spans": [ - "3,1,21,39", "24,1,1,39", "1,36,1,4", "26,9,1,4", "26,13,1,4", "26,5,1,4", - "1,1,1,34", - "26,17,1,3" + "26,17,1,3", + "3,1,21,39", + "1,1,1,34" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1792,4 +1535,4 @@ "Formula": "选择Git仓库!$R$27" } ] -}//fOv0xPbMxp8Xio0UI+Yf4K/A8pnAzEtigqLjKeKn+cCkGkJD06UG+Tc6eJ3zBv2/5Guy7mwNKKLo9gkKoUtW55tqpoJ8Ke/Ouzf0bFm3j2yBedt0qdUjACJDblu43YECVIcCe12s7h/V8usb0ofRJ6mvRIrtaCS1VkcfL9Sccbgo/HnS9PsR6Wk8WmD8Z721IL9nz5tFAHQr0xHXn4gZBIwSpVrtaLBtGNH4Ak+G8bqwy7nqIQ+PEZRqsdIC6rU6VWS+Yr+xbmLnJShLhX2LU/3LK8mjuK5k4RCdug1S0dKmd9XeUedcF6eVXfXLZmjpDfMg9uZsTmkuckHWYUnBetnMp0csrcN5lXKMaOwUM/afO6oQb1FLznnCGEUggfQd4AzeYtk0kiSMrx1cmRSMDPIG5D2SplLBwcoKhLZjQRs7jICPiPXohIqeBcMWc4QrBXikW6e/EcZaAubWZQoZFL5NE5jGKadw0CTffDi4eXXgAyoPJe0PUAUwDsWea9U+bpLSfnmI29ERq/kCvdu2ud8+2kB362AtPzpmZIV7/xrFp4tHQvH3DxRLjASztoddD5xDbN3tsB20aO/2v95fERlH5lZtIxIY0GkAEmzbeUHwPTdXHDfTYNvYJYUDNxBWTiKFEA5EGEvCdXh9n9yaeT7fwVtwRd5MZJePXeswi/d6U2TyImA11smDBQhVLm6ISBEhrE2Hd4n3064IqjvSiSQc5MEROqmC+deGJ9KFDO33QiyFVc8tdKvneke559EcS9u66DqnDYJk4n27NfLjtjaCyON5h0lxgprbJaqvlsmIMc5FXtbgOTXn69aBaCH/8stPzBL73sO37ZEQYBAZ94XiLb2mbPy3mXLD7hez/8zQ2PUUjXginCW5eH9ex4o3LQqvO2logRzicgcaeKjHFQ==|920 \ No newline at end of file +}//DNsU5+JPTR/vIzTIbEhtU01m6vaomWBlR3eNPtBA1N5Gkf8qwrIfDYLI0dFz2fVxSZzLB0IxrRtP8VsmTPdXdqU72geOYFS/cXJ128+P1VwS/4Gpw/x1hkXf18Bo6P6xl6PS4KmUIlho7rgz8NUa9ai8OigevSvkHMxotwwS28BmHDDpqoFjMaM9rjV6O23Z7vjh4QXWkXIPqtvif5QqZ+5NX6sCOQ8ObOuCRF7rerHGEde9aO6keKP8Us2UbDJNm9zD2EhaD4tmBAQrlRRlgAzis5YcVYM/KVr6FQBWCsMwl7cOFJ3lgMHmIFuVNC4SUsrfeYXVaryGDC89mPgOZX2MZ/05Ycb9yP/EC/T2h8t7EePYgMORivQh+LwV/mOtjRRrGxwpMiWsYc/I0ahshyUbIKtdr4m4h4jc0/sZElKe7xAcuPy+uQ5edJN4WWtY0ZhqMo6Bh3UE2fU3RClIlqoNGttuVJfS5RIUNgtLWUBw+A+b8eY0oVQXbegIT2hOe27SHNkh4ajvUGyubzEAw/t8USLLZmJOsp7W/vpm0UTZY27wkvzrhqGpV+fZgA8W0u7xNbaTMnLeXEFqX1Bz8n/fvbNF40jBeuIpSFpFDUjptX0jJp0TrzkDPeNQT0cXHuodkXf7hrJxf49kNe7uyEJGCs8z439EDD2OQJMmJmKg8HmtC/zmuigGbwo030Z8eVq435c1MnI6knAHIvaJ3napN1laKtZjJSwcXyvg8E/ILUFPHLG0gfFyuzk2e0kqSFR3j6olrXl49Dr3qpRk/KiDiBTkJVrEPhQPTKXBr1JbAtYNWdoqJuGwuBglDT/Pl1qAqi3cZRmVkHcf4iJR9BheH0BxKq2gKxBI0peLD57vDbUg5y8I/2NAwZILIKsueupzK0Kl0neWuVOyy6ypPA==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index fd3236f7..627dbb46 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -352,12 +352,12 @@ } } ], - "ID": "ad176467-f565-4329-b3c5-e33966c4148b" + "ID": "e471d28b-e744-4719-9228-ba4e7882a85e" } ] } ], - "ID": "22d9a18e-c629-4983-9345-738c24b344cf" + "ID": "5610849e-0434-4599-ba26-41341a1283b3" } ] } @@ -506,12 +506,12 @@ } } ], - "ID": "9c5fa398-540b-4832-a71d-8b9772c47051" + "ID": "02600632-d823-4e70-9822-ec6176db920d" } ] } ], - "ID": "17e311b0-607c-48ea-b031-291ab9550545" + "ID": "e419da27-f0d3-478f-9580-868e74556248" } ] } @@ -691,12 +691,12 @@ } } ], - "ID": "5bc361e0-8ecc-441d-9eae-29ca703b3958" + "ID": "3778b623-830a-4f14-932e-914848791ad4" } ] } ], - "ID": "add0cac2-8736-4d57-8ec1-3014f6c3d58d" + "ID": "3754cb98-e202-47b1-ae8e-99fc00a82c1e" } ] } @@ -839,12 +839,12 @@ } } ], - "ID": "7e9f323a-8ee7-4364-adb9-b94be47674b9" + "ID": "fb0dc125-a36f-4cde-ada3-69e179975c20" } ] } ], - "ID": "ed8c92af-8e8e-45ca-b3b1-c2fc11b7f141" + "ID": "05b7491c-cad7-48dc-b6bd-86a0c57b0fb1" } ] } @@ -903,7 +903,7 @@ }, "6,5": { "CellType": { - "$type": "ElementUI.InputNumberCellType, ElementUI", + "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1017,12 +1017,12 @@ } } ], - "ID": "80204521-f283-4813-8e48-9663b3081f99" + "ID": "fa033b4e-9ad5-442c-8bea-10806fda670f" } ] } ], - "ID": "ee7d281a-757d-4d2a-9f7b-3d1e44f68d51" + "ID": "f757c4e2-89f6-4e92-8a98-603ecb664839" } ] } @@ -1039,19 +1039,22 @@ "AllowRoles": [ "FGC_Anonymous" ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] } ], "DefaultValue": "%CurrentUser.GIT用户名%", - "min": 0, - "max": "24", - "step": 1, - "controls": false, - "controlsPosition": true + "type": "text", + "resize": "none" } }, "6,16": { "CellType": { - "$type": "ElementUI.InputNumberCellType, ElementUI", + "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1165,12 +1168,12 @@ } } ], - "ID": "d11367f5-fb46-4574-ab79-54ebabfef50a" + "ID": "4f9cb727-059c-4aee-b0d1-13746c7954bd" } ] } ], - "ID": "f99b5d57-d638-423a-9a86-de3b8388db7c" + "ID": "2436afd3-771a-4f15-bd5a-0ace9cae1052" } ] } @@ -1187,13 +1190,18 @@ "AllowRoles": [ "FGC_Anonymous" ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] } ], "DefaultValue": "%CurrentUser.GIT密码%", - "min": 0, - "max": 100, - "step": 1, - "controls": false + "type": "password", + "resize": "none", + "showPassword": true } } }, @@ -1460,8 +1468,8 @@ "2,27,1,6", "6,1,1,4", "6,12,1,4", - "6,5,1,6", - "6,16,1,6" + "6,16,1,6", + "6,5,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1524,4 +1532,4 @@ "Formula": "'个人中心-基本信息'!$Q$7" } ] -}//bvBbiI4KLr/PV1V1SYjQXA6w87/W4AdY5tI6xB/9pjqFjZd+oT/TOdatUGQLghOmgk9e0GbRnc/QHUGrLVI1ieX0rGG7l2tRcxeUFA+wveV0TGXaebYpy14UXDE/uXdRZsSrEAl47WSxs7WIIThNraEEwSSCWsqTZjR0WuoqBWGxlJB+HNRe72//dDpHFTecQa9D5eqWzCe5vBpMBE1qXAxBp0SW5sI6t9zb8aql9hsJfMTNHkFAPsxMYvPQvSovgecM/oUhHQ8/BIwMbtSJ/Tdt1yjXmHDvxI9Pl3Fcm3gI0Rd5D3kZRPz+9gPxYbkHl+w71eZA9gugE8bMmYDkSDa+BB01w/d1r323vwlVqcCrw6BM++Y9ATCeWoa3iFY5peO/flnkkonGUi9iOMAvRYWWanOX+n11WRL69XUxNT+nmdx0SqEFVKL7hoUGK1eHPuzfVuznndM3UmnHy6nZIEdaYMqspVireMPytKsrEUp5QzVA/VX3JekJ5yy/T0LFjG0UthKKesRfODhL9xrrTtSo0FIHTpVW+QHTEZsx7wxY50Wr6Uw9XCPOmo4Ts4crv/0zc6ezagNYfoNWcG1QweM/WOb8mFbckSyib+Ehe5epKi+7Ky8QRvUHNXnAaQQEc1L+kc53VQYdCW8Mvpi3q3q0o1oOmhEAAisKw7LlgI7amKL586hqTiaoPdAF/g1MljdxITPgR4PkFqbBID/IYO7V+Q/4HRhe4XcAI6vkv9fDKjBZr16KBTE0sKqqyqhZkSt7ZP4O3JEMDYgZE+n8EEIczyMx3768Xg+6TvzQtd2AqbKvqy7EOpctLfT960O/sb185Q9wZND1SZOlpfhHclP9Ft2u2Wsp12ViUg6kE3W/JgRqmw39VGjbWekcJdN/C/apuSwlQQfJoWzgpEce9g==|920 \ No newline at end of file +}//lGxY3rFPEk+d7ozgXXWk2B1XhaVq44ko/cmz4kYAUPDo7m+qHb+Xc5o0jZuBrLdiuUgMPnTEYT6yDGcAT9zFqThxpRrYFBpl61jSIIsYAslWmk15rhl9I/i2bHuvTFCaVaTWP67iN+JYlK2RoFwFrUYRNUF1cmpKt0V1n5nCZPCj/b8ANul6UmJ/v5LuwaAvqGgiSo7Q1Lgg66EiCKIabrqRcbFLzyfdZB/PWjZ/m3LmAswdYfsjo8irJGWwFgTyYbLre8r8MX8o4LAMF+i2QsQWKbT4EZJBll8kq+vydo9d5s6XVw2cBjAifDWYOg/p2zAKDM0mw4hzL+3prm+dvngnOu3yuW7hwf1OT3AKY9yGMM42VwDM7WKFwTRtmPZWtpfGSCm/UzhoCbgyWen88+Y0ZCKJO0z5o5okTXdj+1WSaO9J02qn4Uje1T7flmJ1SR3BY6yeI8bAoT5Vhqf0+gcxgBBfeT3jfCw2In7sPQnQg/t324AO8ChjDbMBI0zo/3f1hFId1+VY9d90soCecBIb2AHRoY22wopUWRORvIuMpmPq0RHDbts3LK5SLBmE7KJTtcX/7GJa6+ErSzaXjjeLIviUXIHG3Y0JoNBd8BYmKT0tCycH4niSOCsXT2YMWQAqH64j16aHDNuleLud6SM3PorR2HgccJcwnE6yJx5RUkBAtKuwh4cc+6ZS6eZleIMVlzhnIzIjX/82O9BKcy3YnaQP/Fh48iMwmtyTwOgvWWVYB55wcYuOOAWMrZLZf8oKP/rVS+WeVNJ5KGmHr/jqMuw0+LlGLloFIXy2Aki3CeX8RBq3vmaLF7U8MLBQ9Rg9yFLWaV45+VlVa9gfzru1Hh9awP+kRdSRJVUQTHZa/8CYglnJ7n2Oaj7wn4dfZ127kmKYG4KTGEXRau5TEA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json index 03549c60..e17e18c9 100644 --- a/Pages/任务/任务-任务信息.json +++ b/Pages/任务/任务-任务信息.json @@ -368,7 +368,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "b7a8f337-3e83-4c45-8d39-1d4de5b755bb" + "ID": "66776aeb-3e26-405e-8b6d-e231477839d3" } ] } @@ -458,7 +458,7 @@ ] } ], - "ID": "a9abeeca-033f-4d3f-98b3-3fb9bfb46c52" + "ID": "99430db2-c330-4dd2-8473-b18e82cad154" }, { "CommandList": [ @@ -475,12 +475,12 @@ ] } ], - "ID": "68b86071-c943-4f37-91e9-c15f272b8d5d" + "ID": "1d1fdc87-9f1a-4755-b210-4b74d5a4fb58" } ] } ], - "ID": "7c692a82-b121-4b0d-ae49-b609eb6c7f1e" + "ID": "aaf2cebe-e336-47c5-91fc-3e6f8d4b711b" } ] } @@ -550,7 +550,7 @@ ] } ], - "ID": "299fa236-b3ee-4c0d-b65d-05358f8a4555" + "ID": "11326b27-6b77-4fd2-b7b8-21adef347042" }, { "CommandList": [ @@ -567,7 +567,7 @@ ] } ], - "ID": "73a4d5f3-426e-4b34-82d8-a52c544d2823" + "ID": "8f685edc-61fc-4c19-b542-34fdba245c65" } ] } @@ -655,7 +655,7 @@ ] } ], - "ID": "6fb57b96-f888-4e2b-a3bb-0e2d96944519" + "ID": "69181848-99b6-4e08-b4f1-b7a1c08cc6d1" }, { "CommandList": [ @@ -672,12 +672,12 @@ ] } ], - "ID": "ec6149ef-9678-4ef9-b5ac-a604ee019034" + "ID": "17fba5d5-6c3a-4f50-8003-c00076e73456" } ] } ], - "ID": "0573eef9-3d00-45dc-8912-f40af1865224" + "ID": "5b16b26e-db9f-45e4-b215-0af54054a014" } ] } @@ -747,7 +747,7 @@ ] } ], - "ID": "bd7c6655-c0e9-4665-9adf-b2e72220e77d" + "ID": "00496d34-0538-469b-9aa8-6043fd0ad0d0" }, { "CommandList": [ @@ -764,7 +764,7 @@ ] } ], - "ID": "a1a5ded8-cec8-475b-ab4c-914b85ce59d2" + "ID": "b146b73d-2603-4b29-a221-21105e4e3b40" } ] } @@ -1028,7 +1028,7 @@ ] } ], - "ID": "0ba621e4-6b68-4565-ac65-ac372b9206c4" + "ID": "d0ce7db3-b9d1-4eb8-82ed-eda73bbd2997" }, { "CommandList": [ @@ -1045,7 +1045,7 @@ ] } ], - "ID": "6b8bed81-d6c3-4158-9501-8d3ab020f8d6" + "ID": "856735c7-8145-442c-bd23-f5bec6ffb11e" } ] }, @@ -1079,7 +1079,7 @@ ] } ], - "ID": "49dc5090-017f-473c-bec4-9a340d6b7cc1" + "ID": "7bfa93bf-c4b5-4ac3-a736-030212d4324e" }, { "CommandList": [ @@ -1096,7 +1096,7 @@ ] } ], - "ID": "25bb4224-7723-4f32-bebd-bdcc371756da" + "ID": "deaa642b-ae36-4a7f-a013-e3e2a78a087a" } ] } @@ -1158,4 +1158,4 @@ "Formula": "'任务-任务信息'!$S$14" } ] -}//TmAPvffRq/erHwhXFCwVqA4EaIuEIYPVnGolMMThJJCnS7F2tVNB7edbHwZgb53MWFdz170ms+nGOdlevPPrdWZKwW57Ei4k6QqrsTKlowQlq9VXOsfDg7AvkF7kz0b3U049JAakL7J5MLhnUNGUVNET8Lt1JBIsGxm/V0NzmSag+Si4mfVtU72BbcYvuYsvRT/kmmxSadF0nvOsXk5766cAdo1KMG3Jp0B5Mp0RcCXgH0ERtAFbwHiIOkDJDB+vFNn518wdbZcatnoMfFGhSXVNBHO8aG02WQ4EC8AygHS2wMqz6iilxaxLhDy/f91lrOVTHeDABTPy5A4CEyiVIoBsVSF5cfkOvx32Ri/lci/iFmsVb6g+XdmSwOhjYPMJYTAp18nbAmmYDWl5FOvbOSvMUK4Fvzi0yVr94ORVy2wgJqz1Y2Y59LEEb2QW4opcobe42JyMT2rHJ2gY0M+g2XhcGy9dOlyL0qXbZpJDTVihQl2UHhswdMacneOdhiN/1Nu+Zl1XGuG1cBPHj9MjWDHIqKYTA61gDfNNQX2Y2hBUmgVWDpg63A2f3miED6Y+3mvF0G3WLhx1ASOweGxprQo5FxSvr0PxUFlt2A8gcG9hTPMjZCiS8qDhACYPrVruTmQu40LApeaAgmh8q3Z6RmaaLt9FsSPP47NqRyFS8gUiZfHNrEETnJdaObJaAoC4c7dF9SGf44xAvYy7m5vfetLYrthPQD07ZhrsmNcOOXCYa2u9uGveQmNRTDPukF44CSxDC8mv3W2+BEETrW14Pin1D+06WmeQehD24EXgEL72nHUVKLBdQ2LYYL8jSzCEvfrCjOK6Sc7HbyGbMvhYWY2rJn5a0DaStbv2lhYKat0Wh8BH5DefJGrk0Te9OoyAyN6sy1+fwLNcsHCYGRep3A==|920 \ No newline at end of file +}//7Byp63FID751bolmqHmqGzvLXIIigKW9TlC0Ni7cYTTn4j+rF1fCSBnRlZ3nhcyMhxkULer6FBLGGWpLylxHbE1A8ZCYaFDpyeV3Idr13+CoaBzKsZ7BvvoAYTzBKZOyrn27V70+6eZWtwsdqt6r44Fi9dGYq/4JOk6imqlZqFl+AOFPCKtC+vrmiKUWmHR/zq0fMDsOjdwWoRErRmaiIeGfdcPiKLhzl7bAxzP0NxQpBZijycqkWuUtzkxJguHx9cQgr0F1oDaRIBPs3mmRAPU0wDkSecddj8rFouz5XsF8MhgpZb6/aAhQrTJHNoNNhCTiHeQY1urqKRjbY/49C+RNdacbUeRblcQyEjLYiFfN5bF4hwlhx/DQskd/JPDpwKSqFSHMuA1IH1R7JALVYbT5R4+lbcLFTHAK7VcLO0NuzTiV/She3hFFUVIEzn+CJfL/hrBTf0oW+GCLiVE9P5807XQ31KQk88q8xv6i9SVkNfF9bEZHZx4Q3pX4DNNM5y15VgmVz4z0ZCy5Wy2zGsTZqPsBtrqog8429nD6xOOKldGdM4WQpbCxw8cVxD58oNKNe4KimWhFyYVV8PaZS1eKRd8qe/s0D/xjyJ6/N5SUegi8zwdPzAcMtfIONPXh68aUU27b7C8SeAlplAYF55azHtd+o4drkaXCHfq6kqEJ/1RkxllroHBJpEWgQnc7Vz9nyp8IygpTMy1F7nBppxKsvEfLvD9524aX8GifFowD3OiRsln3aKMvquOaXSWpi1nn1xGzxpC82U32pkV8G9u7XeslwaTAdXR+4HIMh51jwZ07j/IC2dSDAh4oLeYfictZjAE744/3wxXuu6kELcs6HYpBbP3uHluTaJHeVsmpLV5ddATAg0Jo7dZZTlFubfFkUJDZ+prNWtDV+Nw/ug==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 812201f2..75c7d816 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -474,15 +474,6 @@ "SerializeProperty": "=新增报工!结束日期" } } - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!O21" - }, - "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" } ], "UIPermissions": [ @@ -555,7 +546,7 @@ ] } ], - "ID": "11c91be4-fe9e-4e19-a746-0a9c5875b693" + "ID": "b9608d4f-a59d-4292-acb6-a8c908394454" } ] } @@ -684,48 +675,10 @@ "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "ClosePopupCallbackCommand": { - "Commands": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=是否为确定" - } - ] - }, - "value": "1" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!O21" - }, - "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" - } - ], - "ID": "79ad4011-0674-4a65-83a2-757d25bfa050" - } - ] - } - ], - "ParamProperties": { - "IsOK": "是否为确定" - } - }, "PageName": "完善Gitee资料" } ], - "ID": "62ea4ffb-fbaf-4ef2-b9cf-8800f2f6a76c" + "ID": "cc1e36e3-f71a-4be4-bc6d-c2feedf095ff" }, { "CommandList": [ @@ -737,10 +690,40 @@ }, "Title": "加载中" }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "user", + "ParameterValue": "%CurrentUser%", + "ID": "72f5e61af6c047348aa4600baffa11e7" + }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "从Gitee提取报工", + "ServerCommandName": "在线获取仓库某日提交数据", "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!E31" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "分支名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B31" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "成员用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!user" + } + }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "开始日期", @@ -756,22 +739,6 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新增报工!结束日期" } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "用户", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!报工人" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!任务ID" - } } ], "ResultErrorCodeTo": { @@ -782,7 +749,7 @@ }, "ReturnPropertiesTo": [ { - "ResultPropertyName": "工作内容", + "ResultPropertyName": "提交信息", "ResultTo": { "SerializeProperty": "=新增报工!工作进展" } @@ -818,7 +785,7 @@ } } ], - "ID": "bbe26e9e-87df-4736-be5e-094e7b6fe791" + "ID": "fd6fbf04-b232-4f1d-a08a-9d3a83eb1370" } ] }, @@ -832,7 +799,7 @@ "Title": "加载中" } ], - "ID": "72d78378-09e2-4859-9844-5c3deaa51f6f" + "ID": "7b1c0ad5-5eed-4704-9a82-b454d6f9c14d" } ] } @@ -1138,7 +1105,7 @@ "ReloadData": true } ], - "ID": "afda4026-d6f3-4b7c-b656-bdfd80224ab1" + "ID": "fb1a1d29-c88d-49a3-89f3-0541ae909586" }, { "CommandList": [ @@ -1153,12 +1120,12 @@ "BtnText": "知道了" } ], - "ID": "47dcde47-4958-4fc0-bd4c-f0b20062f382" + "ID": "1d3dc967-952e-4a2e-8c47-4b5971465e1f" } ] } ], - "ID": "06544bc3-a4b8-4d1b-af85-7d09a905c128" + "ID": "ba48f4c9-d6d4-4b41-97e3-fa7f83c8ec6a" } ] } @@ -1235,7 +1202,7 @@ ] } ], - "ID": "fcc3bfc5-450f-4ace-8da9-8a9fc9910412" + "ID": "1462f67b-c95e-46d6-a751-e2a02bd41232" }, { "CommandList": [ @@ -1250,7 +1217,7 @@ "BtnText": "知道了" } ], - "ID": "557c38fa-9a3c-4ace-88c0-f685f9e6c13d" + "ID": "8fcf19d1-303c-485f-8577-4cda20353009" } ] } @@ -1272,6 +1239,30 @@ "ColumnName": "ID", "GUID": "9682825e-fb9c-40a3-bd90-c696538dd6c3" } + }, + "30,1": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "c6ae9309-3c94-4407-9995-944e51228a7b", + "RelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "分支名称" + } + } + }, + "30,4": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "40b093d0-c7bb-4dd5-b6b0-ed660e62b4f6", + "RelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "仓库ID" + } + } } }, "StyleDatas": { @@ -1594,7 +1585,9 @@ "29,5,1,3", "29,8,1,4", "2,1,1,17", - "29,1,1,4" + "29,1,1,4", + "30,1,1,3", + "30,4,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1629,7 +1622,7 @@ ] } ], - "ID": "4b057835-aefd-4b1f-8adb-8e0be108bd56" + "ID": "380cffc3-2f9a-47a4-b087-2117745daefc" }, { "CommandList": [ @@ -1646,7 +1639,7 @@ ] } ], - "ID": "72485a07-6132-4eb3-9514-d4cf5d90d30b" + "ID": "c4dfc705-446a-445e-82f2-adab27f1cad0" } ] } @@ -1703,4 +1696,4 @@ "Formula": "新增报工!$N$30" } ] -}//7Ds3Ck6AdYXm0QrQH+axEkuBtRFsqvBCuMxMgSdy7s+lTPkMLigtDAIqE8mOCe8axa+nNkWzoRJP7yq1cRg1E0Yl6ecS7JtCMYqD4BtCLUdTjSW3Lu8zQ81myaAhand+wdnBOtbuHRe/Hi7eN2NRk0T1MhOakrM3kI5dvLOTMRDqF9eREZJSEE8iqjEha1cS7KOMaAEATL8TFz5VswaNlQfEB+nqDNMVNzc1JnS9JXC1WApb+87zEU0zjvrlL186kd5qhcgV0OUWKerjvSqiLjDqIX0c9DGsXr+SPYNoUtsl+TYjCWZYO7xvxgo/HyIEnuRL4WKgf5OofEdiVqyKoNnonipMEFluRAj0yDskqeeRj88ZFGNttnw3ysw72tTt0aHP/tRSnThfvgwDggSOPNJBDGxN00LLfquRZjVFLg7H2Oh7FAhH2tumWPJe9tghjkgG/Apib5y6vK57nc1wq9QkxnDh9wQPnNCX+KBIZkTxaaHTrRfwtrXD9yqfZWaILWvyTKM8DIQQkw1iR9dSQpM5+ZKz6Rmr9kjBqhdrzxN6OduG3qCJiufcEG9BEljiKd4AYFPp1uAIyJeeLfPDD1aN5bYUopeTbVZx262yVyQlUdJjF9ZXNs61BNOz7mhvyKkF8VDEM8j22fVQGesMLfaXIn6eCRL8QUD23yQ99WsMgHLMq5Aql3uWLRw2TxR/G/tqrGIva8lAXc6IsSizJiO/KvYXMW1XgSNs6lh0zB2i3aKyR9vBJXmQL7v1sh0s9I8Mycgh2I3hReQackz0ClHtB6PQg6ukvwRfZ7RAO8mJdfWvXnv3qyu7IBAmr7/h3fazugH/eoPXkz/1DYi9aVjkebkZ0ixDjZu1JTnA+gxC2mh+BntMdfLL8n92fPLdA1WMOxhXOIP48xE0v74bnw==|920 \ No newline at end of file +}//A5l6TXDPSEB2I43W6BLB+LNgkalWIAyF5skzRGyvus22xNRvFzqr4BcdQDEPWGLZ01728h93lEuxitWmmgdO+FBXWQKMLDepwLkhkNKgkYiQ4o8+MLVA5SWlp6pAlhib4jQDSRF4Kh+CyqHAVqEfvx6Om3/vsXrRSLgF3+LEQhcvO+a05U5zx5O0bh8h0xqm+yT06HB8bVfzNP6Gb+xyTf7gbpXHCvvo4BndTZJDYhNsAcF1B+aL4B/m+g+RRnPhwHjXYDmNL/M3HceTPKLDym37bXkSyo1x/OAO1DAzDDreZBR1mHrn2FYG7AZyx5jonajuO8igszOMiMvlTAi74JV78eq+RCx4/eS+2vSbK2aaq5ucWyfUXzKErvXaGMWPL/Y7HTSnvefuUBKSFfahOUV5BmO87sJJOz4bfA9YVwffhY/x3oolbl0TdMMAjy555XSc3+zVsulEyBF4geQ/HEKubKUlIz6cVXndxnv2+g67GgCOi8CA16OPuLUTB3yn8HPWjY3cw8xn2w/AfuGtqM4JatWDkKmy40IXLlskM74XtnISfBKXx7KlorLQIDFLR+nPvqY72rw0nADkpYS8PS+vKJEz8NiIUpW4aNUjYJGnIONs75nL7hY3jQ071TjQGpqPjdRkDQMd0LxOluLWwUSw3HZmKMsFvjMgaCf4WOLz4mMblRdHgPwQNeupAqoYxl8RweO4rydG0m3/ZJL6roMvQ8AAtD9Cly1Yb9hPXzuVyi/ah0fWVKiuEEoBCOzsQ96tyMGZBlc/Xww5YlvBO4e4bzIlFQCLgARW9U4a7IOfLWKCgMmEopCEIWZcIwvGUnIqUhCPiUjnKgTeQEoOW8g1T9hmHPmHJprQ9REq33n2xodv58XuIPSD2FYMWUPFAB2JnkHb4ZaXcJXSoWWHrg==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 32315bf6..c8aafdc7 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -496,7 +496,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "d87c795a-b243-4eea-8885-42723353e71e" + "ID": "317180db-ef54-4006-b677-3e5af2a5680d" } ] } @@ -735,7 +735,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "0618cf89-2f34-4a7e-be5f-481e9fb28cce" + "ID": "8edf3bac-a610-495f-8ed0-de59f0fd2ea2" } ] } @@ -1165,7 +1165,7 @@ ] } ], - "ID": "ef146168-2083-49d0-b896-608f7d6af193" + "ID": "ba32bfb5-c3d0-43fb-9f23-42468fce7362" }, { "CommandList": [ @@ -1178,7 +1178,7 @@ } } ], - "ID": "e669effc-aab2-4d82-8618-7971af950f10" + "ID": "2084b18c-9bf5-4e44-bbb1-1255ab39d1a2" } ] } @@ -1611,7 +1611,7 @@ "MethodName": "Focus" } ], - "ID": "e196fc0b-57f0-4fbd-880e-4239755d93df" + "ID": "8a7db43e-f5ab-43d1-a709-3145966e6e3a" }, { "Condition": { @@ -1645,7 +1645,7 @@ ] } ], - "ID": "faeb514f-8b94-44d4-91d1-d9ec21a0b059" + "ID": "ba4583bc-f227-4012-9fad-875e138680ef" } ] } @@ -1713,4 +1713,4 @@ "Formula": "新增任务!$F$6" } ] -}//VL63YGLRnrQaDlzgPo8otKGSWk8yEjbIOHXGTtLhTaIdnjjZ0ygJXOMW/yhdEZyNA84y/gBz9NXmJkFWgejsrWuMd1b/D2uSre0htzkf/gs1zVw/HA1umiXroMdSTpZgqz7BxBVeIV7219CKWDvQI7wzN/LWvr4MPrVTnssZqai761+dGx2IzaHc+/E87+DhmxOeVKEY9Q+Z3luQAhnpPbriGf0wqGAivNxXOeHoM7etG6CLgJmyMj68yUcVzuDasWnbMe38zS9h53GKqQKuYLmWxJZwJ9bxEXflbmIy1Av8E0mHAtOXWEIpXb1AzwzCQ6+4XGWrDIdFnjbZy9hQTpTiAHlASeTzzhG2mCs9kMnQyfAg3WVOdy06Zjpr93dYRcTs/SeZE/Dy/c3HpHpMO+VZWBL2X2ECXvQgvpxjaTfDLJ34OiSwn8Ncx3VIWPwZhv10v6PASPxj0jeuSp4jGCDx0wwfMvt0sACpgPyR3hytNSQHQMk3LV/GzWDhs4X7dyXh2ZUGnD8uYPfWAn+6vE98QgKVw7rPn/iSLsdHHeeSCZDw6+ZOSuiNTFAkuDqaJM2f/3HTtsAkcPxWtFa9OjOp2O3qBpMR9TAOClq9/RhF1HFfq9GHR6vvOC19LFwLkjQtGQip1fxKZyLmlceW04O2zVZebnNlMitPl4K/tL7HhLqyvpoMc39zNnKo98RNB+trsQ2O4RdVQydPTt7gWNBEx9xc/8owC+v+cCW4ntFPkCn5++STUfRXq+R5JrmbBvAye6TxPq49OesHbAN+eNK3LLKWwR6RS/4fXq6x9Y1RWNHwM/HgfNoX/bEvkcJSlk74kbWMbKDS03zHcf0ci7TjRPPpO+LiKRRA7+nRzSg4/N0qNwzBJgmb5VSBzK7hMBZsAczXWBiAHVUWvlXVdg==|920 \ No newline at end of file +}//rL9kFoC+H+97mvRU33ogoVv5D6KaLTC85G+UGpLK8x3P9cjZ+j4JbToSOvhcWQBzmREe3ZlNUXlHwPPwQFyNpbcDyd1fr6Y9NrirUWC2W711F8PQLCkidyZBsv+L2HZNxXn24gN4Uvk+tB9hBIk+oR4s1ANDCo7YCL+QB0LrU2B28+NUtidv/HYByAywVgGuDzrK2vdEWxBmGW4Jf6UWRlI6a/3pXux8VsqSMSeWf/RnONgN94jPOWoVicw3uq0BSusHaPK9PYrOvZF+gmnEO04vF3Rboodjk+Okey6Crj8gAsfY0bNz/VXbojml0+g5auUdGCyRouCDI1yPQTrsuWUv5WcHgCbWRsf9O5DrJn09o+hD8b13RGLGg0Y+FBvjcc0Za+NDRqp11qlhY/mkT6/iiUliHI1LFp8wQzbbs8WyM5WB+tsoULNItaqWUXgVXVhAIhr1uKy6+FJ5qNBIr6hfwwAl4JCIXmWhWg679Mpe8rhJFivVcUJ7kLj/34Ol8nB4GCDACeyjiqFdmG1/52XOOzRp7Y7hKSqtW5faqxhdIBsfpz2xSuE4FNX6Bb26yedBPN9cNZXCGmqKk6zpJIhzb/IFe/65abkmP9Du+wRP6bpvsd+DgKY0bYBVgNvG3xKdiw+6KUMTl12zs9d7LqNZghLtiJgQipy3X5s1BsWqJyF20a3WhocE4lUXifxG83pQmwufxhh18uKaBQLIejgP2oQBHo6vnZ26l3W+Ro3xFUzB39JOs/oM9BDFFy2AUWJPxYe0tpACEMx6kGqHB9gdJFfSZwXLu2IhhCaOUMGoUUvh47igIktwhagEWsCQjZyklt0UF3qgX/boZ5Ujp5LnBmMvsh2bb5LZrBNOMsq+6NDsQCUvVKTaPS9LLvhpkJ5LykwzGHP8XD86C9DvKQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目岗位配置.json b/Pages/项目/项目首页/项目配置/项目岗位配置.json index d2c9e79b..bb102c94 100644 --- a/Pages/项目/项目首页/项目配置/项目岗位配置.json +++ b/Pages/项目/项目首页/项目配置/项目岗位配置.json @@ -339,7 +339,7 @@ ] } ], - "ID": "84ceaea5-f27d-4944-b80e-c259894f6ab6" + "ID": "2b33669b-04fb-4c6d-8ec5-ef8005b79e33" } ] } @@ -370,7 +370,8 @@ } ], "step": 1, - "controls": false + "controls": false, + "IsDisabled": true }, "DataValidationInfo": { "NumberType": 9, @@ -415,7 +416,7 @@ "Message": "请设置时薪" } ], - "ID": "16d44a65-6cf0-45b6-9763-58fc13e24c5c" + "ID": "6b827472-9ee1-464d-84ce-6bd4d39c4bc5" }, { "CommandList": [ @@ -424,7 +425,7 @@ "ErrorCode": "0" } ], - "ID": "3f830bcd-5a65-42a5-9dd2-a46384c2cf9e" + "ID": "89b89d8e-bba6-47c0-a38b-bfadbc331c0f" } ] } @@ -529,7 +530,7 @@ } } ], - "ID": "b0777707-45f9-4032-b0d8-8ed27ccd0602" + "ID": "303a6156-f755-4371-8ace-0634ab7557e7" }, { "CommandList": [ @@ -544,7 +545,7 @@ "BtnText": "知道了" } ], - "ID": "c0c04185-b121-47d3-a45b-d11ed597a239" + "ID": "37979802-5d42-4ef6-9e22-5b6a2d00894b" } ] } @@ -615,7 +616,7 @@ ] } ], - "ID": "8213450d-a114-4087-98b6-2f2bfa285901" + "ID": "696e75de-fadc-46d8-a712-8360ab6c2d07" }, { "CommandList": [ @@ -625,7 +626,7 @@ "ShowConfirm": false } ], - "ID": "c91cfbb9-16db-4064-ad0d-1389ceed63f3" + "ID": "db75207e-dab9-4a04-8c7a-fbaa6a931bc0" } ] }, @@ -647,7 +648,7 @@ "Message": "操作成功" } ], - "ID": "4bea9177-820c-4261-9b78-1cbb7ad13856" + "ID": "c63dc4be-71ac-4a4f-9b36-d564b3d5fba8" }, { "CommandList": [ @@ -657,7 +658,7 @@ "Message": "请指定项目" } ], - "ID": "01e4c333-cd58-4cde-a385-a54ccc347741" + "ID": "a9ddcbe1-1ed7-48b3-888a-863cc1df34af" } ] } @@ -919,6 +920,22 @@ "RelatedDataTableName": "项目岗位", "ConditionFormatRulesCollection": { "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目岗位配置!$G$7" + }, + "Priority": 1, + "GUID": "778fc672-916f-493e-8628-85c3a2612cf1", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { @@ -933,22 +950,6 @@ "IsDisabled": false, "IsInvisible": true, "IsReadOnly": false - }, - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目岗位配置!$G$7" - }, - "Priority": 1, - "GUID": "778fc672-916f-493e-8628-85c3a2612cf1", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": true, - "IsInvisible": false, - "IsReadOnly": false } ] } @@ -967,4 +968,4 @@ "Formula": "项目岗位配置!$B$4" } ] -}//aVy2hmLXmXa3SSW5MQoOc6jgDQkaREKW8U5SwvSHdrLD61hwkZd1RMETjlVWewP5gYiixQVeqwJk7pNOZyoFzCfVAjYbsAOfjq/HVPnakeQHwiOSPFm1PxEat5Sq7K83F1wOSgB8lHEHGNl/KzG82zisVXrF7C4wC0v/VXuNl8+2a9J1GEteOIFs6W0F3zHqJDyRtPgtvt5iRRaIpORVPVKGKGIe1D0AWBqt76xhgyLjy/VTQHG+gC6yfZGa3/Ibn1IvIh5WzxhuRH1n2AFjz7b9qL28Pv3F6ERe9qMiqJ8FcJE15vEqKjPHrlOOpK+E9NejYT6+/Z//7A03lbw7/qhcReTHgqhmu86WQyClzrh2jCKuJw6+VDLFUkmMfe69UDoRcdfeah4azLGrgOlZWRx78VcdB2cQsz/Yjd7MmQTc/gVxIOU92NpBf2Qq5I5KxVlpKSzdvc2+zxkO53UwrkFTr+vfwSWzvzrW4h4JV4H9EiL3BTPn4kjC1UHqEjHSwfwvhw8un2/J6gHOGZmFIxQXE04BKTkVIHttP7lnjrzTTXO6O66m0pxaVjUkmG2mBRASqSKGrivMAwSmeHpMb6vpofcb2GC4DkgG4H72/b5EyplXt9FUpN+qXHSx6NffVmdSOjcsYkehjf3ZaO+BIjm5/7UjYLTQQSAWYpiBxFQX2CkLIeTWzbM9nDeHQSrt1FdBqV0qHx4SHlTb3Rtn+1530WpihSmqZ9z5wyePf2RbBExu88gB4u2CXlpbfkS8VttA9k3IueV3YT/rQAfidjddhMLQneQg6YCC5YB/fzHeU/pYJLPPNw1miBcHSkqtiW/zMh2W/h0DYh+y9GcFAPdBii20/rb8O0b3MxLcMcm5Wrl5WbFik8qDHQjYXgCvwJe/NDygfJ2vhfammpR2tg==|920 \ No newline at end of file +}//4tqFWXeZvYMRZtfaZUsHuc5LViQceZczpibYW5zNLb6LhW/GOegcvaVj64lIHf+XckJO06NZTpysa4JfB0nr7i3Yn8KZWsCJZeWEc+ZJk7ITnfF03nFQcNrG6ZcM/f76v5xxMt9knf//ZAK2XeJHLr4u5B2G0e8RXeKBitwBYii5acaAD7zaeFuvxTO5mxSj8TsqMEkCVKHXdCWFvM5LlHHb76feeNNVpcRUWy0QgDijjuXLIDmw8MwYXVV0vR3LORGK/x2bAZ9pyUd0iDekSiOkS3zSP+YfdSnR0Oj3XDDQG2cYbZznDGd/S81KDh+Az6OXhxzUfdZfDkpIUfNXXI8sKiBfGvlR6PNDjDCTAhbbRftAZd193Ar2PI8DN95ajA3/hl8s1CTpUpPB7t0KRlukjf6htnzvKpBI2gLCwf4OX0uRWsWbSRH+G03OMsTN5brkJDnCz2g4RePN9YzkyDKNElhzSB0EtQXsTWOxWYTeozmgDABPQQGWfmoCO/AknMaZz1Gs9FL9VRvlJcLjVM+TGC6Qv29std8zj6A256RW7b+KpB0jwZ+iQZgYwRh0CvvbmnANtWfnNKOW/o6JIOH83vioI9zdO2PkzkrzWFplTSJO3Ea+aZtCeCC6q0rGNy6Gw3YPyTSiJKU/olT4MVxkxNqm9AdgjRECf+9xW5ho9DfSSnmbVrOzGBFZwgttNiC66EbVvFnMs7J2NrYCV3RFpzPUYoPR4nsfkPUgOQBahR3l/VkOVTEhaPjLmdl7sUrHzNqNzRbqQEnaXYOn4F9GAO9SzZLjqwi88pAO40ghIw+U+jjci276ec6xQcfK4vSt/y6A0Wn0nJdVILNTALmMtrsp57kqrc1TKu5nZiWdlUfBNiFhfOu65Np8Qw9YMxAWciU5arIWPqhilZ/NQg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json index 77093980..2a44d7e3 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json @@ -23,7 +23,8 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 109.0, + "Mode": 1 } }, "5": { @@ -33,18 +34,17 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 109.0, - "Mode": 1 + "DesignLengthInPixel": 35.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 + "DesignLengthInPixel": 35.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 16.0 } }, "9": { @@ -54,20 +54,25 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 32.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -75,10 +80,10 @@ } }, "InLogicalVisibleIndexes": [ - 13 + 14 ], - "Count": 14, - "DefaultSize": 32.0 + "Count": 15, + "DefaultSize": 35.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -138,10 +143,11 @@ }, "Values": { "1,1": "版本名称", - "4,1": "绑定Gitee仓库", - "8,1": "订阅", - "11,1": "关闭", - "11,9": "保存" + "6,1": "订阅", + "9,1": "绑定分支", + "10,1": "master", + "12,1": "关闭", + "12,9": "保存" }, "AttachInfos": { "2,1": { @@ -213,7 +219,7 @@ "clearable": true } }, - "6,1": { + "4,1": { "BindingInfo": { "TableName": "项目版本", "ColumnName": "仓库ID", @@ -233,14 +239,14 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B7" + "SerializeProperty": "=任务版本详情!B5" }, "Value": "%Null%" }, { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B10" + "SerializeProperty": "=任务版本详情!B8" }, "Value": "0" } @@ -250,7 +256,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B7" + "SerializeProperty": "=任务版本详情!B5" }, "TargetType": "Forguncy.UserControlPageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "SetPropertyValue", @@ -301,17 +307,13 @@ } }, { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!6:7" - }, - "Value": false - } - ], - "Disabled": true + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!刷新仓库分支" + }, + "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" } ], "ParamProperties": {} @@ -394,11 +396,19 @@ ] }, "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!B5" + }, + "Title": "加载中" + }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B7" + "SerializeProperty": "=任务版本详情!B5" }, "TargetType": "Forguncy.UserControlPageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "SetPropertyValue", @@ -505,7 +515,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B7" + "SerializeProperty": "=任务版本详情!B5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -515,7 +525,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B10" + "SerializeProperty": "=任务版本详情!B8" }, "Value": "1" } @@ -527,14 +537,32 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!6:7" + "SerializeProperty": "=任务版本详情!6:6" }, "Value": true } ] + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!刷新仓库分支" + }, + "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!B5" + }, + "Title": "加载中" } ], - "ID": "a11517d6-8b56-44d0-80d3-7a58b691f70a" + "ID": "173a9595-1173-4f1e-9034-0cda8d0a64cf" } ] } @@ -547,7 +575,7 @@ "PageName": "选择Git仓库" } ], - "ID": "497e8728-6f16-41d9-9b6c-227bdf97c5f3" + "ID": "9f2c7fca-0cc5-4ca0-9472-df29ac6f42fd" }, { "CommandList": [ @@ -594,7 +622,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B7" + "SerializeProperty": "=任务版本详情!B5" }, "TargetType": "Forguncy.UserControlPageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "SetPropertyValue", @@ -694,7 +722,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B7" + "SerializeProperty": "=任务版本详情!B5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -704,7 +732,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B10" + "SerializeProperty": "=任务版本详情!B8" }, "Value": "1" } @@ -716,14 +744,14 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!6:7" + "SerializeProperty": "=任务版本详情!6:6" }, "Value": true } ] } ], - "ID": "f2b8630a-bbd6-444a-afbc-4eba26a8f62c" + "ID": "cf06f688-44d3-4f05-8e39-7ba1dc03043d" } ] } @@ -737,7 +765,7 @@ "PageName": "完善Gitee资料" } ], - "ID": "36bde4fa-3d76-4002-91a3-d35b25518b0d" + "ID": "b2b1d556-52b8-4e28-800b-c285e6d3456d" } ] } @@ -758,7 +786,7 @@ ] } }, - "8,11": { + "6,11": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "勾选后系统可接收来自Gitee的通知", @@ -767,7 +795,7 @@ "UseCellForeColor": true } }, - "9,1": { + "7,1": { "BindingInfo": { "TableName": "项目版本", "ColumnName": "Git订阅", @@ -782,7 +810,242 @@ "d8a27f0e-467f-4073-8e4b-2d06edd8fd9f" ] }, - "11,1": { + "9,11": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=空间路径名" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=仓库路径名" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "user", + "ParameterValue": "%CurrentUser%", + "ID": "9ddde25dd1fb41ff83b5e726932f9722" + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!B5" + }, + "TargetType": "Forguncy.UserControlPageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "GetPropertyValue", + "ParameterValues": { + "userControlPropertiesTo": { + "$type": "System.Collections.Generic.List`1[[Forguncy.GetUserControlPropertyValue, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "PropertyName": "空间路径名", + "PropertyValueTo": { + "SerializeProperty": "空间路径名" + } + }, + { + "PropertyName": "仓库路径名", + "PropertyValueTo": { + "SerializeProperty": "仓库路径名" + } + } + ] + }, + "userControlPageName": null + } + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "获取某仓库分支", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!user" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "空间路径", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!空间路径名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库路径", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!仓库路径名" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "分支列表", + "ResultTo": { + "SerializeProperty": "分支列表" + }, + "Remark": "[\r\n{\"分支名称\":\"\",\"最后更新时间\":\"\",\"最后更新人\":\"\"}\r\n]" + } + ], + "CheckDataValidation": false + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务版本详情!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!B11" + }, + "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetDataSourceByObjArray", + "ParameterValues": { + "dataSource": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!分支列表" + }, + "valueProperty": "分支名称", + "labelProperty": "分支名称" + } + } + ], + "ID": "c08f47fa-509d-4b3f-8114-57a06de86d4c" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!B11" + }, + "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetDataSourceByStringArray", + "ParameterValues": { + "dataSource": "[\"master\"]" + } + } + ], + "ID": "54f6e78f-e72f-4269-9163-ba8e01abb00d" + } + ] + } + ], + "ID": "f8b69155-c7ad-45e7-9745-bdc775b4300d" + } + ] + } + ], + "ToolTip": "刷新", + "Size": 14, + "ImagePath": "Application/058_refresh_2.svg", + "BuiltIn": true, + "UseCellForeColor": true + } + }, + "10,1": { + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "分支名称", + "GUID": "6848c61f-899c-48eb-b8ba-1922644960fc" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "master", + "options": [ + { + "label": "不绑定" + }, + { + "value": "master", + "label": "master" + } + ], + "placeholder": "不绑定", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + }, + "RulesGuidList": [ + "e639516a-09f2-4d1e-90ad-d23cfed2a53b" + ] + }, + "12,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -794,7 +1057,7 @@ "TemplateKey": "_RS_Information3" } }, - "11,9": { + "12,9": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -817,7 +1080,7 @@ }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B7" + "SerializeProperty": "=任务版本详情!B5" }, "compareType": 1 }, @@ -827,7 +1090,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=任务版本详情!B7" + "SerializeProperty": "=任务版本详情!B5" } ] }, @@ -841,7 +1104,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B7" + "SerializeProperty": "=任务版本详情!B5" }, "TargetType": "Forguncy.UserControlPageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "GetPropertyValue", @@ -1071,12 +1334,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "85c42f5f-bb38-4610-a9bc-c32dd5c7fe5f" + "ID": "c56e2e2d-95b4-4211-89a8-a71eb86d8e5a" } ] } ], - "ID": "d1fc43a8-ebbc-482b-9016-376d070b9ead" + "ID": "e82f7a4c-9568-462f-a7ba-cb943da38b92" } ] }, @@ -1105,7 +1368,7 @@ "ReloadAfterSucceed": false } ], - "ID": "7f8992df-b246-44ea-a491-799233ecc1b5" + "ID": "860e13f8-e562-418d-b4a8-eaf29403bedc" }, { "CommandList": [ @@ -1116,7 +1379,7 @@ "ReloadAfterSucceed": false } ], - "ID": "4128ab28-0d8b-4170-89a2-15041c01f8d5" + "ID": "e0e9ed4d-e2f7-4ea8-b377-06fa4eb98e60" } ] }, @@ -1140,7 +1403,7 @@ "IconSize": 14.0 } }, - "13,1": { + "14,1": { "BindingInfo": { "TableName": "项目版本", "ColumnName": "项目ID", @@ -1150,11 +1413,6 @@ }, "StyleDatas": { "Styles": [ - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "HorizontalAlignment": 1 - }, { "FontFamily": 0, "FontSize": 13.333333333333332 @@ -1162,19 +1420,18 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 2 + "Foreground": 1 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 4 + "Foreground": 2, + "Formatter": 3 } ], "Types": { "Strs": [ "Body", - "Center", "Text 1 50", "black", "General" @@ -1182,36 +1439,61 @@ }, "CellStyles": { "4,1": 0, - "5,1": 1, - "6,1": 1, - "7,1": 1, - "7,2": 1, - "7,3": 1, - "7,4": 1, - "7,5": 1, - "7,6": 1, - "7,7": 1, - "7,8": 1, - "7,9": 1, - "7,10": 1, - "7,11": 1, - "8,1": 1, - "8,2": 1, - "8,3": 1, - "8,4": 1, - "8,5": 1, - "8,6": 1, - "8,7": 1, - "8,8": 1, - "8,9": 1, - "8,10": 1, + "5,1": 0, + "5,2": 0, + "5,3": 0, + "5,4": 0, + "5,5": 0, + "5,6": 0, + "5,7": 0, + "5,8": 0, + "5,9": 0, + "5,10": 0, + "5,11": 0, + "6,1": 0, + "6,2": 0, + "6,3": 0, + "6,4": 0, + "6,5": 0, + "6,6": 0, + "6,7": 0, + "6,8": 0, + "6,9": 0, + "6,10": 0, + "6,11": 1, + "7,1": 2, + "8,1": 2, + "8,2": 2, + "8,3": 2, + "8,4": 2, + "8,5": 2, + "8,6": 2, + "8,7": 2, + "8,8": 2, + "8,9": 2, + "8,10": 2, "8,11": 2, - "9,1": 3, - "11,1": 1, - "11,4": 1, - "11,9": 1, - "11,10": 1, - "11,11": 1 + "9,0": 0, + "9,1": 0, + "9,2": 0, + "9,3": 0, + "9,4": 0, + "9,5": 0, + "9,6": 0, + "9,7": 0, + "9,8": 0, + "9,9": 0, + "9,10": 0, + "9,11": 1, + "9,12": 0, + "10,0": 0, + "10,1": 2, + "10,12": 0, + "12,1": 0, + "12,4": 0, + "12,9": 0, + "12,10": 0, + "12,11": 0 }, "SheetStyle": { "FontFamily": 0, @@ -1219,14 +1501,14 @@ } }, "Spans": [ - "13,1,1,3", - "9,1,1,11", - "13,4,1,2", - "11,9,1,3", - "11,1,1,3", - "6,1,1,11", + "14,1,1,3", + "7,1,1,11", + "14,4,1,2", + "12,9,1,3", + "12,1,1,3", "2,1,1,11", - "4,1,1,11" + "4,1,1,11", + "10,1,1,11" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1255,14 +1537,14 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!6:7" + "SerializeProperty": "=任务版本详情!6:6" }, "Value": true } ] } ], - "ID": "0ec37672-91bf-4f6a-aaff-85744ebb610f" + "ID": "56937ddf-95f5-4376-b799-348065eb0992" } ], "Disabled": true @@ -1297,6 +1579,17 @@ "Underline": null, "Strikethrough": null } + }, + { + "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", + "Operator": 3, + "Value1": "=1", + "GUID": "e639516a-09f2-4d1e-90ad-d23cfed2a53b", + "StyleInfo": { + "Foreground": "Accent 2 0", + "Underline": null, + "Strikethrough": null + } } ] } @@ -1308,7 +1601,11 @@ "CustomNames": [ { "Name": "项目ID", - "Formula": "任务版本详情!$B$14" + "Formula": "任务版本详情!$B$15" + }, + { + "Name": "刷新仓库分支", + "Formula": "任务版本详情!$L$10" } ] -}//B3xh6IkCQZWkcb/nii/t/bZwSC8oH1zkRDeZ6GV88z6VeusCkjykqtreaOVG7SQc9e3YdXnFXkvm80uaR2Akc0OUNXDwmDkg0RoExOjTc3axgZA6Thgep1mxKJYw1c1hX3H2IJdVVaBgVGmgrPGj9C8TcVQcb83BgcqLzRmOrlZLk9+LNfHDTi+7xluOxPGsc3kZoTYnTsB1iy7G0szNb5d3AqKezjlgVITok8GJA7yqYPxs4ZcuKH6wEfyvV3bp8jqpjRIpDOHUClv4VMSJ+YPG99sumjxTmkUlZvnkwlBirqgQXzAfKjviDi6cWiRPd+gvecIDQHfDpgBSXKIRHEgqbZxSpPmWjBFEZUjMhifnx6P7touoLwChwPSdVWPsQ23LB2XzKafWGiK55Da2ExkCHe/6EVfHTYzR6OKPy1YUFQ3OODgkrRO7nc2dw+NgT5Ihpf+htdfsj5AlEKdzLTS4IRdxk2St11KjwT4hl52vd5LugB3NPchIcgg/TwXmQ1KoLva4ZSStvnjFwTgGMhBAc2liLRLP2w9InuMIP9yUCS+Q1JV0YJe/HMpQCS/iGEpvxePxv8XS9LlkcRKn1+rYLZvDqAYJGO+ZYirKyvwbThIbGXuI94xlRlVzVoqYnnnygKJWR+MkKOS/wefY/fmM/9ufv0okXTrYW3SjXAUaAxUJtw6Vb/KgKOY08sYye0564lfeGlhKlU6fLByhN9zS2OVHys6yWMfetM9AkYRl4i1YvdGKnSzMXWN9mxa5KGItj8mohTLRr4lYXKWwppWsJz3v9KSODqqJi2jfCgT8/qW3hxmc5HqqxuWM6GVKygjoKrfFOb16WhyIMtVFMcf8KPBwlPZGjJ4G2YBr1+8PQeh93qkX1zP1KzLyVCgKIcjYY24MBRwu8f4bk6YrlA==|920 \ No newline at end of file +}//+QYWaAiRuRSwDgma+7dyKTLYGD3V+sQLQBLrgCJI4Vxh6XQanypJ5D1a+f1GjStVdHplMIc6QAc/m0Ov3Gd1CGjIoxtD4yF4mAo3gce6tjK5IBaxWkN+L52HA4mVZqmq4tjP5eaa7Jn6SYRSYwH90o2ro0SVPzwUe7ZhX5Z9Lx2ya83GuRZXQ5V+OLPTrQ7w2iarNfsJy4fRiQ/mRKHzO50BQ5XPfPQF5n+sZhyNW2DEdhdl0QmiUIpruKjbB3CCbE22o3rh4tWgz8jJ4QK5B0oEo4c4zmerTtzlClwa6ceHxwKshExc4hb789tAMRci9CuAwA6f2rTYYlMWXH63TAY8TBI+YswkN83aAsTfTBa9dComud5lZ7anv3OIp6ZdoPkoQDEHCnu/HLGaoWIZZkNtVK/moHmV5JMTlHtBaeRa+8Mjz13MuEpK2mUlUHTfuzEppea9oR9anZSbaeuUwKrMMPC9LSnJooIQZ+ohaAV1rIDOPKwJZyG/cA8xQN5PffKg7e6z12YWnTMKp3cCL0Kc4ds7lHojZ3STKK3lR4jw2jFjrda2aHzuVx3tgEFFGO890FH6o2D9XeDQo2INHg4tZPzFs9fKxIl3nteJMpNutYlY1WvnAzh4ebiV3KH+p704gu3Zr/wMu+kMxsT0dVHeSPLvAnhAzhkXIvk2IrMQpNEJJcgdpJqh1tTfJcq7W6Xr3Siat7cjpbqNiiLWo79aw1JsCo5z48DMYlvlHZP98RFaSywIXeZ2mqVmevyE7xFKRLDoVgicQ1uoBoGiKIY06lHiJPNqg24jCUUJpNHSqqZlD2jU9qeTNwVt8qm2Vy8tu0NeYAmt02FN/uwoTkx9UuwewoRydzqDu0Aw/T5Qil2cMkfRCXz6mgSjN6WOwO8/JbmDSsNrnkbfIKQUJQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd index 4bf9b0b7..44ed185d 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd @@ -1,11 +1,15 @@ { "PageType": 0, "ColumnCount": 13, - "RowCount": 14, + "RowCount": 15, "CustomNames": [ { "Name": "项目ID", - "Formula": "任务版本详情!$B$14" + "Formula": "任务版本详情!$B$15" + }, + { + "Name": "刷新仓库分支", + "Formula": "任务版本详情!$L$10" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json index e05c0e10..a80fceb8 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json @@ -677,7 +677,7 @@ } } ], - "ID": "2848a997-0aeb-4e4a-aa68-530da20ee25e" + "ID": "c1744817-dd6d-4797-8ca1-8265a71c169d" } ] } @@ -780,7 +780,7 @@ } } ], - "ID": "b70292b2-dc0f-47c5-8e54-f0df1a5e5729" + "ID": "683d006d-3944-4b97-960b-436b51c950c0" } ] } @@ -1081,4 +1081,4 @@ "Formula": "项目版本管理!$G$8" } ] -}//lfpSV70NKIbXV2bTbQpoDXyopQGDWEATKBqPjXKrkeG1ycPmrDBArRAlr9svtH3GdH+gn3mMxXWrDa7Jnp6EGLmhZDKVJWJzZRa0lRvG+J88Pz0hcd3qaeF4B05VD4RiLg0OXtNQa7IatZpSFkrY0yqZRHYnxUxk/bVeO+uzrHjiqGbc3cX6KIz83IAZK3jYDv7lkvXsPoNwB31DgHFO4CgF2+y9qtBRtka2CTJEuyrPnbAq012ZAd0aC+uMK5Ms1IJj1ju4hPHzMwE+jYRV3vFI2N6ryuhn1wWPBi5rQeadKfQVFe1MA0tajKxm6CnVeJq//94aYlNF+p+PZ0lQLEoZHQGMGg4JOItgR3DIS1FvuMJQzlB2AYKViNybXe+utaxkWLm5hXSKTidKEkVWu9jnDXlAUOzA9FgyU84qPz+6eq0SRVtGeBChetPe1Vh8HPYt11J7AWzK2ZySVhg+cbxLPsli57gEsLhS5AuftbdwGbgAcEmMuoxPEUrRDJkmupRbu8V+xHXJOOUaVcx2/E4d/HWsXs32EGHd8EszfOk4JvBBHvhSJx5UKreZpZ1Wu4BlttW+BE8ClPBYN5Qa4v7h4xBMR4JAgiZq57wWleE+R/XGq5cQJztsFliA5NZIhP7Aje4Nvr3kVwjYGtMhAEUBO9vr0a2tZOGashNnXynGZOY6cbKmuespdkdX4hrg7p4P+7/sI2aad/MPz9ZHO4vZrspDCwLtUEXof9m83vdSBIWUF+fCJJitRtGwxZ8cTWH902p7ZTWiUXPzkTPBEx8HEFKWC2p5lIBlkS0qCOnRO+y+4U3z60pu85QFhQW0fkARGpS1PXaKpWBesVYnwxt1oqMejtnnH7tu1a+/JJ78z0q342y9esA/3zEt/k8xEbQUi68BtApqMS3umgV8Cw==|920 \ No newline at end of file +}//KUF5xJxSM7PnvOtAUMeBPaLFYqXLqyW0VLaMTfJhkaN2b+/yvMRK0mAWz8afwxAWpYewilNSuuVUEQpSaYnfVUtYCmrOB0hepcxC34BwQi7DmacwbVMfdqfXYognxcSt3yLxxG+MZdTGJx9PjbxYGoKCtJZ2U3sFsToi8M7Kure4en60bmxAxw5WuwG0iCnEpuaedGJkG01DOrl/vIpSkg+yrkWHKc6eDZ0AQ5yuXOwlh6SJ1lYn/i8fUeMemT7jJytMqRajVs822a/QPpHnWHvLgG5vtdriZDpX/dqqOlbuV9f/K8j9rqqKVaOk7chmp8TAudOkGq8x/BVVxCS2fl67z1bIHB3XV626wuMKQm2qPHD5jbuqCzt0e3LGGnIBFhloEYivS+qIt/G4yOijS72S3jb0iisUy0rcBihDCMj8C7v5dw84rp4ivYmoVC9hvlEmskg2geL2cAYsVJNBQuOwvDm+1Umh3SxYgoVsVPrVzTDgYFRz6sQwIBO6S37ouaFOy8Sl+Xq7pmnKIl+ZIZVW+79EG3n169DIktjdlKlUS8FVQA62DeFolwgmvFoMWw+pKeJFzlLLkuED+kIpXehS0KE+qY0vO/IB/ed9tuHOz8K6jM5EwhAC0dQEm3aZ2Pra6RU9PzJD6hm7u3Y1kVoRksxECvGAhEfqF1yUzKtooF3PG3x8gx56nVb416dD78gYs7NvrNg97AOidXrf3qB32yZoENLfYEvnRXnUpG86fqlY3PCx6XnJ5wyC7zDTsdtGK4CxJOidTBx+H1sFyhIt3Rh1koq7g5I0F8+S3MiujUFmogkjGBaoo6fbiuhtTOPvpNc2wcfDXnobtb1zhEvxdMSfbNLPhlLZt+xgKQZk9nmD7ECFDw6E+YJ13ZGZektJxP4gexhkg/2byGq08w==|920 \ No newline at end of file diff --git a/ServerCommands/Gitee/GitCallback.json b/ServerCommands/Gitee/GitCallback.json index 2032633d..76d42eb9 100644 --- a/ServerCommands/Gitee/GitCallback.json +++ b/ServerCommands/Gitee/GitCallback.json @@ -29,7 +29,7 @@ }, { "$type": "SaveFormData.fillInJSONProperties, SaveFormData", - "FullJsonString": "{\r\n \"hook_name\": \"push_hooks\", \r\n \"password\": \"pwd\",\r\n \"hook_id\": 1,\r\n \"hook_url\": \"http://gitee.com/liwen/gitos/hooks/1/edit\",\r\n \"timestamp\": \"1576754827988\",\r\n \"sign\": \"rLEHLuZRIQHuTPeXMib9Czoq9dVXO4TsQcmQQHtjXHA=\",\r\n \"ref\": \"refs/heads/change_commitlint_config\",\r\n \"before\": \"0000000000000000000000000000000000000000\",\r\n \"after\": \"1cdcd819599cbb4099289dbbec762452f006cb40\",\r\n \"created\": true,\r\n \"deleted\": false,\r\n \"compare\": \"https://gitee.com/oschina/gitee/compare/0000000000000000000000000000000000000000...1cdcd819599cbb4099289dbbec762452f006cb40\",\r\n \"commits\": [\r\n {\r\n \"id\": \"1cdcd819599cbb4099289dbbec762452f006cb40\",\r\n \"tree_id\": \"db78f3594ec0683f5d857ef731df0d860f14f2b2\",\r\n \"distinct\": true,\r\n \"message\": \"Update README.md\",\r\n \"timestamp\": \"2018-02-05T23:46:46+08:00\",\r\n \"url\": \"https://gitee.com/oschina/gitee/commit/1cdcd819599cbb4099289dbbec762452f006cb40\",\r\n \"author\": {\r\n \"time\": \"2018-02-05T23:46:46+08:00\",\r\n \"name\": \"robot\",\r\n \"email\": \"robot@gitee.com\",\r\n \"username\": \"robot\",\r\n \"user_name\": \"robot\",\r\n \"url\": \"https://gitee.com/robot\"\r\n },\r\n \"committer\": {\r\n \"name\": \"robot\",\r\n \"email\": \"robot@gitee.com\",\r\n \"username\": \"robot\",\r\n \"user_name\": \"robot\",\r\n \"url\": \"https://gitee.com/robot\"\r\n },\r\n \"added\": null,\r\n \"removed\": null,\r\n \"modified\": [\r\n \"README.md\"\r\n ]\r\n }\r\n ],\r\n \"head_commit\": {\r\n \"id\": \"1cdcd819599cbb4099289dbbec762452f006cb40\",\r\n \"tree_id\": \"db78f3594ec0683f5d857ef731df0d860f14f2b2\",\r\n \"distinct\": true,\r\n \"message\": \"Update README.md\",\r\n \"timestamp\": \"2018-02-05T23:46:46+08:00\",\r\n \"url\": \"https://gitee.com/oschina/gitee/commit/1cdcd819599cbb4099289dbbec762452f006cb40\",\r\n \"author\": {\r\n \"time\": \"2018-02-05T23:46:46+08:00\",\r\n \"name\": \"robot\",\r\n \"email\": \"robot@gitee.com\",\r\n \"username\": \"robot\",\r\n \"user_name\": \"robot\",\r\n \"url\": \"https://gitee.com/robot\"\r\n },\r\n \"committer\": {\r\n \"name\": \"robot\",\r\n \"email\": \"robot@gitee.com\",\r\n \"username\": \"robot\",\r\n \"user_name\": \"robot\",\r\n \"url\": \"https://gitee.com/robot\"\r\n },\r\n \"added\": null,\r\n \"removed\": null,\r\n \"modified\": [\r\n \"README.md\"\r\n ]\r\n },\r\n \"total_commits_count\": 0,\r\n \"commits_more_than_ten\": false,\r\n \"repository\": {\r\n \"id\": 120249025,\r\n \"name\": \"Gitee\",\r\n \"path\": \"gitee\",\r\n \"full_name\": \"开源中国/Gitee\",\r\n \"owner\": {\r\n \"id\": 1,\r\n \"login\": \"robot\",\r\n \"avatar_url\": \"https://gitee.com/assets/favicon.ico\",\r\n \"html_url\": \"https://gitee.com/robot\",\r\n \"type\": \"User\",\r\n \"site_admin\": false,\r\n \"name\": \"robot\",\r\n \"email\": \"robot@gitee.com\",\r\n \"username\": \"robot\",\r\n \"user_name\": \"robot\",\r\n \"url\": \"https://gitee.com/robot\"\r\n },\r\n \"private\": false,\r\n \"html_url\": \"https://gitee.com/oschina/gitee\",\r\n \"url\": \"https://gitee.com/oschina/gitee\",\r\n \"description\": \"\",\r\n \"fork\": false,\r\n \"created_at\": \"2018-02-05T23:46:46+08:00\",\r\n \"updated_at\": \"2018-02-05T23:46:46+08:00\",\r\n \"pushed_at\": \"2018-02-05T23:46:46+08:00\",\r\n \"git_url\": \"git://gitee.com:oschina/gitee.git\",\r\n \"ssh_url\": \"git@gitee.com:oschina/gitee.git\",\r\n \"clone_url\": \"https://gitee.com/oschina/gitee.git\",\r\n \"svn_url\": \"svn://gitee.com/oschina/gitee\",\r\n \"git_http_url\": \"https://gitee.com/oschina/gitee.git\",\r\n \"git_ssh_url\": \"git@gitee.com:oschina/gitee.git\",\r\n \"git_svn_url\": \"svn://gitee.com/oschina/gitee\",\r\n \"homepage\": null,\r\n \"stargazers_count\": 11,\r\n \"watchers_count\": 12,\r\n \"forks_count\": 0,\r\n \"language\": \"ruby\",\r\n \"has_issues\": true,\r\n \"has_wiki\": true,\r\n \"has_pages\": false,\r\n \"license\": null,\r\n \"open_issues_count\": 0,\r\n \"default_branch\": \"master\",\r\n \"namespace\": \"oschina\",\r\n \"name_with_namespace\": \"开源中国/Gitee\",\r\n \"path_with_namespace\": \"oschina/gitee\"\r\n },\r\n \"sender\": {\r\n \"id\": 1,\r\n \"login\": \"robot\",\r\n \"avatar_url\": \"https://gitee.com/assets/favicon.ico\",\r\n \"html_url\": \"https://gitee.com/robot\",\r\n \"type\": \"User\",\r\n \"site_admin\": false,\r\n \"name\": \"robot\",\r\n \"email\": \"robot@gitee.com\",\r\n \"username\": \"robot\",\r\n \"user_name\": \"robot\",\r\n \"url\": \"https://gitee.com/robot\"\r\n },\r\n \"enterprise\": {\r\n \"name\": \"开源中国\",\r\n \"url\": \"https://gitee.com/oschina\"\r\n }\r\n}", + "FullJsonString": "{\r\n \"ref\": \"refs/heads/版本10\",\r\n \"sign\": \"\",\r\n \"user\": {\r\n \"id\": 13097545,\r\n \"url\": \"https://gitee.com/tyfeikele\",\r\n \"name\": \"tyfeikele\",\r\n \"email\": \"tyfeikele@qq.com\",\r\n \"username\": \"tyfeikele\",\r\n \"user_name\": \"tyfeikele\"\r\n },\r\n \"after\": \"e74df3005e06241146220c1c78b746b1cb903e9d\",\r\n \"before\": \"bce508cc4c7574d8974a6e94a832c639ad07af99\",\r\n \"pusher\": {\r\n \"id\": 13097545,\r\n \"url\": \"https://gitee.com/tyfeikele\",\r\n \"name\": \"tyfeikele\",\r\n \"email\": \"tyfeikele@qq.com\",\r\n \"username\": \"tyfeikele\",\r\n \"user_name\": \"tyfeikele\"\r\n },\r\n \"sender\": {\r\n \"id\": 13097545,\r\n \"url\": \"https://gitee.com/tyfeikele\",\r\n \"name\": \"tyfeikele\",\r\n \"type\": \"User\",\r\n \"email\": \"tyfeikele@qq.com\",\r\n \"login\": \"tyfeikele\",\r\n \"remark\": null,\r\n \"html_url\": \"https://gitee.com/tyfeikele\",\r\n \"username\": \"tyfeikele\",\r\n \"user_name\": \"tyfeikele\",\r\n \"avatar_url\": \"https://foruda.gitee.com/avatar/1687145611305567010/13097545_tyfeikele_1687145611.png\",\r\n \"site_admin\": false\r\n },\r\n \"commits\": [\r\n {\r\n \"id\": \"e74df3005e06241146220c1c78b746b1cb903e9d\",\r\n \"url\": \"https://gitee.com/cuckooent/pms/commit/e74df3005e06241146220c1c78b746b1cb903e9d\",\r\n \"added\": [\r\n \r\n ],\r\n \"author\": {\r\n \"id\": null,\r\n \"url\": null,\r\n \"name\": \"HZG System\",\r\n \"time\": \"2024-06-18T09:38:19+08:00\",\r\n \"user\": null,\r\n \"email\": \"HZG System\",\r\n \"remark\": null,\r\n \"username\": null,\r\n \"user_name\": null\r\n },\r\n \"message\": \"{\\\"Message\\\":\\\"签出模块 : 后端新增项目反馈, 匿名提交项目反馈\\\",\\\"MessageType\\\":1,\\\"Modules\\\":[],\\\"Version\\\":\\\"v1\\\"}\\n\",\r\n \"removed\": [\r\n \r\n ],\r\n \"tree_id\": \"57f89455bbd615902d2a41732205a659beec7dc4\",\r\n \"distinct\": true,\r\n \"modified\": [\r\n \".collaboration\"\r\n ],\r\n \"committer\": {\r\n \"id\": null,\r\n \"url\": null,\r\n \"name\": \"HZG System\",\r\n \"time\": null,\r\n \"user\": null,\r\n \"email\": \"HZG System\",\r\n \"remark\": null,\r\n \"username\": null,\r\n \"user_name\": null\r\n },\r\n \"timestamp\": \"2024-06-18T09:38:19+08:00\",\r\n \"parent_ids\": [\r\n \"bce508cc4c7574d8974a6e94a832c639ad07af99\"\r\n ]\r\n }\r\n ],\r\n \"compare\": \"https://gitee.com/cuckooent/pms/compare/bce508cc4c7574d8974a6e94a832c639ad07af99...e74df3005e06241146220c1c78b746b1cb903e9d\",\r\n \"created\": false,\r\n \"deleted\": false,\r\n \"hook_id\": 1400568,\r\n \"project\": {\r\n \"id\": 33487312,\r\n \"url\": \"https://gitee.com/cuckooent/pms\",\r\n \"fork\": false,\r\n \"name\": \"PMS\",\r\n \"path\": \"pms\",\r\n \"owner\": {\r\n \"id\": 5267986,\r\n \"url\": \"https://gitee.com/cuckooent\",\r\n \"name\": \"超哥\",\r\n \"type\": \"User\",\r\n \"email\": \"phoben@qq.com\",\r\n \"login\": \"cuckooent\",\r\n \"remark\": null,\r\n \"html_url\": \"https://gitee.com/cuckooent\",\r\n \"username\": \"cuckooent\",\r\n \"user_name\": \"cuckooent\",\r\n \"avatar_url\": \"https://foruda.gitee.com/avatar/1677043949039184563/5267986_cuckooent_1646218684.png\",\r\n \"site_admin\": false\r\n },\r\n \"git_url\": \"git://gitee.com/cuckooent/pms.git\",\r\n \"license\": null,\r\n \"private\": true,\r\n \"ssh_url\": \"git@gitee.com:cuckooent/pms.git\",\r\n \"svn_url\": \"svn://gitee.com/cuckooent/pms\",\r\n \"has_wiki\": true,\r\n \"homepage\": null,\r\n \"html_url\": \"https://gitee.com/cuckooent/pms\",\r\n \"language\": \"C#\",\r\n \"clone_url\": \"https://gitee.com/cuckooent/pms.git\",\r\n \"full_name\": \"cuckooent/pms\",\r\n \"has_pages\": false,\r\n \"namespace\": \"cuckooent\",\r\n \"pushed_at\": \"2024-06-18T09:38:20+08:00\",\r\n \"created_at\": \"2024-02-29T22:11:29+08:00\",\r\n \"has_issues\": true,\r\n \"updated_at\": \"2024-06-18T09:38:20+08:00\",\r\n \"description\": \"新的PMS软件开发项目管理系统\",\r\n \"forks_count\": 0,\r\n \"git_ssh_url\": \"git@gitee.com:cuckooent/pms.git\",\r\n \"git_svn_url\": \"svn://gitee.com/cuckooent/pms\",\r\n \"git_http_url\": \"https://gitee.com/cuckooent/pms.git\",\r\n \"default_branch\": \"master\",\r\n \"watchers_count\": 3,\r\n \"stargazers_count\": 0,\r\n \"open_issues_count\": 0,\r\n \"name_with_namespace\": \"超哥/PMS\",\r\n \"path_with_namespace\": \"cuckooent/pms\"\r\n },\r\n \"user_id\": 13097545,\r\n \"hook_url\": \"https://gitee.com/cuckooent/pms/hooks/1400568/edit\",\r\n \"password\": \"6158891\",\r\n \"hook_name\": \"push_hooks\",\r\n \"push_data\": null,\r\n \"timestamp\": \"1718674701049\",\r\n \"user_name\": \"tyfeikele\",\r\n \"enterprise\": null,\r\n \"repository\": {\r\n \"id\": 33487312,\r\n \"url\": \"https://gitee.com/cuckooent/pms\",\r\n \"fork\": false,\r\n \"name\": \"PMS\",\r\n \"path\": \"pms\",\r\n \"owner\": {\r\n \"id\": 5267986,\r\n \"url\": \"https://gitee.com/cuckooent\",\r\n \"name\": \"超哥\",\r\n \"type\": \"User\",\r\n \"email\": \"phoben@qq.com\",\r\n \"login\": \"cuckooent\",\r\n \"remark\": null,\r\n \"html_url\": \"https://gitee.com/cuckooent\",\r\n \"username\": \"cuckooent\",\r\n \"user_name\": \"cuckooent\",\r\n \"avatar_url\": \"https://foruda.gitee.com/avatar/1677043949039184563/5267986_cuckooent_1646218684.png\",\r\n \"site_admin\": false\r\n },\r\n \"git_url\": \"git://gitee.com/cuckooent/pms.git\",\r\n \"license\": null,\r\n \"private\": true,\r\n \"ssh_url\": \"git@gitee.com:cuckooent/pms.git\",\r\n \"svn_url\": \"svn://gitee.com/cuckooent/pms\",\r\n \"has_wiki\": true,\r\n \"homepage\": null,\r\n \"html_url\": \"https://gitee.com/cuckooent/pms\",\r\n \"language\": \"C#\",\r\n \"clone_url\": \"https://gitee.com/cuckooent/pms.git\",\r\n \"full_name\": \"cuckooent/pms\",\r\n \"has_pages\": false,\r\n \"namespace\": \"cuckooent\",\r\n \"pushed_at\": \"2024-06-18T09:38:20+08:00\",\r\n \"created_at\": \"2024-02-29T22:11:29+08:00\",\r\n \"has_issues\": true,\r\n \"updated_at\": \"2024-06-18T09:38:20+08:00\",\r\n \"description\": \"新的PMS软件开发项目管理系统\",\r\n \"forks_count\": 0,\r\n \"git_ssh_url\": \"git@gitee.com:cuckooent/pms.git\",\r\n \"git_svn_url\": \"svn://gitee.com/cuckooent/pms\",\r\n \"git_http_url\": \"https://gitee.com/cuckooent/pms.git\",\r\n \"default_branch\": \"master\",\r\n \"watchers_count\": 3,\r\n \"stargazers_count\": 0,\r\n \"open_issues_count\": 0,\r\n \"name_with_namespace\": \"超哥/PMS\",\r\n \"path_with_namespace\": \"cuckooent/pms\"\r\n },\r\n \"user_email\": \"tyfeikele@qq.com\",\r\n \"head_commit\": {\r\n \"id\": \"e74df3005e06241146220c1c78b746b1cb903e9d\",\r\n \"url\": \"https://gitee.com/cuckooent/pms/commit/e74df3005e06241146220c1c78b746b1cb903e9d\",\r\n \"added\": [\r\n \r\n ],\r\n \"author\": {\r\n \"id\": null,\r\n \"url\": null,\r\n \"name\": \"HZG System\",\r\n \"time\": \"2024-06-18T09:38:19+08:00\",\r\n \"user\": null,\r\n \"email\": \"HZG System\",\r\n \"remark\": null,\r\n \"username\": null,\r\n \"user_name\": null\r\n },\r\n \"message\": \"{\\\"Message\\\":\\\"签出模块 : 后端新增项目反馈, 匿名提交项目反馈\\\",\\\"MessageType\\\":1,\\\"Modules\\\":[],\\\"Version\\\":\\\"v1\\\"}\\n\",\r\n \"removed\": [\r\n \r\n ],\r\n \"tree_id\": \"57f89455bbd615902d2a41732205a659beec7dc4\",\r\n \"distinct\": true,\r\n \"modified\": [\r\n \".collaboration\"\r\n ],\r\n \"committer\": {\r\n \"id\": null,\r\n \"url\": null,\r\n \"name\": \"HZG System\",\r\n \"time\": null,\r\n \"user\": null,\r\n \"email\": \"HZG System\",\r\n \"remark\": null,\r\n \"username\": null,\r\n \"user_name\": null\r\n },\r\n \"timestamp\": \"2024-06-18T09:38:19+08:00\",\r\n \"parent_ids\": [\r\n \"bce508cc4c7574d8974a6e94a832c639ad07af99\"\r\n ]\r\n },\r\n \"total_commits_count\": 1,\r\n \"commits_more_than_ten\": false\r\n }", "SourceJson": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=请求信息.Body" @@ -81,6 +81,16 @@ "value": "2" }, "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "Operation": 17, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.ref" + }, + "OperationParamaterBName": "/", + "OutParamaterName": "ref" + }, { "$type": "GETPOST.正则类.正则_校验, GETPOST", "JieShouMsg": { @@ -97,7 +107,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(内容有效性,0,LEN(message.Message))" }, - "ID": "7501e93f1fca4186be97273c76c90e00" + "ID": "185837ec261e4cd899d04cad3f26b2e1" }, { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", @@ -109,7 +119,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件名称", - "GUID": "9afba933-59bd-417b-a5e6-d4784e58129b" + "GUID": "d11e5d0f-25e1-443d-b8ad-492b1808c81d" }, "Value": "签入工程" }, @@ -117,7 +127,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "hook_id", - "GUID": "ee135ea2-1c69-4319-b43e-d73a3030788c" + "GUID": "caff9319-64eb-4276-8168-8f8c286d5684" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -128,7 +138,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件内容", - "GUID": "8c9d1dd9-5944-4b8a-a4ea-2c6dd0e9b07a" + "GUID": "11f04fb1-57d7-492b-acb6-e99fabb249a8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -139,7 +149,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "空间路径", - "GUID": "4b6980cb-c9cd-47dd-8763-9fd15f428d39" + "GUID": "7ad7226d-893c-4557-bd9e-dee2d0129041" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -150,7 +160,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库名称", - "GUID": "28cc2340-020e-48ae-9706-50352688bfe0" + "GUID": "a377a58e-15fb-4094-ade9-a55dfe500e68" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -161,7 +171,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库路径", - "GUID": "ae427cf3-11ab-4792-970c-891778bb9814" + "GUID": "3d216989-8a10-4a4e-8ea2-eb785966bcac" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -172,7 +182,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "url", - "GUID": "58dd6560-f46c-45ff-ab83-cade1f943f80" + "GUID": "6678b805-6437-49ad-9da1-9b0de77ebdc8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -183,29 +193,29 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "提交人", - "GUID": "5bc56c0b-134d-4773-97e2-9080b03fefb9" + "GUID": "de862070-67db-4aa1-a3ab-3879924702f8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.head_commit.committer.name" + "SerializeProperty": "=钩子数据.pusher.tyfeikele" } }, { "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "git用户名", - "GUID": "73c38ad6-6238-44a8-8d27-3e8fe40ac0bd" + "GUID": "c7911bce-2a61-4724-b8ef-6eefa0606ffc" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.head_commit.committer.username" + "SerializeProperty": "=钩子数据.pusher.username" } }, { "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库ID", - "GUID": "b7da3bc8-c9fe-4c9a-b4aa-27b09b8fa01f" + "GUID": "85b7bd3b-8e17-421b-ab49-bf67e4db45c0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -216,23 +226,45 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "日期", - "GUID": "9c5e506f-7326-47e9-bdec-73351267bcec" + "GUID": "d1f440b2-6191-45da-bed1-a5bda92796cf" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.head_commit.committer.timestamp" + "SerializeProperty": "=钩子数据.head_commit.timestamp" } }, { "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "内容得分", - "GUID": "11ccd64d-5b65-41c4-8d9e-79ac19c3dce5" + "GUID": "34080b86-dc4f-49e8-b1a9-bdceb4258c6c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(内容得分>100,100,内容得分)" } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "sha", + "GUID": "2bad1d08-99a9-4b02-921a-3dbae28e4cbc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.after" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "分支", + "GUID": "14c04561-e090-4e3a-a6a2-9ad2fde120e0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ref.2" + } } ] }, @@ -242,7 +274,7 @@ "Message": "签入已被记录" } ], - "ID": "9e5fb441-085e-45ec-855d-67a76a9c166b" + "ID": "e0873df2-056b-45c2-8395-151ba6500766" } ] } @@ -250,7 +282,7 @@ } } ], - "ID": "da7e3056-66c4-4dbe-a7bb-b022b5338fc5" + "ID": "c447f209-f783-400e-ad2a-985820fd18a9" } ] } diff --git a/ServerCommands/Gitee/从Gitee提取报工.json b/ServerCommands/Gitee/从Gitee提取报工.json index 546f6a4c..0439e7ed 100644 --- a/ServerCommands/Gitee/从Gitee提取报工.json +++ b/ServerCommands/Gitee/从Gitee提取报工.json @@ -26,14 +26,14 @@ "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "2024-06-13" + "TestData": "2024-06-16" }, { "Name": "结束日期", "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "2024-06-13" + "TestData": "2024-06-16" }, { "Name": "用户", @@ -47,7 +47,7 @@ "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "12" + "TestData": "1" } ], "InvokeTriggerTestData": { @@ -64,7 +64,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "46366003-75e0-4903-87a0-dcf074895064", + "GUID": "69d8c1ee-a506-4394-b555-d677c7d67873", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -88,7 +88,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "8391e0732ab841529e2174dc037526ea" + "ID": "402bd344cfca42359c04befcc43281eb" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -98,7 +98,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "0e59cb25-2e18-48bc-8977-c383f267b674", + "GUID": "a0951355-4309-4cb6-ad68-64b157cbb953", "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", @@ -127,7 +127,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "a958acc5408244d390156e9085776e6e" + "ID": "53d55dafedf84348b4e169d77995ba21" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -170,13 +170,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")" }, - "ID": "1f3988569f6f469fa81277a93360312c" + "ID": "048771b03aa5416a895bd851b7627f55" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "总工时", "ParameterValue": "0", - "ID": "73122483179048b18313028406573a8f" + "ID": "ad995e7f70654432b1f0484ef0ba2576" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -185,7 +185,7 @@ "TableName": "Git_事件记录", "BindingInfos": [ { - "GUID": "6bafd44a-35f7-4cc8-afc3-d06f8ba7b421", + "GUID": "51124d2e-a47f-4e12-a8a5-7b9e54a89b01", "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件内容", @@ -263,7 +263,7 @@ ] } }, - "ID": "2cb377727f324c1ca26920b7ae0c1401" + "ID": "21794093a6d44ebda680c4016a96ee16" }, { "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", @@ -294,7 +294,7 @@ ] } ], - "ID": "e47946cd-e4d2-408f-86f7-44e46767465c" + "ID": "78a97a6d-7e86-48bc-8d26-54ddd3560680" }, { "CommandList": [ @@ -309,12 +309,12 @@ ] } ], - "ID": "bccc5e99-5617-45b3-8b4a-95a0acd27026" + "ID": "3ef014f6-b415-417d-a979-6c25454ecc8e" } ] } ], - "ID": "f075c648-5586-49c0-816c-95d1283782dc" + "ID": "1158e869-e6a9-4e62-bf87-fba184080455" }, { "CommandList": [ @@ -329,7 +329,7 @@ ] } ], - "ID": "141b8b4f-b94d-4491-bac9-642eed38e19d" + "ID": "a1ad3c0c-131f-4168-bb33-f8b0a75c9daa" } ] } diff --git a/ServerCommands/Gitee/同步一个仓库到表.json b/ServerCommands/Gitee/同步一个仓库到表.json index a589345e..9f3a35c1 100644 --- a/ServerCommands/Gitee/同步一个仓库到表.json +++ b/ServerCommands/Gitee/同步一个仓库到表.json @@ -71,7 +71,10 @@ "Name": "默认分支", "DataValidationInfo": {} } - ] + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } } ], "Commands": [ @@ -88,7 +91,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", "ParameterValue": "%CurrentUser%", - "ID": "f738695b16964509a000739e1d871902" + "ID": "1dd4782fe94f4a11941ae75c0bfc282c" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -98,7 +101,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "0e7da4a8-d338-4585-b6f4-6ae272aea45f", + "GUID": "2103657e-50c4-48c0-bb28-21b1c95f28aa", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "订阅成功", @@ -122,7 +125,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "20e643f89e194c438087b618ea1c338d" + "ID": "a705fda09a50494186c5584333d88fc8" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -153,7 +156,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库ID", - "GUID": "01d07583-5eb6-405f-b484-29a8d7106f5a" + "GUID": "6adb9f20-7e82-4699-b558-6ecee2653c09" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -164,7 +167,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", - "GUID": "7f004ded-49f9-49ce-aaed-9068c13ce993" + "GUID": "94846f43-0a6f-40ee-b2e6-83f59c05a4a9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -175,7 +178,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间名称", - "GUID": "4a5fcc35-c665-48d1-83f1-28c63a734fe9" + "GUID": "e82b75f1-2032-450f-b0ee-ab508bc0fa1d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -186,7 +189,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", - "GUID": "f0441eff-3746-44c5-942f-1faa63881cd3" + "GUID": "eea7bc5d-66a2-44cd-9c1b-4c898fd49c6a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -197,7 +200,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", - "GUID": "17792e75-3eb5-4f6d-8eea-7bcac52935eb" + "GUID": "561f1d4e-38b7-4e26-8098-c56a8d4c9c8b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -208,7 +211,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库地址", - "GUID": "e43337e6-136b-4973-a4c8-2da5df10b62c" + "GUID": "b79b52bd-1ccc-40b7-8fe3-6739e34398f5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -219,7 +222,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库描述", - "GUID": "3fc25384-f0f3-40ed-95fd-a3642a72d4d1" + "GUID": "a6b61d0f-c37c-4e38-b24c-a06a10911842" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -230,7 +233,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库成员", - "GUID": "5e2f02ce-30e4-4fdd-8c07-9d0fa86a8e16" + "GUID": "4ebd6aef-84f4-4d04-abe4-e0c4ce78a14c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -241,7 +244,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人", - "GUID": "3ae9fe6a-fbe5-4cc4-b0f4-7359c4884e9a" + "GUID": "68ffe807-9d1b-419a-b8e5-88977ab05b7b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -252,7 +255,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人头像", - "GUID": "d4fe3175-f107-442e-82a1-d08b4083cf2b" + "GUID": "fe861d19-f466-4e43-96a5-bff6c89ed158" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -263,7 +266,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "Callback_url", - "GUID": "6fe0d807-fe6f-457e-8ed8-26a9b11e28ae" + "GUID": "b01b60e0-20cc-40bc-877b-75d84018c6de" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -274,7 +277,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "hook_api_url", - "GUID": "e5897052-f6e0-405b-9689-91d47fc17020" + "GUID": "b87fb425-c4bb-407c-bbd9-d90d5cfea992" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -285,7 +288,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "订阅成功", - "GUID": "fecb5c5e-7f64-41f2-8233-1950f0e42b55" + "GUID": "fd497669-e4c4-463a-bef4-b4add036384f" }, "Value": "0" }, @@ -293,7 +296,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "默认分支", - "GUID": "3b464c6f-277b-4666-998c-ee88dfebc54b" + "GUID": "9c785663-d269-413e-9b3b-1d8163dc2e78" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -304,7 +307,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "拉取人员", - "GUID": "89afc82d-2392-444e-a70b-5b3120f0198c" + "GUID": "f4a55dcb-d85b-4263-bbfe-1e990a39c69c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -314,7 +317,7 @@ ] } ], - "ID": "063d5e71-2067-4b57-ab73-a90e9c3f156f" + "ID": "86c56d0c-4d09-48e4-9eb0-96b808d89dbe" }, { "CommandList": [ @@ -340,7 +343,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", - "GUID": "041ebae7-da1f-43df-a747-66f663ec5585" + "GUID": "e95ccec9-8e00-4478-8e7a-b18dfd6bc83e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -351,7 +354,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间名称", - "GUID": "8acc8c3b-e022-42ef-9450-abacf3fcd0d2" + "GUID": "ad7a894a-8c65-44a7-a70e-a0593e038866" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -362,7 +365,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", - "GUID": "2cc89fea-2197-4cf0-8502-b11dca95f55f" + "GUID": "1edfa77c-92a3-430e-965f-15afd1212d09" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -373,7 +376,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", - "GUID": "2838661d-8f4f-45dd-91ca-abd1b1372585" + "GUID": "fdd8cb58-5f17-4e26-a3d3-a73b985fefa7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -384,7 +387,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库地址", - "GUID": "2e5df0c6-8d60-4c7a-a587-69dede5444cb" + "GUID": "33ae0ef1-12c5-4727-8561-2dbbc96e67ef" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -395,7 +398,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库描述", - "GUID": "053d8b3b-ee50-4fda-a985-84268d9cd2df" + "GUID": "fbd8e474-2010-4e5c-8295-0f5ae0092af1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -406,7 +409,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库成员", - "GUID": "c731ebd0-c516-4da9-b143-6399697db393" + "GUID": "994e6d2d-9eed-47f9-bc3e-62973495c45d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -417,7 +420,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人", - "GUID": "cba933c6-5a47-43f3-ae1e-331f9b72a0d7" + "GUID": "c4546402-cef1-4b98-ada8-1856a410496c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -428,7 +431,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人头像", - "GUID": "697c21b2-2f18-41f2-bbc3-730719276295" + "GUID": "910d2883-d6d7-49b7-b730-c8bd24df1f12" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -439,7 +442,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "hook_api_url", - "GUID": "89a225d4-5f79-47fd-934c-b146e56ca3ba" + "GUID": "d8990b5c-4417-49e7-a5f7-8d8d9a24f7cb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -449,7 +452,7 @@ ] } ], - "ID": "39943da2-0a3d-4f37-842c-6734d58d96fc" + "ID": "e63f93a5-1f2f-4286-bcf3-6b015d3f4e01" } ] } @@ -466,6 +469,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=仓库ID" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "分支名" } ], "ResultErrorCodeTo": { @@ -554,7 +561,7 @@ "Message": "仓库创建并订阅成功！" } ], - "ID": "20b8e4fe-a403-4f09-b3cb-4cc4da42fb4e" + "ID": "ee322151-c151-4ca2-b21c-5fc4927829e4" }, { "CommandList": [ @@ -567,12 +574,12 @@ } } ], - "ID": "09991e26-2d6e-4e32-8f44-165c10530922" + "ID": "a6276d3e-6fe9-418f-9a1e-f865463db454" } ] } ], - "ID": "a8630c8c-2e3a-4692-8e97-bfb03b27cdd8" + "ID": "25642aaf-c275-4125-a6d2-766bca9ddd85" }, { "CommandList": [ @@ -582,7 +589,7 @@ "Message": "仓库创建成功!" } ], - "ID": "a2d6be65-1a95-4f68-a0fe-13c8f8cce023" + "ID": "1a1d7a39-1b49-42e8-aef8-47796c021d26" } ] } diff --git a/ServerCommands/Gitee/同步仓库的所有提交.json b/ServerCommands/Gitee/同步仓库的所有提交.json index 574a1088..230e5b4e 100644 --- a/ServerCommands/Gitee/同步仓库的所有提交.json +++ b/ServerCommands/Gitee/同步仓库的所有提交.json @@ -27,6 +27,10 @@ "IgnoreBlank": false }, "TestData": "33487312" + }, + { + "Name": "分支名", + "DataValidationInfo": {} } ], "InvokeTriggerTestData": { @@ -43,7 +47,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "8f4d7549-7487-4a00-9fb0-586c48ffbcaa", + "GUID": "d38e2fe4-5a7d-41c3-9538-77e8875b1048", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", @@ -52,7 +56,7 @@ "ColumnName": "空间路径名" }, { - "GUID": "78335c18-7116-45a6-a3a2-e140c8f61037", + "GUID": "b5136c0c-56f4-4bef-a309-66e88e0d3973", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", @@ -61,7 +65,7 @@ "ColumnName": "仓库路径名" }, { - "GUID": "079ef811-1664-4327-94e5-8a626b4c2631", + "GUID": "dd7fffc1-a816-40c6-992a-1f9d7405e3dc", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", @@ -70,7 +74,7 @@ "ColumnName": "仓库名称" }, { - "GUID": "e12536e1-bd52-46f0-81ab-24ec30a721b4", + "GUID": "cec1fc8d-1f21-4f9e-a3d1-8e01c9686840", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "拉取人员", @@ -94,7 +98,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "aa09a0e53fae4352bd9800656a20885c" + "ID": "575825b5495d488bb5fe2954f610c5f0" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -107,16 +111,33 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库" + } + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.拉取人员" + } + }, + "value": "%Null%", + "compareType": 1 } - }, - "value": "%Null%", - "compareType": 1 + ] }, "CommandList": [ { @@ -173,27 +194,6 @@ { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "Git_事件记录", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库ID", - "GUID": "d46aca3e-0976-4831-b6f7-a986360290d0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库ID" - } - }, - "Disabled": true - }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", "LoopInfo": { @@ -226,6 +226,14 @@ "Name": "author", "DataItemType": 0 }, + { + "Name": "sha", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分支名" + } + }, { "Name": "since", "DataItemType": 0 @@ -295,10 +303,11 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.EndLoopCommand, ServerDesignerCommon" + "$type": "Forguncy.Model.EndLoopCommand, ServerDesignerCommon", + "WithinLoop": true } ], - "ID": "53d78e53-fe5b-4a6d-8428-b818c107e92d" + "ID": "5330b11e-70b9-49d4-acf3-fd571818c3a5" }, { "CommandList": [ @@ -443,7 +452,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库ID", - "GUID": "29fd0f4a-79ab-4749-a00b-cc43845c8b1b" + "GUID": "5e824315-5955-41da-be3f-f628d307c9b6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -454,7 +463,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件名称", - "GUID": "c0f644a0-7341-4da5-8eea-a212b7480746" + "GUID": "a44e3498-b444-4eeb-94b2-cadffa7aaf2d" }, "Value": "签入工程" }, @@ -462,7 +471,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "空间路径", - "GUID": "9a162257-8e3f-4424-9ebd-a74280e5588d" + "GUID": "cc8f4f3c-1af8-4b9f-9432-c68f972c8827" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -473,7 +482,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库名称", - "GUID": "5659bd30-a3ee-4f21-bef5-7c1c73deea93" + "GUID": "8f1e71da-f543-4758-95b9-888654ed6648" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -484,7 +493,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库路径", - "GUID": "931058ab-e2c3-4027-8e03-5d510ced8f59" + "GUID": "f0a7745a-11b9-415d-810e-42311b11478a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -495,7 +504,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "提交人", - "GUID": "a3e85491-4dfd-4751-ba69-597d07a65325" + "GUID": "f9e7c496-0cff-4ecb-891c-588e037987a5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -506,7 +515,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件内容", - "GUID": "23d5edb5-22e0-4ec2-a1ae-b213c741a11e" + "GUID": "a5f07281-31a5-4bea-91cd-147e5f2ab6d9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -517,7 +526,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "url", - "GUID": "af529219-2930-48b7-9998-b355efd9324f" + "GUID": "f11fd976-3bea-4288-bba6-6297a57c0598" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -528,7 +537,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "git用户名", - "GUID": "2072a5e6-8560-4a25-bcfb-dcbfc5b97c6f" + "GUID": "bffbc696-0387-425e-86bd-4ebac35e400f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -539,7 +548,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "日期", - "GUID": "bf07eff9-44a7-4071-a77c-196540aba841" + "GUID": "bbabf6d6-15de-4746-bfbf-82aba78ee815" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -550,7 +559,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "内容得分", - "GUID": "d6e3b1b1-ac73-4f98-90b5-cfe93bd2bd9e" + "GUID": "abf39d1a-c07f-497a-94bf-b8290b5242e6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -561,7 +570,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "sha", - "GUID": "cef6c904-210b-4d8d-8cc8-ed0dd2d0ee4f" + "GUID": "5b7e01a6-ab9b-45ac-91cf-67b7d2598d71" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -571,17 +580,17 @@ ] } ], - "ID": "2b706b0c-9243-4a12-bcf7-5ff809382ca9" + "ID": "caa36840-678a-44ca-b4ae-aefab93d8a65" } ] } ], - "ID": "db714b0c-d12f-4ce9-9bf4-0c7f8ec18145" + "ID": "97673824-c1d9-4d12-8214-072c500d6377" } ] } ], - "ID": "ca82140e-8102-4080-9e21-2d87844124cf" + "ID": "3897beac-9b94-4122-9c8c-eb8fa2230708" } ] } @@ -591,7 +600,7 @@ ] } ], - "ID": "c44ba308-d0df-4e90-ab7c-2c0a460b1c2c" + "ID": "0489304b-393a-4de6-86e0-5aa25b1997dc" } ] } @@ -626,7 +635,7 @@ } } ], - "ID": "bd9ae4eb-5fa0-46d8-8b86-8a1da861c6cc" + "ID": "efa475d6-8b00-4c11-8931-c9c13b83a6dd" }, { "CommandList": [ @@ -642,22 +651,22 @@ } } ], - "ID": "1b0dbf3e-b525-465c-bbf7-974a8b8fe39b" + "ID": "26befa33-2aff-46d8-8457-796f788d0c15" } ] } ], - "ID": "70b69c7b-8c2a-4564-90cf-2fc031fa793f" + "ID": "4b49cfde-63e1-487e-aac9-b5d716fb47c7" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "仓库不存在或尚未同步到系统" + "Message": "仓库不存在或尚未设置拉取人员" } ], - "ID": "62102816-fb19-4b81-8b6d-95e7b96c334c" + "ID": "7e112ca2-8e15-48b9-8f5b-10052ac14df8" } ] } diff --git a/ServerCommands/Gitee/在线获取仓库某日提交数据.json b/ServerCommands/Gitee/在线获取仓库某日提交数据.json new file mode 100644 index 00000000..c3f95731 --- /dev/null +++ b/ServerCommands/Gitee/在线获取仓库某日提交数据.json @@ -0,0 +1,760 @@ +{ + "Name": "在线获取仓库某日提交数据", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "仓库ID", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "33487312" + }, + { + "Name": "分支名", + "DataValidationInfo": {}, + "TestData": "版本10" + }, + { + "Name": "成员用户名", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "Administrator" + }, + { + "Name": "开始日期", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "2024-06-14" + }, + { + "Name": "结束日期", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "2024-06-17" + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "仓库", + "TableValue": { + "TableName": "Git仓库表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "54a7c9a3-f561-449b-8b3b-4e0e55da1d73", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "空间路径名", + "GUID": "9e61f919-3b74-492d-90f5-d7ffe9d57b19" + }, + "ColumnName": "空间路径名" + }, + { + "GUID": "b09a247f-a4fb-4ef5-bcd9-c78513dc4781", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库路径名", + "GUID": "29f063e2-b0ce-4470-b45b-de2f2791caa9" + }, + "ColumnName": "仓库路径名" + }, + { + "GUID": "48dee6ad-e67e-4eb5-8812-c7ff36232eb8", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库名称", + "GUID": "4f72a429-a1df-4d1b-9b8d-a55dd4af7076" + }, + "ColumnName": "仓库名称" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库ID", + "GUID": "86f0f98d-6b6b-4907-bf1a-9829f672b293" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "58567dfba75f43489c48d665b080832c" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "成员", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "d1f81b25-655d-4777-b555-91c9b1db1eab", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "GIT用户名", + "GUID": "25b16057-d543-4975-bc69-f26ab4854843" + }, + "ColumnName": "GIT用户名" + }, + { + "GUID": "004e06bb-51a5-449a-9ebf-2f2209a88b57", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "邮件", + "GUID": "b37b6736-6fcb-4d1f-a8da-30a86de71762" + }, + "ColumnName": "邮件" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "0ce90775-6b94-4126-b1ad-9230b078526c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "47ea19e71148429da9cd6657d940b4c5" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "OutParamaterName": "提交信息数组" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员" + } + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员.GIT用户名" + } + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "请求令牌", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "强制刷新", + "Value": "0" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "最新令牌", + "ResultTo": { + "SerializeProperty": "ACCESS_TOKEN" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": "100", + "LoopIndexParamName": "循环次数", + "LoopItemParamName": "当前循环" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", + "PostData": { + "DataItemType": 1, + "Data": { + "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", + "Data": [ + { + "Name": "access_token", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ACCESS_TOKEN" + } + }, + { + "Name": "sha", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分支名" + } + }, + { + "Name": "author", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员.GIT用户名" + } + }, + { + "Name": "since", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(开始日期,\"yyyy-mm-dd\")" + } + }, + { + "Name": "until", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(结束日期,\"yyyy-mm-dd\")" + } + }, + { + "Name": "page", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=循环次数" + } + }, + { + "Name": "per_page", + "DataItemType": 0, + "Data": 100 + } + ] + } + }, + "WebUrl": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&仓库.空间路径名&\"/\"&仓库.仓库路径名&\"/commits\"" + }, + "Method": "GET", + "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", + "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", + "NewParameter": "result", + "Header": [], + "Timeout": 100.0 + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result" + } + }, + "value": "%Null%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.Count" + } + }, + "value": "0" + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.EndLoopCommand, ServerDesignerCommon", + "WithinLoop": true + } + ], + "ID": "8939d50a-d3ad-4ddf-9c5a-5cf7cab8cb7a" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "SaveFormData.fillInJSONProperties, SaveFormData", + "FullJsonString": "{\r\n \"sha\": \"\",\r\n \"html_url\": \"\",\r\n \"commit\": \"\",\r\n \"committer\": \"\",\r\n \"author\": \"\"\r\n}", + "SourceJson": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item" + }, + "ResultTo": "完整ITEM" + }, + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.commit.message" + }, + "SampleJson": "{\r\n \"Message\": \"签出模块 : 项目反馈\",\r\n \"MessageType\": 1,\r\n \"Modules\": [],\r\n \"Version\": \"v1\"\r\n}", + "ToParameter": "message" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=message.MessageType" + } + }, + "value": "2" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.committer" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提交信息数组" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=message.Message" + }, + "OutParamaterName": "提交信息数组" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "Git_事件记录", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库ID", + "GUID": "9ce37e37-e3e9-4b31-bc35-b2dceb6338c5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "事件名称", + "GUID": "f12b3f9b-714c-43b8-9526-1f48bc4c4187" + }, + "Value": "签入工程" + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "空间路径", + "GUID": "4bad18a5-23bf-4cbb-8f17-069778faaf2c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.空间路径名" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库名称", + "GUID": "61b00490-d53c-4789-846d-6b33d7010de4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.仓库名称" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "仓库路径", + "GUID": "38c3a76e-979e-4544-99af-e3fcedb33798" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.仓库路径名" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "提交人", + "GUID": "70f98756-135a-4e38-ad6f-818fc61efed4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.committer.name" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "事件内容", + "GUID": "a3b39d58-d599-408f-a45d-f395f62d4e96" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=message.Message" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "url", + "GUID": "15970ad6-e39c-478e-b844-5247c8976522" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.html_url" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "git用户名", + "GUID": "af262610-572d-4395-b208-c3f113605928" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.committer.login" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "日期", + "GUID": "8926f4b8-7f20-4923-b72f-117430e70d88" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.commit.committer.date" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "内容得分", + "GUID": "2ba07a84-2f9c-43c4-af98-18a820a4bde9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(内容得分>100,100,内容得分)" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "sha", + "GUID": "4b50f1cb-b821-4c19-8e64-338f187accaf" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完整ITEM.sha" + } + } + ], + "Disabled": true + } + ], + "ID": "6049a564-9bf2-4fb6-b880-09e49807ed3b" + } + ] + } + ], + "ID": "5e9ddad9-66f4-41f7-9c42-95e1426346a7" + } + ] + } + ] + } + } + ] + } + ], + "ID": "99580a51-0499-4fcf-9a8b-6d5634cbfb39" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "提交信息" + } + ] + } + ] + } + } + ] + } + ] + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提交信息数组" + }, + "Operation": 16, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=CHAR(10)" + }, + "OutParamaterName": "提交信息字符串" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "获取完成", + "CustomReturns": [ + { + "ReturnPropertyName": "提交信息", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提交信息字符串" + } + } + ] + } + ], + "ID": "6987da7d-16d2-4aa6-b8ed-cfd397e97192" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "提交信息" + } + ] + } + ], + "ID": "d1a93088-d154-48ed-8d9f-df4f2fd21c84" + } + ] + } + ], + "ID": "748992aa-56c0-4299-9ce8-6bff74a52902" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "所查找的用户未登记Gitee信息", + "CustomReturns": [ + { + "ReturnPropertyName": "提交信息" + } + ] + } + ], + "ID": "10688d9d-087e-4baa-8a4b-8d94286a0848" + } + ] + } + ], + "ID": "ea0affa8-ef09-4ec6-9b01-5a8c3cdee520" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "仓库不存在或尚未同步到系统", + "CustomReturns": [ + { + "ReturnPropertyName": "提交信息" + } + ] + } + ], + "ID": "117372da-18de-4a3e-98a7-bd9d6eebeb55" + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "提交信息" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/Gitee/搜索仓库.json b/ServerCommands/Gitee/搜索仓库.json index fce12247..a8f35ca7 100644 --- a/ServerCommands/Gitee/搜索仓库.json +++ b/ServerCommands/Gitee/搜索仓库.json @@ -30,7 +30,8 @@ }, { "Name": "关键字", - "DataValidationInfo": {} + "DataValidationInfo": {}, + "TestData": "pms" }, { "Name": "页码", @@ -57,7 +58,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "a564604d-afc6-4ae3-ba16-93247cd2cb06", + "GUID": "7e651c76-bd21-4591-adf6-ba5f58e32593", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -66,7 +67,7 @@ "ColumnName": "GIT用户名" }, { - "GUID": "d7dfb6d7-1cef-471a-b3aa-dad8ccac3dfe", + "GUID": "6d6a4540-718f-40ee-8ed7-68e6e101e825", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT密码", @@ -90,7 +91,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "2528034657f241fda14936569d9936c6" + "ID": "051b837a611446279c14a2abdfe7a6f5" }, { "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", @@ -151,7 +152,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "url", "ParameterValue": "https://gitee.com/api/v5/user/repos", - "ID": "da756c8347b240f4b7c2919872ba9fec" + "ID": "732024d7ab3b473793a631aa754e2d01" }, { "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", @@ -399,7 +400,7 @@ } } ], - "ID": "905f8668-d05d-4891-9665-f0ece366c5ec" + "ID": "077de884-7251-41d4-8220-a572e502a4d0" }, { "CommandList": [ @@ -427,7 +428,7 @@ ] } ], - "ID": "575165db-6124-4d97-a157-010dc25f90d3" + "ID": "24637197-89a2-4a0e-aa3f-fc44834e71be" } ] } diff --git a/ServerCommands/Gitee/获取某仓库分支.json b/ServerCommands/Gitee/获取某仓库分支.json index af481d8c..5e654690 100644 --- a/ServerCommands/Gitee/获取某仓库分支.json +++ b/ServerCommands/Gitee/获取某仓库分支.json @@ -29,11 +29,17 @@ "TestData": "Administrator" }, { - "Name": "仓库ID", + "Name": "空间路径", "DataValidationInfo": { "IgnoreBlank": false }, "TestData": "33487312" + }, + { + "Name": "仓库路径", + "DataValidationInfo": { + "IgnoreBlank": false + } } ], "InvokeTriggerTestData": { @@ -50,7 +56,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "63aa6b40-aefd-41c2-91ff-ffdbe5ca9065", + "GUID": "45b269e5-c4dc-4ee2-9787-346de50658ef", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -59,7 +65,7 @@ "ColumnName": "GIT用户名" }, { - "GUID": "fef0405d-1cf9-43ea-ba28-ed59a8b1688a", + "GUID": "e4f61605-c81d-40c7-af98-40c6ffd53baf", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT密码", @@ -83,7 +89,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "d86d5faca9b240dab3c1709b42211323" + "ID": "a38e01c50a6a4e30bbe7b834faeeed99" }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", @@ -136,56 +142,14 @@ "value": "0" }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "仓库", - "TableValue": { - "TableName": "Git仓库表", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "60acd7bb-f3ce-4aaf-8cf6-29c4e06adc31", - "BindingInfo": { - "TableName": "Git仓库表", - "ColumnName": "空间路径名", - "GUID": "6263c854-542e-4df0-a3ea-6ea5c9fb9100" - }, - "ColumnName": "空间路径名" - }, - { - "GUID": "47ede713-1c30-4c70-878e-6cc82f79b222", - "BindingInfo": { - "TableName": "Git仓库表", - "ColumnName": "仓库路径名", - "GUID": "fe8b4447-00d9-4f7f-94f9-1bbcc801da38" - }, - "ColumnName": "仓库路径名" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "Git仓库表", - "ColumnName": "仓库ID", - "GUID": "f68e8430-3956-4143-9408-0e92899d4516" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库ID" - } - }, - "TopCount": "1" - }, - "ID": "61efaba6b39a44c3a33a0d251eb70ae6" - }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "url", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&仓库.空间路径名&\"/\"&仓库.仓库路径名&\"/branches\"" + "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&空间路径&\"/\"&仓库路径&\"/branches\"" }, - "ID": "0a8b384cb5ed47bebbcfabf787647380" + "ID": "7e4968dc56584f0ca5fa27a20e013bfd" }, { "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", @@ -317,12 +281,20 @@ }, "CatchCommandPart": { "CommandList": [ + { + "$type": "GETPOST.JSON类.JSON反序列化, GETPOST", + "BianmaMsg": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.message" + }, + "FanHuiMsg": "res" + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.message" + "SerializeProperty": "=res.message" }, "CustomReturns": [ { @@ -335,7 +307,7 @@ } } ], - "ID": "dc853222-924d-49d1-a1b5-42ec24712061" + "ID": "def1a363-5706-44ae-b7ed-0a6a2a00f973" }, { "CommandList": [ @@ -357,7 +329,7 @@ ] } ], - "ID": "a2d5b142-9601-4f20-9d42-facbea586b03" + "ID": "f2e2fc98-515f-4613-aa7f-65a8203145d3" } ] } diff --git a/Tables/Git/Git_事件记录.json b/Tables/Git/Git_事件记录.json index a9b6cd8f..6967dbac 100644 --- a/Tables/Git/Git_事件记录.json +++ b/Tables/Git/Git_事件记录.json @@ -47,6 +47,13 @@ "Name": "仓库路径", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "分支", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", diff --git a/Tables/Git/Git仓库表.json b/Tables/Git/Git仓库表.json index 41dced7d..32db5ce9 100644 --- a/Tables/Git/Git仓库表.json +++ b/Tables/Git/Git仓库表.json @@ -122,6 +122,13 @@ "Name": "钩子ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "绑定分支", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint",