From 76d3c59c8cc15af4d25ecc5c5e13a1a23f0a5055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= <phoben@qq.com>
Date: Wed, 3 Jul 2024 16:51:16 +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=B7=A5?=
 =?UTF-8?q?=E6=97=B6"}],"Version":"v1"}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration                                | 14 +------
 .../项目首页/项目首页-容器页面/项目工时.json  | 42 +++++++++++++------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/.collaboration b/.collaboration
index efbe4f14..7f198eb6 100644
--- a/.collaboration
+++ b/.collaboration
@@ -550,19 +550,7 @@
   },
   {
     "ModuleName": "PCPage/项目工时",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-07-03T16:51:09.5682978+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.rd",
-      "Pages\\57e644c056074f9d885f24a5bd7b4ae.json",
-      "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/项目成员统计",
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
index 0ead8a89..975f24b5 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
@@ -298,27 +298,43 @@
         ],
         "bindingOptions": {
           "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
-          "TableName": "用户信息视图",
+          "TableName": "项目成员表",
           "BindingInfos": [
             {
-              "GUID": "e108cfb6-744a-4e08-8994-4dccab6170dc",
+              "GUID": "45079be8-912f-4715-ae6f-94fb8c960fe8",
               "BindingInfo": {
-                "TableName": "用户信息视图",
-                "ColumnName": "用户名",
-                "GUID": "7d64e005-8d62-44aa-a015-29088b3aff0d"
+                "TableName": "项目成员表",
+                "ColumnName": "项目成员",
+                "GUID": "874f39cf-ea76-4f1d-9254-3cbbe1f15874"
               },
               "ColumnName": "value"
             },
             {
-              "GUID": "b47fde5d-a48f-4061-bfc0-b67af017cb6f",
+              "GUID": "97179ce7-6b91-40d9-8365-b4d0d9560418",
               "BindingInfo": {
-                "TableName": "用户信息视图",
-                "ColumnName": "全名",
-                "GUID": "43051133-4cc8-4dab-b81e-84cf9316c6f6"
+                "TableName": "项目成员表",
+                "ColumnName": "项目成员",
+                "GUID": "335acd1d-a849-4d4c-9ded-7fc738b55820",
+                "AttachType": {
+                  "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+                  "UserColumnAttachType": 1
+                }
               },
               "ColumnName": "label"
             }
           ],
+          "SqlCondition": {
+            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+            "ColumnBindingInfo": {
+              "TableName": "项目成员表",
+              "ColumnName": "项目ID",
+              "GUID": "3181a4c2-2140-404b-98ed-07200b897198"
+            },
+            "Value": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=项目工时!项目ID"
+            }
+          },
           "CustomColumns": []
         },
         "placeholder": "请选择成员",
@@ -429,7 +445,7 @@
                     "ID": "6912426144fa4151a7665384b46d6a22"
                   }
                 ],
-                "ID": "472ebd43-71e7-47ba-a5fb-07080c354808"
+                "ID": "cb051dae-2fdc-4c4f-be8c-59bd2db50641"
               },
               {
                 "Condition": {
@@ -501,7 +517,7 @@
                     "ID": "4a25d702e22141f495cad5baf9ff1a9a"
                   }
                 ],
-                "ID": "b0208333-eb9a-4f2e-9758-d775336bbecb"
+                "ID": "911b7787-5b47-4b85-adb5-1d209e1cd082"
               },
               {
                 "Condition": {
@@ -571,7 +587,7 @@
                     "ID": "e22633b6551e4332ae99e03268670571"
                   }
                 ],
-                "ID": "3d1168ac-052f-49fd-98c8-d57d7d8882b8"
+                "ID": "08842e32-444b-4ca5-a256-c30e2685cce3"
               }
             ]
           },
@@ -1090,4 +1106,4 @@
       "Formula": "项目工时!$B$6"
     }
   ]
