{"Message":"完善日报里的\"从Gitee分析\"日志内容功能","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/项目版本"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":9,"Name":"Theme"},{"State":1,"Type":12,"Name":"CustomLibrary"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/删除一个仓库WebHook"},{"State":1,"Type":7,"Name":"Table/Git仓库表"},{"State":1,"Type":15,"Name":"ServerCommand/GitCallback"},{"State":1,"Type":1,"Name":"PCPage/选择Git仓库"},{"State":1,"Type":15,"Name":"ServerCommand/同步一个仓库到表"},{"State":1,"Type":15,"Name":"ServerCommand/搜索仓库"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/列出仓库的WebHooks"},{"State":1,"Type":15,"Name":"ServerCommand/获取单个仓库信息"},{"State":1,"Type":15,"Name":"ServerCommand/从Gitee提取报工"},{"State":3,"Type":15,"Name":"ServerCommand/获取某仓库分支"},{"State":3,"Type":1,"Name":"PCPage/分支选择"},{"State":3,"Type":1,"Name":"PCPage/完善Gitee资料"},{"State":3,"Type":38,"Name":"Image/gitee2.svg"},{"State":3,"Type":38,"Name":"Image/gitee1.svg"},{"State":3,"Type":15,"Name":"ServerCommand/更新GITEE信息"}],"Version":"v1"}

.collaboration

@@ -52,16 +52,7 @@
   },
   {
     "ModuleName": "Table/项目版本",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T08:13:35.2435798+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\项目\\项目版本.json"
-    ]
   },
   {
     "ModuleName": "Table/项目预算变动表",
@@ -759,17 +750,7 @@
   },
   {
     "ModuleName": "PCPage/新增报工",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T07:38:39.839941+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\工时\\新增报工.json",
-      "Pages\\任务\\工时\\新增报工.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/分配计划工时",
@@ -1221,20 +1202,7 @@
   },
   {
     "ModuleName": "Theme",
-    "State": 1,
+    "ModuleType": 9
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T09:04:47.4384135+08:00",
-    "ModuleType": 9,
-    "ToRemoveFiles": [
-      "Theme\\CellTypeStyles",
-      "Theme\\ListViewStyles",
-      "Theme\\StyleDefaultNames",
-      "Theme\\ThemeConfig",
-      "Reports\\DefaultTheme.rdlx-theme"
-    ]
   },
   {
     "ModuleName": "image/内置图片",
@@ -1578,19 +1546,7 @@
   },
   {
     "ModuleName": "CustomLibrary",
-    "State": 1,
+    "ModuleType": 12
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T08:25:58.4551401+08:00",
-    "ModuleType": 12,
-    "ToRemoveFiles": [
-      "CustomLibraries.json",
-      "UserFile\\BaseCss.css",
-      "UserFile\\CustomFormula.js",
-      "UserFile\\echart.js"
-    ]
   },
   {
     "ModuleName": "MapJsonFile",
@@ -1690,29 +1646,11 @@
   },
   {
     "ModuleName": "ServerCommandPrivate/删除一个仓库WebHook",
-    "State": 1,
+    "ModuleType": 27
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T08:04:52.2454874+08:00",
-    "ModuleType": 27,
-    "ToRemoveFiles": [
-      "ServerCommands\\Gitee\\删除一个仓库WebHook.json"
-    ]
   },
   {
     "ModuleName": "Table/Git仓库表",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T08:40:52.8221033+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\Git\\Git仓库表.json"
-    ]
   },
   {
     "ModuleName": "Table/Git_WebHook",
@@ -1724,16 +1662,7 @@
   },
   {
     "ModuleName": "ServerCommand/GitCallback",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T07:43:11.9963307+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\Gitee\\GitCallback.json"
-    ]
   },
   {
     "ModuleName": "Table/日志表",
@@ -1745,19 +1674,7 @@
   },
   {
     "ModuleName": "PCPage/选择Git仓库",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T08:23:01.7677403+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\Git\\选择Git仓库.json",
-      "Pages\\Git\\选择Git仓库.rd",
-      "Pages\\4347ba70d904424d852fada4b0f0b0a.json",
-      "Pages\\4347ba70d904424d852fada4b0f0b0a.rd"
-    ]
   },
   {
     "ModuleName": "Pages/Git",
@@ -1765,16 +1682,7 @@
   },
   {
     "ModuleName": "ServerCommand/同步一个仓库到表",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T07:43:03.7068399+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\Gitee\\同步一个仓库到表.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/搜索仓库列表",
@@ -1782,29 +1690,11 @@
   },
   {
     "ModuleName": "ServerCommand/搜索仓库",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T07:59:26.6041414+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\Gitee\\搜索仓库.json"
-    ]
   },
   {
     "ModuleName": "ServerCommandPrivate/列出仓库的WebHooks",
-    "State": 1,
+    "ModuleType": 27
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T08:05:10.4538374+08:00",
-    "ModuleType": 27,
-    "ToRemoveFiles": [
-      "ServerCommands\\Gitee\\列出仓库的WebHooks.json"
-    ]
   },
   {
     "ModuleName": "TaskScheduler/应用部署时",
@@ -1828,16 +1718,7 @@
   },
   {
     "ModuleName": "ServerCommand/获取单个仓库信息",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T08:04:07.5951759+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\Gitee\\获取单个仓库信息.json"
-    ]
   },
   {
     "ModuleName": "UserControlPage/Git仓库卡片",
@@ -1849,16 +1730,7 @@
   },
   {
     "ModuleName": "ServerCommand/从Gitee提取报工",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T07:38:39.8395244+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\Gitee\\从Gitee提取报工.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/服务端命令1",
@@ -1874,62 +1746,26 @@
   },
   {
     "ModuleName": "ServerCommand/获取某仓库分支",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T08:04:00.3926938+08:00",
     "ModuleType": 15
   },
   {
     "ModuleName": "PCPage/分支选择",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T08:25:09.0848724+08:00",
     "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/完善Gitee资料",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T09:04:47.4386203+08:00",
     "ModuleType": 1
   },
   {
     "ModuleName": "Image/gitee2.svg",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T09:02:37.397015+08:00",
     "ModuleType": 38
   },
   {
     "ModuleName": "Image/gitee1.svg",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T09:02:37.3970342+08:00",
     "ModuleType": 38
   },
   {
     "ModuleName": "ServerCommand/更新GITEE信息",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-14T09:06:57.5202553+08:00",
     "ModuleType": 15
   }
 ]

Pages/Git/分支选择.json

