diff --git a/.collaboration b/.collaboration index ca27f3a5..6e8aa2e0 100644 --- a/.collaboration +++ b/.collaboration @@ -44,16 +44,7 @@ }, { "ModuleName": "Table/项目动态", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-14T15:38:40.3959937+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目动态.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目岗位", @@ -77,16 +68,7 @@ }, { "ModuleName": "TableView/View_项目统计信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-14T15:27:08.1513657+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\View_项目统计信息.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/项目任务树视图", @@ -549,17 +531,7 @@ }, { "ModuleName": "PCPage/项目成员详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-14T15:12:18.7707156+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目成员详情.json", - "Pages\\项目\\项目成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位详情", @@ -591,17 +563,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-14T15:40:55.2780345+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", @@ -625,21 +587,7 @@ }, { "ModuleName": "PCPage/项目成员", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-14T15:16:33.1691699+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.rd", - "Pages\\6899a8cead694b3ba00307b6756dbd7.json", - "Pages\\6899a8cead694b3ba00307b6756dbd7.rd", - "Pages\\007ea4aa4c7440478a9a092179dace8.json", - "Pages\\007ea4aa4c7440478a9a092179dace8.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷", @@ -1141,29 +1089,11 @@ }, { "ModuleName": "ServerCommand/移除项目成员", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-14T15:17:01.0750488+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\移除项目成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/同步项目成员", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-14T15:14:32.2726661+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\同步项目成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/同步项目参与人列表", @@ -1933,12 +1863,6 @@ }, { "ModuleName": "Table/项目动态类型", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-14T15:37:23.7015478+08:00", "ModuleType": 7 }, { diff --git a/Pages/007ea4aa4c7440478a9a092179dace8.json b/Pages/007ea4aa4c7440478a9a092179dace8.json index a5e56b4f..ee379d41 100644 --- a/Pages/007ea4aa4c7440478a9a092179dace8.json +++ b/Pages/007ea4aa4c7440478a9a092179dace8.json @@ -12,7 +12,10 @@ } } }, - "Count": 8 + "InLogicalVisibleIndexes": [ + 8 + ], + "Count": 9 }, "Cols": { "RowColumnAttachedInfos": { @@ -51,6 +54,9 @@ }, "6,1": { "TemplateCellSource": "岗位名称" + }, + "8,1": { + "TemplateCellSource": "ID" } }, "StyleDatas": { @@ -82,7 +88,12 @@ "6,2": 2, "6,3": 2, "6,4": 2, - "6,5": 2 + "6,5": 2, + "7,1": 1, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1 }, "SheetStyle": { "FontFamily": 1 @@ -91,7 +102,8 @@ "Spans": [ "5,1,1,5", "1,2,3,3", - "6,1,1,5" + "6,1,1,5", + "8,1,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -156,7 +168,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "5fecf1fa-ff1f-4af6-b695-b8c03c0cd264" + "ID": "bf3ec28c-50c3-4cd0-8750-929b5cd5db5c" }, { "Condition": { @@ -173,34 +185,13 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "移除项目成员", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "项目ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!项目ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "成员用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!C2" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true + "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", + "Title": "提示", + "Message": "确认将成员从项目里移除？", + "Answer": "我已确认", + "OklButton": "确认", + "CancelButton": "取消", + "Result": "按钮结果" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -212,36 +203,80 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=code" + "SerializeProperty": "=按钮结果" } ] }, - "value": "0", - "compareType": 1 + "value": "确认" }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!code" + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "移除项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "成员ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!B9" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" }, - "BtnText": "知道了" + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "a90a843d-4768-4c04-bf28-c1da037c3737" + } + ] } ], - "ID": "151bcc86-62ba-4346-8f45-5ba1fe0917f1" + "ID": "84e002b1-4c1f-4f19-9f12-a37a63c36882" } ] } ], - "ID": "0e19c90c-90de-47a1-a6c2-3a03b040cbd0" + "ID": "9b4cb065-78d6-4e57-81eb-cb7fb68613b6" } ] } ], - "ID": "e52bf7d2-8113-4101-8fc5-0b7c9a974870" + "ID": "9ac14972-9df0-4686-ba00-cc685a8e40b1" } ] } @@ -259,4 +294,4 @@ "Size": "20,20" } ] -}//CIl5LZcK9rI/yFt3Q6j9+h8vdmEHR0bUVylxOhByceWEiaOSf8fah+OlhlinICIeI/qj58kXF3EyKqJ1UMK7CE31a7Pq/fCDSBkE8DmGbVK9sUoX+Cuv39+i2FV+UG5QPbKWyty3DD9gA/qLQI+5v7a1AWWMv928Oc2mf4JC0Da9XukjM9EOssj0Gj/8rh1AobRE8E27N1glr4tHN9I0edLHv5rYh0xRX7Q1aYhp6VytxFaZ9yuwZo5o0YV8Eq8M2DQiQu0LpXxBECD2Gv9DejoUhUdqWEQ9rjfRuzfmY/rUi8wrLU9k9Yz5kksBDCgF/KLJSK9uvHP/y2EnuVW3JLo9MWDwoDEwUA2AejHKpf0ym5ZuFRpxtTl3s7Q618ywINaFBowJ3kKZRKCq7Sd2+ruj2hZ9LBp59ZgglasOS5xevlmlFhGS4yB13rgoeYHR5tuPEz8G3cpu+3pLtNC0Y+mHEJYRDBZSvSlJddPos4165ve3bKLhkF1imOa+PkYfkMMw9pGywFZE0Zxi19jsnX0qQ4DeOx4luQaeQdfQgBjvmrAcmmMLJVTq+Uiwa3Nmptz6k0Q5teSPVFNMuTesLJbTRuab3p+7rBBMbfBGPS9Ihz9paxpIYgt5+5YVF6oMepOKFZXGtncn6qTOmWpUM4NXR9IMSPWeqU/23hWsZX+GFCC0ojdQuoYT3BelHppenwzXTt7DFtvUH+p7Kf1MG00+0Ys95GKw6NrjAWu2LaofgR3YlBR6iH/MfmOYIy1REPnP0Yeh6abF/yg4I1DEJBwBnZ8clHGIVtSovXKPQ0JFLGvZDVafNsofv3egrMYqehH595s9cQcgaQ5lGDTCC19kz1V1xhe0D5i7UXBJ1Tt8/S6q9BmAw3SxnDZ+yAUGOrkpuJfoDkzMTZyxLWswSw==|920 \ No newline at end of file +}//Gr6J3T8UAJ3ElcukovJgPednqey4cbEnaW5gYvjY5rGC6jBS2tqfDhdK5T4Ljku9gDvs5MLxa7iY4XC/GNEUy68O+s6MF22NLcPz7Y4YC3MmRMX9ZzpmVhUjEPHKr/FEt6AC9lc6MBxeKEIfpipLh80GssA4negYx1MlcdeutRQzSD21aEvfBF6IzttqkJ8QCvcqIzG3Gl+aw+OrG2v79LBAtY5e75PraYC3JNfNO1rM/HUZK0Kr97OlQnvRPSLxHF1ls2ioNA//RZXFKh1c+x7OxkOZFzguUfCUtdWujC60UtaHiLE+98ETrfB51eBF4aQQ5dIwAZbQ2+WaHBNYVohjXYEUoEEEdQrGXY28JP1rg0q4FoW9ZyLXqFZuIdtEVVQoqGTKSCLhYXCwNIvp7hBPsfuUTas0im2ukL2GsOETHFqpbwbPU8dUH5ZwsZANWEy90uRnv0KExccJd+TBTWYMaVy1E8gJtvQBCAg+QqF1WqKzW3p9RCSHPa9vnDqestyXQfb/F5ZOApirQc/xMo8UXJlON3heMG3ez5jOiJoTh9Ldf0L+xNrN6U4/Z20gnvj0Bto5x1yqqm/asyEUAGMK9m6Dqw0haR2jAJJE4+UPzomQunf1Hb+nRj0O6Cqarq0FKYQqzU+aSmzBN9ZpW0YRoaLmiJ68LEP5XImpy2xE1sY8m8Seofirs2W6OS1nQeC+oFDq8KoG1g2AffzxihVRyTGBpox8jnVuj0qcHT6KvlrJtGgAX+CS82N362i9F9GSFUtfpE3jNZ+YANZw8mcsQUvDV588JguquoJqrzPst0q3Fae5LD2R7bTHlec7t+NmHQskwrBwycDsKpTK8512c+wslIQMk4OeJgkVRrhR2Im5Iuo1xLkzEQfNsK6Grh45+n4Ev2sYV3TReId8Dw==|920 \ No newline at end of file diff --git a/Pages/007ea4aa4c7440478a9a092179dace8.rd b/Pages/007ea4aa4c7440478a9a092179dace8.rd index a26cd3f2..87520ab1 100644 --- a/Pages/007ea4aa4c7440478a9a092179dace8.rd +++ b/Pages/007ea4aa4c7440478a9a092179dace8.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 7, - "RowCount": 8 + "RowCount": 9 } \ No newline at end of file diff --git a/Pages/项目/项目成员详情.json b/Pages/项目/项目成员详情.json index 0e877bc0..2157b176 100644 --- a/Pages/项目/项目成员详情.json +++ b/Pages/项目/项目成员详情.json @@ -432,17 +432,17 @@ ] } ], - "ID": "10666bc7-619f-4b01-9743-ad58962d66b9" + "ID": "395ec9f1-4b54-482d-8f2d-5560bc75d603" } ] } ], - "ID": "60550002-e9e6-44fe-968e-230219a9750c" + "ID": "bf27f184-8772-4774-ba31-aebc027d3a55" } ] } ], - "ID": "62940714-201e-4b51-a33d-91180fec05cf" + "ID": "ac42a2cd-28f9-4dfc-9118-cfa5b2547268" } ] } @@ -617,13 +617,49 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目成员表", - "UpdateType": "add", - "ShowConfirm": false + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目成员详情!B3" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!已有项目成员" + }, + "compareType": 13 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false + } + ], + "ID": "29f1b0f7-ecd0-4987-a097-5cb01ebc658a" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "failure", + "Message": "请不要重复添加成员" + } + ], + "ID": "048c44ab-8b76-45cd-9932-4bdc009be29f" + } + ] } ], - "ID": "ebcfd897-d37d-4c60-9421-5d695fa329d3" + "ID": "e34cb86f-da16-4deb-9bd2-f835cf672d3e" }, { "CommandList": [ @@ -633,7 +669,7 @@ "ShowConfirm": false } ], - "ID": "938eb6c8-0b0c-4ee1-bc82-ae289c1ea2c4" + "ID": "b1ea5009-013d-4752-8a19-1c06798fa4d4" } ] }, @@ -655,7 +691,7 @@ ] } ], - "ID": "e8d82edb-282e-4340-8509-9be6d6d4763d" + "ID": "39712058-f9e2-4860-ba3d-0d7320d905a2" }, { "CommandList": [ @@ -665,7 +701,7 @@ "Message": "请指定项目" } ], - "ID": "24879a34-ce74-4e3b-bb35-9ac7bcb58c85" + "ID": "c24e9de7-e30e-4270-a310-bae596e31922" } ] } @@ -687,6 +723,13 @@ "ColumnName": "ID", "GUID": "314562f3-292a-48d6-ae9b-f410d11976b3" } + }, + "16,7": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目成员", + "GUID": "f8e37c92-932d-4893-8ba6-0af354a81936" + } } }, "StyleDatas": { @@ -874,7 +917,8 @@ "11,1,1,14", "16,0,1,4", "16,4,1,3", - "5,1,1,14" + "5,1,1,14", + "16,7,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -908,6 +952,10 @@ { "Name": "ID", "Formula": "项目成员详情!$E$17" + }, + { + "Name": "已有项目成员", + "Formula": "项目成员详情!$H$17" } ] -}//1l/bYrvSHAKXDiCyOT3ckyOYBs5AZ6zvW4NOdakwetYcDvMNreBDkQLsth120UR48sxrZpknC+kvMoYR+BAWK3G120eiW9KgqagxgOFpfu3nWLSumwNnVXtoVsUbW5+PIdO04UBAxtKhlt0o5UI+hf5k0NMvzwvw0wpKjBSBtuCctD1gbnum2izZnCNWJ3hsjFrNCajQavQcuhJIsc3R3hBl2Jml97Xv1XmKsDPWBojN36ki0n9xkog3srF1oyiuyt4/qMQJuIH/B/NgB3qWxwQplFGISwOtp5xY3DjZooejOdPhhFE0Cb+CrVnyNvaON61Rlyl2ZKWGxZGZWmqX9LmFl6jB5tiV9c9WHxNtYtCY8CnKPdpE1ANGYdCoOw0urUleWv1d7KhMmJE23BT3pW6F/BcwW5/5l1AG5sAl2FGn8fE+v0v05EatCKMqGncs+4vQlhskl8FuUhJUgHakaeRl9RIa6GLHN3fkoTBz1GXQBxEldFVWW9s0ksg7zZwi8p6SPB4n8vs4qa24Ysnc0c9+owWlU671KlsOmzQYmjcC/Jm1GOIaSd/hT8Glokd8sCJm1cAn6I7/xC5vGshlhHjvmNzltgb+yiWY5t1lA7nEYWmd8q+LH+yIWXS7RvDk/r4PZiGPlBuB2UK/4YJ1PLNh3lnAOEJNzt6P1Fzk/3NxiaX5s3pp+IxMxNkduNICI7X4OZWLjpguvXlsK4sIWvxeo+bxNRxxkk6Tl6GpFMT63BMGA0Uv3g+u+3cOpIAHSXBgDWUM/I/kg8bIK4Zo2TICxJIMFdIfHJJqqEMH5YteWSzBrh938koKilQEUh0EtW7CrMOP5nWqBLootdv3pefMUJcX5MFV4BAz2ok+JPLI87r0x6FxCi1mFogW0DRIjTQNHF5BgJam/R/ESYLLAg==|920 \ No newline at end of file +}//uXb15TBAQOfIHHUYIIRplMOsJxQm9AEU5jJfWv9mN8HZ3ZY4LnbNAd7113HL9zaMFNfnoaFompOUzovJHvzMEbF6GPQlkIbjLHp3vq0FNqtYMk/kx/PQtOnGzbB7Xdtk0xKq3n+9BzBubGKIwwu7PuDKubWEKeYH6Sk6HvqSqvW16EwZh8Atl4bMLm1UoE2rE0U0gOoZAHa9iylP+Gufayhh2EfP34GOA0d37j2iODcIZLacOhyf/77mDvHQEaGOGLfMLdqGa7k6kpBWmwNuUgc+p5qJtmT1Q9DzO3SsG8eE4Ovm+8EWwnLmPkceZWe9hTWN0FTd4Vl7rxs39ibfH/QdFbIrX4wIz78i3FI73RYGowhllO3qMDjrnGBh38GNMs1Df3hy/+Ie3tiPZ1F5HFInD9iwWBnnfQDJ78y1y1fkSDZ7vt8czn1whd5prIiku+HZu5kTE8xV8TMt+LyCTVYlHhRQLpV0I9z8I6asbexcwfAAz9zw1W1D5rrIUfLvXmUz4QXWRPptQsM5ZMixzz2w2kPr5a79IQGWoAnJGuNotUCciwUbNqxnuppV24iUxOK1SKVYwE8T3xVBck1ngWTxn7m3oE7BlcgJeJ4CYkF9nA4dd28FwUDYMLWpRCLsaRV5WTwsdu4wZbDrVS4AY+pj4q0Wuw0zRaG7XsKHYhPs/bgEbXbgQlV6cU+Qwad/5FncDt1FodoWq4ckzkS3I/s2mIehSnAS1Z7o2dj8lDnAmHZa7FEtLQLMOtX2XDCP5Np8A8eei/IVF9p1qSoSa+gmRSweCxg9iaqNKRZBnr8+7+KRH3wa3aOj1W8rxbv2Lfqz9SDDxL7agBWJNkQCb7sYAHHTE/aUnrJ1KoGjIzZFZAhiGpZOVwAfJwOLLM8to8XZG66jp9IkGLMHIQe7BQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目成员详情.rd b/Pages/项目/项目成员详情.rd index 9dd7a824..865768a3 100644 --- a/Pages/项目/项目成员详情.rd +++ b/Pages/项目/项目成员详情.rd @@ -13,6 +13,10 @@ { "Name": "ID", "Formula": "项目成员详情!$E$17" + }, + { + "Name": "已有项目成员", + "Formula": "项目成员详情!$H$17" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json index 83168221..6d749229 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json @@ -581,7 +581,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "dcc5bd21-1646-4d98-9a81-1f3e1bc6a77b" + "ID": "c7452dc5-bfd3-44e9-9cff-222ba94274ab" }, { "Condition": { @@ -603,19 +603,7 @@ "Parameters": [ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "项目ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!项目ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "成员用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!C2" - } + "ParamName": "成员ID" } ], "ResultErrorCodeTo": { @@ -656,17 +644,17 @@ "BtnText": "知道了" } ], - "ID": "3f7ba6ce-1fad-4921-8cf2-872445542c22" + "ID": "9311cba7-4e89-467d-a6b7-4b8cdb90af1c" } ] } ], - "ID": "3421c9f6-e7ee-44ae-b031-a0ea60aae078" + "ID": "4a052a6b-870b-422f-8969-76366aeb56df" } ] } ], - "ID": "7afffad4-bc80-4a20-8743-9e43b1c45124" + "ID": "f7736128-5856-40b0-be9f-c423b01aa2a9" } ] } @@ -691,6 +679,15 @@ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", "TableName": "项目成员表", "BindingInfos": [ + { + "GUID": "9214d2a4-e2ad-455a-aa0e-ce15a26400a8", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "58213360-fc83-4335-bd9c-4d73dbca1c89" + }, + "ColumnName": "ID" + }, { "GUID": "edf50db7-2107-4ddd-a3c3-b19acf2d2903", "BindingInfo": { @@ -1005,4 +1002,4 @@ "Formula": "项目成员!$F$7" } ] -}//D7z9gvwevds1r2esPgcOgmh8OgcJhVQi8ZxM2FjS6LaqU9oNhK3M7K7j2PuutCqFIdRpKPraWiJsViQeT48c30hunqQ/FqMxjBO07YBN/AmsCZppJIXsbUyrGH0koeAYZuw9oW2gLYCcKk2ogywCeRlGqhXVaNajOIXV3IBYbujHTIQhJ7Og04gXwhg0Hi7yClqyLIi+8Y1FLPnxcZ2BXqL43AdsR34D7uL0nn99pQuhtjewNvOurej7VcoZHCf+ejnI+9hbMs4JcIFXpMDYZeiwSSju4/GV8dufOyUUACUHUau5osqxC8rHIPmh6UejvJYyEquIAFjEpIax82OdbeuzryPEjJ8qBDlPmknyFghQfzMd64KGeZwMxK6x5VHE7gL56bwwGYpRTG7CYJo1T794MVcGZgJ72j/XVrkodQaj3PXygz+eUyC8v8ivpSotpgUuc2l7udyyAe81RguuiTsuujX90F/lva9onXdMVMPNBfvtmqqbMmkHVcDBr/t3+MRJxmxyuO8VxKbx1fRxxBJUVpHYqN1sAAJJdOhcL/Ua+Znn2wQyVRbzJVv4FSXyjnE1B4mZ9gT1UEx+TC7Uu45Z2u/N6aHPwbP5+ey40NljEnL+SZrLPxxNqJgbbDdCFppRmey4PgWTAPCocn/mUgw0EB2yAyxXAVpLrAB7UK0YqlL21z0/IHAbe0LOIvEqZCJv0FrV6GAny0o+M0BM5t4aSc26CIsFxbsOsdSyfjM6FK5cn0GieLx8/Q74/QjrGQpHlE5Z6+PzG6CdSN5Jju2wtsoWsNAlVIwLYkWz13T/m6YmrQKAN2LYsBkasMI0HwNufgmG51uV40UAhDS26De6xRCMIDEf8z4EICFxKDM1kbG6O/EARYMYnmEZ2au8Gu/3vLGgQJhR9JBHiz5GaA==|920 \ No newline at end of file +}//62qf3aJnOHoY/BPhcRm0GuTKie/8+8y5f8YXpAHxqRwdAM/Jx6jxlnA78dfAFz8GkH/gyN4VyflxkillYDYT47G1Uphi0aDRy6xiSH2EOEijbzva0uQpkTuFAufy9O8DmF3VJ/gVdxulSFcGbGq4Npt2pJETqLx3sk+ldODGdKll/rIK4mVb8ZeHGCE3MeESVtc86Fw5aKQJ6zvho4caiajaBij9ei1FD9fAV0Es29sO7KrieI5k2IKZaLwfpTHghrol3jjL0Fmj3DI1YRqTRAUMjkZ1/IEKLABy/AonXoE3BLD49BwFueflIG+3m39nL85hqSkz/gR62OI7tl3RucLL75Rny9aoi2NtHuaqSYAvfx1YeXb0/H4zbgGp7iQPMWxGM/zzgYiwuomQISzTIldmaWrq+dc68ffDdFR8KqzUrrVXTp4AtGQKpYI8fKUFRV0tyqa46vujIN0mxX9w7J6Jx+QXwohNl8zOzEtKd8C3BN6kLyFx+ydpST8iKjtzYX7zFXKklmWzLj9ZBXGY/IJFRcN0p9d0UlcuJhtmUvzHpIWnKZuGhPaqOloLi2j29NfHBtYQ4HRlZhK8V15ikvgeMfRXz2UgVTStiSCqgSHTxOTFzjigRgVPR0XhvY4OiPyvlXlQz9NkijxOput2vz0oNIwukOXu6romvGF6oagiCmZZ51xCwD1LqpYFPnDYNRXWzfZucAxZKXQ5dHg920/MG0TUsOoNUVsfDbmIrKgjorWtYXipKMyEwtdpxWA/HfkIm25CbgDJPI1mLw7E5W4LbKPutsUVlHqwiRdrkQ9wW58uW0m5OjNJiYSrhpKKe6xaf2pt6m2MI1pO3jqniGCld/7PcYwOxx80S6suU1fqtZqnI+bVrpHmCvikQigtc0N3kdjYzemxAJfQ3pVRHw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index 2d161040..ba6e5857 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -345,37 +345,28 @@ "DataSourceBinding": "DataSources", "DataSources": [ { - "Name": "xm", + "Name": "report", "BindingTableOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "7d0744fb-fd1f-4ec7-8895-d50b1e002036", + "GUID": "bd626c2c-372e-424d-b89f-d7c23db034a0", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", - "GUID": "dd42903b-683b-4db2-bcbd-501ca3d52431" + "GUID": "a535f340-480b-43a0-a4a0-b45282bafe66" }, "ColumnName": "日期" }, { - "GUID": "9c68251d-bcf6-464c-8a98-02ac401a8b80", + "GUID": "b4232ed4-0fa3-4c42-ae3b-25834be77210", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总计划工时", - "GUID": "e22e8774-de36-4f7d-951c-d2ba5706fd95" + "ColumnName": "总上报工时", + "GUID": "fade0ace-a7b0-4c26-ae08-fd114f240264" }, - "ColumnName": "总计划工时" - }, - { - "GUID": "f1ba1999-9e76-4d8d-999f-55ed6a061911", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", - "GUID": "780adbe4-fb3b-432b-b671-552efc92f9c7" - }, - "ColumnName": "总实际工时" + "ColumnName": "工时" } ], "OrderBySqlCondition": { @@ -384,7 +375,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", - "GUID": "7b9e6b64-9ed1-4ada-8880-5d08f2cc7caf" + "GUID": "be6e1dd5-8f49-436b-9ffe-ec759bab6582" }, "Order": 0 } @@ -396,7 +387,7 @@ ], "JSONDataSources": [], "ImageDataSource": [], - "Config": "{\"option\":\"const {\\n \\\"日期\\\": xAxisData,\\n \\\"总计划工时\\\": yAxisData\\n} = ForguncyEchartsHelper.splitDataSource(Context.xm);\\n\\n// 改变页面图表样式\\nlet bgColor = \\\"#fff\\\";\\nlet color = [\\\"#0090FF\\\", \\\"#ffc300\\\", \\\"#f64662\\\", \\\"#ec610a\\\", \\\"#00c9b1\\\", \\\"#6730ec\\\"];\\n\\nfunction hexToRgba(hex, opacity) {\\n return (\\n \\\"rgba(\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(1, 3)) +\\n \\\",\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(3, 5)) +\\n \\\",\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(5, 7)) +\\n \\\",\\\" +\\n opacity +\\n \\\")\\\"\\n );\\n}\\n\\noption = {\\n xAxis: {\\n type: 'time',\\n data: xAxisData.map(el =>{ return el.split('T')[0]})\\n },\\n yAxis: {\\n type: 'value'\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n symbol: \\\"emptyCircle\\\",\\n symbolSize: 8,\\n showSymbol: false,\\n lineStyle: {\\n normal: {\\n color: color[0],\\n shadowBlur: 5,\\n shadowColor: hexToRgba(color[0], 0.1),\\n shadowOffsetY: 6\\n }\\n },\\n areaStyle: {\\n normal: {\\n color: new echarts.graphic.LinearGradient(\\n 0,\\n 0,\\n 0,\\n 1,\\n [\\n {\\n offset: 0,\\n color: hexToRgba(color[0], 0.3)\\n },\\n {\\n offset: 1,\\n color: hexToRgba(color[0], 0.1)\\n }\\n ],\\n false\\n ),\\n shadowColor: hexToRgba(color[0], 0.1),\\n shadowBlur: 10\\n }\\n }\\n }\\n ]\\n};\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,PublicResource})=>{\\n var datGUI=undefined;\\n var option={};\\n const { \\\"日期\\\": xAxisData, \\\"总计划工时\\\": yAxisData } = ForguncyEchartsHelper.splitDataSource(Context.xm);\\n// 改变页面图表样式\\nlet bgColor = \\\"#fff\\\";\\nlet color = [\\\"#0090FF\\\", \\\"#ffc300\\\", \\\"#f64662\\\", \\\"#ec610a\\\", \\\"#00c9b1\\\", \\\"#6730ec\\\"];\\nfunction hexToRgba(hex, opacity) {\\n return (\\\"rgba(\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(1, 3)) +\\n \\\",\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(3, 5)) +\\n \\\",\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(5, 7)) +\\n \\\",\\\" +\\n opacity +\\n \\\")\\\");\\n}\\noption = {\\n xAxis: {\\n type: 'time',\\n data: xAxisData.map(el => { return el.split('T')[0]; })\\n },\\n yAxis: {\\n type: 'value'\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n symbol: \\\"emptyCircle\\\",\\n symbolSize: 8,\\n showSymbol: false,\\n lineStyle: {\\n normal: {\\n color: color[0],\\n shadowBlur: 5,\\n shadowColor: hexToRgba(color[0], 0.1),\\n shadowOffsetY: 6\\n }\\n },\\n areaStyle: {\\n normal: {\\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: hexToRgba(color[0], 0.3)\\n },\\n {\\n offset: 1,\\n color: hexToRgba(color[0], 0.1)\\n }\\n ], false),\\n shadowColor: hexToRgba(color[0], 0.1),\\n shadowBlur: 10\\n }\\n }\\n }\\n ]\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" + "Config": "{\"option\":\"\\nconst{\\n \\\"日期\\\":xAxisData,\\n \\\"工时\\\":yAxisData\\n} = ForguncyEchartsHelper.splitDataSource(Context.report);\\n\\noption = {\\n xAxis: {\\n type: 'time',\\n data: xAxisData,\\n axisLabel:{\\n formatter:\\\"{yyyy}-{MM}-{dd}\\\"\\n }\\n },\\n yAxis: {\\n type: 'value'\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle:{\\n color: '#5470C6',\\n width: 5\\n }\\n }\\n ],\\n \\\"title\\\": {\\n \\\"left\\\": \\\"center\\\",\\n \\\"text\\\": \\\"报工趋势表\\\"\\n }\\n};\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,PublicResource})=>{\\n var datGUI=undefined;\\n var option={};\\n const { \\\"日期\\\": xAxisData, \\\"工时\\\": yAxisData } = ForguncyEchartsHelper.splitDataSource(Context.report);\\noption = {\\n xAxis: {\\n type: 'time',\\n data: xAxisData,\\n axisLabel: {\\n formatter: \\\"{yyyy}-{MM}-{dd}\\\"\\n }\\n },\\n yAxis: {\\n type: 'value'\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle: {\\n color: '#5470C6',\\n width: 5\\n }\\n }\\n ],\\n \\\"title\\\": {\\n \\\"left\\\": \\\"center\\\",\\n \\\"text\\\": \\\"报工趋势表\\\"\\n }\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" } } }, @@ -477,7 +468,6 @@ "5,30": 4, "5,32": 1, "6,32": 1, - "7,1": 4, "7,32": 1, "8,1": 4, "8,2": 4, @@ -599,4 +589,4 @@ "Formula": "项目概况!$AG$2" } ] -}//YWQB2GiIw4iLmtwTDSZgK3xPy/z7NJx80Nq+lwLqa47KA28+zJkHMkAMVZ+7BdArH0l6KP44Gih1bZp6TZ0WwKnTgYq00s1f52pqHZDWcILcKRdcuLD2WcOSlSfBla3cF0uCDjgJPV4NFTb3wef4QE33dcC6EXs10oc11+JJrfzKFm7phUWxa+IGcap7n7fvxglQ/cnrw/LUOwlz3d5IYO4yBQcle3aUQR0NI5TtwaE9wGr6IVyppmXGSVicsweNaqU98tknBPaaedm4tCbs/YDLuLWPrV//rSZJQz4yMSNDEEv9W9kNB+6fLgFpV6ctS02SkUfvqmYuyBnwmyF5ZWNOQLHkX9FG3UgmY+uNh+C1GPQq8qf8kFfXuMiTlloortXFJOHOEFeDW2J9uG+HqMRao5dg7QbeFIePyj8vnXQZUU8UB1DKUiWLCONF6bcE+vOZSjmJprgEueoZn/rqLFQ3QMaV6piTojpk/vYJJ8RsrKZO3gMWoV1qC0oNzkMkhjT2yqdZls/f82n/8x4rohwYwXusTZ3yjxeR7Qp8gpQ1RvV9FnZtauKOKXmpq+oM7eBNllYduXq0QfUoeSMjbXc8N4htBJzRkkiYkosc5N28d3BTKStM0phEwMTT3/n9/irwaICGAUSxIpttIlxBQCT8kl7DJyYmYGxtMkCGSFUSdyXIb///7Hm4LEtqJrdg1j5vqA9351SykO2HRLem5G5HZp7VCZk9MJS7mRuW+eZ5ND4TyXuKlBDUe95AFhnSW6UGtZD5xziO1a/Y3MzLrNAbc33IR4hIwRzfwru0AmZZBRiTggtPDLAoWTUkQUYitc/Pw+yjkJO2DqtrKJskOaTLo7z3dxOmkkeSoFAyt911OOF/TSvb3HnW/IWJ9uogllvAo7w5in+dPYfSQIa6jA==|920 \ No newline at end of file +}//ZAAs29kBASOoC6QuwZTTDU08fQDLKUJoAKVofLjezDmPArdIm3zisH/50khQq3SiNli4EGVgrkd/iWFz5GTPb9q2yRDGAArdBrhOHmBsHwFTN+vX8DIQwRahKnTWP6n2d80yiXat6MPgbDQdKOjAkST1wA9MfsoblhOYdBctFK8DQrEzyed/exRMV6VMPk9WNuKRkWfuJZrkfmXNadpi7edKW0tbn3cosPOKHdjVR1GLAz3ZS0eA4SWJ1HA6WADUlu9VTXABYVTxuFbK4IFnwJPLFWyZadRsQE7WOy5suyIcL28sMUTmF7pHFgrEzvUJ515Sp9JTK/Z1nYK8AIvp8VJfS+uJJHX1jpZocJUpEKhxP0ad7XbN7rYOshhGJw4xXyGQPxeV9h+DwDj0aeqVoWp8zDCgfZpXjhdfitC88sbXL1oJSGWIC0Sdf1ufcN5YBdovmQXjIoAIukUz9IT48xEh9K4p67wzQyhHMsPUt0IyNitC4LqQihWpOsBdkkDLpuBrXcLWe8o5/sBW4q0eLjvfoaSVKm6T3GGFrXKAJznqf2MxWvHvVfba/PaQbRO7rDqCWs2VIIqVqxIoXca9gWGgoSSojqRH1ymJ9M++TRVS22zFF2Av7gUT+oeo1U2yS6IUmb2w8z6gtTrXM6gg4uM48fmB3hd5n3xi5qlEgSqC11EwDnsHX2rcP4wpccfMgFA3Aq1FTLkIHTrFQrtZ4k1/kcWRWvhbUvOz7XhMVwdHennexxUp4GY+zbLPQsaXWyD0kW0oShy6NGDBJrqirqYlMQ02xD6MlIdc93bSiAYXTL6FRjjrtMwyEJN6ilBo0nwDU6mv3Npq24w+YURvEK5yV6KLIc6ZRj7dUd5poxgiQrGanYzWS2w5zOfqB+fQ758B/0kx0OAEmg7Ob4eNXg==|920 \ No newline at end of file diff --git a/ServerCommands/项目/同步项目成员.json b/ServerCommands/项目/同步项目成员.json index 11ec018c..d495034e 100644 --- a/ServerCommands/项目/同步项目成员.json +++ b/ServerCommands/项目/同步项目成员.json @@ -232,7 +232,7 @@ ] } ], - "ID": "11879f47-8edd-4bd0-b768-38cafd1fc2cb" + "ID": "57dc61fc-38f3-4d5e-8b76-2e4c449d55b9" }, { "Condition": { @@ -283,7 +283,7 @@ ] } ], - "ID": "bd17d7f8-10c7-44fe-b385-a358ade9ed87" + "ID": "65242093-099b-4f40-81c7-32ecb240ccbd" } ] } diff --git a/ServerCommands/项目/移除项目成员.json b/ServerCommands/项目/移除项目成员.json index 23dcd8d0..21af9306 100644 --- a/ServerCommands/项目/移除项目成员.json +++ b/ServerCommands/项目/移除项目成员.json @@ -22,13 +22,7 @@ }, "Parameters": [ { - "Name": "项目ID", - "DataValidationInfo": { - "IgnoreBlank": false - } - }, - { - "Name": "成员用户名", + "Name": "成员ID", "DataValidationInfo": { "IgnoreBlank": false } @@ -39,66 +33,58 @@ "Commands": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "是否参与任务", + "ParameterName": "项目成员", "TableValue": { - "TableName": "任务成员表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "项目ID", - "GUID": "cb481729-447b-4d73-9329-6985ed0428e8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" + "TableName": "项目成员表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "a8f998b2-d3c7-4224-9196-3a9dbc555e4d", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "aeee1b70-ae87-4119-8cf1-297e7264a485" + }, + "ColumnName": "项目成员" + }, + { + "GUID": "b6ea5aa7-de25-4c1b-862c-8e5346ab2a91", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "d7373f0c-67da-4118-a920-8f4eb1e2ac79", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 } }, - { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "51726e62-6255-4e23-9bb4-498d1b063d3f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员用户名" - }, - "LeftBracket": 1 - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "463af416-af9e-43ba-91cd-5b3f7771b538", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "执行者" - } - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员用户名" - }, - "RightBracket": 1 - } - ], - "RelationType": 1 - } - ] - } + "ColumnName": "项目成员_全名" + }, + { + "GUID": "1a6587ac-cd40-47d8-a007-56bc639e3d78", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "88295008-b207-4cc2-8e55-2276651588c8" + }, + "ColumnName": "项目ID" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "3045a9fe-e0fe-4283-8308-d9f23feead50" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员ID" + } + }, + "NullFormulaValueQueryPolicy": 0 }, - "ID": "76f278bfb195492ba46fd874d4750856" + "ID": "9f0b430c1d9c4a83b2b1ca8a694335a0" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -110,170 +96,218 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=是否参与任务" + "SerializeProperty": "=项目成员" } }, - "value": "0" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目成员表", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "ID", - "GUID": "442c8862-a026-4267-9d73-bce2152a982d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "ID", - "GUID": "fb204421-bf1a-4021-9b8b-1237c01a1fa7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员用户名" - } + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否参与任务", + "TableValue": { + "TableName": "任务成员表", + "BindingInfos": [ + { + "GUID": "8b01fba1-2393-41c6-972a-9b5958950b91", + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "49609b4d-8df4-4508-a9b8-8072e328756f", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" } - ] + }, + "ColumnName": "任务名称" } - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务成员表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "项目ID", - "GUID": "6c11b9bb-f57e-445e-aa08-f0710b540c34" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "bf84ac5f-0e10-47fa-9398-d2b9099cc239" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员用户名" - } - } - ] + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目成员ID", + "GUID": "c06a2faf-aba9-41bf-bfa1-09d5af3c82eb" }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "项目成员ID", - "GUID": "6307591f-dcb7-47d5-bda8-bca2b7446af2" - }, - "Value": "%Null%" - } - ] - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "af87ba88-6365-49bc-a9ab-16badbc39596" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "f1f47cd2-a9c5-4aea-8ce5-46cdacd3cf8a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"将成员\"&成员用户名&\"从项目里移出\"" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "a87dbcdb-9108-443b-8eb4-200fa93ae63b" - }, - "Value": "%CurrentUser%" - } - ] - } - ] - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "同步项目参与人列表", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "项目ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" + "SerializeProperty": "=成员ID" } } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true + }, + "ID": "034d791dc35841da884c5517d12c66ae" }, { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "删除成功" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否参与任务.Count" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "442c8862-a026-4267-9d73-bce2152a982d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员ID" + } + } + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目成员ID", + "GUID": "79351972-a943-4838-82e6-66a242a90804" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目成员ID", + "GUID": "309b81d4-42e8-4f8f-b58b-f796769f37e6" + }, + "Value": "%Null%" + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "73e1b918-1054-463d-a15d-a43deffeb88c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "ba8b71a5-e9ba-4aa1-a159-3b4dc1a93578" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"将成员\"&项目成员.项目成员_全名&\"从项目里移出\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "9a6d6bb4-0157-4622-b00b-5fa507cc874b" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步项目参与人列表", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员.项目ID" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "删除成功" + } + ], + "ID": "9810f851-b1b5-4c78-bafe-27134840900e" + }, + { + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否参与任务" + }, + "Operation": 16, + "OperationParamaterAName": ",", + "OperationParamaterBName": "任务名称", + "OutParamaterName": "任务名称拼接" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"存在已参与任务，无法删除！
任务：\"&任务名称拼接" + } + } + ], + "ID": "4001df20-5a9a-47f3-88c8-2a0e549b58ad" + } + ] } ], - "ID": "b6a0e863-93b5-44e7-b6b9-cf494a699b08" + "ID": "9d140248-4d94-442b-9d4d-4672c09ef848" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "该成员已参与到具体任务，请先从任务中剔除后再进行删除！" + "Message": "项目成员不存在" } ], - "ID": "94cad1b0-9fda-49b2-85d7-b836f960f648" + "ID": "efb5077a-f8fb-4e1f-9f2d-8364be7b96dd" } ] } diff --git a/Tables/字典表/项目动态类型.json b/Tables/字典表/项目动态类型.json new file mode 100644 index 00000000..3b6315d5 --- /dev/null +++ b/Tables/字典表/项目动态类型.json @@ -0,0 +1,60 @@ +{ + "Name": "项目动态类型", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "Unique": true, + "AutoIncrement": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "类型码", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "类型", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_Creator" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_CreateDate" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifier" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifyDate" + } + ], + "ExternalDatabaseInfo": { + "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, + "ConnectionId": "业务表", + "SourceTableName": "项目动态类型", + "SourceTableSchema": "dbo" + }, + "PrimaryKey": [ + "ID" + ], + "Indexes": [] +} \ No newline at end of file diff --git a/Tables/项目/View_项目统计信息.json b/Tables/项目/View_项目统计信息.json index db32db5b..c962e457 100644 --- a/Tables/项目/View_项目统计信息.json +++ b/Tables/项目/View_项目统计信息.json @@ -112,7 +112,7 @@ }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([已完成任务数]=0,0,[已完成任务数]/[总任务数量])", + "Formula": "IF([总任务数量]=0,0,[已完成任务数]/[总任务数量])", "Name": "任务完成进度", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, @@ -136,25 +136,25 @@ }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([已完成任务数]=0,0,INT([已完成任务数]/[总任务数量]*100))", + "Formula": "IF([总任务数量]=0,0,INT([已完成任务数]/[总任务数量]*100))", "Name": "任务完成比例", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([总实际工时]=0,0,INT([总实际工时]/[项目预算工时]*100))", + "Formula": "IF([项目预算工时]=0,0,INT([总实际工时]/[项目预算工时]*100))", "Name": "工时消耗比例", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([总成本]=0,0,INT([总成本]/[项目预算费用]*100))", + "Formula": "IF([项目预算费用]=0,0,INT([总成本]/[项目预算费用]*100))", "Name": "预算消耗比例", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([总实际工时]=0,0,INT([总实际工时]/[总计划工时]*100))", + "Formula": "IF([总计划工时]=0,0,INT([总实际工时]/[总计划工时]*100))", "Name": "计划工时使用比例", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, @@ -166,13 +166,14 @@ }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([总成本]=0,0,IF([总实际工时]=0,0,ROUND([总成本]/[总实际工时],0)))", + "Formula": "IF([总实际工时]=0,0,IF([总实际工时]=0,0,ROUND([总成本]/[总实际工时],0)))", "Name": "平均时薪", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, "ConnectionId": "业务表", "SourceTableName": "View_项目统计信息", "SourceTableSchema": "dbo", diff --git a/Tables/项目/项目动态.json b/Tables/项目/项目动态.json index bb6ba6d1..8b9062fa 100644 --- a/Tables/项目/项目动态.json +++ b/Tables/项目/项目动态.json @@ -34,10 +34,10 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "nvarchar", + "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "类型", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", @@ -77,6 +77,13 @@ "ForeignTable": "项目动态", "ForeignColumn": "项目ID", "IsDetailTableRelation": true + }, + { + "PrimaryTable": "项目动态类型", + "PrimaryColumn": "类型码", + "ForeignTable": "项目动态", + "ForeignColumn": "类型", + "IsDetailTableRelation": true } ], "Indexes": []