-}//mFVTrOlVyTqU+WOFXkeyiXwQglhxW8NQt8R9GfxfRFhga0iV75a9t29oac5X4862C365l1siPZn3YcT1OXKV+s5qx21m50WTHvrrdgG+siPaOQ6CnfRF8Kt31KPZOh/s/3965Z8DOvu0/j7o8m3e/ESUj0RgFkCq2rBI7peEMMCTFLIrnIGiQII8obpADDuN5TmOjOgBTsoMn0F9BAEV1vgGx5igVwSCXkedRBw2HAPFjFyOUnNYT6c8SThXwVrQsdgKl/NubGOfR+/WoDDfSWEuL/v/Ivri6wPDQn4ewP74udAR+YDU3QqJ817NsedilnCKIodQ8ScM4wUgKiq0mM7AArRfM7uEpLgI1kYXKAA1XKbSNQwU9FaNY/dt7srgBb/egoK43nvfxJxHRBR2OnYLhEF0SyUL0TIUfhEPNmzDScPftnRd93Qx+F/IOqBsTS8Hgxwm/uu7tzuO90qKGNnj85sCJsYNlRXNVYGi8ujeNQl0xaj2D/i04wevMhhl+H/11gQuSOvVu84L7+nlnPN24hhAdLBJxl4zsSpBmig52pi083hpdxO+1oMJqzZRHlwL7FmKCqx5/Axmlco/YyS3y4ayFQ7+7zUPj9W0FuvyWSlu61ctZwk46ITOS+oIZBYMYU/SG/J1L9Tg2Mpix7m5GeaT6hg/9fS76p8wDy9+7mI6bDEObGcnjFGALi6DgxV8zOBqN/acEJdPm7jC8R8a2svB0IXZ8utpGZVFncTuVz0S5ndvpKpCMeRE+BoT668HQya9KHZYwstyv8fBA6637yXjYBEUB6b4TZeSCSa4uBpzTqOVdWPYxtT2unrc9N8VE+mxWWcRCaw0VoIJTiSR/xj7fwU/JYRosIMKXY9kipF96okztgR7cBq8Lkb12R5lBvBbqz+WxbBrek/WCg==|920
\ No newline at end of file
+}//ujUeyHpNGXnUYazs/nCgkEUMxbpGmQWdWKVFFieHA1IWIjN860UQWtVZ5rPPfnR3MGCjonC+4u3YVDzLtLoVpzhBRkMU3f3H6cOFR+QicVYlh+rQ61DaNp+1ExBpDeZMD1oGTQ5gpxslO+valxBRDDyJpb2q1MmefD564Jt5gpTChOFrObum0WxMg2sw8JPIKbadnMAtZYD40+rgAdamVoM1d/Jg0mLzOKfw3t1L81u2M/rgpsBAH5OCOn1fs4w/cVpbMqWnKM5btBWJxcUUxRXsKBIaypbS5WaBZM4GMoRxAJ1CBOUlHle00GXy7dL3GuiLzNdrxrqRrB8zGiI0QXn9kn9Wws15VhVoSqyDJc9wz6qDsrzupKjyp5uK7kx2qh2VVMCWeKbOUYRT9k7gmlLzFmIrM2ZeBilTMBvdTw+dPesZtz2dJh7lAy9kF2iHHk6SRARBNIEB/vpJcCIlsK6O3UI6cELV+uGTttzoSxIfV8rfDxDpH+r3tO0UMAlBvfb8Rr6YlSIzIjXyxW600Gm7onWnVe22IvBIAYaAO/TK7GVbM3x+Lce3XogvmmclokASxAT9ZaC/BZ4pJT6YxO4ooVErwk4OgB0bH7lEnZLcngAFX/2zkt8oKB+OuHrGKTn+TRx3pqDl3qzrB7/+Sqih8KyRK+Z6nnjcCKipQqm+BimgKz2SK34vh0tYiC4mD7nKimKnyXzLIuOgADsPinWdM08hVerBm1nkQTxCaq8krP7BVzfKkNJ4OWjjW78m/QUyDZjkVJ3wUHaVeUDhm1c+4JfmpVHQtCXb3sYd0WnSzgHYmgxsR47UoKJN/1yZurWmQdJZoBahi3pcSDWCsGA3XRzyQjpw1A1rrTcX7gUHApUi6O4EsX0+6+P4e2QkMoLru/na2fDbNnrGMlSsJw==|920
\ No newline at end of file