@@ -0,0 +1,256 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 23.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 135.0,
+          "Mode": 1
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 25.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 39.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 33.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
+        }
+      }
+    },
+    "InLogicalVisibleIndexes": [
+      7
+    ],
+    "Count": 8,
+    "DefaultSize": 32.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 56.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 56.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 56.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 56.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      }
+    },
+    "Count": 6,
+    "DefaultSize": 56.0
+  },
+  "Values": {
+    "1,1": "请选择绑定的分支",
+    "5,1": "确定"
+  },
+  "AttachInfos": {
+    "3,1": {
+      "CssName": "singlebox",
+      "CellType": {
+        "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon",
+        "Style": 3,
+        "PrimaryColor": "Background 1 -5",
+        "SecondaryColor": "Text 1 0",
+        "LayoutMode": 1,
+        "Items": [
+          {
+            "Value": "master",
+            "DisplayValue": "master"
+          }
+        ]
+      }
+    },
+    "5,1": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    "cellLocations": [
+                      {
+                        "SerializeProperty": "=分支选择!分支名称"
+                      }
+                    ]
+                  },
+                  "value": "%Null%",
+                  "compareType": 1
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+                    "ClosePopupReturnValues": [
+                      {
+                        "Name": "选择分支",
+                        "Value": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=分支选择!分支名称"
+                        }
+                      }
+                    ]
+                  }
+                ],
+                "ID": "cdd13f19-baff-486d-8c0e-92a4af5d400d"
+              }
+            ]
+          }
+        ],
+        "Text": "确定",
+        "TemplateKey": "_RS_Success3"
+      },
+      "RulesGuidList": [
+        "c36d069c-596b-4b9f-8bf1-210c89299716"
+      ]
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontSize": 18.666666666666664,
+        "HorizontalAlignment": 0
+      },
+      {
+        "HorizontalAlignment": 0
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Center",
+        "Body"
+      ]
+    },
+    "CellStyles": {
+      "1,1": 0,
+      "2,1": 1,
+      "2,2": 1,
+      "2,3": 1,
+      "2,4": 1,
+      "3,1": 1
+    },
+    "SheetStyle": {
+      "FontFamily": 1
+    }
+  },
+  "Spans": [
+    "3,1,1,4",
+    "1,1,1,4",
+    "5,1,1,4",
+    "7,1,1,4"
+  ],
+  "PageInfo": {
+    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+    "PageLoadedCommandList": [
+      {
+        "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+        "TargetPageElement": {
+          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+          "SerializeProperty": "=分支选择!分支名称"
+        },
+        "TargetType": "Forguncy.RadioGroupCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+        "MethodName": "SetItemsByObjectArray",
+        "ParameterValues": {
+          "dataSource": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=分支选择!分支列表"
+          },
+          "valueMember": "分支名称",
+          "displayMember": "分支名称"
+        }
+      }
+    ],
+    "PermissionData": {
+      "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+      "permissionResource": {
+        "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+      },
+      "permissionBindings": [
+        {
+          "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+          "roleNames": [
+            "FGC_LoginUser"
+          ]
+        }
+      ]
+    },
+    "RowBreakLines": [],
+    "RepeatRangeSettings": [],
+    "ConditionFormatRulesCollection": {
+      "Rules": [
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=分支选择!分支名称=\"\""
+          },
+          "GUID": "c36d069c-596b-4b9f-8bf1-210c89299716",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": true
+        }
+      ]
+    }
+  },
+  "PrintInfo": {
+    "PaperSize": {},
+    "Margin": {}
+  },
+  "CustomNames": [
+    {
+      "Name": "分支名称",
+      "Formula": "分支选择!$B$4"
+    },
+    {
+      "Name": "分支列表",
+      "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

Pages/Git/分支选择.rd

@@ -0,0 +1,15 @@
+{
+  "PageType": 0,
+  "ColumnCount": 6,
+  "RowCount": 8,
+  "CustomNames": [
+    {
+      "Name": "分支名称",
+      "Formula": "分支选择!$B$4"
+    },
+    {
+      "Name": "分支列表",
+      "Formula": "分支选择!$B$8"
+    }
+  ]
+}

Pages/Git/完善Gitee资料.json

@@ -0,0 +1,336 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 51.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 40.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 39.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 39.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 17.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 25.0
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 43.0
+        }
+      }
+    },
+    "Count": 11,
+    "DefaultSize": 28.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 43.0
+        }
+      },
+      "21": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 43.0
+        }
+      }
+    },
+    "Count": 22
+  },
+  "Values": {
+    "7,1": "忘记密码？",
+    "9,1": "保存"
+  },
+  "AttachInfos": {
+    "1,1": {
+      "CellType": {
+        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+        "ImagePath": "gitee2.svg"
+      }
+    },
+    "3,1": {
+      "CellType": {
+        "$type": "ElementUI.InputCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 4,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "type": "text",
+        "placeholder": "Gitee登录用户名",
+        "PrependText": "用户名",
+        "resize": "none"
+      },
+      "DataValidationInfo": {
+        "IgnoreBlank": false
+      }
+    },
+    "5,1": {
+      "CellType": {
+        "$type": "ElementUI.InputCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 4,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "type": "password",
+        "placeholder": "Gitee登录密码",
+        "PrependText": "密码",
+        "resize": "none",
+        "showPassword": true
+      },
+      "DataValidationInfo": {
+        "IgnoreBlank": false
+      }
+    },
+    "7,1": {
+      "CellType": {
+        "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
+            "ValueFormula": "https://gitee.com/password/new",
+            "IsOpenInNewTab": true
+          }
+        ],
+        "Text": "忘记密码？",
+        "ClickMode": 1,
+        "TemplateKey": "_RS_Main"
+      }
+    },
+    "9,1": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+            "ParameterName": "当前用户",
+            "ParameterValue": "%CurrentUser%",
+            "ID": "fb32cfaef97d4c898e8e9db271732f2a"
+          },
+          {
+            "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+            "ServerCommandName": "更新GITEE信息",
+            "Parameters": [
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "用户名",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=完善Gitee资料!当前用户"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "Git用户名",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=完善Gitee资料!B4"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "Git密码",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=完善Gitee资料!B6"
+                }
+              }
+            ],
+            "ResultErrorCodeTo": {
+              "SerializeProperty": "code"
+            },
+            "ResultMessageTo": {
+              "SerializeProperty": "msg"
+            },
+            "RefreshAfterFinish": true,
+            "CheckDataValidation": true
+          },
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    "cellLocations": [
+                      {
+                        "SerializeProperty": "=完善Gitee资料!code"
+                      }
+                    ]
+                  },
+                  "value": "0"
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+                    "ReloadData": true
+                  }
+                ],
+                "ID": "3f38f193-9060-4632-bd15-4082aaacdfa4"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+                    "FunctionName": "warning",
+                    "Title": "温馨提示",
+                    "Message": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=完善Gitee资料!msg"
+                    },
+                    "BtnText": "知道了"
+                  }
+                ],
+                "ID": "7583453f-5925-4e06-a07c-f26c2ef5bb27"
+              }
+            ]
+          }
+        ],
+        "Text": "保存",
+        "TemplateKey": "Gitee按钮",
+        "Icon": {
+          "Name": "Application/067_save_4.svg",
+          "BuiltIn": true,
+          "Color": "Background 1",
+          "UseCellTypeForeColor": true
+        },
+        "IconSize": 14.0
+      }
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontFamily": 0
+      },
+      {
+        "FontSize": 12.0,
+        "Foreground": 1,
+        "HorizontalAlignment": 2,
+        "Underline": false
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Body",
+        "Text 1 50",
+        "Left"
+      ]
+    },
+    "CellStyles": {
+      "5,0": 0,
+      "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,
+      "5,12": 0,
+      "5,13": 0,
+      "5,14": 0,
+      "5,15": 0,
+      "5,16": 0,
+      "5,17": 0,
+      "5,18": 0,
+      "5,19": 0,
+      "5,20": 0,
+      "5,21": 0,
+      "7,1": 1
+    },
+    "SheetStyle": {
+      "FontFamily": 0
+    }
+  },
+  "Spans": [
+    "1,1,1,20",
+    "3,1,1,20",
+    "5,1,1,20",
+    "9,1,1,20",
+    "7,1,1,5"
+  ],
+  "PageInfo": {
+    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+    "PermissionData": {
+      "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+      "permissionResource": {
+        "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+      },
+      "permissionBindings": [
+        {
+          "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+          "roleNames": [
+            "FGC_LoginUser"
+          ]
+        }
+      ]
+    },
+    "RowBreakLines": [],
+    "RepeatRangeSettings": []
+  },
+  "PrintInfo": {
+    "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

Pages/Git/完善Gitee资料.rd

@@ -0,0 +1,5 @@
+{
+  "PageType": 0,
+  "ColumnCount": 22,
+  "RowCount": 11
+}

Pages/Git/选择Git仓库.json

@@ -413,7 +413,7 @@
                   {
                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                     "ParameterName": "选择行",
-                    "ID": "da397a5f3a524e3290c56e256d4f078b"
+                    "ID": "4049a4c0873e46968fa2e60b5a0cf1fa"
                   },
                   {
                     "$type": "xTools.Commands.xGetTableSelectRows, xTools",
@@ -426,19 +426,334 @@
                     "ID": "34f47449d1ec4f669acb748841bc9c7d"
                   },
                   {
-                    "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+                    "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                    "ClosePopupReturnValues": [
+                    "ParameterName": "当前用户",
+                    "ParameterValue": "%CurrentUser%",
+                    "ID": "8635f75ce2e0426e88fe92b6c229c420"
+                  },
+                  {
+                    "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+                    "ServerCommandName": "获取某仓库分支",
+                    "Parameters": [
                       {
-                        "Name": "仓库信息",
+                        "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                        "ParamName": "用户名",
                         "Value": {
                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=选择Git仓库!选择行"
+                          "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
+                  },
+                  {
+                    "$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.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": "e78c6e5a-dcb4-463b-b2dd-929a109be6d1"
+                              },
+                              {
+                                "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": "32a3487d-0983-4c25-b25e-3d68df991732"
+                                            }
+                                          ]
+                                        }
+                                      ],
+                                      "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": "f12f2eb3-0d04-415a-8aca-defb048099b0"
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "e2523b9e-b5d0-4117-aca8-dfd54c592031"
+                      },
+                      {
+                        "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": "c4bad0e2-1ea3-4fb9-9a62-6e93af22024c"
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "6e6bc466-40a3-472a-abc2-746e79636b59"
+                      }
+                    ]
+                  },
+                  {
+                    "$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
+                            }
+                          ]
+                        },
+                        "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+                            "ClosePopupReturnValues": [
+                              {
+                                "Name": "仓库信息",
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=选择Git仓库!选择行"
+                                }
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "987c6b40-c720-40f1-957a-ffeb4097087b"
+                      },
+                      {
+                        "CommandList": [
+                          {
+                            "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                            "FourStandardStyle": "warning",
+                            "Message": "请选择要绑定的仓库和分支"
+                          }
+                        ],
+                        "ID": "8505ba25-57ff-431a-8c31-ab1394c2e3e8"
                       }
                     ]
                   }
                 ],
-                "ID": "f0b7b886-7c4a-4171-9fff-da652e6b33f6"
+                "ID": "59029747-e42c-43c2-8ddf-5f043bbea7ff"
               },
               {
                 "CommandList": [
@@ -448,7 +763,7 @@
                     "Message": "请选择一个仓库"
                   }
                 ],
-                "ID": "164593e2-04d4-4cf3-9756-85c9152fcf77"
+                "ID": "055d9eb9-20f7-4660-908e-d562e43b2176"
               }
             ]
           }
@@ -606,6 +921,15 @@
               },
               "ColumnName": "创建人头像"
             },
+            {
+              "GUID": "1a0c3283-71bc-43df-8cd3-db0ffdf1d407",
+              "BindingInfo": {
+                "TableName": "Git仓库表",
+                "ColumnName": "默认分支",
+                "GUID": "21d2bfe0-7353-447a-9169-be585ad3a74c"
+              },
+              "ColumnName": "默认分支"
+            },
             {
               "GUID": "0880909f-adde-4b4a-b1d5-c5c147d1cbab",
               "BindingInfo": {
@@ -877,16 +1201,20 @@
                       {
                         "ListViewColumnCell": "hook_api_url",
                         "PropertyName": "hooks_url"
+                      },
+                      {
+                        "ListViewColumnCell": "默认分支",
+                        "PropertyName": "默认分支"
                       }
                     ],
                     "SourceCell": {
                       "$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"
+                    "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"
                   }
                 ],
-                "ID": "fe901f27-0d40-414b-8032-4957d6f77cf9"
+                "ID": "ebb79263-2794-43f1-8f3c-e2da0192130f"
               },
               {
                 "CommandList": [
@@ -901,7 +1229,7 @@
                     "BtnText": "知道了"
                   }
                 ],
-                "ID": "3d25400e-0919-4cfe-99cd-e79e480fbfd8"
+                "ID": "a1b3223f-86f6-415b-903f-2d7d69af5430"
               }
             ]
           },
@@ -1405,7 +1733,8 @@
     "26,9,1,4",
     "26,13,1,4",
     "26,5,1,4",
-    "1,1,1,34"
+    "1,1,1,34",
+    "26,17,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1457,6 +1786,10 @@
     {
       "Name": "搜索框",
       "Formula": "选择Git仓库!$B$2"
+    },
+    {
+      "Name": "临时_分支名称",
+      "Formula": "选择Git仓库!$R$27"
     }
   ]
