From 23b14ba8fb9fd964e6ce61d69cc98eee86aecab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Fri, 21 Jun 2024 14:57:21 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E6=9B=B4=E6=96=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=A6=96=E9=A1=B5=E5=8A=A0=E8=BD=BD=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage?= =?UTF-8?q?/=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8"},{"State":1,"Type":1,"Na?= =?UTF-8?q?me":"PCPage/=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5"},{"State":1,"?= =?UTF-8?q?Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 40 +----- Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json | 16 +-- Pages/任务/任务-基本信息.json | 126 ++++++++++++------ Pages/项目/项目列表.json | 65 ++++----- Pages/项目/项目列表.rd | 2 +- Pages/项目/项目首页/项目首页.json | 145 +++++++++++++++------ 6 files changed, 227 insertions(+), 167 deletions(-) diff --git a/.collaboration b/.collaboration index 440efc39..ed69c6c5 100644 --- a/.collaboration +++ b/.collaboration @@ -518,21 +518,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T14:53:25.618129+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/项目成员详情", @@ -556,17 +542,7 @@ }, { "ModuleName": "PCPage/项目首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T14:55:25.8202668+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页.json", - "Pages\\项目\\项目首页\\项目首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", @@ -706,17 +682,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T14:49:18.3070849+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", diff --git a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json index f5edea2b..c4d97832 100644 --- a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json +++ b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json @@ -160,7 +160,7 @@ ] } ], - "ID": "dc3f7e54-9ae9-4be7-b44b-4003a0aae3b2" + "ID": "fa6753d4-4d3c-460e-8e8a-c2a4876a86e9" } ] } @@ -235,7 +235,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "2a7517bd-6da4-4953-a878-c478fff86cb4" + "ID": "2da691fd-e258-4333-b825-4d35111abcdc" }, { "Condition": { @@ -265,7 +265,7 @@ "Message": "复制成功" } ], - "ID": "5fecdaa2-03ce-49ee-867e-e144f1cc7370" + "ID": "9e512a5d-6afa-417a-a056-a355853bbaef" }, { "Condition": { @@ -342,7 +342,7 @@ "Message": "操作成功" } ], - "ID": "ced55eda-db07-4526-9461-36e347b3a38c" + "ID": "1184e224-7bf5-487b-94fa-16232b619f9e" }, { "CommandList": [ @@ -357,17 +357,17 @@ "BtnText": "知道了" } ], - "ID": "1398fcdb-5cc8-4305-b771-0f3d8e3cb625" + "ID": "b5e932a9-cf96-4a57-8da6-f9e2927ab78f" } ] } ], - "ID": "61e7a2eb-d620-493e-a79f-555348b4f73b" + "ID": "dadcb77b-fda3-47c6-acc8-d069d6b6a0da" } ] } ], - "ID": "39f3457f-28e0-4b2d-9b60-cbf64dc160d2" + "ID": "6cfde878-dab8-465a-be01-93c2f047ef0d" } ] } @@ -439,4 +439,4 @@ "PaperSize": {}, "Margin": {} } -}//LNYHlNfZTaXbYB+UOAxMMlqOvEKSa9PAOZ35P+AtFbqopkzA9Ybo5YWuFAym4JGHIP037Ou+foYFw9oexHniivOalZO3zTcZFcGdItg70d6skHy7ba/9ZOoVfYe58+et/sNIrccxE5enXn19C08kkaDwH7LnMzCtkKoIyNcZVpLs5Zhv+Nd/Ez8iX6kui6zyMhG3vkuGRsY6eJmN54Hq/fnhbAqNalZtTXomYnxYZAxvcRFFyrKsFe7/Mf24jmU3fI5TP/O5Lda6jUm8mPDAKI21kZJfoxrJPGfKJvjaxItDWaFYEK4GWawya4j2vyJD8q1VKAUgaES30jQ9X6u/XyK/gOW8AIzdr+MvU1bLjNHxD0bJVgMNTsi3CcFwRipgVjLXrGpEsNZkKqKPETUlQUaRbozXgfebhyx5dDf3RpPJ7DlUdiW1AMVykHV756R6VRwDnS4FRTW/gOmV5Ab3weiFTkBwe3IKOgGS35UPmXRSFrGAGUvkoLjOFXRGWNE1FRhtXdlCnxU6euDOuTTAUJMb8NBZqFqI0Go+9UA7JdqYeaBSxR4wpqLqHIGtE2JZ5CmyrvV9DCdDiVNFQ/IRRFPO6j5ZXwY8yt+esTigXlLIAhGPodY3L6582dq5Perq2FVhmK4JU1aamLYQlyc2rM1ohqz3Bp4kVp+GSqI3l5Umuy51jnxgbo6b6hf1/+GYxhUwdtoCsiECk0DHC+D4InhgwiXfqkLXSZPcLlj4XBDpWetytdiO7OJYbmjFHW+KQcKGKmoMsDV/vv0hqCeWJgcSm7crpEN2tM8rqUv0/eMk5kKF7sddZ0VqUsC4brSCWtQ+Ug6k/ILZ90HSPK6sXPUSChZGQnoFq2DT+9G9ZfVkh7sO19fH7SV/JqSmHfxWbcncFTsmiypRdCXMGctqDw==|920 \ No newline at end of file +}//gBPsCVgoevjEvCvR6RqeTiGk8F3cV4rMtnbUX2FSCtGVVbFh7WFwEVQL8fO2CtOrQAAooDTrX4qY33joRl7/SBvTkp8P/1AHRk1XQWvY871MwvuRHxOaeAH+gcQnpB5MEpWFRXUgA47/aoFTt2RgVbJ/zoVB003gCRlPNYTHBMNDRwBowt+SOIADsoYKnEgd32sDoBn/+Qx4WAT/PJCoyg5t8d3AO/MUm3/5SE95V6U9ZloDmLWhgkEYFEsv1cHuWx8OJK3h+ZB9gMpN1rWmS+fe07C43g1ON9L/M0eHsvI3JhICzwXnJu39UdjPje2g2+BNJAN7Ivpc2jDG3ZLkAxQYRmR0OuAr/Nj3DJO0y21V5Mp27r0df0QEGsQEUDZqlzJg0Jx/RpnWLtNR5ORgDKXKEr5TtL6bv+mBbZpxm+AAkIHH3LKEmlSQx/Y2tBrW0yTJOBlguHjrHQhxJFL6f1NgFgVMtirmB7q7jNB/Ctd9Y9x9jBNhDr6Jz54GD5/Ok5/7t2kordNCXBkqkcEKUSozuiC6PcLFW6Hv0aei2pnrUKXQQnjn6gXytrBRNazE6rUI4jLSm7CylxK9dLX1gbbgjv6qTM8OLHY4q+zT7KMORV9zU6Y7oxhpvCmjzInDZgv3ldhg9PSdQjSor9kc3gXUrPaJetYecZAmvB1u679zcG8UOWcvRPccdDP1XUf6Qo5lK4xlsG+kDCbT8ShyKiRgC3Mw4LdovkEWDTApZYdlEOFI2XjzJI4qoFkDEVxa9Ywx4dVKdpj5+g5W8f6yVepid69MIgMAqZb4afpeJSkWnI6vP8y1VWzu6VaPjNtetWpSSrdl/ba6YW5QMR/nGTNSIKoiUd2iKUcJyS0tSx+naXdOFxa5XQTBvURr6TsfkdOrTTh/7GkdZFYoMiWj2Q==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index e55f22f2..fb5f30f6 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -156,6 +156,11 @@ "DesignLengthInPixel": 39.0 } }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 39.0 + } + }, "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 600.0, @@ -167,11 +172,6 @@ "Value": 1.0 } } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 - } } }, "Count": 22, @@ -295,7 +295,7 @@ ] } ], - "ID": "18a0642f-0190-479f-b39c-b1574ea044e9" + "ID": "70f66ecf-0a65-4fac-9b15-e787b7cd2b04" } ] } @@ -434,7 +434,7 @@ } } ], - "ID": "f0c2da71-f65e-44f3-9556-6cec8acb0aec" + "ID": "7f42506a-7374-46c1-b3f6-9dacd5cf3dd1" }, { "CommandList": [ @@ -449,12 +449,12 @@ "BtnText": "知道了" } ], - "ID": "830b0632-1245-4e9d-b332-c8c4678d55b6" + "ID": "528370ce-f7cd-4f66-9416-c4d9e8b78221" } ] } ], - "ID": "6a3009c3-c91f-430d-9e84-253707c9ca76" + "ID": "2c12e099-4a80-4973-87e1-1ff9f387a5e0" } ] } @@ -467,7 +467,7 @@ } ], "Comments": "小于进行中", - "ID": "86135980-fe67-4285-8be2-da83ee010535" + "ID": "a6f06c9d-6c99-4431-bd41-daa921b4e722" }, { "CommandList": [ @@ -477,7 +477,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "5e00b8c2-e00f-42f9-97f2-d009b659ce01" + "ID": "288df50c-95c1-4be8-a9ea-e8521faa2ae3" } ] } @@ -575,7 +575,7 @@ ] } ], - "ID": "3867f772-f846-4093-9704-4793069c90a1" + "ID": "b94cb400-baea-41b3-8bd6-e3a908f0788d" } ] } @@ -657,7 +657,7 @@ ] } ], - "ID": "32abfc9c-24c8-47a3-b00d-0206d79c2ae3" + "ID": "a4e85d49-bfbe-44c0-aaa2-18bf74a59c4b" } ] } @@ -808,7 +808,7 @@ ] } ], - "ID": "a260d24f-c083-4aee-81d2-c67e11ebac48" + "ID": "f2c8454e-7747-44ab-8c4f-0d9aabf8eab7" } ] } @@ -905,7 +905,6 @@ }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -978,7 +977,10 @@ "noMatchText": "无匹配数据", "clearable": true, "IsDisabled": true - } + }, + "RulesGuidList": [ + "49653b0f-d1e1-4cba-999a-e93924c42a60" + ] }, "7,11": { "BindingInfo": { @@ -1077,7 +1079,7 @@ "BtnText": "知道了" } ], - "ID": "828a7c03-5962-410e-9277-412360b973d5" + "ID": "d416ec5a-4703-4468-8993-3702c76e1499" } ] }, @@ -1091,7 +1093,7 @@ "Title": "计算中" } ], - "ID": "a141f4b2-473a-45d0-926f-0a6cf4e3bbdd" + "ID": "b5c679fe-ec9d-4298-ab73-56ea115ea7fd" }, { "CommandList": [ @@ -1128,12 +1130,12 @@ ] } ], - "ID": "dc3091c6-1c43-40ae-8f77-f1bcc0c7a67e" + "ID": "7e95c4f9-cf6d-4a7f-b35d-5d759a98ffe9" } ] } ], - "ID": "cab79de2-114f-4ba9-873e-b91666a3e0ed" + "ID": "75c20e55-1064-470b-8b86-e3511a8aa30e" } ] } @@ -1180,7 +1182,7 @@ "TableName": "任务表", "BindingInfos": [ { - "GUID": "cdddcf70-ea11-4351-9620-e1fca1d44d8a", + "GUID": "775b0c1f-d625-4d9d-b0b0-2ed3d92dc203", "BindingInfo": { "TableName": "任务表", "ColumnName": "ID", @@ -1189,7 +1191,7 @@ "ColumnName": "value" }, { - "GUID": "a56b4b53-8b19-4bae-8bf6-579cdf271774", + "GUID": "e930fe81-e619-4613-82a3-d4deef55d62f", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", @@ -1198,6 +1200,18 @@ "ColumnName": "label" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "7ca2f7ab-1508-42e6-8a47-8e66b6f5deb5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!项目ID" + } + }, "CustomColumns": [] }, "placeholder": "选择父任务", @@ -1285,7 +1299,7 @@ ] } ], - "ID": "9bd47d41-a1b4-48e3-b904-9ad15acfbc7f" + "ID": "26f9a3d9-53e3-4b1b-8d1f-8b4720bcfa47" } ] } @@ -1393,7 +1407,7 @@ ] } ], - "ID": "6e182f85-aedd-49d2-94c7-1ec5195cff39" + "ID": "67e81d1d-130d-49d6-8167-115a65d1c004" } ] } @@ -1501,7 +1515,7 @@ ] } ], - "ID": "e3b08a57-69dc-476c-9667-ac8dd17082de" + "ID": "77be7637-5d2c-4245-ab0c-db01c34d29bc" } ] } @@ -1545,27 +1559,43 @@ ], "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", + "TableName": "项目成员表", "BindingInfos": [ { - "GUID": "b9262ea4-ba31-48a9-80e2-0460756db75e", + "GUID": "d9d18b1b-50f4-4127-a981-9f07880ea216", "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "c90bceab-fa72-442d-8c19-61dc7764dc63" + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "6f623c23-af0b-420d-a96d-bc4ae351bd67" }, "ColumnName": "value" }, { - "GUID": "52bbff4f-7d0c-409f-9e3a-09fb21d6a41f", + "GUID": "6eb4dd5f-9544-4cda-b00c-c32ef2e4c348", "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "f70826f8-1622-4d18-8846-86da93f54d84" + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "4dcfd657-63a1-4d03-961f-d88d19fd1063", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } }, "ColumnName": "label" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "99888e4b-b741-4a35-a3c0-cc660511871e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!项目ID" + } + }, "CustomColumns": [] }, "placeholder": "请选择", @@ -1709,7 +1739,7 @@ "BtnText": "知道了" } ], - "ID": "90d74e98-4f40-4766-83d6-47162f197354" + "ID": "a7389b82-8338-4ddb-8717-c0da4c13cd43" } ] }, @@ -1723,7 +1753,7 @@ "Title": "计算中" } ], - "ID": "be0b1c35-8df2-4092-9b5f-7efcbb54c982" + "ID": "fe99fe6d-9666-46b7-9799-bf402ec6ee3c" }, { "CommandList": [ @@ -1759,12 +1789,12 @@ ] } ], - "ID": "4fe0fef1-bca6-4899-a130-e23353da7164" + "ID": "598ba275-a1b6-4fe4-a13a-7f922063e331" } ] } ], - "ID": "5c5821ea-db03-4b2c-96fc-1ffde9ee168b" + "ID": "0af837d3-d24d-4da7-bece-f0b5664a95d8" } ] } @@ -2044,7 +2074,7 @@ } } ], - "ID": "583ca4e0-8586-4876-b958-875ee4f448eb" + "ID": "53e0791f-6a5a-44de-a99a-5eb97d872dfb" } ] } @@ -2068,6 +2098,22 @@ "RelatedDataTableName": "任务表", "ConditionFormatRulesCollection": { "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务ID=\"\"" + }, + "Priority": 5, + "GUID": "49653b0f-d1e1-4cba-999a-e93924c42a60", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, { "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", "Operator": 3, @@ -2183,4 +2229,4 @@ "Formula": "'任务-基本信息'!$C$12" } ] -}//SmGRq+8TQkL9NMLGa6n8gsqkLHEKk8RdnE6HYyZvXqMcnB89RvxXT8DO9PPADz8CVpyi6zTgnzVRiIdWFxEL3vgCuM44hb3Ag9AHQq/tgZMyZSwUX+2Nkfk0h6ubEax6LhXOul5n1HYg/dUaYd7rE9AdDArN0cg1pBpzo367r35eFEeYaE3KTa4MSDsUKKjIr12JShG5J26R0cFtYQV/CNQT6qUsv2DbcKWkrwGWHiC6HLWwbvGw7sMj8CnLuOHa0/wKoXIC01Y3AT7BckbK3LQij4Z8D+UBeo3U/BdjX8RHYerm9sysziNZRll338aHniaNoC/cShXgFBCQXNP5qhyPFOHLB58MuNM6frXBB1MTWSl0M+0nJIx1QIIUOJr1QjnFrWMwvtTYy43mspVdZLLRs9ZjqrK+/mNJBuVh+tkbF4Qgvc7S792N80FrIfG68c+egMDzsSsn7gkb3WxFqkFqAfjjkpB4OoxxMd8tcE5qiEsZ/TKXSQ0c6v0SmmbTyDj38atWeRJPhsHfTPhzqGuOwRoPcaPNxw1FsQZdO9PX0xif5Dbr7ggJyifuFrZnyAIJ1jLKmXDz7Hw1xP2dc+1wF/gKub+4mWQZtL3AWcbgvvplgBIMU/7NAsF/76bVHTML7NKdxuKxe2VLF60pepw9YXMs6/WhqAdeY2A3fGVnCB71+wczZeWnFHfZ25QjYrFwaeBsEb5FIxuvTN6dCbwUquJUWxUc99PcnK6acg+d7LF7H9JPyScaNnNLV+3kpHKZYK1V+VGrFdflCzEzJkhTdMzf0r47wJDxWpMVGPd3y3zmnre1fnayP8nizkHYmhZHN3EcrKmLxo6jarFbNJz/2A1eBX+KAo7NGuXak+0A8zBFgR8wSv8y1lx8Z3EMrPY1XlKz24qPNfhfCKLy5Q==|920 \ No newline at end of file +}//HGz2qPuXHF2U2qKr2tmDOOKr9tcLNn3ktNxMo333jjgqOEKkHiVmVG+H2OZcPXJsqZ6Df76C/SOc8BfhCfKS+bmYV/Ab92X6/V5GFfGaSs4HVke3eweH9fJ0vOEtec4nWH0xAJZbW5XwxrvS194GSj9ReVeTnVyWouosHy3wm4BSO3msux+ErBvBhkysYklyNFxmO/QNZAv+OezYYW9NcfQ60tVROui31tZuLgT42oLswsrLEy1qSWC5lwud6t5p8VFY3HtgspG/ZXF1Z77rvbikiiWlV6IeMbCSNbS4YzDCfM+Xbs2NPNdvtb3e7N0USz+zsfzs4b9n7kiYMxK4aTDA2lGMrg+I0mLuWzCmpuXe9/gLj2iQ5Dn4Y+ZpH5N//zGpWlOTSTnKiutyKLIpRi3e9B4AOq9Y0ZczMG3NqxGOo43dMwKoKmQjIOMxdajWxbjKis7sw4Y9o3xcY1qP1cJka7UvjjF7QYnIpVfd1mvOyqgc5kBEuReKpITEqO4KickGKD3+LBCP4Ft+73D8ijTIQaKIODixdmoDi+ev33Aw/GILutKCyDMzOxdx1zCYIPcOv0HkvxQ3nth5QLRqPUIFGYT0SNxLFUz6Iu+/KIX2xs3XRRbeEKMkVZm3AtBEqYDeyouzCMSzMg/T/I2/3R3n1W7xgLKbuuXURYqTKsqb7qIjHWR/eeFPmaYg94x2hafDXggpdOJskp2/5jF3UG4ik48pXDbj6bxhB6xhSP3zdESkmH2Mu8IwS3B3HqpJUf4DRKaE1dkOybotTp+jzwEkMDjf/aJFi2F51TTP2V8nCtgUKcf3RST6+sc81D+sFxwRScG+VBxyi+B6LwLAPtul9dQzZ+hWrnEFMB+tY+8xkXQ/yGXev5z2ct8FFCgnxxG2rFomoqjIQcdB/QRvPg==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index a97754fd..954578ae 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -147,27 +147,27 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 32.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 32.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 32.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 32.0 } }, "10": { @@ -302,14 +302,7 @@ }, "37": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "38": { @@ -329,21 +322,23 @@ }, "41": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 12.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "42": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "43": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 44, + "Count": 43, "DefaultSize": 32.0 }, "Values": { @@ -488,12 +483,12 @@ } } ], - "ID": "1a8a1e5b-c875-4d40-af83-42eb8cd436de" + "ID": "33bf16d8-2df5-47af-a0db-b3961b43138e" } ] } ], - "ID": "0211428b-d79c-4e9c-bfc9-9b39ac07957d" + "ID": "188449ab-f58a-4131-9e5d-364a69aa06d2" } ] } @@ -831,7 +826,7 @@ "ID": "f80245fe95e54190b6fd428917237293" } ], - "ID": "d02a29f5-782e-4158-a5ca-6e897f173c0d" + "ID": "b58e9f88-b8ef-4fbe-818b-cd0ca7cf48ba" }, { "CommandList": [ @@ -842,7 +837,7 @@ "ID": "f1f46d09366c4d40878ac41cc03c7045" } ], - "ID": "21a58d73-f379-44c3-a4ff-4d8e7c61d20c" + "ID": "c353b831-862f-4a08-ac23-439b5c1ec0f3" } ] }, @@ -970,7 +965,7 @@ "3db70195-fce8-4da3-b3e5-e56009ee399a" ] }, - "10,42": { + "10,40": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1133,7 +1128,7 @@ ] } ], - "ID": "c1b8ae4c-8a34-4314-9dc9-d93be38b7fc0" + "ID": "1780d82e-d595-45ef-bd73-0099f0564c1a" }, { "CommandList": [ @@ -1146,7 +1141,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "d3cd4464-b952-45e1-931c-e39406eabd34" + "ID": "4fc0008f-ee66-47e1-9c55-42fe63971c40" } ] } @@ -1420,7 +1415,6 @@ "1,39": 1, "1,40": 1, "1,41": 1, - "1,42": 1, "3,1": 2, "3,2": 1, "3,4": 2, @@ -1485,12 +1479,10 @@ "4,39": 1, "4,40": 1, "4,41": 1, - "4,42": 1, "5,1": 2, "5,2": 1, "5,4": 4, "5,41": 1, - "5,42": 1, "6,1": 2, "6,2": 2, "6,4": 4, @@ -1531,7 +1523,6 @@ "6,39": 4, "6,40": 4, "6,41": 1, - "6,42": 1, "7,1": 2, "7,2": 1, "7,3": 1, @@ -1570,7 +1561,6 @@ "7,38": 4, "7,39": 4, "7,41": 1, - "7,42": 1, "8,1": 5, "8,2": 5, "8,3": 5, @@ -1612,7 +1602,6 @@ "8,39": 6, "8,40": 6, "8,41": 6, - "8,42": 6, "9,8": 9, "10,1": 10, "10,5": 11, @@ -1620,7 +1609,7 @@ "10,7": 11, "10,8": 9, "10,10": 12, - "10,42": 11, + "10,40": 11, "11,8": 13, "12,1": 14, "12,8": 15, @@ -1663,7 +1652,7 @@ }, "Spans": [ "18,1,1,7", - "1,31,1,12", + "1,31,1,11", "5,1,1,2", "3,1,1,2", "18,10,1,4", @@ -1675,13 +1664,13 @@ "3,32,1,2", "3,34,1,7", "7,1,1,2", - "7,4,1,4", "10,1,1,4", "5,4,1,37", "13,8,4,1", "12,1,2,7", "15,1,1,7", - "12,10,6,33" + "12,10,6,32", + "7,4,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1753,4 +1742,4 @@ "Formula": "项目列表!$B$19" } ] -}//Qi3tab9/nIYvpMTWEcbP/NLjIum4SZ0jRqYvEFYg4VfIw/uaLWgCvl+i0HiqRJ8bxPKqfH8tQTKHIMh6DkyQlQDJ+a0NYcuNHs053m6xge+5q9ksGx4MPDJw0KvH7fiHu3LOzyBle9YIeYDcHOEtVmyx+x9LHM839/T4JwPUhizOp5qNpXhmS5hvFEJYAgCM3MA3Y9SXV4eS42E0lmz+DPyQCjACJoaERdUQj+wU0lNvhmX2i5V5sZBR0tp3ILu1sAN9KmZ4tVz38yqfqUIoRWpHgDaJqmpkl1O8XvLcdW5Iufh/43wXBSiZN6nqtjV2T14Hl+A+GKwX0DEo8Av3HoHvtTShSWh7nvOHFwuLWZ91xaanknnv27PMjjEHCuXpI+s/Zf9Km+AhJ5rdiWlaNrddPCdJdumISIkAU1CQ4PwgQ0ltJ2fJ6T8lboCf+Wi2HepRNXCVLtcjwClAEEI4C+K/aqiolmmKZO+NwM0WKmjgDc5w69kyUEbDHO018HoIafk1XkHrtyHVSoCWj+ckzqfA2qWpbn7RjaMnugxAsE/cMNV5fHov/2g/SEHWuhezbFakTg6cdYpnnnBzh0k8sJs3HylrGSPYduYm5wCLPw0yHj07/Mls+Xz6o1DEAbjwsGKXmLHeAY5nQvbIOdFe2hd0PZcBHrYRX5BEXv3bMniIFfi2bGj1URRpx2I5yqDC0x3wZDb2SgIc/d296jxzVrh4R2MQY927xeIfbDFjMWzqW/6A1TvCBzuIspCL4eJKwdIDL9JORsyE9NiIWFkcfanh4A74073k9MP30tmuHTr1nq5R0W/2NFIcp0NpuPXnhkNiT1GqOG12wuJPjtDqaXwOSp8itpJhCzxrH15W3snrwchJ4rSF2kao/sdYf486CXxG6gKjWPtxuY4wzNX1dQ==|920 \ No newline at end of file +}//OcHIpQ4sWgMsUCkC54qPrQ14Xpx9gtw6GydyBgvPomgavA9TdHAskxvrXeMwWkTuUXojruiXSBYXKX0SE5wFNObtBQhVLI34fhAUOGBvPpCaUknyYRwlW8tadjj1h4DSOCg9lwybJLDsIZzinQywqXW10uBEoKqSsPNWMvN9yHIv2Eit4N0gIGZAPioV1GeoWiPLQpzWcF4hRypCZwu7x5ckQJUxn2VtfNXSBKQHUfFWa+VwT9cM4N94VCgwKc9tvAxCJiiE/P17ebFJx+AtFq5qdey8LFAeZXZpvUiV1uw4Y0oZxvMGn56K+NGMXuZIywZ6Ik1vNuXaYOpKaYx3HubjVcv+2x4PLFhHhODZZ6AXlG1SDSTuwBGAMTeb8p4so+rtmGcEBP3zuJa7r3qTMre1bRGkvhTBV1SUYIEaRljPdhNZDxFoWrunpjyEjmI5mZx+aTb34Ua/QLbjwzPF7YPApTwXi66NanAhyySz5/yyEyGCH7dt+yIZCfF7QuzJeXFMAXYQP0Scz/6vTRZTxo3EiG2pG/x69JrTiOzGE7eCDKuvOyffiPRpxjgg7ekdpQ4W/Jc7PiE1kthr+vgStOgwvZangSAwoPwbyTNA0pqAXMMwiQPXnvZYEQVR/R7KVf8NBm7E1sC9l4lIkluIZO/XrEfz2a4Dos7FUNwKTtTJBYNTwkqEUCH3Ss+nuLuwSnDhi8r5stQWtCQpvzf/lzURXdMr3LwyEdFeT6YHMfRXidnPf3MJOd2WldgHVIaWW33eVwpmVT2gtTqmpiA32Us5cfotfIXOA9ViVZNZxYQP434M1fyQSEadlx/v88W75vSReCwt5EVQaNvv7V42dK+2HidS+ny5jbFUwtdU11xiguBWEk5yUPXzN5Zvel7VIKVYYj01F3s1Uo3D2cIuXA==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.rd b/Pages/项目/项目列表.rd index 6ef3aa59..66ffad47 100644 --- a/Pages/项目/项目列表.rd +++ b/Pages/项目/项目列表.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 44, + "ColumnCount": 43, "RowCount": 19, "Formulas": { "10,10": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" diff --git a/Pages/项目/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json index 0c7ea254..db33cc7a 100644 --- a/Pages/项目/项目首页/项目首页.json +++ b/Pages/项目/项目首页/项目首页.json @@ -293,12 +293,14 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", - "contextProperty": { - "Display": "值变更原因" - } + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目首页!项目ID" + } + ] }, - "value": "binding", + "value": "%Null%", "compareType": 1 }, "CommandList": [ @@ -307,39 +309,96 @@ "Title": "加载中" }, { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "24a388d6-e3a7-492d-8b87-27ac72cb0457" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!项目ID" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "e50c9760-00c4-4829-acd9-63e8241d8e59" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目ID" + }, + "compareType": 1 + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "24a388d6-e3a7-492d-8b87-27ac72cb0457" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目ID" + } + } + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "Forguncy.Page.reloadBindingData();\r\n", + "ID": "2d7d267652364b68a72cc98b6606e67f" + } + ], + "ID": "82e86eaf-c84c-478c-8819-03a41638f4b3" } - } + ] }, { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目平行视图", - "ColumnName": "ID", - "GUID": "67031000-1c48-4994-afd4-3f8b7d5b3258" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!项目ID" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目平行视图", + "ColumnName": "ID", + "GUID": "60aa5c3a-6583-4501-8faa-5639b4bf8b0e" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目ID" + }, + "compareType": 1 + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "ID", + "GUID": "67031000-1c48-4994-afd4-3f8b7d5b3258" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目ID" + } + } + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "Forguncy.Page.reloadBindingData();\r\n", + "ID": "2d7d267652364b68a72cc98b6606e67f" + } + ], + "ID": "432f0349-5a27-47b8-8c8a-6c65963e26d7" } - } - }, - { - "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", - "JavaScript": "Forguncy.Page.reloadBindingData();\r\n", - "ID": "2d7d267652364b68a72cc98b6606e67f" + ] }, { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", @@ -347,7 +406,7 @@ "Title": "加载中" } ], - "ID": "74a72b30-4b68-46cc-a166-2c0c71479218" + "ID": "93cbacce-b603-49be-bd86-f1a05bb15343" } ] } @@ -433,7 +492,7 @@ "ID": "9b783f6a83594474bd58c4a4ea74efe0" } ], - "ID": "166fc53f-fead-4557-94b4-49516ba2d153" + "ID": "72c13763-aafd-4b9d-85a8-ee9a002c0053" } ] } @@ -618,7 +677,7 @@ ] } ], - "ID": "544f2e11-49e9-4b90-9318-e2f3613bad58" + "ID": "e565f17e-1f0e-4b8c-b89d-31240c08d9d1" }, { "CommandList": [ @@ -638,12 +697,12 @@ } } ], - "ID": "1c9f528b-cc74-4dde-9354-cd8849ab61bc" + "ID": "f72286b4-3c48-419d-9225-03fae8d184b1" } ] } ], - "ID": "9881644f-d356-4daf-9a02-98a44d055f3e" + "ID": "23a469af-16dd-4dce-abd4-d18a42dfb2fb" }, { "CommandList": [ @@ -690,7 +749,7 @@ ] } ], - "ID": "6087be2c-e2ba-4bf4-b891-3f7bce4d1017" + "ID": "9c7334e7-4499-4ccd-87b4-3b1a319d8b34" }, { "CommandList": [ @@ -707,12 +766,12 @@ ] } ], - "ID": "cc6b3651-ccc0-48a2-aef4-971c6b65fdb1" + "ID": "fbb90bad-4dcc-423a-9918-f3787396fc0a" } ] } ], - "ID": "22cae634-2686-4773-b201-7b61e2693b2a" + "ID": "fee5cfce-ecf7-489e-9cd1-5a9927bc7c8d" } ] }, @@ -757,4 +816,4 @@ "Formula": "项目首页!$I$3" } ] -}//7KOWZ1+Po2e61qYt7r3t/KQP+Vy/b0nhVadgOeGM9Dioo1Befbjx9NXCyu19XJ4e5Lf1GLPRrq3X5Oot9KXgtwiTgHoY/7vTUnfsTlKwvwoZllYxnCI4uU+zpuLGMGtMPPxeiQ66DJLmgYj5SzkDozX/NcAGfM/CWsM6dajoPg5AjsBhZLdigoPHCABVjJQGWnHRNvKxdAIElqgQ03pN99lt3chsMZdbJ2kQI/wGD5j5dtaGc9gK5QnbV+UI1rP1b9NHs3e6L90I1Zm2bOco+n2cP/nQfJZ2D6CUDFWvZEVj9kB4MUzGeSrBllNPY61r0eus9dwLD0sy1RPfmtsA10uELX0cqiAQ6RHfK3cMfFWSxBJuS762qtpCTpjTi8aOTusZ6T/RnlrfKpxQ+O2vPlLVbVZileuFwH0Wn/DuASY9zu/wMF6ucpc8gA5D5AYkBdvC6eW+rxZI8uy/nwU6DGTiwbnvOVVZiWLT7jB+FbCj/JX8/mXfnp0YI+ZKCosX4haOimJCiEsppK0CLKtrj5y+2DqYcSP0eZBv+95wLaZy/SNT5dpTLs6BmdpqmSGVXb6/DMeqyjrajzu41mN0HvyAERE8oz6aCgZVWmV7pu51t/itpc0mtcKMpRF3zBpht+XAszQE92YpRqmTkVJ0K4/GmSzQCv4qne8GhgQQpLPGNHdWoV6tX7I4VoVw0y1xOcUQEoHs0Xi2B/kY8P+FHsXrD6yyOKT2c7laf8roRSPo3/upBpmjfeYJgmudN8XDxWq047BihINxT6xRfCw/lvalJqFEGPXFtRpTzD6UjGI6rFR4LGWhlaJAMXi5k/0YhsGvvfavcNTqg2+xq61LClzhZbK3iAZKTzzFdP6mXCRi+QJ9ZW/ASSFgtPb2KdWMHL5RLgS1lzNYKqKGrq9TDg==|920 \ No newline at end of file +}//YGDqqmBtf57h6HhdW4d+NABID0dLPtPrWgHMNLwvTRgHFjB58kOkDvL1cd+e8YKwLxoqDJUzDckwS7qdk0nHtnjk9Lx324S3SOZsRWjdVSjiOWiVyvA56gdssmKZF674y+3uIl2m8nGU8arO2FUh/iJvk69j/AvzLy58qDF8HtLSucKnVBhk6qhFfpQ2GE4tpNB7bj9Uk6oPVR1IQUxmtcb3QGlSSWnS2gKCi6GVvYLxYxGenrTZw/2VoXc0GYM+SoUlPoJK4Omqdlynkx6jY1Qoe1sj0R3fYqDnSLQrsNRWJK4vMTY0TRnDkina9lCPPlDJtFBR0xzuLHzg8X7aEa54NudNUpCdQyaivHgry+Rdirqy408M0oqY4DnjapITTZ4g5VdN3p8EXhXGd3EBEsrE/DjmcKF72rp4SE38KYtLoIRGUb2pIVTzt3xuynmUlNUzcuyOKzc5r96SoHcM21PBx0LpHrzsiJ/5GgEe77JQmR9Mpqk25oza/jXonRaxDGuoxBVmpQIqOPOcG5RbZogfgexKsTWH5ZixsgewFVQYIQ9Y92nPwVdKcFiL9RPeKcpbNm00AyTs223CoL78vO5kn2AwwMW9PoIB9LmGCrtG47O4JwnMwWe6MJaPUqfm5PjInrhUVbs35SN8KOmvngXS9daHpv2IPfYxjrTyvtQ/q9Taan9kk0+vesgb4isDhBxM9tMNAARrPgCl+Iv1fuHAfMUPnL6kW6bmefTleTYj3Qrz2yWgHcVBjnxHQZPo9djO4lKEYkCtWe4VytZ56pLia3ylIi76u0BOm6dQtwct+9iZAmS5K6SOc1LDlaVjSnvm8YUdu+z5jS1RsoDqcypbJrZRacfyASx2eMD0KfTYubvToC3gpyWai51sRJnZST1/919O/r4SsRGD/qI4Vg==|920 \ No newline at end of file