From dc624e8481975a0ff04ed44846f9b65e9e97440b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Wed, 19 Jun 2024 11:46:41 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BF=AE=E5=A4=8D=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E9=A1=B5=EF=BC=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97=E4=B8=8D=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98","MessageType":2,"Modules"?= =?UTF-8?q?:[{"State":1,"Type":1,"Name":"PCPage/FGC=5F=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=BE=85=E5=8A=9E"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8"},{"State":1,"Type":15,"Na?= =?UTF-8?q?me":"ServerCommand/GitCallback"},{"State":1,"Type":7,"Name":"Ta?= =?UTF-8?q?ble/=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E8=A1=A8"}],"Version":?= =?UTF-8?q?"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 50 ++------------------ Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json | 16 +++---- Pages/b90932e038f94707b54e571ff7cd84d.json | 46 +++++++++++++++---- Pages/b90932e038f94707b54e571ff7cd84d.rd | 2 +- Pages/流程页面文件夹/FGC_我的待办.json | 14 +++++- Pages/项目/项目列表.json | 10 ++-- ServerCommands/Gitee/GitCallback.json | 53 +++++++++++++--------- Tables/KPI/积分记录表.json | 7 +++ 8 files changed, 107 insertions(+), 91 deletions(-) diff --git a/.collaboration b/.collaboration index 7dcb95d2..b6ec7f2e 100644 --- a/.collaboration +++ b/.collaboration @@ -439,17 +439,7 @@ }, { "ModuleName": "PCPage/FGC_我的待办", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T11:07:48.848988+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我的待办.json", - "Pages\\流程页面文件夹\\FGC_我的待办.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我发起的", @@ -537,21 +527,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T11:44:52.150525+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目列表.json", - "Pages\\项目\\项目列表.rd", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员详情", @@ -1660,16 +1636,7 @@ }, { "ModuleName": "ServerCommand/GitCallback", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T11:01:51.4871807+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\GitCallback.json" - ] + "ModuleType": 15 }, { "ModuleName": "Table/日志表", @@ -2155,15 +2122,6 @@ }, { "ModuleName": "Table/积分记录表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-19T11:01:33.4264722+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\KPI\\积分记录表.json" - ] + "ModuleType": 7 } ] \ No newline at end of file diff --git a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json index 27de8bc9..1aef90a0 100644 --- a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json +++ b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json @@ -160,7 +160,7 @@ ] } ], - "ID": "0833d917-5bed-48be-8ecb-c968b0297142" + "ID": "6e26deff-53cd-4f80-8b7c-2eeaaa5dbffb" } ] } @@ -235,7 +235,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "e9cdfc33-e5b8-42aa-b7bf-91ab2fbb6f1c" + "ID": "01369907-e8c5-410c-a18c-8e41b78abfe3" }, { "Condition": { @@ -265,7 +265,7 @@ "Message": "复制成功" } ], - "ID": "8d1f6300-c818-4314-a054-3665608c711a" + "ID": "a62fd1bc-82ff-4348-a25f-6c9ca394079f" }, { "Condition": { @@ -342,7 +342,7 @@ "Message": "操作成功" } ], - "ID": "4a4dce53-d85f-48ed-9772-43e8b86d8bf5" + "ID": "5e1a32a5-f763-43ca-8c98-62920c0065b2" }, { "CommandList": [ @@ -357,17 +357,17 @@ "BtnText": "知道了" } ], - "ID": "0c9b151e-4ab5-4ae2-887f-7e3da9b9f7a4" + "ID": "6032f8bc-5a0e-411d-9f52-2f4971d49a34" } ] } ], - "ID": "73e2667c-b804-49aa-8d5c-9a9c9c6292bc" + "ID": "a578b0c3-ac87-4674-82ae-98dd9224d848" } ] } ], - "ID": "11b71522-4f1b-4916-8da6-6cb1194ed181" + "ID": "6163f312-20b5-4eb1-9aa0-b5bd9a7690da" } ] } @@ -439,4 +439,4 @@ "PaperSize": {}, "Margin": {} } -}//pBuC8TyXwXDA0Dmy89SwaxPWUY/pNE/JOnb1Q3x/p6douYw8fCVr0QzuBnngWlm0O86F+RuEZt0glA6vRAZKH0hNGvOG+NPi7MG2UsX/G3mRI3GPGNlY0wK+tRXJrJq7QQBLTfBsu5MHW3YUS5xyI92TyDCAh15zfji1S6Z2gqEqIU/Dm8O4+684/4dQvY0+UTybaQHkewkLYAHlTsW58mIEP2TPndCTDsgh65ZkTnknABobchT8X0eJRyDB1PZRrqFbBwaXTKDZsZdAmJcGDTrfiVpS15KVK/jTy7iXmgWU2kSVXtnB9DUF2D/0QfKwv0PUR0qGpYkhGrFhAt4PCWASihpS7ZRXDICMtS2rRy5Ly3QgXL1Z9QlTIdn68Wxr2R8arJ9yLquA/3a+h3yXLBOfLtxWYiMGZ/39qNluPKyZpZvgygqZQjtpurgfctdZ8LG76VNMACQ8gdAFuErn7nQTWsoe8BbfC/hek8IaE4QPzucW5qJfQ9DqThjWGJPqPNTPm1GI+YeB989Tp2oR18k1G6LoeeYITlJhFdeGwRv3k5bSEJEIst6nolCiAGNrrblz9WS70x8fD5S4VYe5bCtvRB8zZFp7HaxIJe4fU3Eu7Ggmn+RiFPc4LIqL7n6idnX5J5zEYPplqIjYZeKTvbHcitTOd2LsyiFqOEoHDu81WamWWa3q7GNcV5IxkEzSsRG4IbcnSMWTx93uleSe7Qgo8NTyjiLsODjJxuXqjTSjuMBnNCpdVmhWENNOCrB15p4ncIacNFcZncDOiZXiUsNHzDhadRtlZpmaP1bEpnCV2TELlrR6tm7MaudVm839GSta1LMdTeZsc90zdY8GYsY73OuqdP5qTeFBJsk1OAbwpOMbxAlWyY6H9ELELGoBT4qRub9ngpJOJfAxvGt4pQ==|920 \ No newline at end of file +}//C8wo/1xQXjkK0gOhBqSAcrufbMQDVp5IV1W2SWVC+z1EzQ79/XNjaBm/brpQIg9M1wFnwG8lnje65wV8lTQ/hX3yM36xyk8YujH1b1rGRrM89oCr0Pd50CdGeFob6wRLjzNd0D8LnKCVzr2/6zmfErt4VQgsuvucMgYjlrTpLOVvMDmMOGSFTXVc6QzSZhS/q5UHa8I+btfIm+oT4psYynp6DC4SrpB5esMk3BwzTu90wr82XjAALoM8TznqzRubC2XNie+JziZGxV0D7iGY6A/7V0JemsOh1+gY+OrMlJ48QrrPiklxXUMO+82ay8y/HuSKRXvgz9Sv3IwdY/xgTNWkqKAFP6voBRKl/tL3N8Yp4kvT/DdNXIXkg4omsRBD3X3Rs8sVlpdHDGyktGNvBB7vqcLUfadGVuBjX5sDzWfD13Lgzde/xeL/UmWu05SJqwgwANkpgHln3sjsv9Uet/g91jQfw+AURnBCS6qF/TRitWhOXtS63tpVZij88o9awq5kgjkvvlKTIk5RnqlIE8Hl3em1Jqc3/NBxo45CMQmsdNGqeUtHos4VLBCSWS7FXPxkj0nf5q06gqBI8ZpHSFiJW3rJko6Qrw+tEgo9RcQoOPXvBXCzicuCWhWCR6GovVhtSOD0ILoYgvibVBSy7cqcuU1it6R9OKq6xiVAD2048EjSz0WF8l8FOso9EnwgpHsocKcqU+uuOIFnRm/DwlgRmqIqwhCm2XvOZKdAjeVtQ9asLSC05hENxIFdXZFccqKllM9SxTuiy2lqa8tN4t6f0hIfh2oLPl1gGoNyuIATkgOTsbhsfzt/fnwCBE3j298fIjhvMG/MmGMME3K53YQd0wN1XWTf+AzKTHDpbCrHS1nroqp3tFAsSioekuLg9fejUsjZqrg15iNzkTcV5g==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index fb6490e2..25a8e554 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -20,9 +20,17 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 25.0 + } } }, - "Count": 4, + "InLogicalVisibleIndexes": [ + 4 + ], + "Count": 5, "DefaultSize": 10.0 }, "Cols": { @@ -53,6 +61,9 @@ "2,1": { "CssName": "ec-label", "TemplateCellSource": "项目名称" + }, + "4,1": { + "TemplateCellSource": "ID" } }, "StyleDatas": { @@ -74,7 +85,8 @@ }, "CellStyles": { "2,1": 0, - "3,1": 1 + "3,1": 1, + "4,1": 1 }, "SheetStyle": { "FontFamily": 1 @@ -141,15 +153,31 @@ "value": "编辑" }, "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "1d2e8095-a583-48be-800d-cad929d18797" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!B5" + } + } + }, { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 3, "DrawerDirection": 3, "ShowDrawerHeader": true, - "PageName": "项目信息" + "PageName": "项目信息", + "LoadBindingDataOption": 1 } ], - "ID": "c30f7a90-98ab-4524-b795-ea6f21888bf4" + "ID": "3512efda-5eae-40b3-9729-63b89610cd4a" }, { "Condition": { @@ -232,7 +260,7 @@ } } ], - "ID": "dea25a5c-ac65-4e02-a9cc-8c0b7d650084" + "ID": "f3b98ecf-7f4a-47ee-9dd3-9315c2fa8b06" }, { "CommandList": [ @@ -242,17 +270,17 @@ "Message": "无删除该项目权限" } ], - "ID": "5a3a67ab-7b07-4aa3-8048-2c7744567fdc" + "ID": "d8c20754-9c47-4932-a4ee-77e29c79140d" } ] } ], - "ID": "d7f23333-8648-49db-abd5-bd0ece404f30" + "ID": "5529e156-8b20-4f82-9f25-0b7e22e9ec75" } ] } ], - "ID": "bbe8c8e0-a08f-464a-8399-cc11a3531eb0" + "ID": "6724364e-6906-4f19-8cd6-2b585fa8dd4b" } ] } @@ -269,4 +297,4 @@ "Size": "20,20" } ] -}//BrTgv3u7Q3vSIcnu7oE0tGCWQxd7r8ppSh9DxUPGsQUhHR+8sjwf8lnJtbQLUYYajyh0W64ZE2sZLvHnmdvwbmE9QcLePXz/R9WlUO/6MtRPmlgEUlbObFDcIZl1xpVAgdpsRV8OuJ2Ug+77ZSvwtODM4Aj4MtgL9NJUfN9I6cCdOAtblQ+aTgS4k6tsfpyAVaq9Yp80tHlerMVzvZ/jXmuIlYoXmNdH/LlImka7jEJr9gjWbu0lzm0TyJ8AKR/Y7z8Q3SsIxWp38Edw0Ke84CC9jmYZAewnbXxjMYplzsubqqEfWpnt7+WRmiZrAWYBZvKEFCAxhegeeOz+b50mp4pcatkq3g5coW5XPN0nGXKxmVrvZdJhp8I5JfF3uQzZfseYEJewoT8NW7K4mqkOmLwAVgitqC1c2H2JhFxwzlAeanQvDd1qm5qrW61Xm6USqjqCcbi8xSXx2m76QkFwj7Z7InN3oH3ALCPYqmZwt4Habc+kmHGfcdp9PxOOvAF5HpcLKBdlIhcJUmDWR6LhjUDQrTqnMH95XELbgVIQsw0TljY37+KHaunFjHMph/MVAO2Uo8b40j1AHLFAshDJ7PtBOEwWuHVPY2igUKmxTHPJSN7m9z8ipLHOfWW0gRPC2OThVGVzBEBwJpv8iAyZHF9NSwK9hsQysHqnb80hirM364cbaYaNX0/XwNDNfDqEiETu1TLYj7YdIXFqQsiwtY3zv6X1ZsnBv6NzusWR68ns8ax+jC/vvslE14ZfFi+8P75Hec1ASJtyrLDidZHOgfcXZht0Q4zCPmADcIxEbzaToFaJ2WonGAtSvb/Wp/SI67U1mHv3J/1KxZchdwa2rGQ8iSIhMdvqR1AoEs1H0FOsr4EN3nVA+X6xFZVZjJCfuvc7GbzREcVLvkvmi7PohQ==|920 \ No newline at end of file +}//acYWWhLXSmH1tleKpyiHjx2lnNq0UkGFoUdroFUX2ByUfDmareRMKLh/DUygP3mvtIkJKzVwz1pNxqwmHl2dSGQlseZO/iQAA3m88SbEa7ygGx+m7H7BzGErqIJCv08sz7LgThEQ0yNKS6Mky3MQTjI0l8cZlz6SrrgXKYbwioylJ+TISeaf/J0VlicuZSlcjdwrVQby/WQ4h8vP98qJ4tiQNLrERr8AQU3zTyZNnTi8FwWAoLRBKrDUUi1quUxyLi808BhiFZ4qfo5LVs+xJMnkc3Hui188Wdh1oJtCwIG7DX6PUHjRAPFt0CwDPMK0SXkhh2lTxyC14CsBz8dhnoEvz2HzvOy27YXm/OqX6/UBMLRK6C2wWmu0DmZ6DpmLDyLhaQ0yrVHZIuH+J2DHBfAFNwfNqS+P6TXh38FxgSx1dixnf0H5xyhKlNxcqSSjNoGQ7scnfsn2JBVBhad5hNzcE4qa28+TmMNbJc4PBK4NGeHmk3Oa1kkBNFC5m9dAn5xW2LRypIxrrWftEQkc0pSq3UxnfHksQrjDIHXB7WjGzDVBgj08uPV6yDo3J6LlTkBTiNJ/8tBy8EZDIHIPPAuYMjKwdfYtfOEHa7kMiEqtOvdyXw50d0V44JWupn1C5M5FTXGaElUZUE1/7M7Edv9kCBhImOr8yZQs8l9lxNAbKkZfxaXmXlvLUVe1NrlYHir1ORA+t8/f6L8SclvfHGgU/pLTd5n5OSDKa1oJN4TLZgiLXWJT6D2dSVk2ydiAgC5whZcOcBXFD6a/sDLBMw2wjoie7We19rjsi6lZCjAsh4/Sj5mX5si906zCVILzAzy4FnHX+eyiJKj7VZIuawv73chRB3CBP8U1BpdyMB7KFc2AgWum9nofmEDtg8DIu+mBVeMJ88uEr4IEWNdPZQ==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.rd b/Pages/b90932e038f94707b54e571ff7cd84d.rd index 80a7cc3f..4fb0d08c 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.rd +++ b/Pages/b90932e038f94707b54e571ff7cd84d.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 3, - "RowCount": 4 + "RowCount": 5 } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的待办.json b/Pages/流程页面文件夹/FGC_我的待办.json index 5c8f3c00..485a36a4 100644 --- a/Pages/流程页面文件夹/FGC_我的待办.json +++ b/Pages/流程页面文件夹/FGC_我的待办.json @@ -374,6 +374,18 @@ }, "Value": "抄送" }, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "CREATE_TIME_", + "GUID": "8e9db7e0-b802-4b66-8eaa-94112e564e47" + }, + "Order": 1 + } + ] + }, "CustomColumns": [] }, "autoGenerateColumnsByDataSource": false, @@ -904,4 +916,4 @@ "PaperSize": {}, "Margin": {} } -}//DEVug9nxvJj9Qi7Nh9nesFaSo0FjpTyqEe28hskslMXYaacUJWcuRMV2V0d+MwgwwDeLXts5RL/ezgwZsx5He8Bv4uJJtrywVxsfprmgPkzmPGUzty+irKgfizOfqVNPEMaLYJO+/ho4oQdTPjJlBOA89kGxvJF25IMPHO9jF0pX8Ps+Ge+bKjkMYsFUEVQ4GplJ/x2+QGNVz6JTTBYp8TfzDpu/s/TvHgdVn6nZkcBMiTdui1tgbYmZC5Bg3NFk2nLh+fNKqTCRHN93nLH2qeUUVUJtyEz9+yL4BAiQ3mXZyFfIyf//6DfyTriaBfMB9Nf5yZF6O5LqaVKWJH6996SyvwF3VmQ3TGXF/pYcC1n2rk5ZIGsPvgVoZFKl+J7EOOZFa9UENF4oXIgCkoiQ8bY/nai1Le/V5oKJ4mxpRZCukdpK3u/1T43xn4ZHNHFu8AGSJkzCxXNa9Ypl7zzvmfkhh+L30y8xCJf7EWspV36Q/5uOXnsKEyBLxNKkUJ661Ig5wzhaO5qgkJlBRD1feDJCyWPsfGy2c4z8qChTaBr3lW5LUdZtkoNNK2ejV1eHKwmZ4uR9je9gJBnYjGWff8IR11skFZkVZcfghYcgwUhnR/zZ9Ih1Vtw1w6kBsRqCcF/PgvpXeJMglcRMP6AuZ2l6wwMvV7T9MR3v34p8xDcjS9MAZpgvbk+e2ZOw34XAUdW2ixipavqlXEywF7i1wRnt5R8xEFYqEMBmY6w9DVAIk7UKte4oM6TJzYHO4Qb3a1uV5GK/iVt2osdgO/rIjvJ4zkh888qZRHl762Y7TLKkBgiBss0C2lE3hwjpwlIptAgkmXCCFH1k+jhErLZPMldzabW8/UfTuHKSf4pe///6dQkvhAxF3gvghriqoGTIWoDdOlpuwuGUiYus9NdnWw==|920 \ No newline at end of file +}//FbuTdvzfYHdmYc5i9K8ME11bxgEvCWnfOCebdsAjlInGoGK8bX1piGayymKPoms0OryEENTxZEbua490dKqI3S9ZEiKTVW8dLrnw/6Q/SUbG4pIpKF9NT05I4rvUG4pY0hXOg5CvzBZc1ZY8aPT4xbY1Qrlz1y9x/8kix5f+Pdy6fod4ZP6vUDB7uh9cXQtKEsn4hQWisovxDhQyAfVnDTw1Ygp9jh0LrL1bFc270gZF4mpoDFwVoWvrmcQEPDqLJLobECgTYMkMQCxRpeKd1SGgoTzpG0W8G2m8hLKS1Mrd96r023RHw9XkhkWUHnblJ+9GjwNakmOD9qWu5eShEkWXkcxiXmGBaylJi+3W3W1+0Fuc4JDwJ/pasmjuPyXluY8Eqs8tpLR7VmcrDdsYCFlEUGhqfiwnaUAXF3hX6X7GZYcgUPv/zO2/JsCF5LKP437jrXTeoTeGjehbcfMIfGqK1Vo1Nl+i4iTwL7yIo6ETpXE8L9jLO2T3vUypUZ8eC6b8O+cijbavD0G0VnAJdbcwgOKT+nhC9VHQKit+tb7nWZk5B8dkdCfDWt0gXwxrt4/Yz3WJOpV0+K5rlwU+4zQvIsxdHw99LI4IdQXjJWznTOh5uwQmuRlV4qe0xO5yz72YJlRh85HwnZTvBB0uevYbJIi4Wg6y+itdn1LC1t4/OMI9mjixzUZEo/IsKIQLFyvvRLch2X4sa6stY13oGgSBusZuDaHATZ5Tm/GNtGdt0inEA3C0kj0XFRslkfEZNjjM5VyzC955EqxcDJ1iWL2XugJL2TzFlvRvH0AIkYLBaNi8LDdUtE9/HgfpjKYDCM7+wXfwCV+aPkVOEjx1DXI1URFIysxCWDDakD/667BorAHQlzUUkpxwn7SHBsk8XaZ5DUYpb1whK+lko3oz5Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index 249d611a..a363e1d9 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -499,12 +499,12 @@ ] } ], - "ID": "fe0b0928-51a3-4f32-a1e6-13329d489ad3" + "ID": "c0477bea-2b08-464e-a7b0-e270a5d31786" } ] } ], - "ID": "589b705e-80ed-4720-9110-3c1aa8f3e97c" + "ID": "7955aa8a-c06d-4f75-af03-50ffa76a9305" } ] } @@ -1038,7 +1038,7 @@ ] } ], - "ID": "7d6a2013-2886-4558-8d95-1b37d0535622" + "ID": "14f0d91a-8acd-44de-a728-f27175002c62" }, { "CommandList": [ @@ -1051,7 +1051,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "5c4f80e1-eb94-4db3-8810-8331bc0ee822" + "ID": "90792655-9715-4acb-a38a-682ee2c82790" } ] } @@ -1696,4 +1696,4 @@ "Formula": "项目列表!$B$19" } ] -}//37xC912FGnP3FPJUnQM+wOFkk+acGcF/MbOPYqAsYGkft8NBokEXsYhE3X9nO8l9cgRG9w8i7BnugTrsON/E2yS/9HH6DJJadlu/mxlaoeA7NTGShZjTieas2CuYdagEDDBDEH781xSdKAw7m4F7rv9EjbF/cbTT5jf3SW2tn/sLnD5eMjsBjTwfERKyam/yZAMZWt6RMjytLMlsW+G8azCiCjRLBtvmYSoNUhDqbm8lYLBQ6heB9DJFh0c4zECR/qqlEtD1JqCbnZn4sGpftj0W0gbxZFBREuohqAB2JrgKo/L8vuam7YXgqiDfZe23mlqi3sltqtH/lwE5pJfGmNbEelJRelthcAqUqMb+MoJP6Une4m4PKqxlOTvBGwEbYjiuZ7jV4/Nh2xGyfd2isDzKLdykswtRSX6+5N4sKglqblLxUjZb0hnsuhNvY9xmTqm6ZpJj7y4ONLZiV8VsRc8DygAuhuRa/mPcaSHCcd8Ve4aXyqV7vtw9rbzy/5RdNZo9OVQgPsu4kwXwE5Jpwq2NgqwrJcMzzABQeY+O5CFQZBngAHBL9vF7FhrEeZZfmarzNiMIF1mcoqkW2Y8E61v2Vaqbi3R98J0vdaqAdBo1ZINCPCjC1671i1peFeAIz2Fly/a2eLkqE3cDCSAHjbOuBnyuyOiYUm9EmgKXRJY+BivMe8H85mVKRWYEE8zMp57E6DfYV9nosFOMh2oSc6o1Jrm08jE/7nVjbE9WuvqJVLP5SQeNm+BMoYBnqdbtUbSXDvBmPwZluGqgNzUyDyoEOFkoWPdxuDsLyXhb7TjsnoLTQ0F27KxJHZr5Y440rDEVnPqEmAMtCuRTmeqxQh4348IGXPVfxAXVQt2K2G0LWiinsxHPZPcGbKpTtc0jIu9cpzgQ/IawGcy4PYfk8g==|920 \ No newline at end of file +}//a9Ie9/JLfn7hEHAGeumF5nH3+OLEu9MnSO5z16MJOCN4O3z8FL4h4NTZ+21saJaWOiy9ZV2q3ZqTmjLGds4uTFf3JZvvJzNlQb2PEKp8jWQL4clSX1/u2pSa/0KgPgvdx6rMbXtJBx/F4XqRR43ydyPJ89p0G0bMD1cwKObcjFmLnt3z7pph8cgl75a2rx2aUEoe2cCFtKezgRxYRoAXhHzFiXy1wjSRkNIEi4PY8p13siThfH9HfBK35u6bRIM8oetvUtfg0l0ubf0eM/iLPKzOoZ/O8iT8l1nNWfJW1i9f0eDYiheqVFaoCnXRyndGNLpRkhigFaZcvLAuuygPvDIoeWFXfLauLGiMVP9ojgV+SHTHSfvQCeEYAZYrPZMrCHvzWAbP8YPZ45PH0VyEwYKE7/TeFsfnI7hYlK0e5GNRp7LlemVzCZ/QvGIMCQO0WcumCueGjPWgNZt4WDko791bZpfzFPlNm/EzkDYwfP6TymrZIFJ4uoWaAtbnXiQcZO9/L/6vBecRVDzobgGQi1h9/cbkkFAOhBqKY39vrmhlX8YlImYmlEZdDdGrMd4rgGnjzqj+OIZVFfmY8kVU7E8ZDDgpfj3P2qzXHxoUjVfnXq7OKQLLxWGAPaDBu7QYD+qR+oXSHTZ0aPQDgT9uVgDyG46Ecxa6VUK9ovZewInZwq1VuajuiCzHoNiPTgPq/6f2AmLGdzr6b0i4Voqu6uauoy85QD0tP+EoRXULt6cF0CxWUJeTiN/Z3ZrasOT8VV2NKK1yKmlPb+NF2WH3Fkb2yllvNE85Qb0KdvaArGto/lGevPc3fArnDu7l8+1pmPvkmlVYlPBl2aNmfU+qT4B/NgiV8OmFHd1v3Uk8twSlYt2FmAp/OHCB2KC5X5aEP4hhSAa8p2Bk6yVi7zURUw==|920 \ No newline at end of file diff --git a/ServerCommands/Gitee/GitCallback.json b/ServerCommands/Gitee/GitCallback.json index dceb4e8d..e0e3b88b 100644 --- a/ServerCommands/Gitee/GitCallback.json +++ b/ServerCommands/Gitee/GitCallback.json @@ -128,7 +128,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件名称", - "GUID": "e60add02-7791-4921-8bb0-ef781cad2816" + "GUID": "d175cffd-1593-44b1-94d7-996f36a53a26" }, "Value": "签入工程" }, @@ -136,7 +136,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "hook_id", - "GUID": "9d754095-ae26-4d83-b41d-56c0a4e51f72" + "GUID": "4fde34c9-8af1-42e9-9474-69950de17aa6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -147,7 +147,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "事件内容", - "GUID": "0df12638-a44a-4e54-a149-685208fbec15" + "GUID": "b6cb65ca-1c44-4977-b713-816f9415ee8c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -158,7 +158,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "空间路径", - "GUID": "842fb0df-848e-4a6c-86f4-e61e557c38d0" + "GUID": "32a4375c-29c6-4aa5-b0a2-082968cd92f3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -169,7 +169,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库名称", - "GUID": "194fe915-1f6a-4cb3-9e2a-88eda23988b7" + "GUID": "bab21397-8651-4e95-8fbd-f5a8c5113e82" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -180,7 +180,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库路径", - "GUID": "e485c67f-c356-4656-a362-d2b71c9cb9cf" + "GUID": "9a1d7fd4-1fed-4ecc-81a1-172a80068423" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -191,7 +191,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "url", - "GUID": "49d7ec12-e0d1-4479-8313-bcd1dd0c9522" + "GUID": "8c3e6194-355d-4130-b1c5-c40af9504332" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -202,7 +202,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "提交人", - "GUID": "cd81a889-c377-4689-9123-4192be490576" + "GUID": "dcf401d6-3247-4733-938d-1dd302903fc6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -213,7 +213,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "git用户名", - "GUID": "776fe34d-747f-40f6-bfec-82cb19e7a9be" + "GUID": "772df5bf-0766-47d8-99f0-0d938d94e687" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -224,7 +224,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "仓库ID", - "GUID": "f351ec11-8b0e-4c23-9dac-7adc9ee2fd13" + "GUID": "4f5a4c02-fd88-42f5-85c9-b6cdd966b214" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -235,7 +235,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "日期", - "GUID": "196e71cf-c978-412f-97fc-0885db5c096c" + "GUID": "9ce6c120-a5c6-4f9a-a73c-3b50189eab84" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -246,7 +246,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "内容得分", - "GUID": "0da58e1a-3811-4e5d-829e-9a33d70ed44f" + "GUID": "82e94bff-8b76-4af7-bfef-b829363f96f4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -257,7 +257,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "sha", - "GUID": "8ca0f22b-a77c-467f-8432-95c86fc632a2" + "GUID": "5b3b4e79-66a0-4440-aa47-ca9c646f131d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -268,7 +268,7 @@ "BindingInfo": { "TableName": "Git_事件记录", "ColumnName": "分支", - "GUID": "5d86ada4-6f89-4184-a276-7a245314737e" + "GUID": "93935bb9-959b-45a0-af58-5b53e844636f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -338,7 +338,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "用户", - "GUID": "b87a6c21-1585-4cbe-9d64-89447ca3e27e" + "GUID": "a66c9c34-e22b-4dee-90cd-d7a287f31e70" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -349,7 +349,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "类型", - "GUID": "8ca8d05c-c01d-4bc7-99fb-4fde28bd3107" + "GUID": "d15df832-bbac-4306-b211-bf4233d92ebc" }, "Value": "GitPush" }, @@ -357,7 +357,7 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "分数", - "GUID": "5f996181-0da0-4841-a4ba-d813fcec56cd" + "GUID": "2d42ca3e-4b2c-4162-9551-55aff67fe13e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -368,17 +368,28 @@ "BindingInfo": { "TableName": "积分记录表", "ColumnName": "变动日期", - "GUID": "298f930f-0bc7-4a47-8a9d-597c150f993e" + "GUID": "ae60b68b-e01e-43cc-b911-315f71d61185" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=NOW()" } + }, + { + "BindingInfo": { + "TableName": "积分记录表", + "ColumnName": "备注", + "GUID": "05624087-0575-475f-a08d-84d7966645b0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"用户对Git仓库[\"&钩子数据.repository.name&\"]的签入,被系统自动评分\"" + } } ] } ], - "ID": "00957153-1cf3-4979-af7f-279bd6af10c1" + "ID": "7c0ba71f-3010-447b-89fe-d1b1ccf27e0c" } ] }, @@ -388,7 +399,7 @@ "Message": "签入已被记录" } ], - "ID": "b506f309-6e76-4915-af68-cf8fb7df29d7" + "ID": "1c211a9f-b7b2-435f-8e6d-64c1e9a2346c" } ] } @@ -396,7 +407,7 @@ } } ], - "ID": "d69ca17f-2618-438e-8a75-4cf004866ad6" + "ID": "a6f6cb54-5225-4a1e-ac4e-6f53ba014f4a" } ] } diff --git a/Tables/KPI/积分记录表.json b/Tables/KPI/积分记录表.json index d3e55645..053d718e 100644 --- a/Tables/KPI/积分记录表.json +++ b/Tables/KPI/积分记录表.json @@ -43,6 +43,13 @@ "Name": "变动日期", "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "备注", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",