-}//EXwA/8FUtYSjZJ1zRZozL0Bqifp6BtMCt8Im7J/IYZOEdUQrRnXnhuiKV7RpVqJvKcc3vyMrEZDJXxxWkffynCxIUUSEu9nlNF8M7TJ07hK7LiXAGiwtWp+TmYGEU8YX6DJ5Vr96TxjPLt2xMQZQDiifKVASDTpK9JxizdTl+wPLLulvpaeVj4kFbk2gibVf+TomQAEsEpBA5hthliS2YcaHjrrOiysaqDJZY7NovEWjXRDqkhqnQzin5/FtGcBdl3dCfBc4j7/exGWaXs/MgOULACz7tNBGO14snvcyNM4dhY4HND2x/IyYrr65tp1Fcs8yoay+CN2ItubjdIrLVlQ4TxDzKo7FhPD9aa63CdaUIh78rgGSXlBbjBgs+MIpQtXWzDWfx8K08hQvB7cs2dMAZXbdvhyFSA5y3zwnkzpEyITnRYvP7A4iK1N7zZ94HZW7qpsmjVrpgpFK0RmbZ2IrmHNyEoD2Dae57M0eDhkvkNCzx+F2cFN7pC3Goc/o28MaYdjuv6R2tLj/gi/4LPlgo8y34zwwD4QLJOvz5kOXHiZA+ixaqpXbzC64UKtqqHjVVYUVrm+XzRhmbTMNAUr+BqLlY6N48FeS6pvjBLgx1t+dzuOLK0bU4yU6lKDp8r8K/5QBh/22LVK1fVI5+JecSGBRE6+We7L0CBH0Kt8zPMyz5DrUxTx6hA/JuCxzZDReDg4Fb/4ch0sN8YdeDKcZFuirJlvSCiBgvBCsFOs5tP4MZhSa/flnHxlqcbL6grmWCHXWTNbO3k/6ingOdQQu0GjtfUPB7kAD4g1drCj4nYfvIWt2VC2TV/jQJ2FigGopGIpXJIB2Eu+4AUgoh1IjgKo0EFgpEFq4zgfF4Ff90/tef/x8MTVVPaTtznx9BktuBkasKe7P7Sb3TgWSeA==|920
+}//We7vE3IhgS+zPyeB3GngENlmsYRBXuABgA1AJpGzPyVrH5XLN4Zdv+dhRGmpDw8i8uelNZ5I6Bvxat3YRPsbFa4etyLzj7ikHphgA8wK6aSYFf46FKJF/hFUrElipgDNCBf/1zCdF1Ba4YHAnEXJJJ0JTfm5LQdkc2XlVFXZCgCeHJOL1NnZ/PkiwcHkP9R5+88e3WtKQbleazobaZ5mZVlFPsRt8Kjp/P8mZqduty/o1XUcsAF+F6eekqOhoSGdz+OAOFsm2YzI8QDneXrhoel0wye6LTCtRRmm57Ae+NO8CMTuEbQMHEWzOEEcI4GunxYNjrhJq1mrBe+2548IkS+oWVlwYbe4jWza81S+o2/f0ZVDY5GgLYSuW1HYbH+mqOvnP8O65K2Jo5EokAUO2ApBKxXiVQKc8MiU41Qyw2uAV2U/AMyRwN0Iux1kktelddz+AwAfniCmZUJinxiFATDLm4djSyz0PZhXuk/f82V85UbKSvNzw12glrhquU3D5L2rJPNXCHX7dWO7DcVUW3Fh1zZxD8ppJbgsgJ1K4lyFmxizNP9xX25yvmQXunuIaD7zc4cNjUbEOgKOx3GSQSjdg+j9gSTQ6pWs7JHpsh/TNcHipMnBZb4HDlzu8qinG95S4LfBuLIq9AUcbgKGk1/gFOXcH4JwPDt4zTHT1f18bVy+RlbF4dTZKjZ5vwz1/t29/Ew9eN9+Za0hORYwMY9GU4kpv3p5/fRRpm4r8K4kZFrt5uxUGKz5IdXvDbQjAH8B+r/3MQ5oUrSboS/7E5ENiDYz3f2rs8ySxcBEOyxPc8kN78uHn3w3LfqryFIWMhXxplAqd0iFZJKULw3G1Pvev4jMaho1myr4rKe5d3D2O3mOqu8dJfKe7ITtriZtDWcoXOlAi+g9aAkVKqqKNA==|920

Pages/Git/选择Git仓库.rd

@@ -18,6 +18,10 @@
     {
       "Name": "搜索框",
       "Formula": "选择Git仓库!$B$2"
+    },
+    {
+      "Name": "临时_分支名称",
+      "Formula": "选择Git仓库!$R$27"
     }
   ]
 }

Pages/任务/工时/新增报工.json

@@ -264,8 +264,7 @@
     "27,14": "提交"
   },
   "Formulas": {
-    "29,6": "DATEDIF(G30,N30,\"d\")+1",
+    "29,5": "DATEDIF(F30,N30,\"d\")+1"
-    "10,1": "TODAY()&\",\"&TODAY()"
   },
   "AttachInfos": {
     "2,1": {
@@ -469,12 +468,21 @@
             "MethodName": "GetSelectedRange",
             "RetrunParamNames": {
               "StartValue": {
-                "SerializeProperty": "=新增报工!G30"
+                "SerializeProperty": "=新增报工!开始日期"
               },
               "EndValue": {
-                "SerializeProperty": "=新增报工!N30"
+                "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": [
@@ -497,6 +505,10 @@
             ]
           }
         ],
+        "DefaultValue": {
+          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+          "SerializeProperty": "=TODAY()&\",\"&TODAY()"
+        },
         "type": "daterange",
         "placeholder": "请选择月份",
         "startPlaceholder": "开始日期",
@@ -543,7 +555,7 @@
                     ]
                   }
                 ],
-                "ID": "92b18256-4a1a-4b14-85a5-098eaf63cd99"
+                "ID": "164debad-3ed1-4d59-95ed-24955bd98ffe"
               }
             ]
           }
@@ -571,7 +583,7 @@
         "NumberType": 7,
         "FirstParamValue": {
           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-          "SerializeProperty": "=新增报工!B15<=新增报工!G30*24"
+          "SerializeProperty": "=新增报工!B15<=新增报工!F30*24"
         },
         "IgnoreBlank": false,
         "ShowInputMessageWhenCellIsSelected": false,
@@ -637,118 +649,174 @@
               }
             }
           },
-          {
-            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
-            "Title": "加载中"
-          },
-          {
-            "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-            "ServerCommandName": "从Gitee提取报工",
-            "Parameters": [
-              {
-                "$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": "=新增报工!结束日期"
-                }
-              },
-              {
-                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                "ParamName": "用户",
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=新增报工!B7"
-                }
-              }
-            ],
-            "ResultErrorCodeTo": {
-              "SerializeProperty": "code"
-            },
-            "ResultMessageTo": {
-              "SerializeProperty": "msg"
-            },
-            "ReturnPropertiesTo": [
-              {
-                "ResultPropertyName": "工时",
-                "ResultTo": {
-                  "SerializeProperty": "=新增报工!B15"
-                }
-              },
-              {
-                "ResultPropertyName": "工作内容",
-                "ResultTo": {
-                  "SerializeProperty": "=新增报工!B23"
-                }
-              }
-            ],
-            "RefreshAfterFinish": true,
-            "CheckDataValidation": true
-          },
           {
             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
             "ConditionAndCommandPairList": [
               {
                 "Condition": {
-                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-                  "param": {
+                  "SubConditions": [
-                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    {
-                    "cellLocations": [
+                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                      {
+                      "param": {
-                        "SerializeProperty": "=code"
+                        "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon",
-                      }
+                        "currentUserProperty": {
-                    ]
+                          "UserProperty": "GIT用户名",
-                  },
+                          "PropertyType": 4
-                  "value": "0",
+                        }
-                  "compareType": 1
+                      },
+                      "value": "%Null%"
+                    },
+                    {
+                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                      "param": {
+                        "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon",
+                        "currentUserProperty": {
+                          "UserProperty": "GIT密码",
+                          "PropertyType": 4
+                        }
+                      },
+                      "value": "%Null%"
+                    }
+                  ],
+                  "RelationType": 1
                 },
                 "CommandList": [
                   {
-                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                    "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-                    "FourStandardStyle": "warning",
+                    "ClosePopupCallbackCommand": {
-                    "Message": {
+                      "Commands": [
-                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        {
-                      "SerializeProperty": "=新增报工!msg"
+                          "$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"
+                        }
+                      ],
+                      "ParamProperties": {
+                        "IsOK": "是否为确定"
+                      }
+                    },
+                    "PageName": "完善Gitee资料"
                   }
                 ],
-                "ID": "eff6efc0-985c-414d-9407-2702932534a4"
+                "ID": "4d7842e8-7478-4fbb-ade8-abf8a942ee16"
               },
               {
                 "CommandList": [
                   {
-                    "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+                    "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy",
-                    "PropertyItemsList": [
+                    "Cell": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=新增报工!工作进展"
+                    },
+                    "Title": "加载中"
+                  },
+                  {
+                    "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+                    "ServerCommandName": "从Gitee提取报工",
+                    "Parameters": [
                       {
-                        "TargetCells": {
+                        "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                        "ParamName": "开始日期",
+                        "Value": {
                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=新增报工!R13"
+                          "SerializeProperty": "=新增报工!开始日期"
+                        }
+                      },
+                      {
+                        "$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": "=新增报工!报工人"
+                        }
+                      },
+                      {
+                        "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                        "ParamName": "任务ID",
+                        "Value": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=新增报工!任务ID"
+                        }
+                      }
+                    ],
+                    "ResultErrorCodeTo": {
+                      "SerializeProperty": "code"
+                    },
+                    "ResultMessageTo": {
+                      "SerializeProperty": "msg"
+                    },
+                    "ReturnPropertiesTo": [
+                      {
+                        "ResultPropertyName": "工作内容",
+                        "ResultTo": {
+                          "SerializeProperty": "=新增报工!工作进展"
+                        }
+                      }
+                    ],
+                    "RefreshAfterFinish": true,
+                    "CheckDataValidation": true
+                  },
+                  {
+                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                    "ConditionAndCommandPairList": [
+                      {
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                            "cellLocations": [
+                              {
+                                "SerializeProperty": "=code"
+                              }
+                            ]
+                          },
+                          "value": "0",
+                          "compareType": 1
                         },
-                        "Value": "工时可能与真实不符，请核对！"
+                        "CommandList": [
+                          {
+                            "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                            "FourStandardStyle": "warning",
+                            "Message": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=新增报工!msg"
+                            }
+                          }
+                        ],
+                        "ID": "3ec52c93-b6da-4f00-b347-e04e051fa78e"
                       }
                     ]
+                  },
+                  {
+                    "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy",
+                    "FunctionName": "remove",
+                    "Cell": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=新增报工!工作进展"
+                    },
+                    "Title": "加载中"
                   }
                 ],
-                "ID": "9d655275-f972-4c18-ab04-3c129694412c"
+                "ID": "8516141c-e93e-4a8d-b67c-5da61bf11962"
               }
             ]
