From 0b8ffc6bee90f2fb08d38672d104ccb56aad1ec8 Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Wed, 6 Mar 2024 14:23:06 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BF=AE=E6=94=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E5=BF=83=E6=AF=8D=E7=89=88=E9=A1=B5\r\n","Me?= =?UTF-8?q?ssageType":2,"Modules":[{"State":1,"Type":3,"Name":"MasterPCPag?= =?UTF-8?q?e/FGC=5F=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 12 +- .../流程母版页面文件夹/FGC_流程中心.json | 244 ++++++++---------- .../流程母版页面文件夹/FGC_流程中心.rd | 6 +- 3 files changed, 108 insertions(+), 154 deletions(-) diff --git a/.collaboration b/.collaboration index 68ee4f04..676464f8 100644 --- a/.collaboration +++ b/.collaboration @@ -523,17 +523,7 @@ }, { "ModuleName": "MasterPCPage/FGC_流程中心", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:32:03.1789342+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\流程母版页面文件夹\\FGC_流程中心.json", - "MasterPages\\流程母版页面文件夹\\FGC_流程中心.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterMobilePage/FGC_流程中心_手机版", diff --git a/MasterPages/流程母版页面文件夹/FGC_流程中心.json b/MasterPages/流程母版页面文件夹/FGC_流程中心.json index 2fcd845f..faa4fedc 100644 --- a/MasterPages/流程母版页面文件夹/FGC_流程中心.json +++ b/MasterPages/流程母版页面文件夹/FGC_流程中心.json @@ -8,12 +8,12 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 38.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 10.0 } }, "3": { @@ -23,7 +23,14 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "5": { @@ -421,27 +428,15 @@ "Value": 1.0 } } - }, - "38": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } } }, "InLogicalVisibleIndexes": [ + 38, 39, 40, - 41, - 42 + 41 ], - "Count": 43 + "Count": 42 }, "Cols": { "RowColumnAttachedInfos": { @@ -1106,24 +1101,40 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 25.0 + } } }, "Count": 70 }, "Values": { - "1,3": "活字格 - 流程中心" + "1,0": "返回" }, "Formulas": { - "40,11": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(BI2),\"null\",\"'\"&BI2&\"'\")&\" and 类型 ne '抄送'\")", - "41,11": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(BI2),\"null\",\"'\"&BI2&\"'\")&\" and 类型 eq '抄送'\")" + "40,11": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(BI2),\"null\",\"'\"&BI2&\"'\")&\" and 类型 eq '抄送'\")", + "39,11": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(BI2),\"null\",\"'\"&BI2&\"'\")&\" and 类型 ne '抄送'\")" }, "AttachInfos": { - "1,1": { + "1,0": { "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ImagePath": "Application/156_processCentre_1.svg", - "BuiltIn": true, - "Color": "Background 1 0" + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "项目列表" + } + ], + "Text": "返回", + "TemplateKey": "链接样式", + "Icon": { + "Name": "Arrow/304_undo_1.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + } } }, "1,60": { @@ -1137,7 +1148,7 @@ } } }, - "5,0": { + "4,0": { "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", "TemplateKey": "流程样式", @@ -1188,7 +1199,7 @@ ], "Notification": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=FGC_流程中心!L41" + "SerializeProperty": "=FGC_流程中心!L40" } }, { @@ -1226,7 +1237,7 @@ ], "Notification": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=FGC_流程中心!L42" + "SerializeProperty": "=FGC_流程中心!L41" } }, { @@ -1314,7 +1325,7 @@ ] } }, - "5,10": { + "4,10": { "IsPlaceHolderCell": true } }, @@ -1328,6 +1339,8 @@ }, { "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, "BorderBottom": null, "BorderTop": null, "BorderLeft": null, @@ -1335,21 +1348,6 @@ }, { "FontFamily": 0, - "FontSize": 16.0, - "FontWeight": 1, - "Foreground": 2, - "Formatter": 3, - "TextIndent": 10, - "HorizontalAlignment": 4, - "BorderBottom": null, - "BorderTop": null, - "BorderLeft": null, - "BorderRight": null - }, - { - "FontFamily": 0, - "Foreground": 2, - "HorizontalAlignment": 5, "BorderBottom": null, "BorderTop": null, "BorderLeft": null, @@ -1358,7 +1356,17 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "HorizontalAlignment": 6 + "Foreground": 1, + "HorizontalAlignment": 2, + "BorderBottom": null, + "BorderTop": null, + "BorderLeft": null, + "BorderRight": null + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 3 }, { "FontFamily": 0 @@ -1367,10 +1375,7 @@ "Types": { "Strs": [ "Body", - "Bold", "Background 1 0", - "[AUTO]General", - "Left", "Right", "Center" ] @@ -1393,17 +1398,14 @@ "0,43": 0, "0,44": 0, "0,45": 0, - "1,1": 1, - "1,2": 1, + "1,0": 1, + "1,1": 2, + "1,2": 2, "1,3": 2, - "1,4": 1, - "1,5": 1, - "1,6": 1, - "1,7": 1, - "1,8": 1, - "1,9": 1, - "1,10": 1, - "1,11": 1, + "1,7": 2, + "1,8": 2, + "1,9": 2, + "1,10": 2, "1,29": 0, "1,30": 0, "1,31": 0, @@ -1422,25 +1424,16 @@ "1,44": 0, "1,45": 0, "1,60": 3, - "1,61": 1, - "1,62": 1, - "1,63": 1, - "1,64": 1, - "1,65": 1, - "1,66": 1, - "1,67": 1, - "1,68": 1, - "2,1": 1, - "2,2": 1, - "2,3": 1, - "2,4": 1, - "2,5": 1, - "2,6": 1, - "2,7": 1, - "2,8": 1, - "2,9": 1, - "2,10": 1, - "2,11": 1, + "1,61": 2, + "1,62": 2, + "1,63": 2, + "1,64": 2, + "1,65": 2, + "1,66": 2, + "1,67": 2, + "1,68": 2, + "2,27": 4, + "2,28": 4, "2,29": 0, "2,30": 0, "2,31": 0, @@ -1458,62 +1451,34 @@ "2,43": 0, "2,44": 0, "2,45": 0, - "2,60": 1, - "2,61": 1, - "2,62": 1, - "2,63": 1, - "2,64": 1, - "2,65": 1, - "2,66": 1, - "2,67": 1, - "2,68": 1, "3,27": 4, "3,28": 4, - "3,29": 0, - "3,30": 0, - "3,31": 0, - "3,32": 0, - "3,33": 0, - "3,34": 0, - "3,35": 0, - "3,36": 0, - "3,37": 0, - "3,38": 0, - "3,39": 0, - "3,40": 0, - "3,41": 0, - "3,42": 0, - "3,43": 0, - "3,44": 0, - "3,45": 0, - "4,27": 4, - "4,28": 4, - "41,11": 1, - "41,12": 1, - "41,13": 1, - "41,14": 1, - "41,15": 1, - "41,16": 1, - "41,17": 1, - "41,18": 1, - "41,19": 1, - "41,20": 1, - "41,21": 1, - "41,22": 1, - "41,23": 1, - "41,28": 5, - "41,29": 5, - "41,30": 5, - "41,31": 5, - "41,32": 5, - "41,33": 5, - "41,34": 5, - "41,35": 5, - "41,36": 5, - "41,37": 5, - "41,38": 5, - "41,39": 5, - "41,40": 5 + "40,11": 2, + "40,12": 2, + "40,13": 2, + "40,14": 2, + "40,15": 2, + "40,16": 2, + "40,17": 2, + "40,18": 2, + "40,19": 2, + "40,20": 2, + "40,21": 2, + "40,22": 2, + "40,23": 2, + "40,28": 5, + "40,29": 5, + "40,30": 5, + "40,31": 5, + "40,32": 5, + "40,33": 5, + "40,34": 5, + "40,35": 5, + "40,36": 5, + "40,37": 5, + "40,38": 5, + "40,39": 5, + "40,40": 5 }, "SheetStyle": { "FontFamily": 0, @@ -1524,13 +1489,12 @@ } }, "Spans": [ - "5,10,34,60", + "4,10,34,60", + "39,11,1,13", + "1,60,1,9", + "4,0,34,10", "40,11,1,13", - "1,3,2,9", - "1,1,2,2", - "1,60,2,9", - "5,0,34,10", - "41,11,1,13" + "1,0,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.MasterPage, ServerDesignerCommon", @@ -1553,7 +1517,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Size": "1200,60" + "Size": "1205,58" } ] -}//hrvL5GAtoC0sqmQjjNZ1tg42d2LAIMy3yEUEjhlJ7K3v55mJEN8TdOAMa+TYmb4dHkE8QJJQjXYhnd3hHanhlrdHNjhZ7PnqyMTIHHG7U69j8Lkp9UIx9e1Z35SK5KouJ9kw6mbFQ8xu7yzAyfEOF8thiki6OMzXIYgNN6fey18ob8H4y/r5v/2rpAp2kPe10fQW9I8AlsNBCiFT6t5ry7+2r/sE2HjZbSYaq2qVU+DzZsDcj4uLdDwrtWlepczxYhIqVrXw5nLnr8l0kkvJyTYDy+NpVLZhEWtFx3WhUYLl2nS4hUkH6rFdQkIy7r7QtsqjpYjFA6y4cjfTwGnQCF/LGC+GR1dLulGF7RJBinfpIp8MBS8MgCdLFATPqjvMNCbPJdY3SlFPMP3DSSUIHMaUAUx2Gc85tTHhRFBZb6b8jQ437B/xAn09L7YiNlcaesjmlrWqFFjjyv0EU/dEA72ewulpQfYvPWnqqNOR+GPPINLrjc22WM/7NdlitAr5xxu40jAc2yEj+hipxVRBMkAMUMtkjv/nbHJjBOkBLMo6ASTZMw5eZ5o81+azY86IQx91Y7ZexBrq/r0m6++fcoKaIVLU66u7pN4bRuKICsp6BWWATd/d8Jz5V23oR8Ks0V4I4s06rsC9QcX+yxpqunMHyvi8Zevr0jxnigMPkfF4rZaYYE4NuWIJuMj2WzN9NIEamBEuMf816ZiQr9AnnSCGlIWNb0wc091le0PYs7diuLHFLlqC0h4EG5CyaOc0M4RhMVkjJYuhstYjQsgj4Y1iv92IDh+lk+ZqzXirNrCkweLtN49JB3WTG28HMV4nEngJ87CWABf+DyQS1AnkHbk8S+Dqqf7O42WNBoVvMdbXZT7qeW0doisTRjOq3gCwtP+b2EodmKFsVaSJQP8IJg==|920 \ No newline at end of file +}//dq1Tl1XHj8aXDLzxCbpOGyxk+z81E8UHMZ4B14j/+2GTlj2Q3LPF2/HP/9UpKBHIkvUWfgLRdIvBjMevrn06QMJ1oxktQQHw3MqVw8goKsfMA4iqJi2krvdfaleqV6+fTD2Xvq0G/hwTwQwvGu1A4tHm+Ms+W/alegVOh3pg/3hkeU0s5KXRyt1Jnj/+lWk72BWDNevnlTbxuo4r4sEQOj3dwRFVw3hcdsB/rO/q9UPUwSmbtRfnL1Kp1ecuuAWbNByFK1VgC7/9rLeZB+r+NDABbuJUYsXqDvJ1UhgNgAaNeH53lGySe7kPQip+sjBOacpVvXv+CiceXpQvCpBS5tuND4GNoG7RM9YEETqR3roP5Q/4PKFCfUNw8P7J4SWEx5VTkz8VcqivmT9uK8YfjUAsz/465gIRlHZ3fn7/UmWm0yCExaMgSHJo2OxSs3jtSQ1kDRG/AIY/Zoj+43PqE9LpzzF6PHDVGZPqPJBV51tPB9I32QRS7ENIsn/dySrucEyVZX2XYvnSkxyYzRintKOFTvwr7FLpBlzGG8Df0QL7o62PizVoRQ41UNGcpUrufAkxaDbo6A/Q4n3bHwIg425ncfQxQe8VvVoxJQt2H1IX/UsmWPxTYC2ix2+Ge7COr64V0wt0f1K3uwpEpHuE0UC3+6bd91rLSmuhPevZnV905arM4vPsfyy7CV6ldbfrvbYhnR/kfMw8f24N8NcTZj9UKsQMq8KroDssI+xwaA3SdPU0+bvAjIwlxbY82h8ekARoBpFEuAAmLvUvctyWwpUsyiKskabDP6lCOtfyiSJlsv6bsnje+6NsbEbrFw2X4HCheMGzQqKkcV7HldWY4l33gVfy9p/xa+XhjLD4NsI9gjvW3f8Gj214gT+jyH3AH1Q4SewSgGufF6q/z3olWQ==|920 \ No newline at end of file diff --git a/MasterPages/流程母版页面文件夹/FGC_流程中心.rd b/MasterPages/流程母版页面文件夹/FGC_流程中心.rd index 04a18632..5c939821 100644 --- a/MasterPages/流程母版页面文件夹/FGC_流程中心.rd +++ b/MasterPages/流程母版页面文件夹/FGC_流程中心.rd @@ -1,9 +1,9 @@ { "PageType": 1, "ColumnCount": 70, - "RowCount": 43, + "RowCount": 42, "Formulas": { - "40,11": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(BI2),\"null\",\"'\"&BI2&\"'\")&\" and 类型 ne '抄送'\")", - "41,11": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(BI2),\"null\",\"'\"&BI2&\"'\")&\" and 类型 eq '抄送'\")" + "40,11": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(BI2),\"null\",\"'\"&BI2&\"'\")&\" and 类型 eq '抄送'\")", + "39,11": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(BI2),\"null\",\"'\"&BI2&\"'\")&\" and 类型 ne '抄送'\")" } } \ No newline at end of file