diff --git a/.collaboration b/.collaboration index a5f01f6b..fda22ea5 100644 --- a/.collaboration +++ b/.collaboration @@ -138,16 +138,7 @@ }, { "ModuleName": "Table/需求反馈登记表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-13T09:59:30.4593195+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\需求反馈\\需求反馈登记表.json" - ] + "ModuleType": 7 }, { "ModuleName": "TableView/反馈收集任务匿名视图", @@ -543,17 +534,7 @@ }, { "ModuleName": "PCPage/任务-反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-13T10:00:01.7005647+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json index 55f5b9de..a6cded81 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json @@ -288,7 +288,7 @@ ] } ], - "ID": "e6082774-dc25-41b1-a20c-7968c53719ed" + "ID": "c7c868ea-2c58-4fad-9d9d-157cd3f575cd" }, { "CommandList": [ @@ -326,12 +326,12 @@ "MethodName": "Focus" } ], - "ID": "08198ec3-531f-494b-9e7e-77033a574b36" + "ID": "32aed5a0-c1fb-4faf-97b7-5d209523d6f2" } ] } ], - "ID": "3d06524a-c449-4cd8-9612-929c24033971" + "ID": "31c42cbf-7b3a-4d74-9c6d-a38808795f53" } ] } @@ -457,7 +457,7 @@ ] } ], - "ID": "0ab66424-e8e2-4a6a-a36f-e4ee80836d69" + "ID": "d7cbecd0-7616-4db2-907d-df20605cb37f" }, { "Condition": { @@ -479,12 +479,12 @@ "Message": "清空功能名称，请先关闭收集反馈" } ], - "ID": "bfdc627c-f1af-466b-95e0-75ed9fdbadeb" + "ID": "bfa03196-16e9-456f-8869-8506c88d3f01" } ] } ], - "ID": "c094220c-003e-4742-a7db-49a2f66b9b2f" + "ID": "2932e103-2952-444d-9456-b110cfaa69b5" } ] } @@ -580,7 +580,7 @@ ] } ], - "ID": "84760840-205e-409e-bab1-8e0cc95f55d3" + "ID": "c0a2d7af-73d3-4f94-9fd6-10bc8794394d" } ] } @@ -926,7 +926,7 @@ "TableName": "需求反馈登记表", "BindingInfos": [ { - "GUID": "1a639428-6631-4fec-bf0c-bb5ac89ce71a", + "GUID": "0140e053-31c7-482d-86e1-18a1568b3916", "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "ID", @@ -935,7 +935,7 @@ "ColumnName": "ID" }, { - "GUID": "1ca986e5-182a-4cce-b8b1-6e22f8e287b7", + "GUID": "f11e46fe-f756-419b-8811-256f7821a046", "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "反馈类型", @@ -949,7 +949,7 @@ "ColumnName": "反馈类型" }, { - "GUID": "d5983765-c9e8-487f-85b9-eb276dd709e8", + "GUID": "bfb9e8cd-26a6-420f-b203-158bb7bf7783", "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "工单编号", @@ -958,7 +958,7 @@ "ColumnName": "工单编号" }, { - "GUID": "c1eb74ea-d85f-4af7-9460-c81c440c1be1", + "GUID": "38b18ed3-5a1f-484f-a4e3-c32d858cee09", "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "标题", @@ -967,7 +967,7 @@ "ColumnName": "标题" }, { - "GUID": "76490aaa-f66a-4a3e-a0d3-595ac26df180", + "GUID": "bc1ae90f-73dc-4ffa-b275-e9fde7f2c313", "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "提交人", @@ -976,21 +976,20 @@ "ColumnName": "提交人" }, { - "GUID": "02f84b04-fe3a-4d03-8b03-2e98424435ad", + "GUID": "5f3ed736-1e59-404d-b5c2-1b086545cc3c", "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "处理人", - "GUID": "7bed9142-4aaf-450e-9a04-e83a32276238", - "RelationBinding": { - "RelatedTable": "用户信息视图", - "RelatedColumn": "用户名", - "DisplayColumn": "全名" + "GUID": "15cdcdb3-3327-4813-9235-5152342d475f", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 } }, "ColumnName": "处理人" }, { - "GUID": "2bd0c3d8-8f32-458c-8fcf-8f7343c75406", + "GUID": "9fd728bc-adc8-4a84-b0ee-fc5d804eaa2f", "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "状态", @@ -1004,7 +1003,7 @@ "ColumnName": "状态" }, { - "GUID": "8d953087-6e94-421b-9625-4787f6ae753d", + "GUID": "5683504d-1698-426a-90ba-536ef370c62b", "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "FGC_CreateDate", @@ -1038,7 +1037,7 @@ ] } }, - "ID": "5ed72cda343d47ec832ffba63efdcbcb" + "ID": "3cf57194152c4b5ba6ac525956acf21b" }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", @@ -1065,7 +1064,7 @@ "Title": "加载中" } ], - "ID": "eece1de2-f50b-4e96-9a0c-6e977090c728" + "ID": "b9568ae2-4edb-47a5-90b4-b7a0aa042c93" } ] } @@ -1300,4 +1299,4 @@ "Formula": "'任务-反馈'!$S$11" } ] -}//gKbVgWXIFjBi73dnquTg8A5kgFdirGRbeyoKbXjm6blzVswaemTcOzCey890i4ql/Dty1aMLfGVIv322hbtU1iylFKUFusEQkIk+ojCA4Koz2dvBNDifGM3N08PqS/fdqnMlzTJyjiDvYYKEVJuH9UtgflUJoETsP04Ze3xTaBqAsy0+wXfGmIF0CNRSEpCuCn63poPS+Y686S3w2GDgrlnM9fe+q6uM3vljnIzluwmd4sJb0aFhBVidFTeVFGU+QJGopw0MeQnxAIEBz1z7YsETyTu5/5uN27NoPwm/XPVMk03qfyC3C0N1s5CkbZP8q2EvD5AG4aHifmLHwrrQ02KjNToT+UF8UnNo6thwaYlXnyr0EuOxHasztYlcVX6L78gIU/hWnZMcPVhHZezfFdqrTJuEEJZ4azPwMIGzPEA+HZHwEgZL1p2LrbRnua0VeXqeklHG2XQJcXCGWimbdqb/l6eDeLEgjun3t0h/8D9h3gSu3aqYPHfS2Qbev93ZLZ2raKo024nIYPP/7vBGmd1W2SPktOkOwmDjF3Hi9ynRl+FSDKDZEFSFfY+7KetmmEQerdyWgGaaovZ/YOopupehpESUQcT9sKJoeD3kusRZFwY2fPcPHaPguALEX3VSn9ajnUnBtKPGa8rOboHb6WJ0y2a/07fXM4fIvX7JFqNbOqNO2m7W5mE73ipN6y73/NTUd7Y/anKtpxXY71Vq/a2JJaw1FxDJnVT6fc2XK0A6b0ehCPS4B34BUXZdonKPr3dw2WreU6sDk+nAoXZAgKQnVM5NAtKSa6QWCXJ0FXLH05nijPUwPOTsxhvaDfOUJG803czYJEAHSIcri+EMQIBu7r7g1yv89ruALXirZjPzVvfCF4DExFQFXEVl5cqoLPObeDTJ4QKJXYT4rkY9PQ==|920 \ No newline at end of file +}//kgw7elewFUf4agY0hW6CuolhUNyKccElSuXOzPYV5qrOOo3Xk8jhytgzPHWqXTg7VS1Fm/Wk5a9Rq2SKMDpwYS7I5OrF9UUwE5Q37yc1XfukJFXXooq2rat/dgB9yfc/ASURP6Vr4mEcl12GWHZhJ6rTZcnpuO1vxhhDhtuc1PI3BXpxjt6lvUTzNeQAWugUPLRErLRpqNC/TXo7pOPuYlA0aHO9NWDwBesk80m9JhYqlHiuagVfEUZqS3f5DMhbneUcq4lqyMyzaQS4GYifm5Nea3t4qI5KEdJCVW8FG4+qpqyuYkNqrMvxYF3a4BOnPgvTAbl5R/U5x542BXDkOZ+Q1oUK1kYdqkCzAOKdlglNcN9MjCp7IEUMHEHDR0CYEjVGDXFqkEWGIzuwxEUgOqhXtUAuFCEDpb1gXdgRDpTe//bwUYL/MPKGotHYBmEl7qwecebdY2iGyRgX6/ePF3gMPXncJqFRqMcLaz/hVFPiuwrvRvSD/K4FaG7KVdUzPphtkut2AAr7bYkUrB/rouLozN+7PglDJCbqsSojjO+kI9r6b59spFJMQ7tMugS3WZZYDTzwF7W3yVM3YI9akICe4WYKL6C9BkloJBX6jQCESEljJgfaQYoyqd8yiZEEwjEpW/2X9iFMxwN4r5xbbcevOge+VmeGMoy3w6l3WD+h1I2HOiDW+gHmWzDZoX5/XM20ZBD4SqBP7zXTxIbdEdJiPGOyBDHv8KgmWg69MOjl2g3AYncs0V/sHtMOKhNtac93jCsPTy68lVIUBGWJ70Bt8o/NH3xvHpON7H6j/ysz5a3Tbt7q+KeGrnC2rUhVELnMt1S1BXuHwUu6oBRs/vlpZOlf/EhIi/3yhb/wQr48BJrOdlBL+2nBD/3JfN0vH7/idI5uNvSYAbQy8scYEA==|920 \ No newline at end of file diff --git a/Tables/需求反馈/需求反馈登记表.json b/Tables/需求反馈/需求反馈登记表.json index eea9bd89..22c2e93e 100644 --- a/Tables/需求反馈/需求反馈登记表.json +++ b/Tables/需求反馈/需求反馈登记表.json @@ -90,7 +90,7 @@ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "处理人", @@ -233,13 +233,6 @@ "ForeignTable": "需求反馈登记表", "ForeignColumn": "发布记录ID", "IsDetailTableRelation": true - }, - { - "PrimaryTable": "用户信息视图", - "PrimaryColumn": "用户名", - "ForeignTable": "需求反馈登记表", - "ForeignColumn": "处理人", - "IsDetailTableRelation": false } ], "Indexes": []