-          },
-          {
-            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
-            "FunctionName": "remove",
-            "Title": "加载中"
           }
         ],
         "Text": "从Gitee分析",
-        "TemplateKey": "_RS_Information3",
+        "TemplateKey": "Gost",
         "Icon": {
           "Name": "gitee.svg"
         },
@@ -855,7 +923,7 @@
                       },
                       "NullFormulaValueQueryPolicy": 0
                     },
-                    "ID": "0008fead2d2d41faa28d1379f5ab4771"
+                    "ID": "f6f4e3ba76524509bcb0d818fa1f987a"
                   },
                   {
                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -1050,7 +1118,7 @@
                                                           "ReloadData": true
                                                         }
                                                       ],
-                                                      "ID": "00b03b8e-5c95-40f1-a88a-3699e6664c9c"
+                                                      "ID": "eecfde35-c50e-4d15-8fd6-bcf3b0f03a38"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -1065,12 +1133,12 @@
                                                           "BtnText": "知道了"
                                                         }
                                                       ],
-                                                      "ID": "e24d766e-d420-4c65-9d18-34f47a671d01"
+                                                      "ID": "1f62e450-b714-4859-ad32-1461c3eabe0a"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "c6eb29b5-5c88-40b9-84f1-19196d300b4d"
+                                              "ID": "37222052-a7d7-409d-9439-16f425aa32cc"
                                             },
                                             {
                                               "CommandList": [
@@ -1080,7 +1148,7 @@
                                                   "Message": "用户已取消"
                                                 }
                                               ],
-                                              "ID": "16f2ac71-4d8e-424f-9d9f-1f4a18f707d8"
+                                              "ID": "32f9f9ab-8905-4153-b8d7-d10ee70cd77d"
                                             }
                                           ]
                                         }
@@ -1123,12 +1191,12 @@
                                     "LoadBindingDataOption": 2
                                   }
                                 ],
-                                "ID": "1777ea65-a465-4aa1-a155-b93e5f6cb9df"
+                                "ID": "ef11949d-e652-4f9f-a78a-d5539bf770cf"
                               }
                             ]
                           }
                         ],
-                        "ID": "a9380541-e52d-44d9-98ca-cc4a63a83b8c"
+                        "ID": "cc89dea3-40a8-41bf-abf2-fe1f5dfb2098"
                       },
                       {
                         "CommandList": [
@@ -1140,7 +1208,7 @@
                               "TableValueType": 1,
                               "BindingInfos": [
                                 {
-                                  "GUID": "84474ac0-8fe0-416f-8a9c-e9555fe3b273",
+                                  "GUID": "5c4a5d98-839f-4dbb-b207-a0877e197225",
                                   "BindingInfo": {
                                     "TableName": "任务工时表",
                                     "ColumnName": "总工时",
@@ -1189,7 +1257,7 @@
                               },
                               "NullFormulaValueQueryPolicy": 0
                             },
-                            "ID": "5b3f4e1a9e4f44c4b8c48c7eb6f7edfd"
+                            "ID": "36d6ac6c1fec4cc18b5caa2f00f8913e"
                           },
                           {
                             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -1241,7 +1309,7 @@
                                     "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
                                   }
                                 ],
-                                "ID": "90909dcb-9e1a-4a3b-afd8-02763da204c7"
+                                "ID": "39fdb361-728a-47dc-b82a-52a1ee9b467d"
                               }
                             ]
                           },
@@ -1267,7 +1335,7 @@
                                 "ParamName": "执行人",
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=新增报工!B7"
+                                  "SerializeProperty": "=新增报工!报工人"
                                 }
                               },
                               {
@@ -1275,7 +1343,7 @@
                                 "ParamName": "工时数",
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=新增报工!B15"
+                                  "SerializeProperty": "=新增报工!工时数"
                                 }
                               },
                               {
@@ -1493,7 +1561,7 @@
                                                           "ReloadData": true
                                                         }
                                                       ],
-                                                      "ID": "2f4bd7ed-36c0-405b-9e8a-f11ff9475016"
+                                                      "ID": "a77d9388-a462-4c64-85cd-2ee36f93820f"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -1508,12 +1576,12 @@
                                                           "BtnText": "知道了"
                                                         }
                                                       ],
-                                                      "ID": "5f0a5b68-24a9-4416-bbf6-bc39994a0f9c"
+                                                      "ID": "11eae05e-0ba0-4b4b-8f8f-36dcf01a7fac"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "0fbc5305-45de-4993-89b2-803f0ef91401"
+                                              "ID": "11505940-01c8-43e5-8bf8-df800163b58a"
                                             }
                                           ]
                                         }
@@ -1590,7 +1658,7 @@
                                     ]
                                   }
                                 ],
-                                "ID": "cb4cf9a5-fc9e-478f-97c9-7bc1376f1dd0"
+                                "ID": "52bfe329-0ca4-48f9-af90-8a346e59081f"
                               },
                               {
                                 "CommandList": [
@@ -1605,17 +1673,17 @@
                                     "BtnText": "知道了"
                                   }
                                 ],
-                                "ID": "c18b7e4e-c026-4f98-a200-a4684395482b"
+                                "ID": "5364e5ac-ce6e-4086-bce7-589be1803901"
                               }
                             ]
                           }
                         ],
-                        "ID": "09d1f95e-b8c9-4a3c-8f47-928af7eea7e1"
+                        "ID": "595350e9-3077-47b1-b01c-db5feef51cc3"
                       }
                     ]
                   }
                 ],
-                "ID": "4867ede5-4e22-436e-abab-b2866a837a39"
+                "ID": "2fa1d89a-950b-4c10-a786-b313cd63742c"
               },
               {
                 "CommandList": [
@@ -1625,7 +1693,7 @@
                     "Message": "请添加参与人后进行操作"
                   }
                 ],
-                "ID": "595bf9a0-5234-4b0f-b5b4-c5c3ae85d79b"
+                "ID": "a9f162c4-9145-4bd6-9f93-e8e4c5a475d9"
               }
             ]
           }
@@ -1947,9 +2015,7 @@
       "27,2": 1,
       "27,3": 1,
       "27,14": 1,
-      "29,6": 8,
+      "29,5": 8,
-      "29,10": 1,
-      "29,11": 1,
       "29,12": 1,
       "29,13": 9
     },
@@ -1964,13 +2030,14 @@
     "27,1,1,3",
     "10,1,1,17",
     "18,1,1,17",
-    "29,13,1,1",
-    "29,6,1,7",
     "2,1,1,17",
     "29,1,1,4",
     "6,1,1,17",
     "20,14,1,4",
-    "27,14,1,4"
+    "27,14,1,4",
+    "29,13,1,4",
+    "29,5,1,3",
+    "29,8,1,4"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -2005,7 +2072,7 @@
                 ]
               }
             ],
-            "ID": "f7d25c39-a2e9-4d69-9ed2-58a6bc0b582c"
+            "ID": "058da7f2-89eb-48e8-86aa-4559f809b640"
           },
           {
             "CommandList": [
@@ -2022,7 +2089,7 @@
                 ]
               }
             ],
-            "ID": "0f62cc0e-baa6-4e85-baed-19bf45ff4723"
+            "ID": "c8f5bf6d-1936-4969-922b-512cc3827365"
           }
         ]
       }
@@ -2057,6 +2124,26 @@
     {
       "Name": "项目ID",
       "Formula": "新增报工!$B$30"
+    },
+    {
+      "Name": "报工人",
+      "Formula": "新增报工!$B$7"
+    },
+    {
+      "Name": "工时数",
+      "Formula": "新增报工!$B$15"
+    },
+    {
+      "Name": "工作进展",
+      "Formula": "新增报工!$B$23"
+    },
+    {
+      "Name": "开始日期",
+      "Formula": "新增报工!$I$30"
+    },
+    {
+      "Name": "结束日期",
+      "Formula": "新增报工!$N$30"
     }
   ]
-}//iXj46tq7HodI+BChrXyZ6k4Pa7UV/prVspFUtUdXrPpt1Ii/g6vcsTQl4qgWMVKw/E77P4879QUC3dIPu0XOoEin8fzHj2hjxr9dgNmYleJ9jZQdaVRGbucKZV73UO80EkbOumpGXkiPNSHrWtwJDQKhdvCBR67CXpSS9BCRrawqpfE/T1wa+D/mB0ljM96iRJwV+ctJo/0fM1K71afkbTSOSdxfThaDNSjMc5lfjCPEXQtcs8oVQiGAdbjxFDDB3mtwUImehpiuug+/Kfore4Hq+h8V6Gd3pLXTeKP2/qD3n+kCHCXQnZz9z1k//cYRXpDFjWARD7ojyCjo77tsQ+IDADEzBCrsgiVulNS/1CjXA9Rh5YKGV9ghMc5WlXjhZdJ+KYA1MuOXt5R6O/cBRzH0rJv9X4cK3/keYmUYpAz602eB5btQrOUNEjGvGsuIm+w7IgLnlQs4AwhLebA8jnNqb+LVbLXyuRHKSOluVew8R6gX5zVDl+dV5j72gvwOTyuy8gTbNbLyIL71oB4KoNjF5yqsyQCk46aXoLjHCwI1aH73FpULaORv01Ixnpuec6SeROgpNhfEmxj1DjnoVoMCJ0gG6lfTIHFWwxlaoo/FtgaZAaT6fyQc7LUrc96QNhU1mK2bOUEvJLvq/kXVGc1VMYUbA/X84JIm3OSpQPF8b6W/IZaycggOnLEhM1kXup2CZhQrB/pONRAoTYIYcpNnrTfzjMImrRxdHvKcvnjYSbjIjWAmS4nBwJO1vykWMOqyjLDFTIKMUOwAtF/Mti9ZZM6FVrjFH50rtxvs7Nc2BbpZQLeQxf/O14A6jWH/ZlJja7un+9VUw7u8sUL7+x9qtogHHQEAaDggetn/t1Pc1xdCfDo2Nqu+vZO1oOS03nFHtpRwgdZZyj7rxqoCsg==|920
+}//2AsG5uG+kE09uqjD1+IPSz8/ZFzGgtRlSPkttCWficZxQ2ClYJyXxmnXVN7snAbqtzAf2bp5QXkzsU7+aSFfmIYRsaTdNXED3GyCZ0RiPa3ume8q4OnIGF0+WwDffWPi4/ho6taTNrZpCe/zvVZzSsTS+hi2pseLlRsaPCsoMDhp1Hgej4bgN1DLzVI0FVe+w7bk3Cr1iqcnwoY8Jzne+5RzaCGi1xDVc/0feOGtmg6NQoEPKgaNv8NVTSwtaagRuqpGvi46TwQQBg+qvomTs09Yvzo9I8xsCRLimnVUNaBuTZAdkox+sJ7PrW7unVbeguNVCX+6ed0CUrKDRcOJAfSyncXw0+qxwrf1HxlGuoZqTWz9WzY4hHMnBEgy08AY0z5QDKETqLcJgPvRdhQo+jb3E1x1Lyfo7Rj0oa5nr9yEV9f1fCVBx9nkEugX52ujIPKNqlpjTtxfSycNeEE44gSm8jov+lbn5rP8Eo9cMBNfe3pgguuYCHePr+Rxbr4yaqLU5HGQjKW18lVpW5O0dFFxxzlfslId4ETpOx1/dY91OxMVwiPr7AiFmQ1f9OhTtU/XsZxqMtURsKN7exegKiCZArCm55cIgmwzYHPfCpv3Fexu+a28eb3bQYnfUh/077P9J7ZuXjfKj8Dvcs/vOpwVYzq2tzp6FVWeyQJXeQLgV53Ppqb3UJ8GO/Uu8Y+fZe31bt4D8LON42y8ZZ0ihZIdEZ88ggr1sUdG5+MB53gxy9e5pK6bCWE3GQ52bFajObQnvudYsOhpykaBoZn7qTZR31vO/8u7RoyLm1Elgru+fM84Ses0on+edLL6RzFKP+0CWrt2Nhpw2SzqKqhjnGFy2SVXxTGFfLYX6j4FDV3xzF5BQUDx/j++SxC5a4Z1HSjJwfX/01MS5ETzEzo4ZQ==|920

