diff --git a/.collaboration b/.collaboration
index 38d69c70..8a2de0dc 100644
--- a/.collaboration
+++ b/.collaboration
@@ -28,16 +28,7 @@
},
{
"ModuleName": "Table/项目表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:01:24.127433+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\项目\\项目表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/项目成员表",
@@ -61,16 +52,7 @@
},
{
"ModuleName": "Table/项目版本",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:00:59.1706479+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\项目\\项目版本.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/项目预算变动表",
@@ -255,16 +237,7 @@
},
{
"ModuleName": "Table/需求反馈登记表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:10:16.6720955+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\需求反馈\\需求反馈登记表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/反馈状态表",
@@ -630,19 +603,7 @@
},
{
"ModuleName": "PCPage/项目版本管理",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:15:11.0943018+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.rd",
- "Pages\\97bdc47834844e0d8f3a5aef747785e.json",
- "Pages\\97bdc47834844e0d8f3a5aef747785e.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目版本配置",
@@ -650,17 +611,7 @@
},
{
"ModuleName": "PCPage/任务版本详情",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:17:03.8762548+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目周报列表",
@@ -1830,17 +1781,7 @@
},
{
"ModuleName": "UserControlPage/Git仓库卡片",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:35:45.2202848+08:00",
- "ModuleType": 31,
- "ToRemoveFiles": [
- "UserControlPages\\Git仓库卡片.json",
- "UserControlPages\\Git仓库卡片.rd"
- ]
+ "ModuleType": 31
},
{
"ModuleName": "Image/gitee.svg",
@@ -1860,113 +1801,34 @@
},
{
"ModuleName": "PCPage/分支选择",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:45:38.9850787+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-14T14:56:46.1200987+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\Git\\完善Gitee资料.json",
- "Pages\\Git\\完善Gitee资料.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Image/gitee2.svg",
"ModuleType": 38
},
- {
- "ModuleName": "Image/gitee1.svg",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:47:37.8556282+08:00",
- "ModuleType": 38,
- "ToRemoveFiles": [
- "image\\图标\\gitee1.svg"
- ]
- },
{
"ModuleName": "ServerCommand/更新GITEE信息",
- "State": 4,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:50:59.6718244+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\用户\\更新GITEE信息.json"
- ]
- },
- {
- "ModuleName": "ServerCommand/测试Mustache",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T13:51:42.8058189+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\测试Mustache.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "ServerCommands/OPENAPI",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T13:52:45.7081485+08:00",
"ModuleType": 20
},
{
"ModuleName": "ServerCommand/DeploymentNotification",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T13:55:49.3439687+08:00",
"ModuleType": 15
},
{
"ModuleName": "Table/项目发布记录",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:06:17.6758451+08:00",
"ModuleType": 7
},
{
"ModuleName": "Image/git-branch.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-14T14:47:27.4312594+08:00",
"ModuleType": 38
}
]
\ No newline at end of file
diff --git a/Pages/97bdc47834844e0d8f3a5aef747785e.json b/Pages/97bdc47834844e0d8f3a5aef747785e.json
index 92b559a0..3280fe9a 100644
--- a/Pages/97bdc47834844e0d8f3a5aef747785e.json
+++ b/Pages/97bdc47834844e0d8f3a5aef747785e.json
@@ -8,12 +8,12 @@
},
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 33.0
}
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 19.0,
+ "DesignLengthInPixel": 18.0,
"Mode": 1
}
},
@@ -33,9 +33,14 @@
"DesignLengthInPixel": 15.0
}
},
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 21.0
+ }
+ },
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 222.0,
+ "DesignLengthInPixel": 131.0,
"Mode": 2,
"MinLength": {
"Unit": 1
@@ -47,16 +52,21 @@
},
"3": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 10.0
}
},
- "1": {
+ "4": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 21.0
+ "DesignLengthInPixel": 18.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
}
}
},
- "Count": 4,
+ "Count": 6,
"DefaultSize": 15.0
},
"Values": {
@@ -65,7 +75,24 @@
},
"AttachInfos": {
"1,1": {
- "TemplateCellSource": "版本名称"
+ "TemplateCellSource": "名称加版本号"
+ },
+ "1,4": {
+ "CssName": "hover-btn",
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PageName": "任务版本详情",
+ "LoadBindingDataOption": 1
+ }
+ ],
+ "ToolTip": "设置",
+ "Size": 14,
+ "ImagePath": "设置.svg",
+ "UseCellForeColor": true
+ }
},
"2,1": {
"CellType": {
@@ -84,30 +111,46 @@
"FontFamily": 0,
"FontSize": 18.666666666666664,
"TextIndent": 5,
- "HorizontalAlignment": 1
+ "HorizontalAlignment": 1,
+ "VerticalAlignment": 2
},
{
- "HorizontalAlignment": 2
+ "FontFamily": 0,
+ "FontSize": 18.666666666666664,
+ "Foreground": 3,
+ "TextIndent": 5,
+ "HorizontalAlignment": 4,
+ "VerticalAlignment": 5
+ },
+ {
+ "HorizontalAlignment": 6
},
{
"FontSize": 12.0,
"Foreground": 3,
- "Formatter": 4
+ "Formatter": 7
}
],
"Types": {
"Strs": [
"Body",
"Left",
- "Center",
+ "Top",
"Text 1 50",
+ "Right",
+ "Bottom",
+ "Center",
"@"
]
},
"CellStyles": {
"1,1": 0,
- "2,1": 1,
- "2,2": 2
+ "1,3": 0,
+ "1,4": 1,
+ "2,1": 2,
+ "2,2": 3,
+ "2,3": 3,
+ "2,4": 3
},
"SheetStyle": {
"FontFamily": 0
@@ -124,4 +167,4 @@
"PaperSize": {},
"Margin": {}
}
-}//bSDbrw7ZdDJUNrX2MJaES/M8ZRdMsaTMTRgNc0oG6Ob26NqHhV/roCKjLG3SsvsJ36BprQhFbEuhtD9/W5X4zfH6ZYJrHx4zpcfId3c8UcVwEDLi99HMZPr3hczu66cNtSfBCmKpQ7AIdYA0AZnGg22R7/JUhuxaYwN3WQrWSLCW25vrQZK7AtmBNy/9G0MRThoOmgYIGGY0gbpJbbTyIvFr0iJZLal6b1dXmChwHR6WemdWXeHHbkjZfEZPbfJU4uk134XCCHacG3DMbcYkMNHuTzo3ti2ivmbWyp74WFztniqf52QL+bP0IBM0hUja+WGdgvnSWCWFGtnXvTqWbmb6lp+NPHV4U9hdmcC+59A6YvKmp+IY0Lp5xDY1/xE6zmXEoUaYKTRbeLSHecF6NoLyifJJ+oQl2PpnJBL0Bp+idvCsjyDKI8Sl/xuGC2Az9lRWmNoKFG1MJvAVvkwbpfJsESBs3jp8IDPt4TxbI4nxqF6jQYerzSmhdIXUrCMMtzZOpmjCh/BX3+vXnJKboxRcRQUwz/BQv/HnE4nKzEswISyzlvcGz7gtq6xojsZdv62cDdHFJH7Dh/FYTC6iqLUY1iA1/kJwRbqPnFIunkjH/FlB/lF7JxE2xnkjGb6upWINTg0Sb5LKRcAJkF+8fJJUz+MapD5/u/CaMuR07Vr00/F0aq6E7kcNQxKI7XMo4TvVkp8yZeMzGEUcvb+DMF66wu+rEZmZq0vULwmIIlbI5CM+BXzUM4Fr5wxaU+uR5jxep/GSwCaeNTZTjHOfENtX753aOplBLHVXs8W0/vMWS9etWd0yAT3GhoofC4tny/hgGm7q513ePL/KvEzkyz3ZOxzgM34OXGlVIkVivF0YJS2oqtIada+6bxsjst/W/pO1QcLC9Ffq58pPO3CDXg==|920
\ No newline at end of file
+}//vkRF8GWxQDmCQ70HiJdy1ixeP8/1mTg1Sy4zshZs+eG/N+NGmexcg9Pzd4xY1GB1ByC4weFtqswOmYgN9tm6EexwCWWtIbNgI7c4J9Qkh9HxAh8I2ZUg/H3m1e9udzTjiVuiHY0rLZi4gReA6U6Bof+OiPYcu9m5pj2YgXS7UFhxpzkHdsX5+HSeJCnLO6+09aVlTLxukTPML2v0NBqSgFJWNSimT2yDkG/X3cYPJM1VxBrftQuXXgvt8PxUZWsJZ7QiASPMDWvssN/HLrebFFM/W7G9pFYW28m8WVsw7eCufUvcOZL4aB+mupN7il+FLjsR+e8kLlg4k59CsUpoiTxCo6Khqrh30D4oGXU3atZa1ujUIvr56d8qkOUorFBS5SlTMhAzNTK+S0hDzu9pXSZSDneOwzThszZCIscXg1eqG4WB4+nAPMxEl70flfk7DMEZQz/Wkb2maAcC9FbJrTzyWM9aiVyBO691Y6mLaRDjnFq7tiJ0NcKe+VLbTBCEljoASojtQixGjJeva2WYuK2cRowXZIVN+eKwXfCfSs1RCbCjYMOORtmcoJ7OW/g1X2tq56rnj7OI6BOBxtyhj9U3XsQiWUrxHWbvWDOz1fQ4M8DqzTW9ywYEMW1EeZQBqc2/fTDYdmRufs2PCT7Mr3u8/7Yi8mvFNAnSMIgy085CpCtjaReIMlWNLtgLDv7/JURJ5HlZXIIEZwDtd9AOBG2uzycNT/jDhbs2C3rQstGMHWaBAjWtYvOikkMH6IMP6Ai37uxLiIwemHQWm4eoOWGUGiLDKZfkJ0XjC+d9i1zS1JZc1lrJ0TTlHgCoG+6ioHSbxkI4lrr0ruMaR629w+oLyCvenhTb096zXNipq1osGLOt30aLbbPlO95bgYeacTbolmwCBD/UzXnPh0+PtA==|920
\ No newline at end of file
diff --git a/Pages/97bdc47834844e0d8f3a5aef747785e.rd b/Pages/97bdc47834844e0d8f3a5aef747785e.rd
index 8b8e787f..ad4c0293 100644
--- a/Pages/97bdc47834844e0d8f3a5aef747785e.rd
+++ b/Pages/97bdc47834844e0d8f3a5aef747785e.rd
@@ -1,5 +1,5 @@
{
"PageType": 2,
- "ColumnCount": 4,
+ "ColumnCount": 6,
"RowCount": 4
}
\ No newline at end of file
diff --git a/Pages/Git/分支选择.json b/Pages/Git/分支选择.json
index 2a7b2176..d0829af2 100644
--- a/Pages/Git/分支选择.json
+++ b/Pages/Git/分支选择.json
@@ -3,23 +3,23 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 27.0
}
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 23.0
+ "DesignLengthInPixel": 46.0
}
},
"3": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 135.0,
+ "DesignLengthInPixel": 125.0,
"Mode": 1
}
},
"4": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 25.0
+ "DesignLengthInPixel": 46.0
}
},
"5": {
@@ -29,7 +29,7 @@
},
"6": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 33.0
+ "DesignLengthInPixel": 27.0
}
},
"7": {
@@ -37,13 +37,18 @@
"DesignLengthInPixel": 32.0,
"IsHidden": true
}
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
}
},
"InLogicalVisibleIndexes": [
7
],
"Count": 8,
- "DefaultSize": 32.0
+ "DefaultSize": 27.0
},
"Cols": {
"RowColumnAttachedInfos": {
@@ -83,7 +88,7 @@
},
"Values": {
"1,1": "请选择绑定的分支",
- "5,1": "确定"
+ "5,1": "确定分支"
},
"AttachInfos": {
"3,1": {
@@ -91,9 +96,10 @@
"CellType": {
"$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon",
"Style": 3,
- "PrimaryColor": "Background 1 -5",
- "SecondaryColor": "Text 1 0",
+ "PrimaryColor": "#FFC00000",
+ "SecondaryColor": "Background 1 0",
"LayoutMode": 1,
+ "ItemSpace": 15,
"Items": [
{
"Value": "master",
@@ -137,13 +143,19 @@
]
}
],
- "ID": "cdd13f19-baff-486d-8c0e-92a4af5d400d"
+ "ID": "46aa28b0-1e10-42aa-a822-7ce825b151bc"
}
]
}
],
- "Text": "确定",
- "TemplateKey": "_RS_Success3"
+ "Text": "确定分支",
+ "TemplateKey": "_RS_Main3",
+ "Icon": {
+ "Name": "git-branch.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
},
"RulesGuidList": [
"c36d069c-596b-4b9f-8bf1-210c89299716"
@@ -153,15 +165,17 @@
"StyleDatas": {
"Styles": [
{
- "FontSize": 18.666666666666664,
- "HorizontalAlignment": 0
+ "FontSize": 16.0,
+ "Foreground": 0,
+ "HorizontalAlignment": 1
},
{
- "HorizontalAlignment": 0
+ "HorizontalAlignment": 1
}
],
"Types": {
"Strs": [
+ "Text 1 50",
"Center",
"Body"
]
@@ -175,7 +189,7 @@
"3,1": 1
},
"SheetStyle": {
- "FontFamily": 1
+ "FontFamily": 2
}
},
"Spans": [
@@ -253,4 +267,4 @@
"Formula": "分支选择!$B$8"
}
]
-}//bDsEKDWwJee8xZmdeo1MD2VN/AGbbhdmk9WNrS5wBXrGHqkJEKwVR23Yi8zGMhwbOs/J0oyYkGL5DQ4aHB32IqaNr+m+kqfei4RHPU1IvFlXrZrLd7opo5pZU4kapxeNMgUxB5sZzvYkn+Rt0Zu7L5AqrDuK6tXeww+/88suGhPxmW/kjf1mV27dcl4L8c9+ONQ+kJy5vSAVL29rspdhflPj/TkFmOzcoctFc+nfU1VnNCvSJA5J7+r6qZLb/s/6BweVHHiiLRHa4xr7f1n1QkOQH1aaY1FHLdewd+qVYVej6hhyO8oXvyX6Iu4QtwfvW9SK+QzXQ6asdwCWBztb+7PKyrxiQKfV3v7/AbIpt8RGJACIMAPElGHyFq3zSNf9o8CEOlHoDQDfbs1KdX/oA/93no0vMT33Il8horC7NzuCD4DMdXichD4hq71oQr6Lgei2LBDr2DbtfoBC8ToLbOpVhHObNthV3nZfJ39HI6R+Kcd7lrGmiHHu6oZKl5nmQeMX/jg1lsyjXSags6pPIOy275oiUzab1uRVNCddjmL1gOLk4NCBRBSGOJ83QVjm+2tqTpmlouJvCAfXtCfidBHXVRcuExGsn7yE2P4stOKZmMxNAz5m1x2HPJeYrTcjJ5GGi1DEvEweTUYL7cOcdtjKsyE/WOqbeWjzjX5ZOmpkZaqM4KZRtucIErgjcwn37IxyhsieoM/DQ/WYL5oJVyhEhC9QrPcvhsvO5nn7obwxKbRpbqX2I4cn8bmoWUOuExPUcbICe56evwe0j3nFG8e09a98VamI7luavriivS9J+vnerYSfiuXyhYgoXsAtuScdSgq6h0PzRC87oaZ3GodiFtX3CRmpJM2eean/MZczNvuVDWhPQDNBLLgTMguJ3rLx4SPbxFmF1wMSSZoQTw==|920
\ No newline at end of file
+}//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
diff --git a/Pages/Git/完善Gitee资料.json b/Pages/Git/完善Gitee资料.json
index 0990e8e7..5cc690d6 100644
--- a/Pages/Git/完善Gitee资料.json
+++ b/Pages/Git/完善Gitee资料.json
@@ -157,11 +157,16 @@
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "Title": "加载中",
+ "VBalidate": true
+ },
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "当前用户",
"ParameterValue": "%CurrentUser%",
- "ID": "fb32cfaef97d4c898e8e9db271732f2a"
+ "ID": "326e16f6ab524ff18abef12510cc710a"
},
{
"$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
@@ -201,6 +206,12 @@
"RefreshAfterFinish": true,
"CheckDataValidation": true
},
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "FunctionName": "remove",
+ "Title": "加载中",
+ "VBalidate": true
+ },
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": [
@@ -223,7 +234,7 @@
"ReloadData": true
}
],
- "ID": "3f38f193-9060-4632-bd15-4082aaacdfa4"
+ "ID": "ad7da0ce-abd2-41e9-97a9-ec3cace0b01f"
},
{
"CommandList": [
@@ -238,7 +249,7 @@
"BtnText": "知道了"
}
],
- "ID": "7583453f-5925-4e06-a07c-f26c2ef5bb27"
+ "ID": "bbfc6d44-37ff-4418-9f5a-0b0aa45758e0"
}
]
}
@@ -333,4 +344,4 @@
"PaperSize": {},
"Margin": {}
}
-}//SRSDTTtOyNv3KoNRE1iedFFSxov1sMKc6G0hIqZE9jkKd8HyRRRmaoXTgJqMVNUHd9DsmhyLf92IiYHAwZ9lOrgphMGHIEcZ2DArIxyqzrvN41APvKUIEnn7Hs9d8RVpljHs6vFCaoWSK8F0Q1RfQncjtunKBQo5o/bbfWvk/UnbtfzNoPOo8AgsMFpWKAp4wWs7qQGzQxNeH6PPxvs5TOcqrMQy63wob13uJkc53gh7sqK1T0pWwI1/z94fQjCxnqnnP/h33JhFQX/IRM7807+XurSrzQIo/1EWBdYwvX84PPrzFo3af1AM9OvOOPtgviiapiHHGUqNS4d4v/cS8/a08y3iMdwe40iYc8mt/uZrxBlKefTI+RfZqJ4/zm0NGXQjOX/2T6zSmlif078op2sVgamHGOgtP/tL8PFmU/JzKXMNBVsLesDZW4PcfTYHKEEtKjFWKNhg8hF4bkMAUAqTtYkvqs3YTDSb2u3xuLNlXN/v0c+iudyIhoTNi0GMjV27SWg4y6UeV6sbQg1JAnPb6+6soaQGDPuSoFXFVRdGDDMLKGk5jOuT2RW+vLkGLmV8hLmPxEvaA16iddslB2//jcjddUFZh35olVTsjLe+2FfZfsU9gvc2dgZZbdnBzyv4YFcKzi3Py69NIVx1vyZULc0d/B8YCSZfu8dVZoaLqbfCBmeXgZqzs50naX2+HAseLxS3oXP73Na6q1ASseEmORxs2PEOrnvC9v1nPZNrioOodULDfLug4Mb6CelKsklEQt6LRRlcbFL8BqHz5dGBiazkx3e71YXkAHVKmVcsXD19BSk3EAwqNNV7seV74pKpb5FAXgcjtBmcigsycKo8xiyrYiukGWA3y6iZ/OJLnCgUmPcmDf+xckQnGBCOHi3NSNfaDmek6nNTkwuRhg==|920
\ No newline at end of file
+}//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
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json
index 70aaf8c3..4ec930f9 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json
@@ -28,15 +28,13 @@
},
"5": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 16.0,
- "IsHidden": true
+ "DesignLengthInPixel": 16.0
}
},
"6": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 109.0,
- "Mode": 1,
- "IsHidden": true
+ "Mode": 1
}
},
"7": {
@@ -44,6 +42,16 @@
"DesignLengthInPixel": 16.0
}
},
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
"10": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -64,21 +72,9 @@
"DesignLengthInPixel": 32.0,
"IsHidden": true
}
- },
- "8": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
- }
- },
- "9": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
- }
}
},
"InLogicalVisibleIndexes": [
- 5,
- 6,
13
],
"Count": 14,
@@ -106,11 +102,6 @@
"DesignLengthInPixel": 32.0
}
},
- "6": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
"7": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -135,18 +126,22 @@
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
}
},
- "Count": 12,
+ "Count": 13,
"DefaultSize": 32.0
},
"Values": {
- "1,1": "版本标识",
+ "1,1": "版本名称",
"4,1": "绑定Gitee仓库",
- "4,9": "选择仓库",
"8,1": "订阅",
"11,1": "关闭",
- "11,8": "保存"
+ "11,9": "保存"
},
"AttachInfos": {
"2,1": {
@@ -156,7 +151,7 @@
"GUID": "345f29ea-ba0c-409c-a1c1-2338e1253913"
},
"CellType": {
- "$type": "ElementUI.InputCellType, ElementUI",
+ "$type": "ElementUI.SelectCellType, ElementUI",
"CommandList": [],
"UIPermissions": [
{
@@ -170,211 +165,52 @@
"AllowRoles": [
"FGC_Anonymous"
]
+ }
+ ],
+ "options": [
+ {
+ "value": "Alpha",
+ "label": "Alpha(早期版本)"
},
{
- "Scope": 4,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ],
- "type": "text",
- "resize": "none"
- }
- },
- "4,9": {
- "CellType": {
- "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
- "CommandList": [
+ "value": "Beta",
+ "label": "Beta(内测版本)"
+ },
{
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "ClosePopupCallbackCommand": {
- "Commands": [
- {
- "$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": "1"
- },
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
- "cellLocations": [
- {
- "SerializeProperty": "=仓库ID"
- }
- ]
- },
- "value": "%Null%",
- "compareType": 1
- }
- ]
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
- "TargetPageElement": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!B7"
- },
- "TargetType": "Forguncy.UserControlPageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
- "MethodName": "SetPropertyValue",
- "ParameterValues": {
- "userControlProperties": {
- "$type": "System.Collections.Generic.List`1[[Forguncy.SetUserControlPropertyValue, ServerDesignerCommon]], System.Private.CoreLib",
- "$values": [
- {
- "PropertyName": "空间路径名",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.空间路径名"
- }
- },
- {
- "PropertyName": "仓库ID",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.仓库ID"
- }
- },
- {
- "PropertyName": "空间名称",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.空间名称"
- }
- },
- {
- "PropertyName": "仓库路径名",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.仓库路径名"
- }
- },
- {
- "PropertyName": "仓库名称",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.仓库名称"
- }
- },
- {
- "PropertyName": "仓库地址",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.仓库地址"
- }
- },
- {
- "PropertyName": "仓库描述",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.仓库描述"
- }
- },
- {
- "PropertyName": "仓库成员",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.仓库成员"
- }
- },
- {
- "PropertyName": "创建人",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.创建人"
- }
- },
- {
- "PropertyName": "创建人头像",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.创建人头像"
- }
- },
- {
- "PropertyName": "hook_api_url",
- "PropertyValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.hook_api_url"
- }
- },
- {
- "PropertyName": "显示删除",
- "PropertyValue": "1"
- }
- ]
- },
- "userControlPageName": null
- }
- },
- {
- "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!B7"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!仓库信息.仓库ID"
- }
- },
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!B10"
- },
- "Value": "1"
- }
- ]
- },
- {
- "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "Location": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!6:7"
- },
- "Value": true
- }
- ]
- }
- ],
- "ID": "3bad0752-7458-4fcb-bd8e-cc04fa74dfcb"
- }
- ]
- }
- ],
- "ParamProperties": {
- "IsOK": "是否为确定",
- "仓库ID": "仓库ID",
- "仓库信息": "仓库信息"
- }
- },
- "PageName": "选择Git仓库"
+ "value": "RC",
+ "label": "RC(最终版本)"
+ },
+ {
+ "value": "Preview",
+ "label": "Preview(技术预览版)"
+ },
+ {
+ "value": "GA",
+ "label": "GA(正式版)"
+ },
+ {
+ "value": "MR",
+ "label": "MR(维护版)"
+ },
+ {
+ "value": "Hotfix",
+ "label": "Hotfix(修复版本)"
+ },
+ {
+ "value": "LTS",
+ "label": "LTS(长期支持版)"
}
],
- "Text": "选择仓库",
- "ClickMode": 1,
- "TemplateKey": "_RS_Main"
+ "placeholder": "请输入",
+ "noDataText": "无数据",
+ "filterable": true,
+ "filterInServerOptions": {
+ "matchMethod": "contains",
+ "loadingText": "加载中"
+ },
+ "allowCreate": true,
+ "noMatchText": "无匹配数据",
+ "clearable": true
}
},
"6,1": {
@@ -423,52 +259,41 @@
"$type": "System.Collections.Generic.List`1[[Forguncy.SetUserControlPropertyValue, ServerDesignerCommon]], System.Private.CoreLib",
"$values": [
{
- "PropertyName": "创建人头像",
- "PropertyValue": "%Null%"
+ "PropertyName": "创建人头像"
},
{
- "PropertyName": "仓库名称",
- "PropertyValue": "%Null%"
+ "PropertyName": "仓库名称"
},
{
- "PropertyName": "仓库描述",
- "PropertyValue": "%Null%"
+ "PropertyName": "仓库描述"
},
{
- "PropertyName": "空间名称",
- "PropertyValue": "%Null%"
+ "PropertyName": "空间名称"
+ },
+ {
+ "PropertyName": "仓库路径名"
+ },
+ {
+ "PropertyName": "仓库地址"
+ },
+ {
+ "PropertyName": "仓库成员"
+ },
+ {
+ "PropertyName": "创建人"
+ },
+ {
+ "PropertyName": "hook_api_url"
+ },
+ {
+ "PropertyName": "仓库ID"
+ },
+ {
+ "PropertyName": "空间路径名"
},
{
"PropertyName": "显示删除",
- "PropertyValue": "%Null%"
- },
- {
- "PropertyName": "仓库路径名",
- "PropertyValue": "%Null%"
- },
- {
- "PropertyName": "仓库地址",
- "PropertyValue": "%Null%"
- },
- {
- "PropertyName": "仓库成员",
- "PropertyValue": "%Null%"
- },
- {
- "PropertyName": "创建人",
- "PropertyValue": "%Null%"
- },
- {
- "PropertyName": "hook_api_url",
- "PropertyValue": "%Null%"
- },
- {
- "PropertyName": "仓库ID",
- "PropertyValue": "%Null%"
- },
- {
- "PropertyName": "空间路径名",
- "PropertyValue": "%Null%"
+ "PropertyValue": "1"
}
]
},
@@ -485,7 +310,8 @@
},
"Value": false
}
- ]
+ ],
+ "Disabled": true
}
],
"ParamProperties": {}
@@ -496,13 +322,418 @@
"Commands": {
"Commands": [
{
- "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
- "TargetPageElement": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本详情!J5"
- },
- "TargetType": "Forguncy.HyperlinkCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
- "MethodName": "ExecuteCommand"
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon",
+ "currentUserProperty": {
+ "UserProperty": "GIT用户名",
+ "PropertyType": 4
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon",
+ "currentUserProperty": {
+ "UserProperty": "GIT密码",
+ "PropertyType": 4
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "ClosePopupCallbackCommand": {
+ "Commands": [
+ {
+ "$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": "1"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=仓库ID"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!B7"
+ },
+ "TargetType": "Forguncy.UserControlPageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "SetPropertyValue",
+ "ParameterValues": {
+ "userControlProperties": {
+ "$type": "System.Collections.Generic.List`1[[Forguncy.SetUserControlPropertyValue, ServerDesignerCommon]], System.Private.CoreLib",
+ "$values": [
+ {
+ "PropertyName": "空间路径名",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.空间路径名"
+ }
+ },
+ {
+ "PropertyName": "仓库ID",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库ID"
+ }
+ },
+ {
+ "PropertyName": "空间名称",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.空间名称"
+ }
+ },
+ {
+ "PropertyName": "仓库路径名",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库路径名"
+ }
+ },
+ {
+ "PropertyName": "仓库名称",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库名称"
+ }
+ },
+ {
+ "PropertyName": "仓库地址",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库地址"
+ }
+ },
+ {
+ "PropertyName": "仓库描述",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库描述"
+ }
+ },
+ {
+ "PropertyName": "仓库成员",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库成员"
+ }
+ },
+ {
+ "PropertyName": "创建人",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.创建人"
+ }
+ },
+ {
+ "PropertyName": "创建人头像",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.创建人头像"
+ }
+ },
+ {
+ "PropertyName": "hook_api_url",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.hook_api_url"
+ }
+ },
+ {
+ "PropertyName": "显示删除",
+ "PropertyValue": "1"
+ }
+ ]
+ },
+ "userControlPageName": null
+ }
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!B7"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库ID"
+ }
+ },
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!B10"
+ },
+ "Value": "1"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!6:7"
+ },
+ "Value": true
+ }
+ ]
+ }
+ ],
+ "ID": "a284034c-a6ed-4d98-af93-d181d24757bc"
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "IsOK": "是否为确定",
+ "仓库ID": "仓库ID",
+ "仓库信息": "仓库信息"
+ }
+ },
+ "PageName": "选择Git仓库"
+ }
+ ],
+ "ID": "c776141f-abed-407b-abbb-53d4bf88d31c"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "ClosePopupCallbackCommand": {
+ "Commands": [
+ {
+ "$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": "1"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=仓库ID"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!B7"
+ },
+ "TargetType": "Forguncy.UserControlPageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "SetPropertyValue",
+ "ParameterValues": {
+ "userControlProperties": {
+ "$type": "System.Collections.Generic.List`1[[Forguncy.SetUserControlPropertyValue, ServerDesignerCommon]], System.Private.CoreLib",
+ "$values": [
+ {
+ "PropertyName": "空间路径名",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.空间路径名"
+ }
+ },
+ {
+ "PropertyName": "仓库ID",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库ID"
+ }
+ },
+ {
+ "PropertyName": "空间名称",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.空间名称"
+ }
+ },
+ {
+ "PropertyName": "仓库路径名",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库路径名"
+ }
+ },
+ {
+ "PropertyName": "仓库名称",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库名称"
+ }
+ },
+ {
+ "PropertyName": "仓库地址",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库地址"
+ }
+ },
+ {
+ "PropertyName": "仓库描述",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库描述"
+ }
+ },
+ {
+ "PropertyName": "仓库成员",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库成员"
+ }
+ },
+ {
+ "PropertyName": "创建人",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.创建人"
+ }
+ },
+ {
+ "PropertyName": "创建人头像",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.创建人头像"
+ }
+ },
+ {
+ "PropertyName": "hook_api_url",
+ "PropertyValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.hook_api_url"
+ }
+ },
+ {
+ "PropertyName": "显示删除",
+ "PropertyValue": "1"
+ }
+ ]
+ },
+ "userControlPageName": null
+ }
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!B7"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!仓库信息.仓库ID"
+ }
+ },
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!B10"
+ },
+ "Value": "1"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本详情!6:7"
+ },
+ "Value": true
+ }
+ ]
+ }
+ ],
+ "ID": "778d7c53-5c28-4fe9-a8cb-b380403cc488"
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "IsOK": "是否为确定",
+ "仓库ID": "仓库ID",
+ "仓库信息": "仓库信息"
+ }
+ },
+ "PageName": "完善Gitee资料"
+ }
+ ],
+ "ID": "7484c0f4-ca6b-4124-9c7b-b58de0c056ab"
+ }
+ ]
}
],
"ParamProperties": {}
@@ -513,11 +744,15 @@
{
"Name": "显示删除",
"Value": "1"
+ },
+ {
+ "Name": "按钮文字",
+ "Value": "绑定Gitee仓库"
}
]
}
},
- "8,10": {
+ "8,11": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"ToolTip": "勾选后系统可接收来自Gitee的通知",
@@ -553,7 +788,7 @@
"TemplateKey": "_RS_Information3"
}
},
- "11,8": {
+ "11,9": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -816,12 +1051,12 @@
"$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
}
],
- "ID": "7d8189e8-1b76-463b-a20d-1ff80f218eb4"
+ "ID": "c4dc1154-7539-4fcb-9e13-3cfa976b16eb"
}
]
}
],
- "ID": "488a7088-b357-4f3e-9ac0-5ae55e313576"
+ "ID": "3f70baa0-7fe2-4c39-ac51-004a054dab4f"
}
]
},
@@ -850,7 +1085,7 @@
"ReloadAfterSucceed": false
}
],
- "ID": "57fc37f1-1681-47ad-b10d-ba00cc1c9276"
+ "ID": "2a40311c-2d19-40cd-bb39-4778cf6903ab"
},
{
"CommandList": [
@@ -861,7 +1096,7 @@
"ReloadAfterSucceed": false
}
],
- "ID": "12e919cb-717f-492e-97c3-b2fc7cc217e0"
+ "ID": "6e2e5a18-beff-45ba-a4ff-fc81a69e6861"
}
]
},
@@ -895,6 +1130,11 @@
},
"StyleDatas": {
"Styles": [
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 1
+ },
{
"FontFamily": 0,
"FontSize": 13.333333333333332
@@ -902,27 +1142,19 @@
{
"FontFamily": 0,
"FontSize": 13.333333333333332,
- "Foreground": 1,
- "HorizontalAlignment": 2,
- "Underline": false
+ "Foreground": 2
},
{
"FontFamily": 0,
"FontSize": 13.333333333333332,
- "Foreground": 3
- },
- {
- "FontFamily": 0,
- "FontSize": 13.333333333333332,
- "Foreground": 4,
- "Formatter": 5
+ "Foreground": 3,
+ "Formatter": 4
}
],
"Types": {
"Strs": [
"Body",
- "Accent 1 0",
- "Right",
+ "Center",
"Text 1 50",
"black",
"General"
@@ -930,42 +1162,36 @@
},
"CellStyles": {
"4,1": 0,
- "4,2": 0,
- "4,3": 0,
- "4,4": 0,
- "4,5": 0,
- "4,6": 0,
- "4,7": 0,
- "4,8": 0,
- "4,9": 1,
- "5,1": 0,
- "6,1": 0,
- "7,1": 0,
- "7,2": 0,
- "7,3": 0,
- "7,4": 0,
- "7,5": 0,
- "7,6": 0,
- "7,7": 0,
- "7,8": 0,
- "7,9": 0,
- "7,10": 0,
- "8,1": 0,
- "8,2": 0,
- "8,3": 0,
- "8,4": 0,
- "8,5": 0,
- "8,6": 0,
- "8,7": 0,
- "8,8": 0,
- "8,9": 0,
- "8,10": 2,
+ "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,
+ "8,11": 2,
"9,1": 3,
- "11,1": 0,
- "11,4": 0,
- "11,8": 0,
- "11,9": 0,
- "11,10": 0
+ "11,1": 1,
+ "11,4": 1,
+ "11,9": 1,
+ "11,10": 1,
+ "11,11": 1
},
"SheetStyle": {
"FontFamily": 0,
@@ -973,14 +1199,14 @@
}
},
"Spans": [
- "2,1,1,10",
- "4,9,1,2",
"13,1,1,3",
- "9,1,1,10",
+ "9,1,1,11",
"13,4,1,2",
- "11,8,1,3",
+ "11,9,1,3",
"11,1,1,3",
- "6,1,1,10"
+ "6,1,1,11",
+ "2,1,1,11",
+ "4,1,1,11"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1016,9 +1242,10 @@
]
}
],
- "ID": "10b26ae6-fce9-44a2-9527-76d9e1f6113d"
+ "ID": "419b4c23-3eb9-468b-9c9a-798c0366ae16"
}
- ]
+ ],
+ "Disabled": true
}
],
"PermissionData": {
@@ -1064,4 +1291,4 @@
"Formula": "任务版本详情!$B$14"
}
]
-}//O2nITsEYkPDMtmejghClcGURqBf1HN3WYYTW0aUBjl2FKzshQ1FIPcz2Uw4+48o/CzYXsJYZah8DD+dHfJCAcRfTBb7BKCl411IdC/CIxO9Iq+wyOsG9emSn9TqcacTKA5wGVZBYE2Hu0xyFCzBuwXHH6y2dCceZJt8mv4v7LL/0L1VNfMKKx1c+9GWfEiuvTq6B0SXiTIhGREqoNvSI/rrb07q8L1BzTnrX2PapDKUTmj1ihN/u5+U336uXPn6mvd+5x4Tx7CPID70VEaWlRJWNmyjstKXMvD+aANjFwi9Kj86YUtVBotJv4iIM85TQ8C0EbPmBjuAZqWsxJjp/K8sq/8D5EllQ86mZQ6VXsd1/+7zeN14fsvS0ACdjK4ywqMnRKkSbvd3XCA9G/04JmVpmNNw/PoatF6CXi9xlMxTzz8rDdG36hDE2QHDONRdThKmuyyTBAY8tHJZK4eR2qOd8XWsg8bYxWlOQyj5z5T7Dmo7KRJhNepLAVZDtHdlGkNi4YF/2KWgm0tTSvnoOpGsUx21fYgpIKBHHkICchfnnZd+OzNfSxnCPboRkp60052xaedoxQz0QusrihoplkHT1gVXBlOVdU8Pwh16e3FvPfj1wDsXk/QZBqxlYypikQt0mDw5zrcd/DCqX6YASfETTDMHxd2dA24u+WAxKEiE6wUW8+D8BcY3tPhI+buPHG6yBSeAy5q2OVJTY+c0fitxcnYYISZu6+pX00RuQh5jg5RL5HGKcSxUUIFWlSvaS38T15syMK2F+yGJ2zEuULn5nlEouqHsWRxI9BBe5Z7j7uqzVPOkzZfDaDIthnzu8vNLwq4jkYNnsy0vgOvENAwHIEFDKjNgtI9DimbEzMH6knVsqUjj5qXVcUc7/p5Ilth5vZmSRsih2ZPwZ56bVjQ==|920
\ No newline at end of file
+}//6gdiGRcAerZLRfoL12qr+uUibBHc4GtaImNNG7mzI0ph6SdK49yeCvhOzuYj2s2IVWvXsWXilgsiM77UDHbDY4gfxurYuNNkDCFP9sI0OgGMrnQRPAYrHej8SKi45D2oQa+zToiop3KuHC/yCtvqyDIZTjc9yNGfVgWavFUrKxvBgikwdhx9DRooxv94uh3CEmv69wwX686nCsqagGo4TH6m/FbNuq7c7LekQsycSSYu8Wb4/5euun1J5gptVTYWD5bU6YQLBUhiK36JrMmaRs0XCr26vM3VLpkvU8DDtyOJrQYO2TjcxlmWVLm1FlYkCmflgvZPaaOQNRUn9MBkTyfbR9gjMP2SW69J/kh/QzrHRlkD/lLC2VS/+jHES6l1WmdDz372YaKQYsaxUu2y1qS5yR/CdOdNKWPFND4hQPQZY5u1FHTVzPFfn2KYI6n4/VnmAwo6QP2JmgspJz9RVplwY7Cz3uPP7Em12fNxuherCftDsQpuZ5L5sObvyI0IX+EZRH3xF/mpr/cXFAMXTqxd31UvsN11/84Vku8e12f4JcQmNUsoplXHU23h0S20Lk8GyMBM3GDe6Hrqb9/86ZFm6nju6csJwAb6OmhNXyNxcpwDP6fYl8436355zYcYpPgi+mQy2inVAehSnOatKPL4X92a6mp9/iY37Q9WxIacJ/RKc12WPJlgl8Q9bm1lv2M+ed77/kMTHDxpvANETUUYkc1hI5dCvtw+0ev6K+1VoNzDrYfCn7esqYZP6tuC6mYmuVXv85rYMqXare9xC6nlJQtS9wvRToSYHPww0LsjmLETiZCaoDm989xaxR2f9tmvsaMqPYKdPOn7mRCvM8V3xYM8+14nP+6hSNPac6hhhJSVALqdIufiqhCP7Oj3FO9OassgIQM7LbB/BTqvxA==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd
index 13c89199..4bf9b0b7 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd
@@ -1,6 +1,6 @@
{
"PageType": 0,
- "ColumnCount": 12,
+ "ColumnCount": 13,
"RowCount": 14,
"CustomNames": [
{
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json
index 4465c36e..e05c0e10 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json
@@ -78,11 +78,6 @@
"DesignLengthInPixel": 32.0
}
},
- "5": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
"6": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -90,17 +85,17 @@
},
"7": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 16.0
+ "DesignLengthInPixel": 32.0
}
},
"8": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 16.0
}
},
"9": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 24.0
}
},
"10": {
@@ -123,7 +118,7 @@
"DesignLengthInPixel": 32.0
}
},
- "16": {
+ "14": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
@@ -144,6 +139,11 @@
}
},
"20": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "21": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0,
"Mode": 2,
@@ -155,11 +155,6 @@
}
}
},
- "24": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
"25": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -207,32 +202,37 @@
},
"34": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 16.0
+ "DesignLengthInPixel": 32.0
}
},
"35": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ },
+ "36": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 176.0,
"Mode": 1
}
},
- "36": {
+ "37": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
}
},
- "Count": 37,
+ "Count": 38,
"DefaultSize": 32.0
},
"Values": {
"1,1": "版本列表",
- "1,9": "配置列表",
- "1,30": "新增配置",
+ "1,10": "配置列表",
+ "1,31": "新增配置",
"5,2": "添加版本"
},
"AttachInfos": {
- "1,30": {
+ "1,31": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -244,7 +244,7 @@
"$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
"TargetPageElement": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目版本管理!J4"
+ "SerializeProperty": "=项目版本管理!K4"
},
"TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
"MethodName": "ResetTable",
@@ -291,7 +291,7 @@
}
}
},
- "1,35": {
+ "1,36": {
"CellType": {
"$type": "ElementUI.TimelineCellType, ElementUI",
"useBinding": true,
@@ -403,10 +403,10 @@
"GUID": "c4adbd8f-5cff-491c-b247-075bb4983da5",
"BindingInfo": {
"TableName": "项目版本",
- "ColumnName": "版本名称",
- "GUID": "af216557-7ed6-424a-a60f-d28c6508b3a5"
+ "ColumnName": "名称加版本号",
+ "GUID": "e80eb61c-9ed4-42a4-8fd2-fdeab54a2e9e"
},
- "ColumnName": "版本名称"
+ "ColumnName": "名称加版本号"
},
{
"GUID": "6b2a3ef6-f100-4438-94d5-90b04acb2c22",
@@ -454,7 +454,7 @@
}
}
},
- "3,9": {
+ "3,10": {
"CellType": {
"$type": "ElementUI.TableCellType, ElementUI",
"ElTableName": "EL表格1",
@@ -667,7 +667,7 @@
"$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
"TargetPageElement": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目版本管理!J4"
+ "SerializeProperty": "=项目版本管理!K4"
},
"TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
"MethodName": "ResetTable",
@@ -677,7 +677,7 @@
}
}
],
- "ID": "e0759d63-76b5-43ae-ab98-e65f1dd61934"
+ "ID": "2848a997-0aeb-4e4a-aa68-530da20ee25e"
}
]
}
@@ -770,7 +770,7 @@
"$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
"TargetPageElement": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目版本管理!J4"
+ "SerializeProperty": "=项目版本管理!K4"
},
"TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
"MethodName": "ResetTable",
@@ -780,7 +780,7 @@
}
}
],
- "ID": "d4d10bd0-1167-49cf-8840-a5adda5146db"
+ "ID": "b70292b2-dc0f-47c5-8e54-f0df1a5e5729"
}
]
}
@@ -834,7 +834,7 @@
"GUID": "ae0290f0-a846-43e4-8f26-02b5ae169d39"
}
},
- "7,5": {
+ "7,6": {
"BindingInfo": {
"TableName": "项目版本",
"ColumnName": "仓库ID",
@@ -909,33 +909,33 @@
]
},
"CellStyles": {
- "0,7": 0,
- "0,35": 1,
+ "0,8": 0,
+ "0,36": 1,
"1,1": 2,
- "1,7": 3,
- "1,8": 4,
- "1,9": 5,
- "1,30": 6,
- "1,31": 4,
+ "1,8": 3,
+ "1,9": 4,
+ "1,10": 5,
+ "1,31": 6,
"1,32": 4,
"1,33": 4,
- "1,34": 6,
- "1,35": 7,
- "2,7": 0,
- "2,35": 1,
+ "1,34": 4,
+ "1,35": 6,
+ "1,36": 7,
+ "2,8": 0,
+ "2,36": 1,
"3,1": 8,
- "3,7": 0,
- "3,9": 4,
- "3,34": 4,
- "3,35": 1,
+ "3,8": 0,
+ "3,10": 4,
+ "3,35": 4,
+ "3,36": 1,
"4,1": 8,
"4,2": 8,
"4,3": 8,
"4,4": 8,
"4,5": 8,
"4,6": 8,
- "4,7": 9,
- "4,9": 4,
+ "4,7": 8,
+ "4,8": 9,
"4,10": 4,
"4,11": 4,
"4,12": 4,
@@ -961,10 +961,10 @@
"4,32": 4,
"4,33": 4,
"4,34": 4,
- "4,35": 1,
+ "4,35": 4,
+ "4,36": 1,
"5,2": 6,
- "5,7": 9,
- "5,9": 4,
+ "5,8": 9,
"5,10": 4,
"5,11": 4,
"5,12": 4,
@@ -990,34 +990,37 @@
"5,32": 4,
"5,33": 4,
"5,34": 4,
- "5,35": 1,
+ "5,35": 4,
+ "5,36": 1,
"6,1": 8,
"6,2": 8,
"6,3": 8,
"6,4": 8,
"6,5": 8,
"6,6": 8,
- "6,7": 9,
- "6,35": 1,
+ "6,7": 8,
+ "6,8": 9,
+ "6,36": 1,
"7,1": 10,
"7,2": 10,
"7,3": 10,
"7,4": 10,
"7,5": 11,
- "7,35": 1
+ "7,6": 11,
+ "7,36": 1
},
"SheetStyle": {
"FontFamily": 2
}
},
"Spans": [
- "3,1,1,7",
+ "3,1,1,8",
"7,1,1,4",
- "3,9,1,25",
- "1,30,1,4",
- "1,35,6,1",
- "5,2,1,5",
- "7,5,1,5"
+ "3,10,1,25",
+ "1,31,1,4",
+ "1,36,6,1",
+ "5,2,1,6",
+ "7,6,1,5"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1028,7 +1031,7 @@
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目版本管理!J2"
+ "SerializeProperty": "=项目版本管理!K2"
},
"Value": "项目视图"
}
@@ -1075,7 +1078,7 @@
},
{
"Name": "当前版本仓库ID",
- "Formula": "项目版本管理!$F$8"
+ "Formula": "项目版本管理!$G$8"
}
]
-}//G8G39aUeCgLnu9F0nSrWLJm7Pj0nnMQcSJzkD9pTt3Qrz+C1ts5KlAVWeAkNbmWmAKdXjLC4LYMnf5/iuWeJ8Q/Pqaprmgrk3PNRTP9UKqZjqXEmKAVwI7mxpTO4RoI5rQd1F8xYuvMvy36d0r05NVAlMzNsk5i/ki+ahgaDCkl1v2RXfDMlbw6xw+XPXniUzkA3nsYpkuIO2hhmhjGh1vrwJnlIF9uBd8sFstnk7Xq/aDgWrOpQIfYvinqZlOvuCPmk8f3wquYVgA70JgU2RyfdiKZkj4G2HkixC4JWDBXGCZGP5zCqNiobI1A/C7TP7HXioNRhgXDurIryvOhriL2p0Llddq8009VsvrY0uRXK/CCUVAe8KbKRbZEImQZLbsCyVB1ksfOjVPM8fwLyEFWX+cn2jwngHueYCp4M8EFpGGcV3i5+YRDVXhzVj8irNeH9MeD1FuA/F7ezNBGYB7LmpApKmDRsGX1WD9bNQJ+iP2IekQI3Lrnzb37BbaQ6jJFC2dFazbElLTGeG3UsSGNWJInC3TnvLTtaGF7ZVlJEozai8pGyibKcoWLnphh1mHb+NiXKrB/W/STxeUHfoUa26WSJzvUY8W4WfX237jNzCemVUlN4i+V2QTm9R03jX7FC5a81VgRya+ahCacQrS1dUhRQVAeb/QNjDREQ4/dvUh4rKr+wJ+AbWcUhpuS3LRBb6cu/3Qy49fy/1q909lgCYEEHhhcSmy/1RHaFXr35BiEA4oo5Yxf4h0vHzG5i+5O7/kdDAzJGoMYyVFeSeYDNdgivYspTtAi39u8Ipv3TfHFDzPXDMM5A25X3fiUfqCUvAfMjYGEVjhaxsvToEDugmmdAJ3Gq2fk2QCB2yH4rOmxJp91FF4VAkfK4CeeetXH6LnqGDlj14YFoFt3dbg==|920
\ No newline at end of file
+}//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
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.rd b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.rd
index ba887110..0173cdfe 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.rd
@@ -1,6 +1,6 @@
{
"PageType": 0,
- "ColumnCount": 37,
+ "ColumnCount": 38,
"RowCount": 8,
"CustomNames": [
{
@@ -9,7 +9,7 @@
},
{
"Name": "当前版本仓库ID",
- "Formula": "项目版本管理!$F$8"
+ "Formula": "项目版本管理!$G$8"
}
]
}
\ No newline at end of file
diff --git a/ServerCommands/Gitee/更新GITEE信息.json b/ServerCommands/Gitee/更新GITEE信息.json
new file mode 100644
index 00000000..e2891629
--- /dev/null
+++ b/ServerCommands/Gitee/更新GITEE信息.json
@@ -0,0 +1,311 @@
+{
+ "Name": "更新GITEE信息",
+ "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": "用户名",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ },
+ "TestData": "Administrator"
+ },
+ {
+ "Name": "Git用户名",
+ "DataValidationInfo": {},
+ "TestData": "cuckooent"
+ },
+ {
+ "Name": "Git密码",
+ "DataValidationInfo": {},
+ "TestData": "x6158891C"
+ }
+ ],
+ "InvokeTriggerTestData": {
+ "UserName": "Administrator"
+ }
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand",
+ "JsonString": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=全局_Gitee"
+ },
+ "SampleJson": "{\r\n \"client_id\": \"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\r\n \"client_secret\": \"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\"\r\n}",
+ "ToParameter": "Gitee配置"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "用户",
+ "TableValue": {
+ "TableName": "用户信息视图",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "f93daff7-8a41-4e6d-ae95-c5da5cf2d4ea",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "adce5931-be11-4801-8178-6bed10f2c9b2"
+ },
+ "ColumnName": "用户名"
+ },
+ {
+ "GUID": "e492c62f-3726-431f-a9b8-f0803767cb90",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "全名",
+ "GUID": "7deda464-b19d-48b4-bb68-3f738a324abc"
+ },
+ "ColumnName": "全名"
+ },
+ {
+ "GUID": "e4431bdd-85fc-4c72-970f-74bbba378349",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "邮件",
+ "GUID": "07d2c92f-708b-46a8-9610-3c326740dd88"
+ },
+ "ColumnName": "邮件"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "5528766a-0121-41a8-99b1-1d47fcfc5c60"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=用户名"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "3f0ffb1d3f7f4655b6e6d27fe8b598f3"
+ },
+ {
+ "$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.CatchExceptionCommand, ServerDesignerCommon",
+ "TryCommandPart": {
+ "CommandList": [
+ {
+ "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi",
+ "PostData": {
+ "DataItemType": 1,
+ "Data": {
+ "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi",
+ "Data": [
+ {
+ "Name": "grant_type",
+ "DataItemType": 0,
+ "Data": "password"
+ },
+ {
+ "Name": "username",
+ "DataItemType": 0,
+ "Data": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git用户名"
+ }
+ },
+ {
+ "Name": "password",
+ "DataItemType": 0,
+ "Data": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git密码"
+ }
+ },
+ {
+ "Name": "client_id",
+ "DataItemType": 0,
+ "Data": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Gitee配置.client_id"
+ }
+ },
+ {
+ "Name": "client_secret",
+ "DataItemType": 0,
+ "Data": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Gitee配置.client_secret"
+ }
+ },
+ {
+ "Name": "scope",
+ "DataItemType": 0,
+ "Data": "user_info projects pull_requests issues notes keys hook groups gists enterprises"
+ }
+ ]
+ }
+ },
+ "JsonString": "",
+ "WebUrl": "https://gitee.com/oauth/token",
+ "Method": "POST",
+ "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": "SaveFormData.fillInJSONProperties, SaveFormData",
+ "FullJsonString": "{\r\n \"error\": \"invalid_grant\",\r\n \"error_description\": \"授权方式无效，或者登录回调地址无效、过期或已被撤销\",\r\n \"access_token\": \"5c7c5fe2b1f0fc025c1a38006b6e95f3\",\r\n \"token_type\": \"bearer\",\r\n \"expires_in\": 86400,\r\n \"refresh_token\": \"03be42668ee199713604ff75491eeb0904a665d069de178c6c8f73c0a50a6ab6\",\r\n \"scope\": \"user_info projects pull_requests issues notes keys hook groups gists enterprises\",\r\n \"created_at\": 1718241807\r\n}",
+ "SourceJson": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=result"
+ },
+ "ResultTo": "RES"
+ },
+ {
+ "$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": "=RES.error"
+ }
+ },
+ "value": "%Null%"
+ },
+ "CommandList": [
+ {
+ "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2",
+ "OperationType": "202",
+ "CommandOperator": {
+ "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2",
+ "UserName": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=用户名"
+ },
+ "FullName": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=用户.全名"
+ },
+ "Email": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=用户.邮件"
+ },
+ "ExtendedProperties": [
+ {
+ "Name": "GIT用户名",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git用户名"
+ }
+ },
+ {
+ "Name": "GIT密码",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git密码"
+ }
+ }
+ ]
+ }
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "保存成功"
+ }
+ ],
+ "ID": "014e33da-3afd-4d65-80e7-af7fd58ced10"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=result.error"
+ },
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=result.error_description"
+ }
+ }
+ ],
+ "ID": "e6d43ff4-be74-45c3-b98a-7a140635f32d"
+ }
+ ]
+ }
+ ]
+ },
+ "CatchCommandPart": {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ExceptionCode"
+ },
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ExceptionMessage"
+ }
+ }
+ ]
+ }
+ }
+ ],
+ "ID": "465ea1cc-084f-4a65-8d72-4db87b5030d2"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "用户不存在"
+ }
+ ],
+ "ID": "81378159-d987-4662-a42b-0abef3076cf0"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ServerCommands/OPENAPI/DeploymentNotification.json b/ServerCommands/OPENAPI/DeploymentNotification.json
new file mode 100644
index 00000000..dc3ec360
--- /dev/null
+++ b/ServerCommands/OPENAPI/DeploymentNotification.json
@@ -0,0 +1,293 @@
+{
+ "Name": "DeploymentNotification",
+ "Description": "应用部署接口，用来自动通知应用部署事件。",
+ "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_Anonymous"
+ ]
+ }
+ ]
+ }
+ },
+ "HttpMethod": 2,
+ "Parameters": [
+ {
+ "Name": "ProjectCode",
+ "Remark": "项目代号",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
+ {
+ "Name": "VersionName",
+ "Remark": "版本名称，例如：develop、preview、bate、alpha...",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
+ {
+ "Name": "VersionCode",
+ "Remark": "具体的版本好，例如1.0.0",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ }
+ ]
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "版本",
+ "TableValue": {
+ "TableName": "项目版本",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "0b9270f2-a361-4341-92a8-caaf1179dfc4",
+ "BindingInfo": {
+ "TableName": "项目版本",
+ "ColumnName": "ID",
+ "GUID": "ee296702-5f8d-4144-a1b4-bc0b5eb143ad"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "GUID": "7c242a00-9384-4d39-9360-3c32045b9684",
+ "BindingInfo": {
+ "TableName": "项目版本",
+ "ColumnName": "项目ID",
+ "GUID": "3b4b415d-6902-4978-bda8-6708cf3c9a6c"
+ },
+ "ColumnName": "项目ID"
+ },
+ {
+ "GUID": "fbc18acd-4f1f-4a50-ba61-1e67607e8a1c",
+ "BindingInfo": {
+ "TableName": "项目版本",
+ "ColumnName": "项目ID",
+ "GUID": "a035fd5a-d24e-4a16-a09c-a1e10df97293",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "项目经理"
+ }
+ },
+ "ColumnName": "项目经理"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目版本",
+ "ColumnName": "项目ID",
+ "GUID": "5ff14dfb-25d8-427d-be7a-57075aee63f1"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ProjectCode"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目版本",
+ "ColumnName": "版本名称",
+ "GUID": "04d65631-430a-4bea-9ef6-8aebc90ae34a"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=VersionName"
+ }
+ }
+ ]
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "76a4d9a6fad142bdac9c8e202035ded0"
+ },
+ {
+ "$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.ServerTransactionCommand, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "项目版本",
+ "ShowConfirm": false,
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目版本",
+ "ColumnName": "ID",
+ "GUID": "5027905b-f3b6-49a2-b31a-231a6672034b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本.ID"
+ }
+ },
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "项目版本",
+ "ColumnName": "最新版本号",
+ "GUID": "829f1424-897d-4704-9575-4e896c5f0af6"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=VersionCode"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "项目发布记录",
+ "UpdateType": "add",
+ "ShowConfirm": false,
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "项目ID",
+ "GUID": "6985688f-5d91-4494-aa6c-37a172ffb2d5"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本.项目ID"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "版本ID",
+ "GUID": "5bc2e76e-24b7-44f8-b1b9-116d660daea4"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本.ID"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "发布版本号",
+ "GUID": "2daef053-9ea4-4b36-ae0e-a4419db4e20b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=VersionCode"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "负责人",
+ "GUID": "5dc6e639-b11b-4f17-8e68-4d15b8db187f"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本.项目经理"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "发布时间",
+ "GUID": "4036a7e6-bf6a-4cd4-b1b8-4c0b5c80647c"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=NOW()"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "是否发布",
+ "GUID": "c865673d-7c03-4827-aacd-91152c02de9e"
+ },
+ "Value": "0"
+ }
+ ],
+ "ParamNameToSaveNewRowValue": "新发布记录"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "success",
+ "CustomReturns": [
+ {
+ "ReturnPropertyName": "ReleaseID",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=新发布记录.ID"
+ },
+ "Remark": "发布ID\r\n="
+ }
+ ]
+ }
+ ],
+ "ID": "62675496-6a80-401d-9560-86c115ebca87"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "无法找到对应版本",
+ "CustomReturns": [
+ {
+ "ReturnPropertyName": "ReleaseID",
+ "Remark": "发布ID\r\n="
+ }
+ ]
+ }
+ ],
+ "ID": "f21c4122-59c4-4286-9dea-e3671f0bb153"
+ }
+ ]
+ }
+ ],
+ "ReturnProperties": [
+ {
+ "Name": "ReleaseID",
+ "Remark": "发布ID\r\n="
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ServerCommands/测试Mustache.json b/ServerCommands/测试Mustache.json
deleted file mode 100644
index 5b780871..00000000
--- a/ServerCommands/测试Mustache.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "Name": "测试Mustache",
- "Enabled": true,
- "Triggers": [
- {
- "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon",
- "Permission": {
- "PermissionData": {
- "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core",
- "permissionResource": {
- "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core"
- },
- "permissionBindings": [
- {
- "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
- "roleNames": [
- "FGC_LoginUser"
- ]
- }
- ]
- }
- }
- }
- ],
- "Commands": [
- {
- "$type": "MustachePlugin.Render, MustachePlugin",
- "DataSrouce": "1",
- "UseCustomsDataHash": true,
- "CustomsDataHash": "1",
- "SetMaxRecursionDepth": 1512,
- "ResultTo": "输出结果"
- }
- ]
-}
\ No newline at end of file
diff --git a/ServerCommands/用户/更新GITEE信息.json b/ServerCommands/用户/更新GITEE信息.json
deleted file mode 100644
index b7df7ac6..00000000
--- a/ServerCommands/用户/更新GITEE信息.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
- "Name": "更新GITEE信息",
- "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": "用户名",
- "DataValidationInfo": {
- "IgnoreBlank": false
- }
- },
- {
- "Name": "Git用户名",
- "DataValidationInfo": {}
- },
- {
- "Name": "Git密码",
- "DataValidationInfo": {}
- }
- ]
- }
- ],
- "Commands": [
- {
- "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
- "TryCommandPart": {
- "CommandList": [
- {
- "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2",
- "OperationType": "202",
- "CommandOperator": {
- "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2",
- "UserName": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=用户名"
- },
- "ExtendedProperties": [
- {
- "Name": "GIT用户名",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=Git用户名"
- }
- },
- {
- "Name": "GIT密码",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=Git密码"
- }
- }
- ]
- }
- },
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "0",
- "Message": "保存成功"
- }
- ]
- },
- "CatchCommandPart": {
- "CommandList": [
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=ExceptionCode"
- },
- "Message": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=ExceptionMessage"
- }
- }
- ]
- }
- }
- ]
-}
\ No newline at end of file
diff --git a/Tables/需求反馈/需求反馈登记表.json b/Tables/需求反馈/需求反馈登记表.json
index d82514f5..6c348711 100644
--- a/Tables/需求反馈/需求反馈登记表.json
+++ b/Tables/需求反馈/需求反馈登记表.json
@@ -118,6 +118,13 @@
"Name": "结束处理时间",
"ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "发布记录ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"DefaultValue": 3,
@@ -213,6 +220,13 @@
"PrimaryColumn": "ID_",
"ForeignTable": "需求反馈登记表",
"ForeignColumn": "流程实例ID"
+ },
+ {
+ "PrimaryTable": "项目发布记录",
+ "PrimaryColumn": "ID",
+ "ForeignTable": "需求反馈登记表",
+ "ForeignColumn": "发布记录ID",
+ "IsDetailTableRelation": true
}
],
"Indexes": []
diff --git a/Tables/项目/项目发布记录.json b/Tables/项目/项目发布记录.json
new file mode 100644
index 00000000..fba60f6e
--- /dev/null
+++ b/Tables/项目/项目发布记录.json
@@ -0,0 +1,111 @@
+{
+ "Name": "项目发布记录",
+ "Columns": [
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "Required": true,
+ "Unique": true,
+ "AutoIncrement": true,
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "项目ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "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.UserBindingColumnSaveData, 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": "datetime",
+ "MaxLength": -1,
+ "Name": "发布时间",
+ "ColumnType": "System.DateTime, 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",
+ "MaxLength": -1,
+ "Name": "是否发布",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_Creator"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_CreateDate"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifier"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifyDate"
+ }
+ ],
+ "ExternalDatabaseInfo": {
+ "DataBaseType": "6db454c0-531c-4395-9122-921a18942902",
+ "AllowModifySchema": true,
+ "ConnectionId": "业务表",
+ "SourceTableName": "项目发布记录",
+ "SourceTableSchema": "dbo"
+ },
+ "PrimaryKey": [
+ "ID"
+ ],
+ "Relations": [
+ {
+ "PrimaryTable": "项目表",
+ "PrimaryColumn": "ID",
+ "ForeignTable": "项目发布记录",
+ "ForeignColumn": "项目ID",
+ "IsDetailTableRelation": true
+ },
+ {
+ "PrimaryTable": "项目版本",
+ "PrimaryColumn": "ID",
+ "ForeignTable": "项目发布记录",
+ "ForeignColumn": "版本ID",
+ "IsDetailTableRelation": true
+ }
+ ],
+ "Indexes": []
+}
\ No newline at end of file
diff --git a/Tables/项目/项目版本.json b/Tables/项目/项目版本.json
index 464b4130..79ec922a 100644
--- a/Tables/项目/项目版本.json
+++ b/Tables/项目/项目版本.json
@@ -34,6 +34,7 @@
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DefaultValue": "master",
"DatabaseColumnType": "nvarchar",
"MaxLength": -1,
"Name": "分支名称",
@@ -41,11 +42,20 @@
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DefaultValue": 0,
"DatabaseColumnType": "bigint",
"MaxLength": -1,
"Name": "Git订阅",
"ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DefaultValue": "1.0.0",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "最新版本号",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
"BindingInfo": {
@@ -59,6 +69,12 @@
"Name": "任务数量",
"ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
+ "Formula": "[版本名称]&\"[\"&[最新版本号]&\"]\"",
+ "Name": "名称加版本号",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json
index 20c13a35..120a2cac 100644
--- a/Tables/项目/项目表.json
+++ b/Tables/项目/项目表.json
@@ -220,7 +220,8 @@
"工时分配方式": 5,
"参与人列表": 5,
"项目成员数": 5,
- "项目岗位数": 5
+ "项目岗位数": 5,
+ "起始日期": 5
},
"subTableOperations": {
"View_任务工时统计": 5,
@@ -236,7 +237,9 @@
"项目成员表": 5,
"项目版本": 5,
"项目预算变动表": 5,
- "项目版本环境配置": 5
+ "项目版本环境配置": 5,
+ "项目周报": 5,
+ "项目发布记录": 5
},
"dataFilter": {
"$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
@@ -282,7 +285,8 @@
"工时分配方式": 5,
"参与人列表": 5,
"项目成员数": 5,
- "项目岗位数": 5
+ "项目岗位数": 5,
+ "起始日期": 5
},
"subTableOperations": {
"View_任务工时统计": 5,
@@ -298,7 +302,9 @@
"项目成员表": 5,
"项目版本": 5,
"项目预算变动表": 5,
- "项目版本环境配置": 5
+ "项目版本环境配置": 5,
+ "项目周报": 5,
+ "项目发布记录": 5
},
"dataFilter": {
"$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
@@ -344,7 +350,8 @@
"工时分配方式": 5,
"参与人列表": 5,
"项目成员数": 5,
- "项目岗位数": 5
+ "项目岗位数": 5,
+ "起始日期": 5
},
"subTableOperations": {
"View_任务工时统计": 5,
@@ -360,7 +367,9 @@
"项目成员表": 5,
"项目版本": 5,
"项目预算变动表": 5,
- "项目版本环境配置": 5
+ "项目版本环境配置": 5,
+ "项目周报": 5,
+ "项目发布记录": 5
},
"dataFilter": {
"$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
diff --git a/UserControlPages/Git仓库卡片.json b/UserControlPages/Git仓库卡片.json
index 9fe24eff..ea8add0f 100644
--- a/UserControlPages/Git仓库卡片.json
+++ b/UserControlPages/Git仓库卡片.json
@@ -27,6 +27,24 @@
}
},
"5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 39.0,
+ "IsHidden": true
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 39.0,
+ "IsHidden": true
+ }
+ },
+ "8": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 24.0,
"Mode": 2,
@@ -41,9 +59,12 @@
}
},
"InLogicalVisibleIndexes": [
- 5
+ 5,
+ 6,
+ 7,
+ 8
],
- "Count": 6,
+ "Count": 9,
"DefaultSize": 24.0
},
"Cols": {
@@ -65,7 +86,14 @@
},
"3": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
}
},
"4": {
@@ -74,6 +102,11 @@
}
},
"5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0,
"Mode": 2,
@@ -85,38 +118,30 @@
}
}
},
- "6": {
+ "7": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
"8": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 20.0
}
},
"9": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0
- }
- },
- "10": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 16.0
}
- },
- "7": {}
+ }
},
- "InVisibleIndexes": [
- 7
- ],
- "Count": 11,
+ "Count": 10,
"DefaultSize": 32.0
},
"Values": {
"1,3": "仓库名称",
"2,3": "仓库描述",
- "3,1": "空间名称"
+ "3,1": "空间名称",
+ "6,3": "选择仓库"
},
"AttachInfos": {
"1,1": {
@@ -129,7 +154,7 @@
"1,3": {
"TemplateCellSource": "仓库名称"
},
- "1,9": {
+ "1,8": {
"CssName": "hover-btn",
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
@@ -157,7 +182,25 @@
"CssName": "ec-label",
"TemplateCellSource": "空间名称"
},
- "5,1": {
+ "6,3": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon",
+ "CommandName": "点击"
+ }
+ ],
+ "Text": "选择仓库",
+ "TemplateKey": "Gost",
+ "Icon": {
+ "Name": "gitee.svg"
+ },
+ "IconSize": 14.0
+ },
+ "TemplateCellSource": "按钮文字"
+ },
+ "8,1": {
"CellType": {
"$type": "Forguncy.TextCellType, ServerDesignerCommon",
"SavedValidators": [
@@ -177,7 +220,7 @@
"$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
"cellLocations": [
{
- "SerializeProperty": "=Git仓库卡片!B6"
+ "SerializeProperty": "=Git仓库卡片!B9"
}
]
},
@@ -301,7 +344,7 @@
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=Git仓库卡片!B6"
+ "SerializeProperty": "=Git仓库卡片!B9"
}
},
"NullFormulaValueQueryPolicy": 0,
@@ -417,12 +460,12 @@
]
}
],
- "ID": "0b640e78-9c02-4b25-933e-3f1b2f19968b"
+ "ID": "578a625a-20c5-4572-809f-40b03fb3c170"
}
]
}
],
- "ID": "bdcad4d4-2095-4c7e-84f3-c9bc3a12741f"
+ "ID": "9115451e-c205-4bc5-b560-3cb132fa0cfe"
}
]
}
@@ -451,7 +494,12 @@
"HorizontalAlignment": 4
},
{
- "Formatter": 5
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332,
+ "Foreground": 5
+ },
+ {
+ "Formatter": 6
}
],
"Types": {
@@ -461,26 +509,29 @@
"Body",
"Accent 1 40",
"Right",
+ "#FFC00000",
"@"
]
},
"CellStyles": {
"1,3": 0,
- "1,9": 1,
+ "1,8": 1,
"2,3": 2,
"3,1": 3,
- "5,1": 4
+ "6,3": 4,
+ "8,1": 5
},
"SheetStyle": {
"FontFamily": 2
}
},
"Spans": [
- "2,3,1,7",
- "1,3,1,6",
+ "2,3,1,6",
+ "1,3,1,5",
"1,1,2,1",
- "3,1,1,9",
- "5,1,1,3"
+ "3,1,1,8",
+ "8,1,1,3",
+ "6,3,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon",
@@ -521,6 +572,10 @@
},
{
"Name": "空间路径名"
+ },
+ {
+ "Name": "按钮文字",
+ "DefaultValue": "选择仓库"
}
],
"CommandDefinitions": [
@@ -532,6 +587,181 @@
}
],
"MethodDefinitions": [],
+ "PageLoadedCommandList": [
+ {
+ "$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仓库卡片!B9"
+ }
+ ]
+ },
+ "value": "%Null%"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=仓库ID"
+ }
+ ]
+ },
+ "value": "%Null%"
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git仓库卡片!1:5"
+ },
+ "Value": false
+ },
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git仓库卡片!6:8"
+ },
+ "Value": true
+ }
+ ]
+ }
+ ],
+ "ID": "ee1d5e96-9529-48c1-add1-fc38dd1bb142"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git仓库卡片!1:5"
+ },
+ "Value": true
+ },
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git仓库卡片!6:8"
+ },
+ "Value": false
+ }
+ ]
+ }
+ ],
+ "ID": "e61590a7-5159-4a1a-9f43-559549150753"
+ }
+ ]
+ }
+ ],
+ "PropertyChangedHandlers": {
+ "Commands": [
+ {
+ "$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仓库卡片!B9"
+ }
+ ]
+ },
+ "value": "%Null%"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=仓库ID"
+ }
+ ]
+ },
+ "value": "%Null%"
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git仓库卡片!1:5"
+ },
+ "Value": false
+ },
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git仓库卡片!6:8"
+ },
+ "Value": true
+ }
+ ]
+ }
+ ],
+ "ID": "52d7b30c-9177-43e8-a62b-09b7f5eb0db0"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git仓库卡片!1:5"
+ },
+ "Value": true
+ },
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Git仓库卡片!6:8"
+ },
+ "Value": false
+ }
+ ]
+ }
+ ],
+ "ID": "846568b8-fb62-47ff-ad54-df0f6b865bd9"
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "propertyName": "属性名",
+ "oldValue": "原值",
+ "newValue": "新值"
+ }
+ },
"ConditionFormatRulesCollection": {
"Rules": [
{
@@ -572,13 +802,13 @@
"CornerRadius": 9.9166666666667,
"Fill": "Background 1 0",
"StrokeDashType": 8,
- "Stroke": "black",
- "StrokeThickness": 0.0
+ "Stroke": "Background 1 -5",
+ "StrokeThickness": 1.0
},
"IsAutomaticStroke": false,
"IsAutomaticFill": false,
- "Size": "233,101",
- "BoxShadowString": "5 5 0 5 #0A000000"
+ "Size": "253,101",
+ "BoxShadowString": "3 3 0 7 #04000000"
}
]
-}//r84vvQjDdxytppYKqCrANG0+C5OLH2dHGntS05wWzytGtLMZdOxHGwuq6XUuA8yuIMXri/hlmP0OlKBWSajFFPIsLiFwwaxx51pwNzq8NLzy1B1D3NG/4IFSx4hA2aTP1mOlyP41Bvc/HTzfaTjU+FIOCJBrRMn94CHuurJhxAvSL10OXfOxx939x2Y8uiHlTZm8Qm1NL72y0a255DsZDaPa7OTasnuoxvVXdwm3KvNWzfovainzrwBfPUGW+r6GuoiHHLyZBNAh3Rg3VaaLchMNLsSjmNLnvMv4t3MN6qPNYXtdYI4lks3O6R3kUNaiIj6DN7j3aKrvazhaCU4FVlA/fU6WBQseKC2LkLbYldYBKwnGI4UxqfOpom4R+hkawessb0q6ORSoOMOBwE71mJ/2MyGgj/qUtNppfjWQqLPTQYBTApEVTFOA34HOOnaJlHZOa363J1qtUxO2ipvYx50/qwZDmWkiq7Auqnv6LdUojSkWDKRgVnpU1BbO4umhJhMr7GPr1DnL+/xyLb+TGXp0bSBuEWM3BSDMAljCE44MQLMKwE8Q1sDJhxvVk6nKz+8CQ0TW7w9f8p/TdP/IdG/Ohzfg0w7hQQqKqP+Vee2gRlSHCylrPWTvyq2gftJOUyZEJajU/0prjZv9OFwlUyOGSISRPahXgBSX93M6qW2/hDHlCynZNPkYyHJfO6WDjNDXDM/WH13MKrdQ2QEXx6KN0tZj8J/agD1XQ1J8oXXTmYDFtf5BnOAoh/ICi/FS60CEWPjvj9AsfWUgLG7yOFUz6usZGK60UqpKWvxR8BKdkyR2a4RE6KRb7N0jnBz7Ovn/a4hC5x3Ftrammj75DMvWHm2Mb+RPqBvpe/qCV/fYD/iOSYaIJoeJTJvUHi/c0CDNbR0u7SCLwma4LYX/Iw==|920
\ No newline at end of file
+}//PQFMOfdCtW6T09dQm46T7MDTvNBg40zhWWHzHbM0I95cLw8UuMEMxgH7WgEaA7jCaKLxJm7+YPKpj3HhseiueHOfBSaWm06WjmfKU44b4LoItpzuAgPXAXuYjYHy+TpqOQ/xLpqmeqeilhqR9kAWTD69MfwzsLzHsBvqUxaQx8TraQdCWgpe3RC4E4/fI20e/09b6WsB3GpoPlrvEbjvfAvFcjq6Y3CwAsjMttv6TAJYu3c20jPU1Y3GbdmwawpUH0fSSth8uq3cgRa9ynl8vr4yA439+lBqMU6rnFoNUhCPbp8FkSSXT9jcQHJtaoCxVGmZm1I2FTURctqnsRJdIWTuLdSYecaG3Q0O8I+6Cqz5Vtz0dpCB4zltb2TZd+xFtQAHLaVwRsXMUceFzYctNeAtiisuoucj6dOHPXmiZ5b5jVD4G4G3yrQZX2nNJ8t2GpqDzWLY9PClDBAup65rqc/8EZbzr5SCFumCZ9NPMEv8lXuN9/TBTl2NpFnV/nvmFC/l+yQsOOHzO+e7+D7SFLERlA/YC3IYnFpNK1BeHnWn4BMVXIftbWdRxN9+Z3ut5h5oKNTnPUpu9/fcLRELHXdfkjgH/CmhsfQtCVm2UxEnAC/7ZD8cthbXrZNhFAaOvGoIaumLLx/C+YViCdheynzkTO9CLuq6s+OQ6lx7O1f2pt/F/ldqjdpXv3LPqvBY9/xxsmIE8el8LvLd17ILkLj3lWXMCQjFwWUq0Pyo7cs1Hmu0ozzM1EegV94zi8Maw+N+4uWK87tQ/MEiHcP3NmzcisyrFLcMSFzHRHd6bEyEbK0P8WRN2SRninHmGEz+SJgHS8Uu6Y8FO/DWlkQ8PA5Mxz9sZvSp8CMbN376p2lM8JcWHiwZrFEHV1lxoOj3emCLB8vxb3mbpWUcZFhjog==|920
\ No newline at end of file
diff --git a/UserControlPages/Git仓库卡片.rd b/UserControlPages/Git仓库卡片.rd
index 93e14c7b..a179ab96 100644
--- a/UserControlPages/Git仓库卡片.rd
+++ b/UserControlPages/Git仓库卡片.rd
@@ -1,5 +1,5 @@
{
"PageType": 3,
- "ColumnCount": 11,
- "RowCount": 6
+ "ColumnCount": 10,
+ "RowCount": 9
}
\ No newline at end of file
diff --git a/image/图标/git-branch.svg b/image/图标/git-branch.svg
new file mode 100644
index 00000000..33f6742e
--- /dev/null
+++ b/image/图标/git-branch.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/gitee1.svg b/image/图标/gitee1.svg
deleted file mode 100644
index b06b01e0..00000000
--- a/image/图标/gitee1.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file