diff --git a/.collaboration b/.collaboration index b8eb3ff9..a921d984 100644 --- a/.collaboration +++ b/.collaboration @@ -634,17 +634,7 @@ }, { "ModuleName": "PCPage/版本发布详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-08T18:56:53.954723+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目发布历史", @@ -1376,16 +1366,7 @@ }, { "ModuleName": "ServerCommand/在线获取仓库某日提交数据", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-08T18:59:47.0603586+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\在线获取仓库某日提交数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/请求令牌", @@ -2297,17 +2278,7 @@ }, { "ModuleName": "PCPage/导入反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-08T18:57:33.8373884+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\导入反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\导入反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/三经理设置", diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json index 86c14f7c..c77bf265 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json @@ -190,6 +190,7 @@ "DefaultSize": 32.0 }, "Values": { + "1,32": "*只包含处于“等待更新”状态的反馈", "1,34": "导入选中反馈", "6,18": 3, "6,21": 3 @@ -259,7 +260,7 @@ ] } ], - "ID": "dbc3adbc-ed7b-48fa-b682-fcf114410b26" + "ID": "f5f0d07a-ccf4-4b70-bf7e-2aa2b926a6de" }, { "CommandList": [ @@ -268,7 +269,7 @@ "ClosePopupResult": 1 } ], - "ID": "3bea74a4-251f-4370-b43a-1335845d5cb3" + "ID": "83dfa7c8-af80-46d0-bd3a-23a4607c0e17" } ] } @@ -764,21 +765,29 @@ { "FontSize": 18.666666666666664 }, + { + "FontSize": 13.333333333333332, + "Foreground": 0, + "HorizontalAlignment": 1 + }, { "FontSize": 13.333333333333332 } ], "Types": { "Strs": [ + "Text 1 50", + "Right", "Body" ] }, "CellStyles": { "1,1": 0, - "1,34": 1 + "1,32": 1, + "1,34": 2 }, "SheetStyle": { - "FontFamily": 0 + "FontFamily": 2 } }, "Spans": [ @@ -841,4 +850,4 @@ "Formula": "导入反馈!$V$7" } ] -}//YVwqyOofdDLvH8ccobD7kQsrcj9hJU6a2q/P3KsZe9Ot6dVlzYcT3wD/FXsF4+IS5NUoASfzfsg62xZoGcUWH+tGTbWjYtdb2VsiDDs5CSeQ41NtJlhD1S95BEaHZ4aTkUOqQLTlDIJH8ZCWk+/zmsjFtE7AKaUnMsK1F6pNOR/S+UO7NqvvQ8qU2duO6t+hLeNit7KwLDUMDSnmYPrtoDM/97OkyXWko+JdB/YB3Y4KSagsyGfFMpQJ+1ZTEq7/cPN/JjWb9L2bVlJb4rVxbSy9w224MvHag1cF8QGgKybOr86cdDZRMlvhDUNk4mf8JwdkaMgh0sxxjTP4a7uji+XsxjQLf6o0BdkvONkp2Y3GpAR0HsyeTQJBnQ1PScTm3EiQvil9PLROXvveznzfW1GmiSyDGX+MI0b/5QSfL5om13t26ECIsAAy+L0xk333kEF8uUDJo1Q8ZVsb32Q9WqAxGY2ulWpG4Ggrn3myUMEE1T1oPd+mxXq70xEIXd07y50bA3raAPmQhYseLu6dmeOp67TefOWY7hwlNIJPpr/shORUGqZSjyTAxKQdeSMUIZcwc8ZdDin+l0VZtUFl5rt7Z0WnwSgYvzDgS6syl8c9pWBENGkbQAXBVADpvqvWhHtPH+8i7S3jL22/up6GrIufF8v7Nswq0Bqn1fbpzwpuLAf4sw7cbW/3Lr8tb5qHyDg34Uq3DTFxbHVmf4Ev2RvDITUzR5RUS9ZB3GKcKnRMscRLWvbQFw8dTebZI8xISUzOlGuN74iKwS2iwjP6HpaGnOkay+L2177Tu91DBwUPpNfR/fk319+qfteQyxuHIf3rujZzuw+7K6pittpanAcc687B3jeXYiWw9r1kJs6gnB82338ITXH1sSYYKrv+zlHL0XXRaib9CEkYmBtUvg==|920 \ No newline at end of file +}//UuoYU6jBvqN9jh3znLe28AwCKlpDNAQDrYErRWx4SsZHx06W+R++Ww31Fj2UFBP1P3SQFISNpzE5prwPdxkgN4F5eeOhzPuV4c/rRXS9e9Jj/i8BUrf/S43AjCMOEhkB9g16q30mezYvQmLtEvWZD6DWjE+lCrV38dGpcX0aE11FnFSG/RRX5v0GcdLu7cM5kBFHV4AFDyJtf2UPocjmgUiADMSmV6Hr/7d3ZwXIJ9Z8UU9yqwoCIP2kJ+I/YzOwJkzbPG6pMAQKIc/uj47gdcvDbdp+JlmCO/n2ARMcj4I1TqNyPR3dabAr8/XO6pBiJmdFFfznBM42aZQiAJ3m4L+Ob4DKJOyYFYYbJxMgzf9N/kfCL9BwotQTuIRQUUgb2jRlyZXkp/KQuA58mIAkL7syKJNiNMlYPCnMIJbuASKA9N+3d6MN9L3W4rFUAJZ/vZDy5w7H0Oe9LwSFVn6gFUg0CCa9wIGTBsDP4osYNItBoNvjA7YMn4FNvbs+nzHvMvTcRZMsij4TTPEDBRp29HV0fUMaCItNiZvUGZuYA7dmeX65uziQNULpCWGJ3zzcwZF9tfi+N9UEHSA7+23Qu+e14nbJgHFgKWaTrOBHpWAutCAgmMiyli7ngSppESpc/6pjrycR2fkrkjGt/RVXJfaaKDaDPqSUigTEdo9XpfG82N+Q2O4BO2M3xsstmQDSqzTb7B1LKjjQliQ3o91CsAZvE8cjcSh4jTQFoj/VM4iK/qMn5M9XOFRwSFxUnmf/hmufq4zjn2rjgYuGsemSwbBfPsmWdsRmXG+XUdStezZS7MNYdxoxXRXBF1ggj61Smjce4Ygn1zwsSWTiIFRt2fLFM5W1Aw+4ND2mhwQnpfoYZDqOhFuiPlcQFM+k9PcSMTJzwAU8g22XCk2DkP9F+Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json index 340cbf9a..70d2cfe3 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json @@ -741,12 +741,12 @@ "MethodName": "ExecuteCommand" } ], - "ID": "adbb4729-aec1-4e0f-ba81-a795f4600080" + "ID": "8cf0e6e7-392f-453d-95fa-40dd2bf7e0d7" } ] } ], - "ID": "48d2f1bb-33d7-4f0f-8542-c6f4fdae86ea" + "ID": "ddf60429-72fc-4d49-96db-460e31a8ffab" }, { "CommandList": [ @@ -764,7 +764,7 @@ } } ], - "ID": "14ba438a-fba8-4a9d-890d-77f622b44c58" + "ID": "bedf7de9-cab3-4f2d-8468-14309e8f8646" } ] } @@ -797,7 +797,7 @@ ] } ], - "ID": "674172b3-15c5-457a-b2d1-1517c54538f2" + "ID": "32b0c744-31a2-4965-b99f-39e150a71308" }, { "CommandList": [ @@ -811,7 +811,7 @@ "MethodName": "Focus" } ], - "ID": "f3b58424-93dc-46ca-9ca3-75a64fc5c70d" + "ID": "005177c5-80f8-4fa6-958a-2cd6d8d23764" } ] } @@ -1253,7 +1253,7 @@ ] } ], - "ID": "4265ef65-b1ce-4d39-9c7f-42ee7cb0ba12" + "ID": "6549d579-1e2d-4062-a8fb-da3fbbe70f70" } ] } @@ -1267,6 +1267,7 @@ } ], "Text": "从活字格发布日志导入", + "IsInvisible": true, "TemplateKey": "_RS_Main3", "Icon": { "Name": "发送.svg", @@ -1378,7 +1379,7 @@ "Title": "加载中" } ], - "ID": "f82cf5c7-f5a2-4d51-b1af-92e84a969411" + "ID": "d072a7e0-6590-4f0a-8d67-e15f4008e613" }, { "CommandList": [ @@ -1388,7 +1389,7 @@ "Message": "请先导入客户反馈" } ], - "ID": "5b03d075-b93f-44d0-af2a-28ab27bbac01" + "ID": "6412e131-cb70-4848-8f6c-96be1e6026b8" } ] } @@ -1462,7 +1463,7 @@ "ReloadData": true } ], - "ID": "56afb6ee-07ac-4eb2-95f1-4049926756bf" + "ID": "dbd68923-c80f-41b3-aa71-aa56fa42fb4b" } ] } @@ -1594,7 +1595,7 @@ "ReloadData": true } ], - "ID": "b7b1d2ab-1298-41ad-a9ac-ab1d3fe39573" + "ID": "c7d85935-d1b9-4272-ae53-366ef52fac84" }, { "CommandList": [ @@ -1609,12 +1610,12 @@ "BtnText": "知道了" } ], - "ID": "0de789be-4bdd-49e7-9de4-6a55d6fb326a" + "ID": "f57f7bfa-5bc1-40a8-9f98-aac5615cb054" } ] } ], - "ID": "764879f9-e198-4f73-bac6-312da38e400f" + "ID": "370aa12e-265c-488c-ba5c-79d00ee1113c" }, { "CommandList": [ @@ -1632,7 +1633,7 @@ "ReloadData": true } ], - "ID": "4e58dc1d-47f8-42a5-becb-0fdbbda98c1f" + "ID": "0b856c17-9812-4769-a18e-7b2cb2c09b3e" } ] } @@ -2071,4 +2072,4 @@ "Formula": "版本发布详情!$N$18" } ] -}//6QPs4482pxgFL28bBgIc3VcZERBnaFJvOQP5J3DpLkjy1hTxw8d24CL+KgB6oJgtHBG3oaF26e+nTUbxOGBDIphjr2bhCfz/5nOuBJMGfu7N2jpXh5dhFgr3zKDqjUdJiZso3eEw/YFCeA27OLorU+go3FYOUuRhYcHIYb4DjW9cxflB9BK/OEoGOR7JmrsouX0nBYic0Nuf9kLvT0uE/mUyxKcZJwauEqo+mGZ5pPAWfvP9tBBqkLGmS5T05K8HLMFKuNQhQ7jPSwIXJIWqkWz8v3EqpzDodYyG0Ea7HycXQBAsi14t5dChbVLFnhnKMU/yPxqz+Ta5DQMH5jMzEYqFtVOQkP6Iea3yOumJ47AxCItfltHelEIFKGjvyLp1YBvP0kxGyA+t+ORCMFDt9uJJzFQ8VIRn4VbE6ZkOhraSCsEMsTEYZgszQJcHKWB8z/Svt8THo1lYpHYn7YZiMz/9wiSxOEQRlzREXSKmEYFijdcClLl6IHYk5CNodLszntBl7v9Uq8sybIPpDEDRQ9UizSRhTRNBbAebikwCIRhmegE7iyF5g3HKtaWjtDNSTsY0SKlNPJ06lthNtVewaR9xX3cfVlWCh1DmX5WIURWxbJlPubKhUVEjpptrrMdv8M1X/ZFeq7vfQMvQro0finG8HQCodEYJSzmEUNLeG5IhyWqC6T5oPM0QSPZd1a9B23k+H1Wk+uo86BdM89R6QSmRtb97xaGmvHnSKJgdEMOxwLXt3NjPvr2Y7j95ShdYLbtbJDCPdZ5ziJy9xnZIc9Wz/PdP3AufxjcVPrwC1tAS0LBaCeG48yqM1yXP8Z0DwXKkmjLdpgYumLNoiKitZERXfZl6QZ8pPqsQ2nlucEGz5s8HPHj2Ja8HQLrDffwvewNbc8QYvhVyXeU/zEEKZg==|920 \ No newline at end of file +}//13yOhOww0Iq9u81ux9zkXQUtjrN+BUOgfJFlJrqcavRt4ohp20k5Dyi5XMYtMXVb7J4XTWh1Nwzu1O8e76V5JeLubsGGgacLxaMOn4U7lHYWW3Cx5k8CnhiNXGhZH5zpayp0iDpuM3Mg0jFyz3Fy46GJgPYAB7jXZK5r6SesWh2GRO1z5jIEfFywMPc3vg0NZHBMaWdR+5Xm8xqgkWC/XR1Wtsraii7ZulNkYoEGfLJLEZg9rSqwwT4BtSMu49g70gBZEEVR78mDrEaW6hMb1zXQhCOR4AorRZKPCBofc0pH729/qRoqJob7UUBVbKouRtJWBmzOcB5TCTFrOGdbjOaeBuSNm22GX8YN9ESUHUSAu2BaylWInwAVYhKoS8E+rpiHMmwg1jUFxJ4pSyodPSkMOpydYZazw//dAqgCszC2vb0oJ/8Ogd/qamVnxGwfqxn+QT7LqyRdtGRyX8RkiK4a0ZNuqiYyDf0LwpXCccRDrLn64u0slE22j17BIpjUDV2igRh5bd4iNaDkZRtz9fz8T9geYRSuEC//VoqexHcA+w4z7lGGdGmIPPxfm2QNiRG13t2sUs75DLhOsmbQDv1OwZnD6QUiB3f1H5N6hS1sbjVANLhtCJrFmzGeMn6mayhJvimpDnn5rnTkJOxb35FG6yZ4yYqfAwzDcpMv1HGfc55sNsiPb3hv1BJKVYWh2zQQ2ZpYnvy+yOgG51T7KWoMpgtfekKgtcsg6UeQx8Vw4aV2eG01qQ+9fVpvNiH+XUP/0t7FfW1BYFzqgj5sU377tJmQktvhQaHnmXhd+IqM+lOzV/VGtzadXqtDcYPzLysoMX5ZKqLpfqawYYK05sw1rHUlM5/R6vYwWr8X6csTOwsY8E0gqE67LSpJLAQi89nfdmNwlyszRKPF4B3gBQ==|920 \ No newline at end of file diff --git a/ServerCommands/Gitee/在线获取仓库某日提交数据.json b/ServerCommands/Gitee/在线获取仓库某日提交数据.json index 84877606..f0a41eaa 100644 --- a/ServerCommands/Gitee/在线获取仓库某日提交数据.json +++ b/ServerCommands/Gitee/在线获取仓库某日提交数据.json @@ -73,7 +73,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "8ec1b6c9-8f37-4ade-989c-296e783fbec5", + "GUID": "19b15ea6-fc48-42d2-9182-6e518b140e8a", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", @@ -82,7 +82,7 @@ "ColumnName": "空间路径名" }, { - "GUID": "29a22111-28d2-4173-9f30-dfddfcdd7813", + "GUID": "0dce8e2d-9e69-4de2-a271-dc7a72eb640a", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", @@ -91,7 +91,7 @@ "ColumnName": "仓库路径名" }, { - "GUID": "d3fe18a4-3bb8-4152-91e2-f6c249985847", + "GUID": "f82f1176-ca1c-4ad9-9598-870198977b1b", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", @@ -115,7 +115,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "fcfcb5370e254905939c4fcfe1f0abed" + "ID": "5be3e6ca9c20408faecb0d57e4cb67f4" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -385,7 +385,7 @@ "WithinLoop": true } ], - "ID": "993fb644-9681-46e0-94b1-334f49d54d13" + "ID": "4106c177-b14a-4088-90ff-b01ec34cd09d" }, { "CommandList": [ @@ -510,12 +510,12 @@ "OutParamaterName": "提交信息数组" } ], - "ID": "fc7814ed-be6b-425f-a872-8c356fd39881" + "ID": "9b7e8226-9bcd-47d2-ab4d-8ffe3e5e5682" } ] } ], - "ID": "71d129ac-d2d2-4c12-822c-71cc00c841d5" + "ID": "72053e8b-629a-41eb-aab8-60fa92b5a588" }, { "CommandList": [ @@ -533,17 +533,17 @@ "OutParamaterName": "提交信息数组" } ], - "ID": "c511ce64-b1ee-46f1-a38e-abc8b627254f" + "ID": "ecaab12a-68a5-4913-8a2d-db2ffb1583f5" } ] } ], - "ID": "283a0f38-82fd-488e-8f8d-2278d64b7401" + "ID": "70f114dc-f711-45ca-953d-bcc52df594d1" } ] } ], - "ID": "10870676-9ba7-4790-920a-b7a00aea9952" + "ID": "e9ffdbce-5573-455d-b057-b5414fea0e42" } ] } @@ -553,7 +553,7 @@ ] } ], - "ID": "f20605ae-95cf-446c-bb44-3e703da46cb6" + "ID": "34e62775-a8cb-4c6d-83c4-dab8f654f3df" } ] } @@ -585,34 +585,87 @@ ] }, { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=提交信息数组" - }, - "Operation": 16, - "OperationParamaterAName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=CHAR(10)" - }, - "OutParamaterName": "提交信息字符串" - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "获取完成", - "CustomReturns": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "ReturnPropertyName": "提交信息", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=提交信息字符串" - } + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提交信息数组" + } + }, + "value": "%Null%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提交信息数组.Count" + } + }, + "value": "0" + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "未发现签入信息，有没有可能你选错了日期？", + "CustomReturns": [ + { + "ReturnPropertyName": "提交信息" + } + ] + } + ], + "ID": "6608f04c-4ce2-415d-aaff-1a72ed1af6e3" + }, + { + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提交信息数组" + }, + "Operation": 16, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=CHAR(10)" + }, + "OutParamaterName": "提交信息字符串" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "获取完成", + "CustomReturns": [ + { + "ReturnPropertyName": "提交信息", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提交信息字符串" + } + } + ] + } + ], + "ID": "8f4c8ce3-bb94-4f87-94a4-d618ffad88f1" } ] } ], - "ID": "9c94ad28-be39-490b-b527-b338c2c55571" + "ID": "74ae4677-daaa-4cf6-9e38-a5152ad1ba99" }, { "CommandList": [ @@ -633,12 +686,12 @@ ] } ], - "ID": "2604893e-3ed9-4b5d-bb45-9dcd9736dc12" + "ID": "054bd8c5-dace-47f4-95ef-ed364eafc99a" } ] } ], - "ID": "66f31fc4-4eb0-4bc6-8442-96b3de0402c3" + "ID": "e522e616-90a1-463e-8189-aa79b577f08b" }, { "CommandList": [ @@ -653,12 +706,12 @@ ] } ], - "ID": "7170c41d-27de-480b-bdff-c5afa101286e" + "ID": "0dbd8d24-19e9-46aa-b4b5-a6dacce5a620" } ] } ], - "ID": "87daa1bc-b262-4e58-8b21-e408c9e2d66d" + "ID": "4e9094ce-1f0c-45fb-b77f-d0cf336d0cc7" }, { "CommandList": [ @@ -673,7 +726,7 @@ ] } ], - "ID": "88815394-6db7-4e1d-8f5b-9882ef4ab6e1" + "ID": "d0196204-c99b-44cd-9e62-a846ecaf2d52" } ] }