Pages/任务/工时/新增报工.rd

@@ -3,8 +3,7 @@
   "ColumnCount": 19,
   "RowCount": 31,
   "Formulas": {
-    "29,6": "DATEDIF(G30,N30,\"d\")+1",
+    "29,5": "DATEDIF(F30,N30,\"d\")+1"
-    "10,1": "TODAY()&\",\"&TODAY()"
   },
   "CustomNames": [
     {
@@ -14,6 +13,26 @@
     {
       "Name": "项目ID",
       "Formula": "新增报工!$B$30"
+    },
+    {
+      "Name": "报工人",
+      "Formula": "新增报工!$B$7"
+    },
+    {
+      "Name": "工时数",
+      "Formula": "新增报工!$B$15"
+    },
+    {
+      "Name": "工作进展",
+      "Formula": "新增报工!$B$23"
+    },
+    {
+      "Name": "开始日期",
+      "Formula": "新增报工!$I$30"
+    },
+    {
+      "Name": "结束日期",
+      "Formula": "新增报工!$N$30"
     }
   ]
 }

ServerCommands/Gitee/GitCallback.json

@@ -87,7 +87,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "事件名称",
-                            "GUID": "b5698686-4edb-4a65-a2e5-45ed333fadc5"
+                            "GUID": "efbbf095-19cd-4dae-92ec-a0f26a2efbcd"
                           },
                           "Value": "签入工程"
                         },
@@ -95,7 +95,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "hook_id",
-                            "GUID": "fd4a5dbb-e0ad-4bf7-9322-d9adf645eb32"
+                            "GUID": "21366caf-c74c-4981-a013-6a7a67f6477d"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -106,7 +106,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "事件内容",
-                            "GUID": "df11c98f-3267-4f64-94db-e7770898100e"
+                            "GUID": "c854b847-0492-418f-b8ff-ec205e556c75"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -117,7 +117,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "空间路径",
-                            "GUID": "65e021d0-421e-4513-b77d-627a293cca44"
+                            "GUID": "4982e365-0843-42f7-aff4-1aff311903fd"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -128,7 +128,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "仓库名称",
-                            "GUID": "6e0426ba-e02d-4d5b-978f-02aaa78e2f1d"
+                            "GUID": "c4d72e32-e0a7-4857-8cb1-df2f89597883"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -139,7 +139,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "仓库路径",
-                            "GUID": "9a4a577a-89ff-45fe-9403-b76a61ca264e"
+                            "GUID": "e12eb196-adc5-4aeb-95bc-c2f7d6eedbec"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -150,7 +150,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "url",
-                            "GUID": "132e4684-4a02-4380-8595-93f2780e327a"
+                            "GUID": "4c3e3d4f-2dd9-4e3a-a49f-d90d31a16a7b"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -161,7 +161,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "提交人",
-                            "GUID": "0f80fa89-fa73-4a11-abfb-700ebd4bee12"
+                            "GUID": "347d5182-7b19-4a6f-8e5d-fc4612078592"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -172,7 +172,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "git用户名",
-                            "GUID": "4b26a8fd-1245-4a97-acdd-f474f45f7cfd"
+                            "GUID": "527d6e11-d777-454e-9677-3ec7fadb6a0f"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -183,12 +183,23 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "仓库ID",
-                            "GUID": "61b0a85a-db65-4576-9e9f-29c51865599e"
+                            "GUID": "cf208007-6e12-4fd0-8cf5-fe0f4f1b3632"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                             "SerializeProperty": "=钩子数据.repository.id"
                           }
+                        },
+                        {
+                          "BindingInfo": {
+                            "TableName": "Git_事件记录",
+                            "ColumnName": "日期",
+                            "GUID": "38c80d5e-0881-40ed-811f-d45eb2a521ce"
+                          },
+                          "Value": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=钩子数据.head_commit.committer.timestamp"
+                          }
                         }
                       ]
                     },
@@ -198,7 +209,7 @@
                       "Message": "签入已被记录"
                     }
                   ],
-                  "ID": "61cdb37b-e3df-4ec8-b55d-6cc16166bcbd"
+                  "ID": "b9cf1980-a636-4a10-a6f5-e53f0711f9db"
                 },
                 {
                   "CommandList": [
@@ -250,7 +261,8 @@
                           ]
                         }
                       },
-                      "ID": "870440a4356a42c68a1979afdc94a1d5"
+                      "ID": "7a9485e728ea41d3b1481daa62b7036b",
+                      "Disabled": true
                     },
                     {
                       "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -278,7 +290,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "事件名称",
-                                    "GUID": "987654e9-a86d-4983-98c3-1d5c2b94733f"
+                                    "GUID": "0e6e01aa-5695-4e80-ac62-9e64cf34a86c"
                                   },
                                   "Value": "签出模块"
                                 },
@@ -286,7 +298,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "hook_id",
-                                    "GUID": "bca8da11-66d8-4365-b254-881fd7e5dcd7"
+                                    "GUID": "dcf94894-2c9e-418e-966c-4f1e23906f71"
                                   },
                                   "Value": {
                                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -297,7 +309,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "事件内容",
-                                    "GUID": "7eef9be6-a388-4e96-9b01-758d8efd041e"
+                                    "GUID": "30f62c72-9b5b-468e-8913-dc78bfac2738"
                                   },
                                   "Value": {
                                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -308,7 +320,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "空间路径",
-                                    "GUID": "69513fe0-9c5a-402a-9315-2e25e0d97ed1"
+                                    "GUID": "d97f0ab6-fad1-4d96-b62f-aa4f65cc42e4"
                                   },
                                   "Value": {
                                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -319,7 +331,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "仓库名称",
-                                    "GUID": "039c74bf-f727-4425-b446-8c39180ff5a3"
+                                    "GUID": "15b9e3d3-cb05-475b-988f-e59667daa4c8"
                                   },
                                   "Value": {
                                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -330,7 +342,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "仓库路径",
-                                    "GUID": "6b130a65-144f-449d-a106-59551eb02836"
+                                    "GUID": "5dd5f4c1-9a4a-4308-a1d2-437ad831b120"
                                   },
                                   "Value": {
                                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -341,7 +353,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "url",
-                                    "GUID": "b0b69598-37b2-42a0-b2a9-ae2a841bbf35"
+                                    "GUID": "2f2a853b-0673-4a3b-b18c-d10b1ba53b40"
                                   },
                                   "Value": {
                                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -352,7 +364,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "提交人",
-                                    "GUID": "103181f1-6b88-4a0f-acf5-3abe972d80b0"
+                                    "GUID": "c0f7d5f9-d752-413e-b346-476b1c544f9d"
                                   },
                                   "Value": {
                                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -363,7 +375,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "git用户名",
-                                    "GUID": "e5bfa05a-f1f9-4aa7-be57-adc7318bf57e"
+                                    "GUID": "8c8e0a31-8990-4a0b-9b8c-94d084cb6681"
                                   },
                                   "Value": {
                                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -374,7 +386,7 @@
                                   "BindingInfo": {
                                     "TableName": "Git_事件记录",
                                     "ColumnName": "仓库ID",
-                                    "GUID": "2da4c9d9-7976-4cb5-b058-85b95eea804c"
+                                    "GUID": "e71e0310-04a8-4a38-886d-c297c63044e1"
                                   },
                                   "Value": {
                                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -384,9 +396,10 @@
                               ]
                             }
                           ],
-                          "ID": "b183a29c-3c17-4c4c-9de2-2b5ab4a32f01"
+                          "ID": "12489899-d76f-4750-b786-fc6d7473bd14"
                         }
-                      ]
+                      ],
+                      "Disabled": true
                     },
                     {
                       "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
@@ -394,12 +407,12 @@
                       "Message": "忽略非签入事件"
                     }
                   ],
-                  "ID": "a372f8cc-845f-42c5-870b-66e27f536a22"
+                  "ID": "2e4c36df-ab04-47b2-aa99-bb1085ff5228"
                 }
               ]
             }
           ],
-          "ID": "0e35e22f-578c-4d58-baee-93e4256386f5"
+          "ID": "635f8496-5932-492c-80b8-2ac48a2a04a1"
         }
       ]
     }

ServerCommands/Gitee/从Gitee提取报工.json

@@ -41,6 +41,13 @@
             "IgnoreBlank": false
           },
           "TestData": "Administrator"
