From 5368b6c07a17448c886a91a57a1fad24bee5c30c Mon Sep 17 00:00:00 2001 From: cuckooent Date: Wed, 7 May 2025 10:43:14 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 16 +--------------- Pages/项目/项目列表.json | 35 +++++++++++++++++++---------------- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/.collaboration b/.collaboration index b5e4fd70..57465e89 100644 --- a/.collaboration +++ b/.collaboration @@ -846,21 +846,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-05-07T10:29:06.0228973+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/项目分组详情", diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index bba3ee08..622eaaad 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -844,7 +844,7 @@ "BreakpointIdentity": "49c0ba5e-ef6e-449b-a95b-3a9d9aebfbbf" } ], - "ID": "fa634a6b-d5f3-4c1d-992f-fd2928c5bd3c" + "ID": "24ac9510-5c62-42de-bac9-26a72071156a" }, { "CommandList": [ @@ -857,13 +857,13 @@ "BreakpointIdentity": "eb3eaa86-61fb-4843-887f-e4c861a4205c" } ], - "ID": "fba7e3d8-31cf-40b8-b49d-e0a7538fc182" + "ID": "f06e906a-b147-45ed-994c-decd90a52b8a" } ], "BreakpointIdentity": "fa030b70-9d76-44fb-8878-e3068e011037" } ], - "ID": "d1d610ca-61b1-4c74-94e4-a7c71d4f3bfe" + "ID": "4df73ac6-f494-44b9-ae30-79b26b5f5e62" } ], "BreakpointIdentity": "6b112335-8337-4674-895c-a5a1a0113abd" @@ -899,7 +899,7 @@ "BreakpointIdentity": "1497778d-bdb5-4314-9688-27dc42e2ed79" } ], - "ID": "c0c4e6b4-e679-49b7-94c7-b23e226e955f" + "ID": "2db03759-08ba-485a-b5e9-3396e7ed0746" } ], "BreakpointIdentity": "f1969dc7-3133-4cc1-acb0-436e6cc77194" @@ -978,7 +978,7 @@ "CellDefaultValue": 0, "Items": [ { - "Value": "0", + "Value": "", "DisplayValue": "所有项目" }, { @@ -1300,7 +1300,7 @@ "BreakpointIdentity": "a12df77c-b855-40c4-8eeb-2b847e7a31a5" } ], - "ID": "bec444ff-cfbe-49e4-a63d-eaedb66908d8" + "ID": "9f305d3a-03f2-40f2-84d3-ba09d020f47a" }, { "CommandList": [ @@ -1312,7 +1312,7 @@ "BreakpointIdentity": "3617c0c1-7cc7-439e-af71-18f99f1b067a" } ], - "ID": "da043445-29b4-46f7-b8ef-cfdbf2c3c31e" + "ID": "d340674c-1354-4b06-a28b-97b91fe748a6" } ], "Disabled": true, @@ -1700,7 +1700,7 @@ "BreakpointIdentity": "57519858-b323-4de9-9d2c-728d6e452e2e" } ], - "ID": "a919caf3-3ebc-44f8-88a3-1403627a1475" + "ID": "004e98ad-0f1a-4702-9dd0-3fff9f123667" }, { "CommandList": [ @@ -1715,7 +1715,7 @@ "BreakpointIdentity": "7fc45575-b525-405a-801f-42a0dfefda35" } ], - "ID": "46ef1b1d-215f-412d-82ea-4980f56f089b" + "ID": "1397fa78-3c60-4f3f-868b-a64911aeffcd" } ], "BreakpointIdentity": "68d63b0c-a862-4801-b1bc-258944795477" @@ -1917,7 +1917,8 @@ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", "SubConditions": [ { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, "ColumnBindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目名称", @@ -1925,12 +1926,13 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目列表!AJ14=\"\",项目列表!D4,项目列表!AJ14)" + "SerializeProperty": "=IF(ISBLANK(项目列表!AJ14),项目列表!D4,项目列表!AJ14)" }, "LeftBracket": 1 }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, "ColumnBindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目代号", @@ -1938,11 +1940,12 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目列表!AJ14=\"\",项目列表!D4,项目列表!AJ14)" + "SerializeProperty": "=IF(ISBLANK(项目列表!AJ14),项目列表!D4,项目列表!AJ14)" } }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, "ColumnBindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目简介", @@ -1950,7 +1953,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目列表!AJ14=\"\",项目列表!D4,项目列表!AJ14)" + "SerializeProperty": "=IF(ISBLANK(项目列表!AJ14),项目列表!D4,项目列表!AJ14)" }, "RightBracket": 1 } @@ -2559,4 +2562,4 @@ "Formula": "项目列表!$W$4" } ] -}//maLNqngx4KwT3KKli8u1Claa3khgE7qfUhVGzmkWSFLaHDXoSkWwqLiDLYvmGkQm8jvlITH7YFXrJA5U2Sf2drp7iKsB1KeTwRLOIYVsBc0kt9HFpxQhTXMpn3ofn6PoHcHmlrv+Onky9zAO8m+23FAOduZT2L90Kl03qmRXsR6lMHlF3ZTUrkGUyr2aYqfuz/WxxcOS7KnQzI2AVOGTwcD/U4s08ebvI9uNBRCAp12AHv3hRG1Gs/t2PP+CQXIn6byHCXJ1UyuXruhMKrNRlf55vv8s9+XdED+Ay+opOISWWcR/f5OFYo4s+8yLMy+GdWG7AmdgLbnlLYJv1Yzqz1+hkQ85/E/gJY0s78yhdi1dj7KGJesU5RznmffORiecTzFQhxZhQgFFpXaa8YMHNQRJ3U5qWUlw6xKjBgd85RY/+ri6JM79DJR5anCVsHDl7HHhV/4bMc1CSyKhqYRR9hbmdg1T/vFVBYSsJc59Js+ZkxbXnNcaiIc5rTrw/mF2Gj9Sek84UDB3mRwcHaL24RsBm+gdZxiWOwTcG8ZfFqqcVVPuKA49HGSCX1RIbnhoxODOv1uAniMpm8mf+PRaGGWIqOXW1Iq69/gFjteJSAfk8kQhigjDjG1gxWplSo2ARcIB4ugE1vpWnorUMsvta+uedw+BAqJKm0HmYFFWglU0oeqEOyrwGhL7gKIOeAYcoe4FLBJ4peYSHKyAdZn0MnN+FwR9nXaux7mSlQh+Y43lVp82dVmTL9IdzMgxEZNIsZQq4qhNTzO3+dndQMGF5E3SjLjXCVTHVge3sMvs8IKRMV5MOJIa9fathFNeEqCxE5SjLQ0WDH5U5ritUBZHVOPvdqge2a7/EFkenTJa8ClWWaMCxW389Tn17r/KCWUtdqkMpmE+lv4UaAoizP5DCA==|920 \ No newline at end of file +}//X90I8icbu6a8whlqKy+Sa2uvTcq7jVaS21d3yYVrPv4aq9r6DMIUPTJqkw/RKS5pfGvVUNz/YjdHvhwgIjEl3IClu0gmguQdKxE4P3obiSKI6nkjwMz0Uc7FTWrJY8rKl1U8CyG7Dc5ziVbQgYsbDV7JnIfBJkhLL8pyoS+VoAwQfWa+5NIgkbfeEZnxB2eYtbpfhCK03DegK86orOLOiWVvBOmKtQuUc9A9ru3L86goLzbeovh5wD/QN2pUQFybjd3lL2QRSX0dIjkSEbePQ8yN8qFOhr3luYkBr5+ZRIc8lfMxUi5KcXYuQyt9Y2aVlafQ+wFjXlSTuI7PfIYYb3Ol4rSOV0q/9QzH1tP5m6QIhOcCAJFteJy+a3yktH/6XLU8q1PkCbGo0cZ0Q3VmxG0XX+qgJqTbPP+lA9GFe4cZLYeSJqMuHsTlxw0n8KZbcSca/7nMLHKQwo07S0UD2R3BjQ9Uvv6+Yu4AtkwnafJfrBtLfxzA9aVna97AdQAXEcvMqA7k7PtCls6nwKlJHOaRpdl70Gy3CE0EMi/oDinr09P6InL0XCkH6JCoSz+xL2dAgtPLFeN7oMujrdtAFDCcnS35dr++4o6/+zmIsxji3wN559nqKlOYbhScVwJoTlrhnL0TC14fLAWM4xfXBK0VqFYSQBZ0RQL3GdAIbwtkUZEp4Njhputi0eAhH/b5MMhEymmPMe10cZ0JIrQTPP3DstMnHsGy+xvpP+xQUVVXfupm0eetw87gLRpHonvEID3peSKJdwHLBVhsZ1K/gZMvzZckq0fWxEJTceTQ9ALMfyAKxq+tyQ5/UbvYmgCf8NNrCHL9aUJfR+5RIyb3KN/aDnvhhnVMODJbi2CmWKrzxHl6XGr0sFXJtQygJp2kjOyAMt0cjL4KfD8EE1o/ww==|920 \ No newline at end of file