From 9eba980bab32c8c8990ce0c7bb0da3112dcfe903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Fri, 12 Jul 2024 16:16:56 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E9=A6=96?= =?UTF-8?q?=E9=A1=B5"},{"State":1,"Type":28,"Name":"ProcessItem/=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BB=BB=E5=8A=A1=E6=B5=81=E7=A8=8B"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 24 +-- .../项目首页-容器页面/任务容器页面/任务首页.json | 164 +++++++++++------- Process/新增任务流程.bpmn | 4 +- 3 files changed, 106 insertions(+), 86 deletions(-) diff --git a/.collaboration b/.collaboration index d0e958f4..5f0b6035 100644 --- a/.collaboration +++ b/.collaboration @@ -646,17 +646,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-12T16:04:50.5818886+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -1796,17 +1786,7 @@ }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-12T16:13:55.7212028+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/页面反馈录入", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json index ab345574..b132fe1c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json @@ -311,9 +311,10 @@ "ShowConfirm": false } ], - "ID": "17af9dba-0e92-41ab-86bd-845eb2c0b3fb" + "ID": "c8118b21-6811-4dbd-87b8-b70ef1aedee6" } - ] + ], + "Disabled": true }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", @@ -360,23 +361,24 @@ }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "failure", + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "Title": "温馨提示", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务首页!msg" - } + }, + "BtnText": "知道了" }, { "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "76d9e4c6-aa86-4edc-b088-2bf6012b0db2" + "ID": "3d6d7658-a323-4f6c-a7a6-ddc09377622c" } ] } ], - "ID": "e0470b65-14c6-4464-9068-ac3fa49c1cff" + "ID": "982197f1-8acd-48ca-abcb-ffc38722aec7" } ] } @@ -638,7 +640,7 @@ "MethodName": "Refresh" } ], - "ID": "8d158f91-8d59-4441-927f-4d8e9487b206" + "ID": "d0d8f7d3-3032-471a-a4c1-954401c3f5ef" }, { "CommandList": [ @@ -653,12 +655,12 @@ "BtnText": "知道了" } ], - "ID": "cb53ff0e-92e7-434e-97d4-b8825ee80a91" + "ID": "82d3cab6-9b6d-4c9c-a58e-49ab882928af" } ] } ], - "ID": "a7478159-5751-47e5-8acf-0027fba02d23" + "ID": "5c29ecca-5f14-4744-a459-bdde02329930" } ] } @@ -718,44 +720,6 @@ "value": "确认" }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!A5" - }, - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "删除任务", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务ID" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "CheckDataValidation": false - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!A5" - }, - "Title": "加载中" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -763,29 +727,105 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=code" - } - ] + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "4e867b54-8277-401d-9643-019ad9cff7e5" + } }, - "value": "0" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!A5" + }, + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "删除任务", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!任务ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "CheckDataValidation": false + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!A5" + }, + "Title": "加载中" + }, + { + "$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.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "8f8ed6a5-e677-4f17-b904-cede856a5c94" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "d3d5205d-9e21-4d0f-8aa5-f53df0304803" + } + ] } ], - "ID": "33b1b50f-7b2a-454f-94fa-fe3e1e9aa724" + "ID": "fe346a89-a556-4c0f-9e43-295d7fa17de3" }, { "CommandList": [ { "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", "FunctionName": "warning", - "Title": "温馨提示", + "Title": "任务尚未创建，请提交任务后再尝试删除！", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务首页!msg" @@ -793,12 +833,12 @@ "BtnText": "知道了" } ], - "ID": "009b1b9d-6536-4431-b904-55679cd8a93a" + "ID": "14aeb436-859c-4be8-836c-6e588b9f960a" } ] } ], - "ID": "ace89907-6c5a-4fbc-86c3-1045271831e4" + "ID": "367aac09-af6a-4937-86fa-94a30834f536" } ] } @@ -2171,4 +2211,4 @@ "Formula": "任务首页!$Y$8" } ] -}//Ve2AgKk3/w+550CwKwgAjzYA4Tcg/2PsG/bKwij0OhUnZA+LYwQbl/Tq1iiZIHP8hfp0x4RhYtrTRAkFSd+4fr25RRSlId8qGaoUedG7Ftkvj73FdV0Y3xb1hNpfiGtJyiYhvc/z9QRYiTHBPx6ZVxpK2w0Mkxl9URHq0eloYwynxyQMIBAOk2FuxtHAHn/P6GkaffD7IpTADF1dgiBSrpdmbMEl6EpJoMM3znfamqsikEm0RDCzZ0ypCBXK1uDTFn7nkcYlScNhKyUGF+6EVF8TyjuL9geZsFR5B1+HfP1qkF6jBLQGwrPtKNvy/Bcgrvx6i37Ref5gVpVp+OBGV/On9SEU7gksyHXI442HD7PVB+eUMUZLMWNogLDNr9+CsNF2RVQHKEcoCnaQgZHJBbCs527hJ/4tgWsveVkH9NmeHT5GuLWawjaIP/XLFTmUhSQDpIVii002TYJIgC8J5uzckDyljrRdmsO8TFqAuXzCzPHy5xesZSmojPXO9aUbtNX/lm5Z/JRSOHqWazyCril3DXxplMulmMXTdAkGFzgf1hjSC9psPEb1exLke2zCcnC0bgnWAiWJACIjHbwyrhZX8SAtUcldmZfHUbZY/WPwz0lxWTLKgyWnjSrbI8nIMMk8XRlPNW3jKv4ZYW7gdc5UNriwOKEIfDVrMtqTqlr/cjOdWtLzo345ktSfjAo2arlYibiNe/1vXK4hXCfOhPxQiN4UVlBV72/6dWNQcwBC8DkEbtbH6jKceh4K8bu8ft7cI1PrAltLl3aG3mxLQN/s22/ltb9SicbJslQEn0whoUhdBgQq0cv0Sr+tEEG3VS2w5eLgBhqbyzQu8Lgeqaqmry+GqBV3m3kbFmA6/uo8qSayf20zNvZQC+eDRD7F8B1DPcKSQB2f6tdFoICA7Q==|920 \ No newline at end of file +}//GFcdrGVKKYh4LHexKKcMVzV7JVePNulIWaLlqv5/5ko3h1SA7jYDi2adoAuIA9oVgXVYkRjx5W5WJW0Fu0AEqJhG2z5gLBhy1R+tf0nnLPrhmIzvyIRJdA60o3drmITXMH9z0UQbVAi98XWyMGPVY57B+LNDNbYT67Tk7E60+GVmGoJ/SJf3fVPYl/1/bMPjcFCY7LAS1FfeIs0eo7gByhur5AeDcD0kvoyv19dTK8eIhCu2uMrUkizc6+38RxSJd/aXBfH8YV7RtvAgmJgq9iQWcUuRMWA9MgGJd1MaLxQ8Zee9Ap6nXhf0yzuh/lIrqEv+j29GZ9RpE86B4txtGsx36WER03k9lGUdzw6T5BqP6CsZnz2e0pQSt/9wOmv4JWty2DCwSMWl0sQwZeNaz32UNyfG71823+BPS7/yKrfOSoLt+zR96iTm3yyCP16tCpJLOB/V9mMmMI0QzZKlKaTfIAlZ7MfcQqLAqQcxg3Zk1uwWHCbfOnoMHUwe0w84f9yzH/x9FYpbZ9ukJgzmijE9DYpbXBUkCUr6GuQy3dtezorcXa9Ko2Af1hfin/77/AGa5LwZnAwAp0QAcaoPhBzM1knf+p4UKUUp6MGcpRNiQs9qJKKKFkmzULmumY9XWHQwi15CeDyDkygNvqs6JvHnJLlpOAjdSihYwMz13Ui1/kzJMT/c9uakF32yOWL6grVxDXKjzg12LlBuY5TuQ+nigYTBSvPVu4t+IyfZim16ksI4s18oFZZ2LemDVw8s087X/XoozeMLD7is4FYSwEIDN0PhzjteWHJ++2Z4w08dpKIBRAadqgdA41J50TlSPhdinbFASaRxeS1VGZ5Wodn7ulPD0j92eL8HYZS4lEv5KDfHAc6z70gwdRC1nMnfeFj8YxUDWTPj3Kt82+S3LA==|920 \ No newline at end of file diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index 9522a5df..0bc505f3 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + _4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f Flow_0otbu5x