+        },
+        {
+          "Name": "任务ID",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          },
+          "TestData": "12"
         }
       ],
       "InvokeTriggerTestData": {
@@ -57,7 +64,7 @@
         "TableValueType": 1,
         "BindingInfos": [
           {
-            "GUID": "8f82e754-66c0-4b46-8096-452e5b638a47",
+            "GUID": "46366003-75e0-4903-87a0-dcf074895064",
             "BindingInfo": {
               "TableName": "用户信息视图",
               "ColumnName": "GIT用户名",
@@ -81,7 +88,46 @@
         "NullFormulaValueQueryPolicy": 0,
         "TopCount": "1"
       },
-      "ID": "bbf27a5a9c66482f85c63fea495e0214"
+      "ID": "8391e0732ab841529e2174dc037526ea"
+    },
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "任务",
+      "TableValue": {
+        "TableName": "任务表",
+        "TableValueType": 1,
+        "BindingInfos": [
+          {
+            "GUID": "0e59cb25-2e18-48bc-8977-c383f267b674",
+            "BindingInfo": {
+              "TableName": "任务表",
+              "ColumnName": "版本",
+              "GUID": "dde5bb9b-eca1-4a75-8842-48e549ca0dfb",
+              "RelationBinding": {
+                "RelatedTable": "项目版本",
+                "RelatedColumn": "ID",
+                "DisplayColumn": "仓库ID"
+              }
+            },
+            "ColumnName": "仓库ID"
+          }
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+          "ColumnBindingInfo": {
+            "TableName": "任务表",
+            "ColumnName": "ID",
+            "GUID": "b704bc09-9556-4e08-bf59-03af3049108f"
+          },
+          "Value": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=任务ID"
+          }
+        },
+        "NullFormulaValueQueryPolicy": 0,
+        "TopCount": "1"
+      },
+      "ID": "a958acc5408244d390156e9085776e6e"
     },
     {
       "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -93,227 +139,13 @@
               "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
               "ParamObject": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=用户.GIT用户名"
+                "SerializeProperty": "=任务"
               }
             },
             "value": "%Null%",
             "compareType": 1
           },
           "CommandList": [
-            {
-              "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-              "ParameterName": "计算天数",
-              "ParameterValue": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")"
-              },
-              "ID": "839247702b97432483704b323205cd67"
-            },
-            {
-              "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-              "ParameterName": "总工时",
-              "ParameterValue": "0",
-              "ID": "73122483179048b18313028406573a8f"
-            },
-            {
-              "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
-              "InParamater": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=事件列表"
-              },
-              "OutParamaterName": "事件列表"
-            },
-            {
-              "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon",
-              "LoopInfo": {
-                "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon",
-                "LoopCount": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=计算天数+1"
-                },
-                "LoopIndexParamName": "index",
-                "LoopItemParamName": "当前天数"
-              },
-              "CommandList": [
-                {
-                  "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                  "ParameterName": "当前日期",
-                  "ParameterValue": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=开始日期+index-1"
-                  },
-                  "ID": "d4a5f61ea18f4cc7a24de21472568421"
-                },
-                {
-                  "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                  "ParameterName": "Gitee事件",
-                  "TableValue": {
-                    "TableName": "Git_事件记录",
-                    "BindingInfos": [
-                      {
-                        "GUID": "8c52173d-d148-4903-b056-fb3b5e4271df",
-                        "BindingInfo": {
-                          "TableName": "Git_事件记录",
-                          "ColumnName": "日期",
-                          "GUID": "12eed73a-37a4-4ab4-9850-53a04c017263"
-                        },
-                        "ColumnName": "日期"
-                      },
-                      {
-                        "GUID": "03433246-583c-4fc6-bad5-16ba014ae315",
-                        "BindingInfo": {
-                          "TableName": "Git_事件记录",
-                          "ColumnName": "事件内容",
-                          "GUID": "c2d0070c-3266-465c-865d-90e48ee75302"
-                        },
-                        "ColumnName": "事件内容"
-                      }
-                    ],
-                    "SqlCondition": {
-                      "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-                      "SubConditions": [
-                        {
-                          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                          "ColumnBindingInfo": {
-                            "TableName": "Git_事件记录",
-                            "ColumnName": "git用户名",
-                            "GUID": "0057124f-d1b6-4f02-a3d8-1affcc691fed"
-                          },
-                          "Value": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=用户.GIT用户名"
-                          }
-                        },
-                        {
-                          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                          "ColumnBindingInfo": {
-                            "TableName": "Git_事件记录",
-                            "ColumnName": "日期",
-                            "GUID": "6f2040a7-9a8d-449f-982d-85c6c73ab517"
-                          },
-                          "Value": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=当前日期"
-                          }
-                        }
-                      ]
-                    },
-                    "NullFormulaValueQueryPolicy": 0,
-                    "OrderBySqlCondition": {
-                      "OrderByColumns": [
-                        {
-                          "ColumnBindingInfo": {
-                            "TableName": "Git_事件记录",
-                            "ColumnName": "日期",
-                            "GUID": "d1eb816a-334f-46ce-9738-4740009be374"
-                          },
-                          "Order": 0
-                        }
-                      ]
-                    }
-                  },
-                  "ID": "09aaf1a2b4ed4c7ba9769efd0ffff595"
-                },
-                {
-                  "$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": "=Gitee事件.Count"
-                          }
-                        },
-                        "value": "0",
-                        "compareType": 2
-                      },
-                      "CommandList": [
-                        {
-                          "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                          "ParameterName": "最小时间",
-                          "ParameterValue": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=Gitee事件.0.日期"
-                          },
-                          "ID": "c5dc990dffbc47e18c0f4a1db5c1381e"
-                        },
-                        {
-                          "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                          "ParameterName": "最大时间",
-                          "ParameterValue": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=GETPARAM(\"Gitee事件.\"&Gitee事件.Count-1&\".日期\")"
-                          },
-                          "ID": "7c19014644ba4fcfae80f801b077dbed"
-                        },
-                        {
-                          "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                          "ParameterName": "今日工时",
-                          "ParameterValue": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=IFERROR(ROUND((最大时间-最小时间)*24,1),0)"
-                          },
-                          "ID": "9dc82b30c38a47b98eed930ce1f0db4d"
-                        },
-                        {
-                          "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                          "ParameterName": "总工时",
-                          "ParameterValue": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=总工时+今日工时"
-                          },
-                          "ID": "3cf8b482c8914dce850e9cb334ebcd33"
-                        },
-                        {
-                          "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
-                          "InParamater": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=Gitee事件"
-                          },
-                          "Operation": 16,
-                          "OperationParamaterAName": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=CHAR(10)"
-                          },
-                          "OperationParamaterBName": "事件内容",
-                          "OutParamaterName": "事件内容拼接"
-                        },
-                        {
-                          "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
-                          "OperationParamaterPairs": [
-                            {
-                              "Name": "内容",
-                              "Value": {
-                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                "SerializeProperty": "=事件内容拼接"
-                              }
-                            }
-                          ],
-                          "OutParamaterName": "今日数据"
-                        },
-                        {
-                          "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
-                          "InParamater": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=事件列表"
-                          },
-                          "Operation": 4,
-                          "OperationParamaterAName": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=今日数据"
-                          },
-                          "OutParamaterName": "事件列表"
-                        }
-                      ],
-                      "ID": "5bc82618-62a0-4ad7-81de-4a4ae40003fb"
-                    }
-                  ]
-                }
-              ]
-            },
             {
               "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
               "ConditionAndCommandPairList": [
@@ -324,109 +156,185 @@
                       "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
                       "ParamObject": {
                         "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=事件列表.Count"
+                        "SerializeProperty": "=用户.GIT用户名"
                       }
                     },
-                    "value": "0",
+                    "value": "%Null%",
-                    "compareType": 2
+                    "compareType": 1
                   },
                   "CommandList": [
                     {
-                      "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
+                      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                      "OperationParamaterPairs": [
+                      "ParameterName": "计算天数",
-                        {
+                      "ParameterValue": {
-                          "Name": "事件列表",
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "Value": {
+                        "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")"
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      },
-                            "SerializeProperty": "=事件列表"
+                      "ID": "1f3988569f6f469fa81277a93360312c"
-                          }
-                        }
-                      ],
-                      "OutParamaterName": "数据源"
                     },
                     {
-                      "$type": "MustachePlugin.Render, MustachePlugin",
+                      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                      "DataSrouce": "{{#事件列表}}\r\n{{内容}}\r\n{{/事件列表}}",
+                      "ParameterName": "总工时",
-                      "UseCustomsDataHash": true,
+                      "ParameterValue": "0",
-                      "CustomsDataHash": {
+                      "ID": "73122483179048b18313028406573a8f"
-                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    },
-                        "SerializeProperty": "=数据源"
+                    {
+                      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                      "ParameterName": "Gitee事件",
+                      "TableValue": {
+                        "TableName": "Git_事件记录",
+                        "BindingInfos": [
+                          {
+                            "GUID": "6bafd44a-35f7-4cc8-afc3-d06f8ba7b421",
+                            "BindingInfo": {
+                              "TableName": "Git_事件记录",
+                              "ColumnName": "事件内容",
+                              "GUID": "c2d0070c-3266-465c-865d-90e48ee75302"
+                            },
+                            "ColumnName": "事件内容"
+                          }
+                        ],
+                        "SqlCondition": {
+                          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                          "SubConditions": [
+                            {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "CompareType": 3,
+                              "ColumnBindingInfo": {
+                                "TableName": "Git_事件记录",
+                                "ColumnName": "日期",
+                                "GUID": "6f2040a7-9a8d-449f-982d-85c6c73ab517"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=开始日期"
+                              }
+                            },
+                            {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "CompareType": 3,
+                              "ColumnBindingInfo": {
+                                "TableName": "Git_事件记录",
+                                "ColumnName": "日期",
+                                "GUID": "5a6061db-576d-4083-b830-58e94583f2f0"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=结束日期"
+                              }
+                            },
+                            {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "ColumnBindingInfo": {
+                                "TableName": "Git_事件记录",
+                                "ColumnName": "git用户名",
+                                "GUID": "0057124f-d1b6-4f02-a3d8-1affcc691fed"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=用户.GIT用户名"
+                              }
+                            },
+                            {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "ColumnBindingInfo": {
+                                "TableName": "Git_事件记录",
+                                "ColumnName": "仓库ID",
+                                "GUID": "1e4558ce-b6b5-465e-aff1-ba427e4bb9d0"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=任务.仓库ID"
+                              }
+                            }
+                          ]
+                        },
+                        "NullFormulaValueQueryPolicy": 0,
+                        "OrderBySqlCondition": {
+                          "OrderByColumns": [
+                            {
+                              "ColumnBindingInfo": {
+                                "TableName": "Git_事件记录",
+                                "ColumnName": "日期",
+                                "GUID": "d1eb816a-334f-46ce-9738-4740009be374"
+                              },
+                              "Order": 0
+                            }
+                          ]
+                        }
                       },
-                      "SetMaxRecursionDepth": 512,
+                      "ID": "2cb377727f324c1ca26920b7ae0c1401"
-                      "ResultTo": "输出结果"
+                    },
+                    {
+                      "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
+                      "InParamater": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "=Gitee事件"
+                      },
+                      "Operation": 16,
+                      "OperationParamaterAName": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "=CHAR(10)"
+                      },
+                      "OperationParamaterBName": "事件内容",
+                      "OutParamaterName": "获取工作内容"
                     },
                     {
                       "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
                       "ErrorCode": "0",
-                      "Message": "生成成功",
+                      "Message": "获取成功",
                       "CustomReturns": [
-                        {
-                          "ReturnPropertyName": "工时",
-                          "Value": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=总工时"
-                          }
-                        },
                         {
                           "ReturnPropertyName": "工作内容",
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=输出结果"
+                            "SerializeProperty": "=获取工作内容"
                           }
                         }
                       ]
                     }
                   ],
-                  "ID": "0e598871-c20f-4ca0-abca-cf1feca9c43d"
+                  "ID": "e47946cd-e4d2-408f-86f7-44e46767465c"
                 },
                 {
                   "CommandList": [
                     {
                       "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
                       "ErrorCode": "400",
-                      "Message": "无Gitee记录",
+                      "Message": "您尚未设置Gitee信息，请前往\"个人中心\"设置后再试",
                       "CustomReturns": [
-                        {
-                          "ReturnPropertyName": "工时"
-                        },
                         {
                           "ReturnPropertyName": "工作内容"
                         }
                       ]
                     }
                   ],
-                  "ID": "17cdfa64-1f6b-4a59-9670-949c6c3f5f2a"
+                  "ID": "bccc5e99-5617-45b3-8b4a-95a0acd27026"
                 }
               ]
             }
           ],
-          "ID": "e0f0e898-5752-4cbb-a33a-6d032e73734d"
+          "ID": "f075c648-5586-49c0-816c-95d1283782dc"
         },
         {
           "CommandList": [
             {
               "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
               "ErrorCode": "400",
-              "Message": "您尚未设置Gitee信息，请前往\"个人中心\"设置后再试",
+              "Message": "任务不存在",
               "CustomReturns": [
-                {
-                  "ReturnPropertyName": "工时"
-                },
                 {
                   "ReturnPropertyName": "工作内容"
                 }
               ]
             }
           ],
-          "ID": "3b95baba-3c99-45c2-b1cb-feaed60baf11"
+          "ID": "141b8b4f-b94d-4491-bac9-642eed38e19d"
         }
       ]
     }
   ],
   "ReturnProperties": [
-    {
-      "Name": "工时"
-    },
     {
       "Name": "工作内容"
     }

ServerCommands/Gitee/列出仓库的WebHooks.json

@@ -34,7 +34,7 @@
         "TableValueType": 1,
         "BindingInfos": [
           {
-            "GUID": "ba26ad6b-e153-4018-acbf-19fd62234227",
+            "GUID": "c6eb66bd-c1e2-4bf4-ad2d-549a68fb23f2",
             "BindingInfo": {
               "TableName": "用户信息视图",
               "ColumnName": "GIT用户名",
@@ -43,7 +43,7 @@
             "ColumnName": "GIT用户名"
           },
           {
-            "GUID": "88d30da5-84dc-4d11-b8ef-f8f545176b56",
+            "GUID": "30c3f423-ad80-474d-ae90-2e7dc076bddb",
             "BindingInfo": {
               "TableName": "用户信息视图",
               "ColumnName": "GIT密码",
@@ -67,7 +67,7 @@
         "NullFormulaValueQueryPolicy": 0,
         "TopCount": "1"
       },
-      "ID": "46e29f04b4fd462f8586231d02327d70"
+      "ID": "22c08c26600240308f2761ba08d0b396"
     },
     {
       "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -291,7 +291,7 @@
                       }
                     }
                   ],
-                  "ID": "f3b11adb-460b-462a-a407-eb24c1edf879"
+                  "ID": "f727fc1a-5bda-49c8-a1c1-b54e23d0d412"
                 },
                 {
                   "CommandList": [
@@ -315,12 +315,12 @@
                       ]
                     }
                   ],
-                  "ID": "5151823f-c28b-4635-a478-2b8d6a34cc97"
+                  "ID": "4fde08ac-6a64-4142-bf48-755405561889"
                 }
               ]
             }
           ],
-          "ID": "0fe2bd70-2110-4273-a51b-c8cc82e24dff"
+          "ID": "d3cb6dd1-113a-45ea-877e-0437029ad157"
         },
         {
           "CommandList": [
@@ -338,7 +338,7 @@
               ]
             }
           ],
-          "ID": "76ade898-cb5c-498d-a048-1ce527c4ccdc"
+          "ID": "820d4a45-8033-4364-b172-008343f6154b"
         }
       ]
     }

ServerCommands/Gitee/删除一个仓库WebHook.json

@@ -38,7 +38,7 @@
         "TableValueType": 1,
         "BindingInfos": [
           {
-            "GUID": "6984ed49-645c-4768-a88a-0edc4f34c65c",
+            "GUID": "0f5789c1-7d47-4c09-8653-74a57374d6c6",
             "BindingInfo": {
               "TableName": "Git仓库表",
               "ColumnName": "空间路径名",
@@ -47,7 +47,7 @@
             "ColumnName": "空间路径名"
           },
           {
-            "GUID": "27c330a3-65da-4a14-9f71-81aebbc73575",
+            "GUID": "8dc4402a-90d4-4e1b-98c6-7b53573085c2",
             "BindingInfo": {
               "TableName": "Git仓库表",
               "ColumnName": "仓库路径名",
@@ -56,7 +56,7 @@
             "ColumnName": "仓库路径名"
           },
           {
-            "GUID": "bd5c6119-0f98-41ae-a979-aa49b426d2bf",
+            "GUID": "994df018-43ca-4427-98a9-3e3e0bde686c",
             "BindingInfo": {
               "TableName": "Git仓库表",
               "ColumnName": "Callback_url",
@@ -80,7 +80,7 @@
         "NullFormulaValueQueryPolicy": 0,
         "TopCount": "1"
       },
-      "ID": "69431f6041fc4cd9b99b4d2e12383acf"
+      "ID": "203a79b333264e53af68232a742b899f"
     },
     {
       "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -279,7 +279,7 @@
                                   }
                                 }
                               ],
-                              "ID": "67e6f1f4-5eff-49e0-8926-27d1856fb5c1"
+                              "ID": "035835d7-f6e7-427e-a1d5-5908f7839a9d"
                             }
                           ]
                         }
@@ -314,7 +314,7 @@
                       ]
                     }
                   ],
-                  "ID": "8716d4a2-58e3-4aea-b167-741ed33baac8"
+                  "ID": "096965ab-99e0-45ab-ae27-fa6c7783bd79"
                 },
                 {
                   "CommandList": [
@@ -330,12 +330,12 @@
                       }
                     }
                   ],
-                  "ID": "71262bf0-6d26-4719-a357-b07f85494bc9"
+                  "ID": "8f0c41d9-1e33-41ce-b3de-14694861b5a4"
                 }
               ]
             }
           ],
-          "ID": "0fc6c357-c23c-4d12-9f93-86d3a4225087"
+          "ID": "584c3d0c-dc78-4d8e-81f9-0478dcb4ce3b"
         },
         {
           "CommandList": [
@@ -345,7 +345,7 @@
               "Message": "仓库不存在！"
             }
           ],
-          "ID": "3b7d20e5-423a-453e-ab46-154da6fda2b2"
+          "ID": "433f6e82-7a58-495a-8145-97e68592c45d"
         }
       ]
     }

ServerCommands/Gitee/同步一个仓库到表.json

@@ -288,7 +288,7 @@
                   ]
                 }
               ],
-              "ID": "e1c14211-bea3-40a2-8209-c05ac6641717"
+              "ID": "a807f4c6-100b-472a-95dd-2e5945c7ecff"
             },
             {
               "CommandList": [
@@ -423,7 +423,7 @@
                   ]
                 }
               ],
-              "ID": "51e42604-f5c1-4cf3-949e-0b42df31b38d"
+              "ID": "72407f25-0b64-4d48-9d81-046afe8ec1e1"
             }
           ]
         }
@@ -506,7 +506,7 @@
                       "Message": "仓库创建并订阅成功！"
                     }
                   ],
-                  "ID": "b1a21ca4-fcba-4dd3-8b59-04b34652ed03"
+                  "ID": "20254a52-621f-403a-837c-282f2ebd98fa"
                 },
                 {
                   "CommandList": [
@@ -519,12 +519,12 @@
                       }
                     }
                   ],
-                  "ID": "cb1079c2-3bc9-41fd-9ec1-b68eb25ec4aa"
+                  "ID": "8ca6caf7-69f3-4117-986e-5ab47308dad9"
                 }
               ]
             }
           ],
-          "ID": "b2af65ed-7f3e-4128-8ae9-113cba32e899"
+          "ID": "f3f1ed3c-07e5-477d-b11c-40ab7f9b074c"
         },
         {
           "CommandList": [
@@ -534,7 +534,7 @@
               "Message": "仓库创建成功!"
             }
           ],
-          "ID": "bb33de37-3a08-4b5e-af09-01bd14a2b97d"
+          "ID": "50f342ef-01b8-41f2-8fca-977e82a25f1c"
         }
       ]
     }

ServerCommands/Gitee/搜索仓库.json

@@ -57,7 +57,7 @@
         "TableValueType": 1,
         "BindingInfos": [
           {
-            "GUID": "ee5b35a4-06a6-4a2a-a665-b58156b9fc15",
+            "GUID": "a564604d-afc6-4ae3-ba16-93247cd2cb06",
             "BindingInfo": {
               "TableName": "用户信息视图",
               "ColumnName": "GIT用户名",
@@ -66,7 +66,7 @@
             "ColumnName": "GIT用户名"
           },
           {
-            "GUID": "6ea48354-141a-4d2c-8285-ab8b1988f367",
+            "GUID": "d7dfb6d7-1cef-471a-b3aa-dad8ccac3dfe",
             "BindingInfo": {
               "TableName": "用户信息视图",
               "ColumnName": "GIT密码",
@@ -90,7 +90,7 @@
         "NullFormulaValueQueryPolicy": 0,
         "TopCount": "1"
       },
-      "ID": "c64d23df7d3a47e69f731f0c19239ba5"
+      "ID": "2528034657f241fda14936569d9936c6"
     },
     {
       "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
@@ -111,7 +111,7 @@
         {
           "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
           "ParamName": "强制刷新",
-          "Value": "1"
+          "Value": "0"
         }
       ],
       "ResultErrorCodeTo": {
@@ -151,7 +151,7 @@
               "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
               "ParameterName": "url",
               "ParameterValue": "https://gitee.com/api/v5/user/repos",
-              "ID": "0cc32b8ca0f9411c8519262b7971b1a1"
+              "ID": "da756c8347b240f4b7c2919872ba9fec"
             },
             {
               "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
@@ -331,6 +331,13 @@
                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                               "SerializeProperty": "=Item.hooks_url"
                             }
+                          },
+                          {
+                            "Name": "默认分支",
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=Item.default_branch"
+                            }
                           }
                         ],
                         "OutParamaterName": "仓库信息"
@@ -392,7 +399,7 @@
               }
             }
           ],
-          "ID": "df25692d-cba6-4ab0-b6de-62c3e1e81010"
+          "ID": "905f8668-d05d-4891-9665-f0ece366c5ec"
         },
         {
           "CommandList": [
@@ -420,7 +427,7 @@
               ]
             }
           ],
-          "ID": "aff3d917-7f65-423d-b16a-e5ef80688026"
+          "ID": "575165db-6124-4d97-a157-010dc25f90d3"
         }
       ]
     }

ServerCommands/Gitee/获取单个仓库信息.json

@@ -57,7 +57,7 @@
         "TableValueType": 1,
         "BindingInfos": [
           {
-            "GUID": "dd93bbf6-7dde-4b30-a406-f63a596548dd",
+            "GUID": "a51be233-ca58-4c9d-9a49-eb451a36ca5d",
             "BindingInfo": {
               "TableName": "用户信息视图",
               "ColumnName": "GIT用户名",
@@ -66,7 +66,7 @@
             "ColumnName": "GIT用户名"
           },
           {
-            "GUID": "fc4b6fc7-a13c-4bcf-9882-7e1f7086016f",
+            "GUID": "bd4f2bf5-cb84-44c9-ba5c-9745b7296460",
             "BindingInfo": {
               "TableName": "用户信息视图",
               "ColumnName": "GIT密码",
@@ -90,7 +90,7 @@
         "NullFormulaValueQueryPolicy": 0,
         "TopCount": "1"
       },
-      "ID": "1a4b1507a7cd4d63968f95f0133280dc"
+      "ID": "8324578b86584ff8b9d23602b4759aeb"
     },
     {
       "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
@@ -111,7 +111,7 @@
         {
           "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
           "ParamName": "强制刷新",
-          "Value": "1"
+          "Value": "0"
         }
       ],
       "ResultErrorCodeTo": {
@@ -318,7 +318,7 @@
               }
             }
           ],
-          "ID": "d1816a0e-2d2b-4158-b493-5a03e61fd0bf"
+          "ID": "c16630e5-da7b-418b-98bd-8cade075ff36"
         },
         {
           "CommandList": [
@@ -343,7 +343,7 @@
               ]
             }
           ],
-          "ID": "6619a91b-442d-42b1-879c-43335891ba82"
+          "ID": "219ca079-7c23-4f3f-957a-175807a09cfa"
         }
       ]
     }

ServerCommands/Gitee/获取某仓库分支.json

@@ -0,0 +1,371 @@
+{
+  "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": "用户名",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          },
+          "TestData": "Administrator"
+        },
+        {
+          "Name": "仓库ID",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          },
+          "TestData": "33487312"
+        }
+      ],
+      "InvokeTriggerTestData": {
+        "UserName": "Administrator"
+      }
+    }
+  ],
+  "Commands": [
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "当前用户",
+      "TableValue": {
+        "TableName": "用户信息视图",
+        "TableValueType": 1,
+        "BindingInfos": [
+          {
+            "GUID": "63aa6b40-aefd-41c2-91ff-ffdbe5ca9065",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "GIT用户名",
+              "GUID": "662b2f45-2280-460c-8779-47a746e6319e"
+            },
+            "ColumnName": "GIT用户名"
+          },
+          {
+            "GUID": "fef0405d-1cf9-43ea-ba28-ed59a8b1688a",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "GIT密码",
+              "GUID": "339ee5aa-23f4-47b8-96ff-d0e5c766e1a1"
+            },
+            "ColumnName": "GIT密码"
+          }
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+          "ColumnBindingInfo": {
+            "TableName": "用户信息视图",
+            "ColumnName": "用户名",
+            "GUID": "d2703b93-a7e5-4967-abd0-75f2906e28d4"
+          },
+          "Value": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=用户名"
+          }
+        },
+        "NullFormulaValueQueryPolicy": 0,
+        "TopCount": "1"
+      },
+      "ID": "d86d5faca9b240dab3c1709b42211323"
+    },
+    {
+      "$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": "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.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\""
+              },
+              "ID": "0a8b384cb5ed47bebbcfabf787647380"
+            },
+            {
+              "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
+              "TryCommandPart": {
+                "CommandList": [
+                  {
+                    "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
+                    "OutParamaterName": "分支列表"
+                  },
+                  {
+                    "$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": "=TOKEN"
+                            }
+                          },
+                          {
+                            "Name": "sort",
+                            "DataItemType": 0,
+                            "Data": "updated"
+                          },
+                          {
+                            "Name": "direction",
+                            "DataItemType": 0,
+                            "Data": "desc"
+                          },
+                          {
+                            "Name": "page",
+                            "DataItemType": 0,
+                            "Data": 1
+                          },
+                          {
+                            "Name": "per_page",
+                            "DataItemType": 0,
+                            "Data": 100
+                          }
+                        ]
+                      }
+                    },
+                    "JsonString": "",
+                    "WebUrl": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=url"
+                    },
+                    "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.LoopCommand, ServerDesignerCommon",
+                    "LoopInfo": {
+                      "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon",
+                      "LoopCount": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "=result"
+                      },
+                      "LoopItemParamName": "Item"
+                    },
+                    "CommandList": [
+                      {
+                        "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
+                        "OperationParamaterPairs": [
+                          {
+                            "Name": "分支名称",
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=Item.name"
+                            }
+                          },
+                          {
+                            "Name": "最后更新时间",
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=TEXT(Item.commit.commit.committer.date,\"yyyy-mm-dd hh:mm:ss\")"
+                            }
+                          },
+                          {
+                            "Name": "最后更新人",
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=Item.commit.commit.committer.name"
+                            }
+                          }
+                        ],
+                        "OutParamaterName": "分支信息"
+                      },
+                      {
+                        "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
+                        "InParamater": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=分支列表"
+                        },
+                        "Operation": 4,
+                        "OperationParamaterAName": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=分支信息"
+                        },
+                        "OutParamaterName": "分支列表"
+                      }
+                    ]
+                  },
+                  {
+                    "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                    "ErrorCode": "0",
+                    "Message": "获取成功",
+                    "CustomReturns": [
+                      {
+                        "ReturnPropertyName": "分支列表",
+                        "Value": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=分支列表"
+                        },
+                        "Remark": "[\r\n{\"分支名称\":\"\",\"最后更新时间\":\"\",\"最后更新人\":\"\"}\r\n]"
+                      }
+                    ]
+                  }
+                ]
+              },
+              "CatchCommandPart": {
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                    "ErrorCode": "400",
+                    "Message": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=result.message"
+                    },
+                    "CustomReturns": [
+                      {
+                        "ReturnPropertyName": "分支列表",
+                        "Remark": "[\r\n{\"分支名称\":\"\",\"最后更新时间\":\"\",\"最后更新人\":\"\"}\r\n]"
+                      }
+                    ]
+                  }
+                ]
+              }
+            }
+          ],
+          "ID": "dc853222-924d-49d1-a1b5-42ec24712061"
+        },
+        {
+          "CommandList": [
+            {
+              "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+              "ErrorCode": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=code"
+              },
+              "Message": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=msg"
+              },
+              "CustomReturns": [
+                {
+                  "ReturnPropertyName": "分支列表",
+                  "Remark": "[\r\n{\"分支名称\":\"\",\"最后更新时间\":\"\",\"最后更新人\":\"\"}\r\n]"
+                }
+              ]
+            }
+          ],
+          "ID": "a2d5b142-9601-4f20-9d42-facbea586b03"
+        }
+      ]
+    }
+  ],
+  "ReturnProperties": [
+    {
+      "Name": "分支列表",
+      "Remark": "[\r\n{\"分支名称\":\"\",\"最后更新时间\":\"\",\"最后更新人\":\"\"}\r\n]"
+    }
+  ]
+}

ServerCommands/用户/更新GITEE信息.json

@@ -0,0 +1,97 @@
+{
+  "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"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}

Tables/Git/Git仓库表.json

@@ -74,6 +74,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.ImageBindingColumnSaveData, ServerDesignerCommon",
       "DatabaseColumnType": "nvarchar",

Tables/项目/项目版本.json

@@ -32,6 +32,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",

image/图标/gitee1.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1718288064849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2268" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><path d="M967.736264 416.351648H450.10989v0.011253A45.010989 45.010989 0 0 0 405.098901 461.362637l-0.045011 112.527473a45.010989 45.010989 0 0 0 45.010989 45.022242L765.186813 618.901099a45.010989 45.010989 0 0 1 45.010989 45.010989v22.505494c0 74.571956-60.461011 135.032967-135.032967 135.032967H247.526681a45.010989 45.010989 0 0 1-45.010989-45.010989V348.835165h-0.011252c0-74.571956 60.449758-135.032967 135.032967-135.032967h630.075077v-0.022506a45.010989 45.010989 0 0 0 45.010989-44.988483l0.101274-112.527473H1012.747253a45.010989 45.010989 0 0 0-45.010989-45.033494L337.582418 11.252747C151.146901 11.252747 0 162.399648 0 348.835165v630.153846a45.010989 45.010989 0 0 0 45.010989 45.010989h663.912088c167.800967 0 303.824176-136.023209 303.824176-303.824176V461.362637a45.010989 45.010989 0 0 0-45.010989-45.010989z" fill="#C71D23" p-id="2269"></path></svg>