diff --git a/.collaboration b/.collaboration index 37539092..400ea4a3 100644 --- a/.collaboration +++ b/.collaboration @@ -21,29 +21,7 @@ }, { "ModuleName": "Table/任务表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:34:40.9437928+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\任务表.json" - ] - }, - { - "ModuleName": "Table/任务版本", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:32:06.0627805+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\任务版本.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务类型", @@ -51,29 +29,7 @@ }, { "ModuleName": "Table/任务状态", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:34:40.9437957+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\任务状态.json" - ] - }, - { - "ModuleName": "Table/任务分组", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:34:21.0169949+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\任务分组.json" - ] + "ModuleType": 7 }, { "ModuleName": "Pages/内建页面", @@ -193,16 +149,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:45:33.1754331+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\子页面\\任务列表.json" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/任务", @@ -210,55 +157,19 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:10:31.8753993+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:34:21.0171939+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:32:06.0629728+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-任务信息.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-侧栏", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T21:43:35.0932276+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-侧栏.json" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPCPage/FGC_母版页", @@ -270,20 +181,7 @@ }, { "ModuleName": "Theme", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T21:48:12.3036602+08:00", - "ModuleType": 9, - "ToRemoveFiles": [ - "Theme\\CellTypeStyles", - "Theme\\ListViewStyles", - "Theme\\StyleDefaultNames", - "Theme\\ThemeConfig", - "Reports\\DefaultTheme.rdlx-theme" - ] + "ModuleType": 9 }, { "ModuleName": "image/内置图片", @@ -331,31 +229,11 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:20:21.997511+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T21:40:25.3073359+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -399,71 +277,23 @@ }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:58:39.3454529+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-子任务列表.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:58:48.240278+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-关联资源.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:58:55.7186297+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:59:02.4959886+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-进展.json", - "Pages\\77fae08dfbac4664a299aa7ec207218.json" - ] + "ModuleType": 1 }, { "ModuleName": "Table/任务进展", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:34:40.9437969+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\任务进展.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目进展状态表", @@ -528,30 +358,11 @@ }, { "ModuleName": "Table/任务工时表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:17:34.0539599+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\工时\\任务工时表.json" - ] + "ModuleType": 7 }, { "ModuleName": "PCPage/工时详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:54:20.3265928+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时详情.json", - "Pages\\31a709cea02e45ad83bb92336a6d829.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", @@ -559,17 +370,7 @@ }, { "ModuleName": "UserControlPage/工时记录列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:31:19.6818278+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\工时记录列表.json", - "Pages\\36d33d0079644f28b16bd0fec90394c.json" - ] + "ModuleType": 31 }, { "ModuleName": "TableView/View_任务工时统计", @@ -593,29 +394,11 @@ }, { "ModuleName": "ServerCommand/新增工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:40:58.7183114+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\新增工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "TableView/子任务视图", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:34:40.9437978+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目任务\\子任务视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "PCPage/右键菜单1", @@ -627,92 +410,38 @@ }, { "ModuleName": "Image/未选择.svg", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T21:50:09.8517162+08:00", "ModuleType": 38 }, { "ModuleName": "PCPage/修改报工", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:13:41.2742797+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommand/修改工时", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T22:16:09.994339+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/新增任务", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:34:21.017323+08:00", "ModuleType": 1 }, { "ModuleName": "Table/项目版本", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:32:06.0627846+08:00", "ModuleType": 7 }, { "ModuleName": "Table/项目分组", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:34:21.0170003+08:00", "ModuleType": 7 }, { "ModuleName": "Tables/任务", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:34:31.7356175+08:00", "ModuleType": 22 }, { "ModuleName": "ServerCommands/任务", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:37:08.1345492+08:00", "ModuleType": 20 }, { "ModuleName": "ServerCommand/新增任务", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T23:39:58.1068067+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/CustomLibraries.json b/CustomLibraries.json index 2b265e0c..2921198a 100644 --- a/CustomLibraries.json +++ b/CustomLibraries.json @@ -1,4 +1,8 @@ { "UserJSFileList": [], - "UserCSSFileList": [] + "UserCSSFileList": [ + { + "Name": "BaseCss.css" + } + ] } \ No newline at end of file diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json index 1fde3d59..a3398f2d 100644 --- a/Pages/31a709cea02e45ad83bb92336a6d829.json +++ b/Pages/31a709cea02e45ad83bb92336a6d829.json @@ -134,7 +134,7 @@ "ClickMode": 1, "TemplateKey": "_RS_Main" }, - "TemplateCellSource": "执行人" + "TemplateCellSource": "全名" }, "1,4": { "TemplateCellSource": "总计划工时" @@ -272,7 +272,7 @@ "value": "编辑" }, "CommandList": [], - "ID": "caab7bc7-f9a7-4638-aa83-e6b825c28960" + "ID": "f61d7ab1-7870-49d2-848b-d8367e6dba19" }, { "Condition": { @@ -326,7 +326,7 @@ } } ], - "ID": "97650be6-4583-42eb-be9b-6c6e325130b8" + "ID": "8d24331f-9212-4981-8fd6-3e2ff1782028" } ] }, @@ -343,12 +343,12 @@ ] } ], - "ID": "800e69d5-0bc4-4b60-8f83-094a5af9213a" + "ID": "7b4303ad-8df2-44b7-81c7-6e2821ab8f5f" } ] } ], - "ID": "7950daf7-879f-4a4b-9ced-281e2bd27564" + "ID": "b7ba3787-aa1b-47c3-bc37-72094c363930" } ] } @@ -462,4 +462,4 @@ "PaperSize": {}, "Margin": {} } -}//fP0olUxyCml4V6TCkgs3u3fJQcwfQ6Ob4BmOIG5mF0//aG7163IKP6VHHzje4mVMhf2Aq/aHuKYOfMrfZWAacwZRyoZxeOGtG7uEBLljWnj6CdZEMU7BLjR9wMia24HwDgLKdfIjgcG/O+3Pn2agF1VMnIFmK7973VtKFlTU4zVj8OyuZHH3n9idSfRL939a3DOuOHXrzy/76M0aPyOWdK100cqbNhCXf40g3n2zyKV6VeYy1B1ZYJmiwxfHUpC7luPL66khtkSzwPV/PTeBeos9LYEhOYV6muPpYNbXwpgygNqC7wriGBZ5QDL15IGAUk5PEUYSQWlnBoLZ3p+svSjazufgcfh+cYgn5oiAt6j/W3FI+utTwSrYyawNmfi5g7DH/d2wmm9t0VWvSpmkX3tKUj5932BMqQforYsfZgfR3Mm1Ngz5biCdRkvgGwnEJhSCgKa8KyWJRBe69QuVUdMAc3Nq1TqFWOxjgdRAAZZnTymZPSBqB3znL689MaXztoFXOyZMnnEuSUEY3mrVpMHe7IsSC83Y45jKjUz9xqmWnB1G5IMvAaM4DLlXrryC450PVMggdSd5wosgSlzte2AlPjTH85qgLNajfwAwdWC2QZT7z5m9dNKw5fu/0Zg2JuJwU1ERYStGeD+tNxWSxezeaCBJyFSKO0Q6FDYE5E2HpM03j7D343fwe4qyVQqYVot9u5s+hC9VTYb/WNooDeU/EGzNs3tK+M2yJy3ajL653CDuIpJevBMUOJo75q2YCzyj2aKOHPs0jg/xudmlWlyBGj3MHqCjSHZscPOGeozafyM2Hwnlltwo4J8yDndr81pOjOJpLXWg8RetDDeCLzr3zMAHh/8CcnW/iuLkI8J5KUWSuzZqsg5CKJ/q75rJiMnHDLbReFdFvFTJSbnxTA==|920 \ No newline at end of file +}//vm/ZQx3GlOtPnmfAkM7q7IvNlKgGOvUaktHMoyUbl7UySqU7Z1yt9sMIqHqTKV53n0V3QT3YL0QjyRLt6biC8SWsRYur3tn8DmXwBT56ei0xFeMlKo9tkg2/eitvPtb+gU+6/dmnFFuIf5EyNRoQVo4lRuGFLb7fmpprmqyStRmmHTE4Wkq0fQYqoFruPN6AQI3tD/5Bqlmg1D2nl1VytGy+NMEZOapdyZdVoyqcbuDyjgmqHhad9mr65VT8sJ0fbz9RmOx3yz3t9b4RpnGOctIZsb+xKhovO3oxrWKgaEz1lhXqMmyBB0pvEMZ7+o6z0lgXZSlmqeZykfGpGMFvXgFdb5I8tR2JoWxe2UQqrbFRKATMfNTxP72VQOI4Gui2zgt5h+qj7pWx7RY91W5lUJvKFiqxPNvHLIiLRboxzWbQGGm+RKsn1bVgsSoBhFx6C1vV9XEy9AAEHoX8kIN7XweIdhDmQyibWChD6DuXyt3Ly7Pua5/jrs01ANjFCB7IC46OwaMYhqSfKmSDXN0xSNpMziAEmbIlDcJ4hj8eEQPVHI3CJ1kB+/ayvn1aRV6z3WZKe93NPeFuTHWSXL3udOcSUoG3x8d6P6plsPXZ5nwMXDnocdkDQ6f7cDsjMBGiFJdWokwzzYEU7mYF4D5kCn0gLicSPRaoagkhcpLslKMVEOAuFBB6bTvz+ECt9kl1W2PFTcZzGq0eEOZOtmflZF9P2AJ2bQsiSSXrITvCwJ7zzAa2SI2aiqA953mVeyYDgLDXaMT7ODdMTlleO0MkBpbrti+G8ZE9meZoXu22KJWTsSlC+9NqH7F5SKIj4mi0h56EMErv7hmiuyliJDj6FUB1kYPzqBVBTk1Ce2+0q0dB7IN891kNHu3LtnvYmesWv8w/12reJOUQqobsAa6uOA==|920 \ No newline at end of file diff --git a/Pages/36d33d0079644f28b16bd0fec90394c.json b/Pages/36d33d0079644f28b16bd0fec90394c.json index 4781f2ab..2f6ef917 100644 --- a/Pages/36d33d0079644f28b16bd0fec90394c.json +++ b/Pages/36d33d0079644f28b16bd0fec90394c.json @@ -24,7 +24,8 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 21.0 + "DesignLengthInPixel": 21.0, + "IsHidden": true } } }, @@ -53,15 +54,15 @@ } } }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 43.0 } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } } }, "Count": 4, @@ -171,8 +172,27 @@ }, "value": "编辑" }, - "CommandList": [], - "ID": "4fe7c5da-1539-49d1-838b-92aa8f6d3d80" + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" + }, + "Value": "%Null%" + } + ] + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 2, + "PageName": "修改报工", + "LoadBindingDataOption": 1 + } + ], + "ID": "0e5ee6fa-1138-49bc-800f-cb4365a395e6" }, { "Condition": { @@ -194,31 +214,31 @@ "UpdateType": "delete", "ShowConfirm": true, "ConfirmText": "您确定要删除吗？" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" + }, + "Value": "%Null%" + } + ] } ], - "ID": "286596cc-cbd7-4894-bb5e-3a13ed1bd524" - } - ] - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" - }, - "Value": "%Null%" + "ID": "04395c8b-e56c-4862-9347-59e9b644a81b" } ] } ], - "ID": "5f07e2fd-83de-4368-aafc-6f995b470860" + "ID": "32863028-2b2c-4b18-821c-d0acc265432c" } ] } ], - "ID": "a0263d1e-3377-4bc7-b465-f487a10cd62a" + "ID": "2db52308-494c-410b-a5c1-b480de94cab1" } ] } @@ -280,4 +300,4 @@ "PaperSize": {}, "Margin": {} } -}//5cQdm0YGh5vayVTlRq2K4fsc9TaYnk1Vrh+pl32ls8Spu/RTSYZnVX/eLnYcOQnoEnv+pUJVuvreYmJ/9RdhbqIBQfJ+RHQjvuAITZmvTK6FGswkD0v6H2F8x5OlM6BG1PdAEMdVlHSB5o6UDbYNoje9E43djFnTM3kwtsMLOhP9aQZhnhgWGyVinyb8cjRdph/MmKP/Rz5CPOpoNOivIVnjrhnC0jUZEJ/wAbq0VH0ZHw0o2f1nhUFG9RTpGj/NKmUkJkHwY+8rcGvhvKGoG7jlQNFD/Y5Rt9wPohcaaOPXZ8kWy9COBqMHU+NdqMMD+lE0oCCMqoXX1JX9BwX/OZUtUYRn+4mAXyebbI8BU7O1kBhO63AHXU4NtB/F1yrKZrlVcRUYwIdiY7ZvNPZ1HZz6EqFMSjz7p1vzRV7BN+bM2prnflnSHc+4vWxWrQD6mjuTBm+uBjfLud9q6nplwj3VTbxkaDOrO+Go7J2xB5rHMMuf5WBv2mWu3HMnWm8iPeLk1JdqTkuI0PN0GC1X2aelCKFqQ/H6FG2z8fl5tEaxknSigidNOQWHrJpqQ+lFSi5yhpVpOmSoLiyIHsfhyO1+vyIA5X84K+EiT1XlwG3+QAQTMfIr/KxIq0eYhdp/petjjRBcSCQ+LnTKpTiHwy0bYOdcefunt71t5caqBZzD2kHZXCT6EpHJyncOE1Ioli5mKxsuaiGqHiQ9I7EPbD8oZxnU7/1xps7vxHrvqySpO+0qwmgUA3wuImKB3JsslyhiKAZAC7XlA5aGa7bFc3cpwYLDY5vipkRk8wSkEaIRlx6s9F30Botglx984jwNA3dYoC02fs+KxtvxMknyurUpwJy/PxhRKsbf0SGbEab0101ZHBz391lDBjdsPKzT2o27IZ2UvzYXbPk3Hb2rTA==|920 \ No newline at end of file +}//yJlhVAZZoplIykx0Qm7+4dL82Hu6ZRAZTR4wJ66soNvomBELgT39Q8b6BUJ8QNnDcl9upzo31DvdVXJCtDdKF0/OYIhnRFAViKoeXRJKSPxMtrtsQXFLrXV8tH9US5o5ytBI87UnneWjJd0WI1BfV8rNx1r4vJqOFv9D5JyU6eX4BFTfS5e9hJJotQLPGd0cHCYSWgv7QcdtnXYVMqM3AT3TCckg0NJSOPJFXcOV5Rfi0WRIoHkz9aUBO5r/uoLhdC/3S2TgnAKUqS00KOQTgilT45UttmqQG405SSnYP9OXIN+hQD2Z/HBEPc83PNBBpiN793LolJcKrB1yeyxNH/g1K71aBSoeAvRxWrHOaOauinRV5vpfKFiq7mc4CL2TX/7jC6TCyhvutfb59N8AjNXp/d+ZGtNfxcljRZJSFNkXbT8OhM6jblkkR7eFyBscDegGwpVCnFSSb3Y5tR5d8uupv5dE8hMy9wSuDufBKC0uIu2JdPBMIwLQ94k6Gkanv7VAj55OeGCXx2mKp1QxogINkcuOgZSfXRjQRdKkcPPSP4PVhrTmlsHOllsCKKR+IoWfcWj/0NZnbel8mRUzyV75/YpzeqXMC60erIHhM08VwqqApcWqkpfY9zMG5sCN+CVFIJMEGM5OH8vp40bDQCMlAM7pYSZ7ydN+M5HgrSCA7UGwfmwiP4Oc1YgXzk4ZSpA4tqoq7aVVbytbjHvOuo6J2187rZ1qL9qYAeApemgp5wKB5n7PJIsioPeoizJ6ymj8llTGeLgHoMRQWy3OjPdo0Ff2EPt5891VPa/xO+NCXuCLPamoxhisnC1gtQw9I6KY5PtOa+gnRJoPdECZp+vPiMqPicTFmK3B12TQc4NqfIGHNd44ucjX6z66S2ONphQNQLHrG82IwTfd8NbM9Q==|920 \ No newline at end of file diff --git a/Pages/558ca610fafc4ffd8884b819161bfd6.json b/Pages/558ca610fafc4ffd8884b819161bfd6.json index 823721b9..7778fe66 100644 --- a/Pages/558ca610fafc4ffd8884b819161bfd6.json +++ b/Pages/558ca610fafc4ffd8884b819161bfd6.json @@ -15,9 +15,18 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0, + "IsHidden": true + } } }, - "Count": 3, + "InLogicalVisibleIndexes": [ + 3 + ], + "Count": 4, "DefaultSize": 15.0 }, "Cols": { @@ -34,7 +43,12 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 554.0, + "DesignLengthInPixel": 545.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -44,11 +58,6 @@ } } }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 122.0 @@ -64,7 +73,6 @@ }, "Values": { "1,1": "状态", - "1,3": "项目标题", "1,5": 0, "1,7": "用户名" }, @@ -85,38 +93,55 @@ }, "1,7": { "TemplateCellSource": "执行者" + }, + "3,1": { + "TemplateCellSource": "ID" } }, "StyleDatas": { "Styles": [ { "FontSize": 14.666666666666666, - "Foreground": 0 + "HorizontalAlignment": 0 }, { - "Foreground": 0, - "Formatter": 1 + "Foreground": 1, + "Formatter": 2 }, { - "Foreground": 0, - "HorizontalAlignment": 2 + "Foreground": 1, + "HorizontalAlignment": 3 + }, + { + "FontSize": 14.666666666666666, + "Formatter": 4 + }, + { + "Background": 5 } ], "Types": { "Strs": [ + "Left", "Background 1 -50", "yyyy/m/d", "Center", + "@", + "#FFFFFF00", "Body" ] }, "CellStyles": { "1,3": 0, "1,5": 1, - "1,7": 2 + "1,7": 2, + "2,3": 3, + "2,5": 1, + "2,7": 2, + "3,1": 4 }, "SheetStyle": { - "FontFamily": 3, + "FontFamily": 6, "FontSize": 13.333333333333332 } }, @@ -128,4 +153,4 @@ "PaperSize": {}, "Margin": {} } -}//kJyeIlKcBkKpcyWbfCCtJTY6hBKJwnBSqbRm0fEw0Qi5aqPf7i/j9oY5gQEBEdamCYzksUszq95wXfEwP1wS7Xc9+jp/GW2TW7VoyGPMK59JwG7M3XPKG/RZfQWTBWynmjIgyBv5AEyZT/5J8sStnX9P/5Cshh4/Q0RJwvE8vasi/a0xz62V/0pu1GLyDGIvRTg+u8/xb9eE9jMXWcDSNK0+jUHVNneGEg80Vxo8+Tp2hdOP3A5ZkgV00LYR93L0IWTVwy+OoE2bT6zdlMnGFrhECtfn+nBtgMDnSK9W+wXxRTofghu17mzxiBbQaHCzCZ8itPPeIMjal5uJFGJ1M43tjitzVeKKyCF2fJFm1i5B7mXWPfvyLsKU+sBj1bk231u/OyUMbxhTxqnZDRyeul3Via1R7FK9BwDVrqlRVjbUUwKnwnzNjSbUHakWcJQcLmNW2zegPaxcSlSb9Y4fLUk8eZVlHhMsFaqidIN4e/ugcO1eMQ4rdk2PI9ZJS/hy+TmtcksCAMv781fd2TTlNb+yH3DfJ+I7T7kI3nn29iZVPy0CDCts6AzI59AGvfFZ1T5eYmlud4wopxFHB7K9MwOzCkLeA/3CFx1v7O8ayE45LyBKvO8F6yAvVs+7ZJy35yzD/l0CiIdvrMzdbABMWpue9hVItlN6mRCk3gjsf0FNeYJTok4Q0/cc3GRk+1wC5gIueSQb1zNES1s0n4G3AfrUNSz/cJTeswBP1TGixUgLejrA2mEP/lcfcVb9yr7eoBKrt/yNpLejSAId+7NDwTQBpqdD0/OPGXpa2gSmewctAAX7C7y+4MUiTB8N7rO2qtWcozxALtG6pNaZuFTNWl9cAP6cmJ7MHsQqv+u+zDYtCDnuWx3XdAPFFWeaGnld9Lxo3J1SxbZeVkyEbMPx5Q==|920 \ No newline at end of file +}//F5t9pDwN+bd8lBQ7kKuUyhlIWU2sEjsarBKBmRReWBBAYUCHbwZ5hVLI9MJjRXH5+nv9/ACCKOCM2OQYR0AZUlnrtwiTayaeePRnE3tpXwBJ7O4CXAtmruMURoiXsuRJR63icuWaqmlPKJSGlQIgAiDEBUznRow393SPtIQwg5k5xT9MGSyRhYWfkcr5/I8YVdC0bPVv46ihmeUF9z1Dw6LeErjrISdkLczxKSgDjQzMDu46NhUSOcclEB0u+TlKYY+LnX40G3QUGDEJDUBDtRxdM0//usAM5aXMzsN4V5UbPx2pnCf+qk3Ryvh20P9SCm+oeG3QleD2diL1lhvNkSZnLUlQLET8xYLLecCtaEXiHgoYJTTaO7/Z88GSpUzveK+Lx31xqZb8cLRXbEMxF594DdAnOmqmf4gFCDrLEOHsboxA5t8LRvRtzGUJAPMjXfMlpDXKPqZj47t1ckjR1qI5JvZlODPP+Yuq/EbC5uSPMeiZce8y/QaoSqMprt5fTr9UbGAsfIp2eMwykC9ZU+Zy03vWi+49IHIfgDnh9PwKPKNh0NCTaTJgHt1Z1TeXDVMKLWzQi1rQqoxpD4Zy6wcWosSt32A5R6CCl5ILgtlbK3WzqyjMW/b5BxoN8FpVXqJtIK8jhyelzyGqDr+yABbE0S6bGNuVjsBuuFvxxd70UxCXmEfE6MdZOfu08Qp6YvYZjbfMGDPMPJTpqhiAmijf/G1yqVbJMG1i7/VutRVoIpKCVLdzLXjcQhQra9HFWzHpaVbQA24JgOASWLVtpz0A8jANEUtzhH0UIibvx/UQcMUXkdKnzA4XVCenScvIHaoZVW0axNFu8xjZu1Fo5rvs0vhWxynQbaMbmx98SAfqeAegEJdscPACR8bj1Xg4y2V4WWzvj6rmgKCbSruBTg==|920 \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index becd2443..3adb380d 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -41,6 +41,11 @@ "DesignLengthInPixel": 15.0 } }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 23.0 + } + }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 @@ -67,11 +72,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 23.0 - } } }, "Count": 6, @@ -195,4 +195,4 @@ "PaperSize": {}, "Margin": {} } -}//lrAkh+ebfJQjpWqhtH5oFaL4LeVBTa5AdpvSA5ZaXGDceFr6fJGDHN3grxVLbnhjqOxvo1Me7HdTn40h89Ybq/mAtbZe87vDTniIJF6AnzI3cLMCB2kxn8i5A/n2LTEHuIRur+RTWEVcoPIoYQzhFRmSKN6ddJbAYWLMedYgryBpNjdVM/Fj5/q6qT6es+9LlZ/S8cOltBr8jPgPc3Khq8hAV99Tksf26mhdwplJywm3Qr1R9vRJas+3VZ8hHIEstfrQWU1fCGESwvYhs8kgSd65RYulFVKcYyc7iM3fS3VZHGW+7hr14lTo8m0FpjqmjfPNB+G2ONaR6bSGGndR3J/n+3VVKP6DqxWCLJ3vC0ctYuAVT1ljD6fisu/VxiwuSqFFiuYcHLvDZLIBZ/hZkQl5x5wRvIRJQLAHgq/vTbiyydadczAp330RrtyDaUp0mDhwtBhipYVRqzlQBj9DL+UXNEcWB6hZaC5xcu05eh2Zz7hGIboDeuB/VeBobowb2FW6MI3tbGLLn1VU1lx8T+kAYtUk0K/o0AY77jukhRkWtyq8x09tpzUHEPItMAaJov/bbq7VmDVJ4wgEISEe8PiWt78PnbqMi3j/iJQOhkQRWrUn2dzJXxH1pd+6tagrIb44FeOU66SI2PR5aHvTE0RtxlNgS320jvb8GLcvkf5l8c+imhkAjMNIrYo1eMaN9wL491fJRqnJgN4KsilWJIFzsGYNQoJ7ROiVasPWBy/IKNF6OBhRy92bG7589HJRmzNMkEzgiXcKpQ5CSf8DnA15QfkezzaQ134UIAH3A/FxYc6GkeQFWGkzoevy4JSllLFmFhgw1CFeep3BhfVWBwjzMHq+HrvY/n9ub/eqgEf65Jrgf0V0FLpyPn+ytH3U33mB+Ia1sYZgvOd/63ynIQ==|920 \ No newline at end of file +}//bv39SahNT/rRDJNWafjEubDYuxAsxoO1KZcIbEbrhpp1HBPMUBNfqJIepILg8ItqJKSpsVPvj+v4hTYAiCWvbyd4JcttBkEB/dBO1p3cRRKWHDi+5QHKB389raLIZt2eC4U2MXiACm7LFgRKSieO1E/6FAAlWt1Z/NTYKHEhXPT92jVGQSbiV1aeJvcEBuny3YwV9l7wCfhqRXAXdeZHPc/JidlIwxA1BLRpK2afpcT9oFRN038zKllCcEwZKKt9zAWIEuYcwoj1mVb+s/hvzxtpwAdF731LNs8/phOakyjiQaADRDF7wooCHk9rzD5sw7goDBshyC2NGXWjvBiz5G61KvcFIL886IsIvVQbqTN+aKC1C8OlJ3F9P9cI6W8YOZrqRmzkUF8w1MmLIi/pw6OnJHfeAmv+/FkZpRF4wgiR4VzBmHxF/Ycg8vyEBUfHZrMdek2HEpb8u2WR56QOnaDGPsy8w4Qrbo/GkKYEmtHS4UWkV6UDW4AqSR1flswVG+OCNdNrLw+9WdO0v9Qy61wdw3H29epZ3TZFUf+f3GQoB/ojq7e3XlyCzrvmH0ygvoQQe61N58JlZyNgFKggL+4Z6iweKfqiLnJYMsSl9kOcL1VaFVr0+dus6xl0gEBa5ctwdp0Q9J5/P7gy5YkYoLpdWPVX+bamMj6WzM05dAvvHNYlCaL3Q4HBgzdhQNMBfw7J1S69EeMsNnUFcxc7+xqcLiWpsQTizPP0HNmujNQyeDdGViBqVpMJgoSm0feWMujEIgg/0DhQA2NkA2izZI0aZlTaMfl6WvXAtl+VkukC7WPBnuQVF4fowMvxXOnYzPi+oucQ3bAcFcq2cE4nNbMm5icHZEd8ZS8r3FzVUyFnDs9DIbJ7YS9XQGLEj/n66s8YKm4qSfZGBZFn7VBwCg==|920 \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json index 512ae880..bbdeeccf 100644 --- a/Pages/任务/任务-任务信息.json +++ b/Pages/任务/任务-任务信息.json @@ -1,11 +1,6 @@ { "Rows": { "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -55,6 +50,7 @@ } }, "InLogicalVisibleIndexes": [ + 0, 10 ], "Count": 11, @@ -133,11 +129,6 @@ } }, "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -148,13 +139,21 @@ "Value": 1.0 } } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "Count": 28, "DefaultSize": 32.0 }, "Values": { + "0,1": "任务说明", + "0,26": "展开", "1,1": "版本", + "1,26": "折叠", "3,1": "任务说明", "3,2": "编辑", "7,1": "备注", @@ -165,6 +164,27 @@ "8,2": "H11" }, "AttachInfos": { + "0,26": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!Z11" + }, + "Value": "0" + } + ] + } + ], + "Text": "展开", + "TemplateKey": "_RS_Main" + } + }, "1,2": { "BindingInfo": { "TableName": "任务表", @@ -172,33 +192,108 @@ "GUID": "7dad81ad-e9ca-48b7-ad01-7540609d19f8" }, "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 3, - "IsBounding": true, - "DataSource": "任务版本", - "ValueColumnBindingInfo": { - "TableName": "任务版本", - "ColumnName": "ID", - "GUID": "b59ba648-7cf6-4c5e-802d-fce61ab98147" - }, - "DisplayColumnBindingInfo": { - "TableName": "任务版本", - "ColumnName": "版本名称", - "GUID": "46995cda-42d7-40ae-ad06-7e624f660b83" - }, - "ItemsQuery": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务版本", - "ColumnName": "任务ID", - "GUID": "8a77ba22-257e-45ad-94dd-5d8054eec6fe" + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!任务ID" + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目版本", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "ID", + "GUID": "72ac95df-9476-4722-831d-f2b22d29ec12" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "版本名称", + "GUID": "28c98b1c-4437-4187-a031-6de1d2948cbb" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本", + "ColumnName": "项目ID", + "GUID": "ae844286-f9dd-4a54-b9de-c3809162d265" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!任务ID" + } + }, + "CustomColumns": [] }, - "CommandList": [] + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "1,26": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!Z11" + }, + "Value": "1" + } + ] + } + ], + "Text": "折叠", + "TemplateKey": "_RS_Main" } }, "3,2": { @@ -303,7 +398,7 @@ "Message": "保存成功" } ], - "ID": "5022e7ef-dd26-472f-ac8a-c2c02d7fed43" + "ID": "b87711d4-058f-4e16-adfd-f0fa165ff559" } ] } @@ -350,7 +445,41 @@ "Message": "保存成功" } ], - "ID": "b8d50ddd-cf2b-4d0a-a111-4add24e2baaf" + "ID": "81a081a8-e4b5-417a-aae4-7654a2643b81" + } + ] + } + ] + } + }, + "10,25": { + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": "折叠", + "Style": 1, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!2:10" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-任务信息'!Z11)" + } + }, + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!1:1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!Z11" + } } ] } @@ -361,56 +490,75 @@ "StyleDatas": { "Styles": [ { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 1, - "Formatter": 2 + "FontSize": 18.666666666666664, + "Foreground": 0 }, { - "HorizontalAlignment": 3, + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 2, + "Formatter": 3, + "HorizontalAlignment": 4, "Underline": false }, { - "FontFamily": 0, + "FontFamily": 1, "FontSize": 13.333333333333332 }, { - "FontFamily": 0, + "FontFamily": 1, "FontSize": 13.333333333333332, - "Foreground": 1 + "Foreground": 2, + "Formatter": 3 }, { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "HorizontalAlignment": 3, + "HorizontalAlignment": 5, "Underline": false }, { - "FontFamily": 0, + "FontFamily": 1, "FontSize": 13.333333333333332, - "Formatter": 4 + "Foreground": 2 }, { - "Foreground": 1 + "FontFamily": 1, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 5, + "Underline": false + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Formatter": 6 + }, + { + "Foreground": 2 } ], "Types": { "Strs": [ + "black", "Body", "Text 1 50", "[AUTO]General", + "Center", "Left", "@" ] }, "CellStyles": { - "3,1": 0, - "3,2": 1, - "4,1": 0, + "0,1": 0, + "0,26": 1, + "0,27": 2, + "1,26": 1, + "1,27": 2, + "3,1": 3, + "3,2": 4, + "4,1": 3, "4,2": 2, - "5,1": 0, + "5,1": 3, "6,0": 2, - "6,1": 3, + "6,1": 5, "6,2": 2, "6,3": 2, "6,4": 2, @@ -438,17 +586,17 @@ "6,26": 2, "6,27": 2, "7,0": 2, - "7,1": 0, - "7,2": 4, + "7,1": 3, + "7,2": 6, "8,0": 2, - "8,1": 0, + "8,1": 3, "8,2": 2, "9,0": 2, - "9,1": 0, + "9,1": 3, "10,0": 2, - "10,1": 0, - "10,2": 5, - "10,7": 5, + "10,1": 3, + "10,2": 7, + "10,7": 7, "10,13": 2, "10,14": 2, "10,15": 2, @@ -461,26 +609,27 @@ "10,22": 2, "10,23": 2, "10,24": 2, - "10,25": 2, - "10,26": 2, - "10,27": 2 + "10,25": 2 }, "ColStyles": { - "1": 6 + "1": 8 }, "SheetStyle": { - "FontFamily": 0, + "FontFamily": 1, "FontSize": 13.333333333333332 } }, "Spans": [ - "1,2,1,13", "3,2,1,3", "7,2,1,3", "10,2,1,5", "10,7,1,6", "4,2,2,26", - "8,2,2,26" + "8,2,2,26", + "10,25,1,3", + "0,26,1,2", + "1,26,1,2", + "1,2,1,8" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -506,4 +655,4 @@ "PaperSize": {}, "Margin": {} } -}//EHUYyKhmoqIInEOZonSOA4+jMEj7SZ0/DdsI9zDp/PKwtmrcZBuWjo3B2Vak+l2IHAjDk28hH0AYppXXONQ4ZRqxOmMdynnhlaYeuZervbHxprr/JdyNyg3VsT0WC+tmE9fDWgw678mgEwTT5BnjXtZ5Pg9np/+JybdbWxU4bbqBoEAsmfrUqhHkhweD5+2kBIWGef6pFFej7TkWFyhtkNK3GCqPerh0m/nl37HfIim6EEJQglSmGYEmcC8RdRXz1lqSaIJS0zWfcG2zmViVRxWHSwq6mBh3jL8v8RujgD8aiO6NJ6Am+p/zcsLbFzRBChd2KibHEHvvT9I6lL5mK5UQBKLTXXcYaCaOk2UrPPv9qbKAMCiJam6KbQkuvVT5XEDTKoahIV72+c2gqO2+G1Wr0+/rvsRxT1YGORor3W7CyPoSjwINHIXrKMh88L1RIQJ2OfHMPVhRO3PcgXe9KAiC89NAYm/BGT2kXnG2KyJ63Zb71AXap0kar3dkkIbhe2zEWq1aAzal1szJSD3tdnj028E76I29N9+qxVjy+q3CcXbbW/GdukvZcLfFx0Dgf93bekVT95dfhDgTlFyrsXQEEUYKVJ5Bwd/T5bpzJAOCBiFzzoLpdBe2N1/N/z4wEGVq/DNoV640JLuDsZMirKIge0DEj9GjJHualb5rK6qfRDPmHBTYGg6gHOEW5HdqgYW1xg098vrhJ8vCt2EBskMtgIgNGcqGhHkdI2h9LMZhFzMCQ/N3CRPIHoc9MxAD5MxAmhWGEdlsxGvU9hG9mTgMwjhMCc+R2+ZvG07QOU8vkrDKBwIHaux0JCMs2ufjVEQnr7OBepoQHNNUVT8hoxUgbb3rmlCjczPZrfBn7JCNeWTCWMFpvhYZMTDbUzHAnd1V2tpO6y/h1pYHxZPDmQ==|920 \ No newline at end of file +}//yhecHa5riH/XBNBi/UAG/T0zFn5+oJGGLa8MjqP6AOlphRN85E/vghUhR/iu20mfqWtlDmx/Sk42H4pjdhfkhI+IXrs4pLRwhEjFHmTD66hZEVWfFJyuhQR9aWFhhIYFOItgX2POqjcmVeQ5MfQtXzyoQw2O1ZqXhG5CfAUvdEbe3Lz0CD8JFbdTqjaiaevzbi/tVwNUA7Wq8QUCDwaIMPQoDmtcr65UM7Tlbggxwcrhl8xra5aMy8ND3h2HsA15Hkw/zdJ5+RAchm6MyeupWxT+f/dy0rMdviu9ldcmirAjjjmkooKuKmKpLnooiZQxav4aFrgCFqU54+bAOLw9lCxT4yVSP/9H5PV+zfJxq40DwUuF4Q1s83TJg5WYerAgjLjrJbxwO0ihSNlZaexmAXD3qp3W4WoB2RNfeOFEs7O/hrgxLYvhZoOkEixHwYBxWLuKdCN2jCutftumK3GaFajZIS09XveReQXYmreIaKi667PlkaVBZMfAXH5abhhIzXQSi6uV2SVP7GVZJnQtsNYBBh8W3aks0Wb9Z+pOTPaRBoxD0o+Wq87wAZUQ+PAdzL4WGtqSwQml3MkgDKI4zw3UpEYdw/B2PbNKv0Xu3dNtkZYVPdiZnPLofpROeznEtVdnJjXwGUeX0CyYbQi0AgiPaulpjtAI42NjIHUnHLLBcCEotyzjGEgQqLRs1wa9Ea0EBaSdvBbex0Ak84EraIkcp9Mgq6/PlYGGTxlN2h1nq0MCrP/C9TMZYhBGvD80SB9NN96CH+9WNDBhAIX2wQaRfZ/kguz4f4221/ZgBYOfGoObJmm9ouUKYZE5gm/IeCAbL7ppjgFcer9JyN0F2l/wmVPUJnUIC+FDa/rHnTl5T3G2EmmQeJwpZoDoC0FEpjQKXVDUvJUcE1S89M8eCw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-侧栏.json b/Pages/任务/任务-侧栏.json index d3f2f5a8..47f8ad1e 100644 --- a/Pages/任务/任务-侧栏.json +++ b/Pages/任务/任务-侧栏.json @@ -60,7 +60,8 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -127,13 +128,18 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "参与者 1" + "1,1": "参与者 1", + "6,1": "singlebox" }, "AttachInfos": { "6,1": { + "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", "Style": 3, + "PrimaryColor": "Background 2 0", + "SecondaryColor": "Text 2 0", + "CellDefaultValue": "singlebox", "Items": [ { "Value": "", @@ -161,13 +167,15 @@ "BorderBottom": 0 }, { - "FontSize": 13.333333333333332 + "FontSize": 13.333333333333332, + "Foreground": 2 } ], "Types": { "Strs": [ "Text 1 50", "Background 2 0", + "black", "Body" ], "Borders": [ @@ -195,7 +203,7 @@ "6,1": 2 }, "SheetStyle": { - "FontFamily": 2 + "FontFamily": 3 } }, "Spans": [ @@ -226,4 +234,4 @@ "PaperSize": {}, "Margin": {} } -}//UNzED8efYq5+we2f8Jcuec18sBxPg1MZra1PpUy7Afo/mRCRHB5omVXJis1nMD8sPavRPGERSlEnNtzK2p13E8/PMkgVX/LKAXX9nSGNt0NNO52mJ5TfdMxw1aULprGjQY7Pudx9Ri0RRPZwjAzpu2VMwqmHutrzdbUhB9n9fyP8lozXi4vZ84dc7eC2pu3+vhmPetv7S3IOl4LWOxIft7UvKUlJGINN6geMLmQE8Z1T3ZbZ6WGSZpMxJIoJjdTGBGwniHLEtxN9jbV1oti4hGXvvO1vE+TwOsnie04CF6FZ037vVi9VYbAhQAvg8VJo/5SMqnpyjIz3t+MOf9JU1xsXX+LfGkr5DIDD3r8uTSYlDOTdnxayYItLusnLZXHyBE5TIdCSd1CKHWWi3MPgm1HjFFubDFors3CaDHbDo1IvwpPeQRzueGxn9/jLzFdZxi092U/Dm8Jd2NTltPwEDq1g3r+7/YXObcFCOrw3Jvag+0S6MhnAoSDa+Ud+/x1l+bwUR+lxbyirspzUJW7gmD+qNdeW7ATBwqoWUEf37ewDNlQwwf6PbzipqlEJjEorpMNKJ3GUvh64fEtdG1WFefxJWp1I74jTOeYf8A7SVykX2dRcWEVL0FxNfExyHGwMTtoH7wlZfdozj9hYIFK8AaE4eLzl6JuItJygwgw8N+ubMZCEwNFHWPPXc/JmFGLbf5oAiFaF+RcwozV0HpH84eSQOjSGTcZEVEbfQkpJdgg+d3ckxiPfjrgVX2PiHThMcjagCi/s0vXliSaEovzg8rE4IdH8oTih0arq6AkZnxVxsvZpjsggB+bg0SSu51IlY6DSw3A8g6u3An+PCH3KV8LIrc0baquhMHslX0tHhTqMhV9xuteH55BVRMJ+QFZbK+vCoa9KSViWzv/uaGQE2w==|920 \ No newline at end of file +}//DOG9GXBVJORAJjM3TypcRGbKhhHQBm8n7jN5ZyEikXbZkQ4E905d0u9ftaOVKczca/N8Y6zucsxVPOIuCDy2oPB0x1YqDvWW1aeELMQ69ANn4QUR9c6CZWeuZwhhui+9K/NfZwadtVtyXgK63f0dgad68eRw9aYl6jKMV+02X9A40oEiVXvgichbX1iij3ERPkTH2PSeKNSt4xUZutnUcok22evTMvlxL64qJLaOCnXj4uA1RtL+ILnTK9NTlqkodBKEjfpBeBf9KQ50cvii6GOBWlZHagy0C7WHMIuIo5L/fkrkCtPKyVige/bdak0aCtUvgjsqe/oGufW8R0hrdPhhTVDXDYMxBHO8LwtNNSUxbodOsdjDiZ0rmTAmRVCM31n7W0utB0MOWTkh+pxFqtGDEE485MW2d5d9Ez7Zk4cWJNNF1XqOpqX/Cz+4lsMrYcLQ/2azG5vuf18x859FsVw2rSQJEJQ8DlQbia0JWcD44zDD+nHgw2U0o+JmjcG54M9GcXL9fQfJXsukPa+gKY9PmZ8ZwlekRIr3STJUNShq2uBJxFzQF1R+FgX2Fc+m1pNbL/nDeCOibd0jgnB1V/saD7l+cFNVx9HXMbttWu2Hvq+vMFfjI9BOCNA6lDI1xrkTxmPXPcSAIaG843pJmNb/Kl23K5AmgaeDzO6jMHvhi/2d1J2lGa7OEqjx/2P6T0ASzS2Z74kS5oaV5TVBqrK9jHfWTGsIW5OIczpkM7C+7QVnN7X9LrKh9nKssqC6qpSWzQjf3XnJ0iP2TEJnKChZ1hsPhCzYrQKB2JMDGx2X3UBWnX6lP8hLGXJr/YAPtWfBrgOfCwOIwZnDZKbpqPPPY+1SSFBwpNSq7h77ze9Br6oBdea57X5GSeZyGEq7ImWZDDhGWVG2rmxGvAMqsg==|920 \ No newline at end of file diff --git a/Pages/任务/任务-关联资源.json b/Pages/任务/任务-关联资源.json index c155ff53..8f306739 100644 --- a/Pages/任务/任务-关联资源.json +++ b/Pages/任务/任务-关联资源.json @@ -3,27 +3,22 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 136.0 } }, - "3": { + "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 136.0, "Mode": 1 } } }, - "Count": 4, + "Count": 3, "DefaultSize": 136.0 }, "Cols": { @@ -120,10 +115,10 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "关联资源" + "0,1": "关联资源" }, "AttachInfos": { - "2,1": { + "1,1": { "BindingInfo": { "TableName": "任务表", "ColumnName": "关联资源", @@ -179,7 +174,7 @@ } }, "Spans": [ - "2,1,2,27" + "1,1,2,27" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -217,8 +212,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "24,47", + "Location": "24,32", "Size": "957,272" } ] -}//5rG31XsucSc2m31Rc40R3JblqtysHUq3m2SiDHd/XSPR3YiaXlpCImfFdpTuW05qI5NYT+PvlwNlN8e0KIGLV2LEcqz7xcoEdjslITojyZxUfg4aEkrkewIRsMOw79QS5Z1tlhSu1yBuebcN0bqyjmzn/P5CQvg/dwYPR6bVsua1ENLSTfOTB9N5sh3CBczdakAK/iDqFODRYpTfDvXL4GWWiA3deIka5G1gaV9oUGZHgV1+MjhVHXarMfxGjMzev+4pjnTKPkSLEofJ0aqhkQx6jDppla/fbw6GQ4yBhQ/3z2//fzqsF2ilM4/yLHdUBZdEjgiOneBBdjsU5rBSdqY2uyzQ/+/W1PdjCBog/3eqMv3aGSu0wBg/yoQnaR+SNErOO6jKIjxcOqqejU3RjTDvp7G3nA3O+CVTUbfS3QXJj/0HsqK9/Vw2UNaybpVc5ofx/UpdQBFGrroF9J6155W+xnIeZ90ovX4JhgYQQLI0Dolthdzs7i5j7XVF84gA9JnG62UBIXh8w0G8PTW8HbfMsceTFpY3eTkHpd7EzfvI7hiNvoouVXuSZQ89vQcYponv5Bc3J1ybqG3N0dPXfG1FPYqANA2XIO2EyhE0NCZArOOWLjycz3E/w3IU64YwZ8Cv1qdv04MzYKk5etjS1BWvox3m7mDFOYh0KfyG6YPkaVDIv5zzzyG6apr/0Fci3IV3cQ0eudIWGZs8UAlAwZxO+dv0O4jm4gcbOt01MyP53U+blxczDmY84nlgZq96xDSM0OLDz1G8jrB3m8z/E5/wQ7LGelemR+HvjL5x793jgvOSv8zG7+YTRBZfbUVTIv6sWojm4g7H/EHaoHvdyi0QnAblkWJlUWQY4JVgjbNBg2qwVKK72tDdR7sP27g3xi9vWwQnJ1SPrR4fkp9Eig==|920 \ No newline at end of file +}//T5A4ZMo4QlhODDin5m90+cYByCcbJb6PSaBZ1Gu06arcvLgEZJgXapgQS5oleYPh/x7+YDU37+VEfE27tS5gze5kCTJrhl9Kh5+sef/uFgDZAyO3aY5qCRAAaFJ62Pg59d6p+p8JtTq4VLw7w+GETXGUX19J1MzvqJv/5t5do3jZqvxEfMco9z36zph1hSJoKLMk1tGYFcDe9zwH/dC5R818qzS0RK28HD4HXX5zrt09d1BdmGs017HZ08bGtlLY8WCLQbbskqPN3wnsdfwUSouXk1cwUoeeOkHVM7en0kopv3rGrRki/34PNi07VlcdYSCZLIWKNvHd3TnTX+WvZJp97fXzWDx/T6PBoR7loCkbQ+oBqQkNqoqZsqQQRjQiq7388cwpClye4Ot9hk9nUxFw2EEtPoM76LOaSI6CXe43xFyHNWW4QUl5ik66sT1sNxbNPzBqWkEm+FRkoDjHsFz18w0rbwSx92t79HGvloGbZiTDw3P4ff3811sw/CBHw0BDnDVXjvTAshKoMK+LzFtNDuXvYCCxatWidmnT/+5yGWa4P6Wmfo8DTSgSZEfqFNlNZmgOCcDX0HtAH16F/A0gJ4zfmxs7+YUDzMtIgE+vmwOFcZnskHA0ZvABu8W4Yd/2oWEUgrOT+tblumWVKQovmj0ikYkFegZLdSayIZs2SflnncfhYZze49+luhgC8t0grRpdrsWI0JC6dkoYR1EaPEdXKaJgnA0tEPTzEMikhv7lfMP+LZtDLSL2XwLUX3ZxmrlkOmwGuApksd7U9Thwl9wpCNpJTEcWm0wrQObpWNfUKFgwa536Dmbc5mEB8r8D1S15uHjbwnLzHxSxLCIQKrEDxMsliJfk6nGz8mIpMHhH8DgnnlWgsJPYj851pNQzwknI0I2CK6KMPaQa8Q==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index cdb14df7..4b349ff5 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -46,11 +46,6 @@ "DesignLengthInPixel": 15.0 } }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 @@ -61,6 +56,11 @@ "DesignLengthInPixel": 38.0, "IsHidden": true } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "InLogicalVisibleIndexes": [ @@ -141,24 +141,24 @@ "DesignLengthInPixel": 32.0 } }, - "14": { + "16": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 15, + "Count": 17, "DefaultSize": 32.0 }, "Values": { "3,1": "状态", "5,1": "类型", "7,1": "执行者", - "9,1": "时间", - "11,1": "项目" + "9,1": "项目", + "11,1": "时间" }, "Formulas": { - "9,2": "C14&\",\"&J14" + "11,2": "C14&\",\"&J14" }, "AttachInfos": { "1,1": { @@ -189,7 +189,13 @@ }, "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "TemplateKey": "_RS_Success3" + "TemplateKey": "_RS_Information3", + "Icon": { + "Name": "未选择.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } }, "5,2": { @@ -281,93 +287,7 @@ } }, "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "TemplateKey": "Gost", - "Icon": { - "Name": "Navigation/170_user_3.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "9,2": { - "CellType": { - "$type": "ElementUI.DatePickerCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", - "contextProperty": { - "Display": "值变更原因" - } - }, - "value": "userInput" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!C10" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } - } - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!C14" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!开始日期" - } - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!J14" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!结束日期" - } - } - ] - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false - }, - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "保存成功" - } - ], - "ID": "c33b11fb-b41b-402f-bff9-145227bfefd1" - } - ] - } - ], + "$type": "ElementUI.SelectCellType, ElementUI", "UIPermissions": [ { "Scope": 2, @@ -380,28 +300,68 @@ "AllowRoles": [ "FGC_Anonymous" ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] } ], - "type": "datetimerange", - "startPlaceholder": "开始日期", - "rangeSeparator": "至", - "endPlaceholder": "结束日期", - "format": "yyyy/MM/DD HH:mm:ss", - "firstDayOfWeek": 1, - "DefautWeekFormat": "yyyy 第 WW 周" + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "c90bceab-fa72-442d-8c19-61dc7764dc63" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "f70826f8-1622-4d18-8846-86da93f54d84" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" } }, - "11,2": { + "9,2": { "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "c6f6fc6c-e1d3-4bb6-a584-b50ce844b2a3" + "GUID": "07be4b9c-14ea-4d97-902e-2375a9623dae" }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", @@ -431,7 +391,7 @@ "Message": "保存成功" } ], - "ID": "67918791-51b4-473c-8618-9ea7f4986079" + "ID": "09cdbf3e-cf86-4326-b67d-c6e1f9fe6197" } ] } @@ -481,7 +441,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", - "GUID": "a7ef212b-d507-4b32-bfe2-8a733b007ebf" + "GUID": "fd28d81f-f3bd-4a7b-b116-78542252ec50" }, "ColumnName": "value" }, @@ -489,7 +449,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", - "GUID": "2130156a-4c51-40a6-850b-abc4e021100f" + "GUID": "03751745-8a51-4961-beaa-8cd4f4e02f44" }, "ColumnName": "label" } @@ -498,14 +458,16 @@ }, "placeholder": "请选择", "noDataText": "无数据", + "filterable": true, "filterInServerOptions": { "matchMethod": "contains", "loadingText": "加载中" }, - "noMatchText": "无匹配数据" + "noMatchText": "无匹配数据", + "clearable": true } }, - "11,10": { + "9,10": { "BindingInfo": { "TableName": "任务表", "ColumnName": "分组ID", @@ -539,7 +501,7 @@ "Message": "保存成功" } ], - "ID": "60e6396a-1cfc-4471-8818-2de3dddf390e" + "ID": "466209d9-0339-48c8-925b-4b6ff1067338" } ] } @@ -583,11 +545,11 @@ ], "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "任务分组", + "TableName": "项目分组", "BindingInfos": [ { "BindingInfo": { - "TableName": "任务分组", + "TableName": "项目分组", "ColumnName": "ID", "GUID": "427d6efe-dbdc-45b4-aadb-6b65a8865e3d" }, @@ -595,7 +557,7 @@ }, { "BindingInfo": { - "TableName": "任务分组", + "TableName": "项目分组", "ColumnName": "分组名称", "GUID": "b704b64d-ade6-4f0d-b8ea-8e734f9253a8" }, @@ -605,13 +567,13 @@ "SqlCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "任务分组", + "TableName": "项目分组", "ColumnName": "项目ID", "GUID": "018d99a5-8bc7-4c34-8301-7977f11b6135" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!C12" + "SerializeProperty": "='任务-基本信息'!C10" } }, "CustomColumns": [] @@ -623,6 +585,112 @@ "loadingText": "加载中" }, "noMatchText": "无匹配数据" + }, + "DataValidationInfo": {} + }, + "11,2": { + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!C12" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } + } + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!C14" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!开始日期" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!J14" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!结束日期" + } + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存成功" + } + ], + "ID": "ba1fdf9e-58ac-492e-8e93-a64462fdb55a" + } + ] + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "daterange", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "format": "yyyy年MM月DD日", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" } }, "13,2": { @@ -662,6 +730,14 @@ "Foreground": 3, "Formatter": 4 }, + { + "HorizontalAlignment": 5 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 6 + }, { "Foreground": 3 } @@ -672,7 +748,9 @@ "@", "Body", "Text 1 50", - "[AUTO]General" + "[AUTO]General", + "Left", + "Accent 4 0" ] }, "CellStyles": { @@ -692,7 +770,10 @@ "3,12": 1, "3,13": 1, "3,14": 1, + "3,15": 1, + "3,16": 1, "7,1": 3, + "7,2": 4, "8,0": 1, "8,1": 2, "8,2": 1, @@ -708,11 +789,14 @@ "8,12": 1, "8,13": 1, "8,14": 1, + "8,15": 1, + "8,16": 1, "9,0": 1, "9,1": 3, "9,2": 1, + "9,10": 1, "10,0": 1, - "10,1": 2, + "10,1": 3, "10,2": 1, "10,3": 1, "10,4": 1, @@ -720,17 +804,30 @@ "10,6": 1, "10,7": 1, "10,8": 1, - "10,9": 1, "10,10": 1, "10,11": 1, "10,12": 1, "10,13": 1, "10,14": 1, + "10,15": 1, + "10,16": 1, "11,0": 1, "11,1": 3, "11,2": 1, + "11,3": 1, + "11,4": 1, + "11,5": 1, + "11,6": 1, + "11,7": 1, + "11,8": 1, "11,9": 1, "11,10": 1, + "11,11": 1, + "11,12": 1, + "11,13": 1, + "11,14": 1, + "11,15": 1, + "11,16": 1, "12,0": 1, "12,1": 3, "12,2": 1, @@ -746,13 +843,15 @@ "12,12": 1, "12,13": 1, "12,14": 1, + "12,15": 1, + "12,16": 1, "13,0": 1, - "13,1": 2, + "13,1": 5, "13,2": 1, "13,9": 1 }, "ColStyles": { - "1": 4 + "1": 6 }, "SheetStyle": { "FontFamily": 2, @@ -760,15 +859,15 @@ } }, "Spans": [ - "9,2,1,13", - "11,2,1,7", - "11,10,1,5", - "1,1,1,14", - "7,2,1,5", + "9,10,1,7", + "1,1,1,16", "13,2,1,7", - "13,9,1,6", + "13,9,1,8", "3,2,1,3", - "5,2,1,13" + "9,2,1,7", + "11,2,1,15", + "7,2,1,7", + "5,2,1,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -787,10 +886,11 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "RelatedDataTableName": "任务表" }, "PrintInfo": { "PaperSize": {}, "Margin": {} } -}//+Ad9ByMkjtuDMTdALZRiLc8yGF98kovjAdgChhZy5TMbq5tg0gNSL3HGmZJ2pCXdyRA5WvF7g75IpxXBYJQTLnsyVbFhopyyT8Ay8Ec+gc2jPlBosfGULewjsKVGvBndh4jXmo20IwNa3sv2KDV0Sf9lX4EZ66AqMUdWHHp2eGvRuiMkGJprYt+HLx30mhecKUSVV2qMcn5q10ZqG76Whu+wKyb7ldxPPHdXvA4dVrWEE0sraiLYXrEcrhmI2O7K0Eoy5TNEv2JH10ZRJbYuStE4OH5LkOFN96CX0qYlVQ25dLjsNFASL2mTacKr3zqV20GGRqM7JNEoN8lBqTKnvbXvuyRHCQOgqj4WCtcBkauGgjTZAegv6hgU05UDEPSk8rr6MKTLuaruoGSG/xiOebyt+TJtws45nXb9HiO9a7tXsGhfmeek1vrS6m/ratmuN2IbOxnwRsU4WRDge3VvJdkLDt8V6ZkKS9UFLeg39h/ngHzOFWyfyD5/ty3HT/UWdTFBsQgo5NIoUIiySK0ld0bAdyxtSP4uXoEE/xqlB9Ej4mram0W/4aUFSCQ6OUOoA9NRX+/8yJTdPrnZfe2D+EovMA4iQBnZ7vr1SU9xvSbn+iIkC077RlozWl183QpZz20xLNLqcJb16R73jt1z9D6vDJYm6DfCZUc5zcrEW6l4EJy29e3Q0gma5mZR2fQ7zAotXqMYEoEVGYvmHHYxsYG5wI1tNBpidAVv4OA+lKchclQymyHx7v/CW7OQsV+eoVaQlSN4NYl/xRRofu4XZugr6+3CEMqmHoT2ydSsPzaQhk5WuTcwLHq7MX3bogFwkTSCAmHMlmk645n7ZJsIeLs+/VZWAIXhAJndHHZro3f8Sctjy7hMVeVb0QCJfT5nE9aIyX2u0qIINaRRlfVdpQ==|920 \ No newline at end of file +}//5CczPd0XrWi7folzqjfIrPmNYBwE9WsNYxMGEb8SJeqrkS+P9Of4AZBwbl6t8DzOS/oRzv7D0AZH05gwtryq65hRIqhKT6qm320JCIt/t7rqB5LbU8CTtqpRt8pPdpy/bP2v0gOEsrCO813CX33gGGNvsAsgFjVQAQUhX3Te7ojiR+1DAcCOJ4JbrhRGwhiuuLWLjzo75pdznRI5qGFfK32llFLTgZhjXHnmXCPH2snKzzZDBjdf3WHhq49TIdeNLWTTbfzXoC0MKTkW78Y8WP5K3vQ3K2MM29VrMQhelaEWQEaYqFLCXYZT8ifd4e7Iu5t9pb3N9A5CPqKyMW3EoktwhD/a9nMadiFxUyGI2OryqmnKfijn4JKUMOi2AujJoDsiY7320NBtRdTqAyqammHd9yRQoriBkIZTG86sojTOf6suRSn7gsOqiuHE5F8z0X1eS85hyvMgTzPLV43a7RMm4d9ll/WLmeu+DIvbluofr4U+EQAaXg1Rg90Rx5wK7xtoaFroxtxZER+V386M7kAJ/Nb9a7Xr1XO1WZ+pHyHl04u1GNF+jJkGSGdzzHztUU9qaLcKu/keoL+E1w9t9Sw+BElPMdNoDN53N1d0veUMTm9IRZ+c5xbm48wKKi00iGw2odaSBJkxrYo7p6ifliTR+k3o/RTGimDTxA6IDR911JtE1y8Qz1u8lPb1yGnlVgYGQHadkNMMTaUliR3ABLhM8dedeX25LMtitsBCE+kzpnZ/EbY0HUbROVSHxljQrcs4NGQR99gXCeRXWAmOYI3QgYqHCpdsDxS9bs7OMfSM15OZsL5NP9lMyf7zNb/xFZqRtDpluKtYXWMLs4EoJuZW4FBQpVIU5/Mi10AxW0US36qMnAaffIsRY81NI3GXND4hAbK+D7hmcvGCIDCw7g==|920 \ No newline at end of file diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json index 12ed0d49..d73bbbf1 100644 --- a/Pages/任务/任务-子任务列表.json +++ b/Pages/任务/任务-子任务列表.json @@ -3,31 +3,34 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 30.0 } }, "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 - } - }, - "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "3": { + "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 272.0, "Mode": 1 } }, - "4": { + "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 28.0 + } } }, + "InLogicalVisibleIndexes": [ + 4 + ], "Count": 5, "DefaultSize": 10.0 }, @@ -125,13 +128,43 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "子任务", - "1,24": "增加任务" + "0,1": "子任务", + "0,24": "增加任务" + }, + "Formulas": { + "4,1": "IFERROR(ODATA(\"子任务视图/$count?$filter=父任务ID eq \"&IF(ISBLANK(任务ID),\"null\",任务ID)),0)", + "0,1": "\"子任务（\"&B5&\"）\"" }, "AttachInfos": { - "1,24": { + "0,24": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增任务", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!项目ID" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!任务ID" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!父任务ID" + } + } + ] + } + ], "Text": "增加任务", "TemplateKey": "Gost", "Icon": { @@ -143,10 +176,38 @@ "IconSize": 14.0 } }, - "3,1": { + "2,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "558ca610fafc4ffd8884b819161bfd6", + "Command": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "38d3f029-b2a4-4a0f-90e9-7d30c5db2c6f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!ID" + } + } + } + ], + "ParamProperties": { + "ID": "ID", + "任务名称": "任务名称", + "执行者": "执行者", + "开始时间": "开始时间", + "任务类型": "任务类型", + "任务状态": "任务状态" + } + }, "DataSourceType": 1, "DataSource": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", @@ -211,11 +272,88 @@ "ColumnName": "任务状态" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "子任务视图", + "ColumnName": "父任务ID", + "GUID": "23edc24b-a803-44a4-b3b2-f45ff233625b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!任务ID" + } + }, "IsListviewDataSource": true, "CustomColumns": [] }, "DataSourceListviewName": "图文列表表格1", - "TemplateKey": "竖排无样式" + "TemplateKey": "竖排无样式", + "CommitDataWithCommand": true + } + }, + "4,1": { + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-子任务列表'!B5" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!2:4" + }, + "Value": false + } + ] + } + ], + "ID": "0bde0caf-e25c-45de-aec1-87d294bed461" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!2:4" + }, + "Value": true + } + ] + } + ], + "ID": "8338f50c-5d16-48a1-a3e6-49eadceecac4" + } + ] + } + ] } } }, @@ -235,7 +373,11 @@ "HorizontalAlignment": 3 }, { - "Foreground": 4 + "Formatter": 4, + "HorizontalAlignment": 3 + }, + { + "Foreground": 5 } ], "Types": { @@ -244,18 +386,46 @@ "Accent 1 0", "[AUTO]General", "Center", + "@", "Text 1 50" ] }, "CellStyles": { + "0,24": 0, + "0,25": 1, + "0,26": 1, "1,24": 0, - "1,25": 1, - "1,26": 1, - "2,24": 0, - "2,25": 0, - "2,26": 0, + "1,25": 0, + "1,26": 0, + "2,1": 2, "3,1": 2, - "4,1": 2, + "3,2": 2, + "3,3": 2, + "3,4": 2, + "3,5": 2, + "3,6": 2, + "3,7": 2, + "3,8": 2, + "3,9": 2, + "3,10": 2, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "3,14": 2, + "3,15": 2, + "3,16": 2, + "3,17": 2, + "3,18": 2, + "3,19": 2, + "3,20": 2, + "3,21": 2, + "3,22": 2, + "3,23": 2, + "3,24": 2, + "3,25": 2, + "3,26": 2, + "3,27": 2, + "4,1": 3, "4,2": 2, "4,3": 2, "4,4": 2, @@ -284,7 +454,7 @@ "4,27": 2 }, "ColStyles": { - "1": 3 + "1": 4 }, "SheetStyle": { "FontFamily": 0, @@ -292,8 +462,8 @@ } }, "Spans": [ - "3,1,1,27", - "1,24,1,3" + "2,1,1,27", + "0,24,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -331,8 +501,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "24,55", + "Location": "24,40", "Size": "940,282" } ] -}//55gQ9WWooQHa28sQQCBkKNOwgOo+khpMm0e5t6nSkWy/cePsTteuWLPBZjQNJZ9elpBipZBGXik97OAjreUwey0DBd9K7ueWzZFxxM+lovPhqKka31toH5JrDIimxyyb24ioDwHH7WFZhnd0gbTlSZKGkSegBBBLSueyzHnlvY4IzN5N+jMfJzf/6jcNn3R8ixId8Y84FHxQayR8/gbLoENtVUGiNj1Oe8ygpWRSx8U+o/uok2N0DAw2laxFS8J/K4INTGpXbR5zkewtFVeOrQzgRoBdj9CaBp1AjafDSTMN0qTgBeWF2z/6uTDJZOXRk5rQdzJD24KSkXVaeAnj72BmSD2o0v6G/ew3R/nu+KItFVXhhgTzMUES/CHr+8NJauQYf0wtttGI7Pijik2OsftiPHGNKJw5XdbyqoEPx7WH4rlFcJZxv7nJkmyidTsw8IPm4c6tCS8FYLS8nF5f1stTSO/my+yY/v1dIGSR2Hsl+QLdpW/9B/9FYgBJchY9F45L6tD+dH8fSA9YgUtNNs9b6bRX+n5djPds9DSmcp5TivTOkzqOyRg2AGBhymZsWlMCTvg994VFhgiWnlTLHCu08L3cltbGBYFqkoT/v95R+kAiVAMd/H9WiqKScNbie2q00jl8zbPMcfaFoOD60odtE8PabwDQoi4Q6OR+o7374wNJAZt05adcQuu2gpsyGDIO8TRHCDyIOJrqolZWKyhUS0IW2kPVwcrb0K2mtSFlIiu9od4ovKX/XTFLW3RuAc+Oc2+63eOqVip+t5tWJyAY09r85JkDh2RZL8vXqY0qC9Rhs1AzDPrXzfKrSgLYrU3gTl2dTUKbTebjSpkKoH/3TkOHvuRxRPWAwNxyDgmp+AF6joPCSp/KLU2bK0YHp+fYfujdJ51ZScozYKJDxA==|920 \ No newline at end of file +}//zNo/v++x01p+tWtJvkxSxhChcDbf+xLgBIjbhSn9S6kJTPhUgabMkkn8p5a2jDABWcMLaHbdd9nBk4a4FhTOjXJd9qJ/ATtcTcSFqyMUvFOEKSR/DBQSRZg1zD1DHm9tWauka1ObZP4pyL4MbsyvhUUDBKZ0y6IWOg/VBDaJvdU2SbxYJJZmWclEothCYBMgoYaYBk2O5G3ONe9zVuYJhXvngdsT+vga11ZbgmD8nEX6DueL+02EGyNr7knoSgnlK89kYT+xVJN6xNs2fEpOu2glhi+ZNCioEAKH8q7Kw2DNzGO4TerXtOVZdRrW4lBifNEwtw9sfxYJKlw3Dz9QQGSYy3Wb3c/7QbeudjmTZ+mU+gam/WmH5fvf/QGimna5GKsx3uCGbhViE6dNtq33iQcZG8WmzZztZmy57F+jvu0yl8azEr5B3J3QjUeQsWf1u+K1TyTujqMn4sZpkrU9hgUChUA3U2ebUUkVCFhm3gvSUobOo+sJ47wqs+SOm67bWFJWMAgimckmwPYmQD08N71JAnaFB9F4b9T4K77IIbP3IqOck7FnkX/0W14VFPXzVgs7rX8vDCQWhNrMiwvFP5mZMCx3D8F+kZQLrHHgg1N/BPwX+wD79gteX+lq6jjVVd8F557h7uebGnaPgfL4EB0kHfsSLtWkh7gR5yXQ6BwIT+VddKTuu/zX/40KelNubGfrDgbEdd75RcoM2RoC/DJ8ko1/46MvNZzJZxelgHYA2QwOENxdos7Z6TtfsE5s2L21iEoSOx/f+Eyu9TvEtnIC30OaY2SmEaGZdQua76RpOzP/wmnlWDaYdR6upxvRtgvsH8HWv9imv4Mt/0MysFj2JvqreCdgUU5Jd03RFDmbqAjGFC3Fzw1xXbRoD+V0ZmVtWXPB7jv+mF6VXvcqgw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index 743ce947..5c7f27f8 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -3,47 +3,48 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 256.0, + "Mode": 1 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 256.0, + "DesignLengthInPixel": 46.0, "Mode": 1 } }, @@ -51,14 +52,9 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } } }, - "Count": 11, + "Count": 10, "DefaultSize": 10.0 }, "Cols": { @@ -160,14 +156,14 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "工时", - "3,2": "计划工时", - "3,26": "计划工时", - "7,2": "实际工时", - "7,26": "实际工时" + "0,1": "工时", + "2,2": "计划工时", + "2,26": "计划工时", + "6,2": "实际工时", + "6,26": "实际工时" }, "AttachInfos": { - "3,4": { + "2,4": { "BindingInfo": { "TableName": "任务表", "ColumnName": "总计划工时", @@ -186,7 +182,7 @@ "TemplateKey": "Gost" } }, - "3,26": { + "2,26": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -215,7 +211,7 @@ "IconSize": 14.0 } }, - "7,4": { + "6,4": { "BindingInfo": { "TableName": "任务表", "ColumnName": "总实际工时", @@ -234,7 +230,7 @@ "TemplateKey": "Gost" } }, - "7,26": { + "6,26": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -263,7 +259,7 @@ "IconSize": 14.0 } }, - "8,2": { + "7,2": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "94f8bae36aee4ae7aec2a063ca731b1", @@ -387,8 +383,48 @@ "CustomColumns": [] }, "DataSourceListviewName": "图文列表表格1", + "LoadOnDemandCount": 10, "TemplateKey": "竖排无样式" } + }, + "8,2": { + "CellType": { + "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", + "ListviewName": "图文列表表格1", + "pagerCount": 5, + "layout": [ + { + "layoutItem": "prev" + }, + { + "layoutItem": "next" + }, + { + "layoutItem": "->" + } + ], + "pageSizes": [ + {}, + { + "value": 20 + }, + { + "value": 30 + }, + { + "value": 40 + }, + { + "value": 50 + }, + { + "value": 100 + } + ], + "prevText": "上一页", + "nextText": "下一页", + "hideOnSinglePage": true + } } }, "StyleDatas": { @@ -425,9 +461,6 @@ "FontSize": 13.333333333333332, "Foreground": 5 }, - { - "HorizontalAlignment": 2 - }, { "Foreground": 1 } @@ -443,38 +476,40 @@ ] }, "CellStyles": { + "2,2": 0, + "2,4": 1, + "2,26": 2, "3,2": 0, + "3,3": 0, "3,4": 1, - "3,26": 2, - "4,2": 0, - "4,3": 0, - "4,4": 1, - "4,5": 1, - "4,6": 1, - "4,7": 1, - "4,8": 1, - "4,9": 1, - "4,10": 1, - "4,11": 1, - "4,12": 1, - "4,13": 1, - "4,14": 1, - "4,15": 1, - "4,16": 1, - "4,17": 1, - "4,18": 1, - "4,19": 1, - "4,20": 1, - "4,21": 1, - "4,22": 1, - "4,23": 1, - "4,24": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,9": 1, + "3,10": 1, + "3,11": 1, + "3,12": 1, + "3,13": 1, + "3,14": 1, + "3,15": 1, + "3,16": 1, + "3,17": 1, + "3,18": 1, + "3,19": 1, + "3,20": 1, + "3,21": 1, + "3,22": 1, + "3,23": 1, + "3,24": 1, + "6,2": 0, + "6,4": 3, + "6,25": 4, + "6,26": 5, + "6,27": 4, + "6,28": 4, + "6,29": 4, "7,2": 0, - "7,4": 3, - "7,25": 4, - "7,26": 5, - "7,27": 4, - "7,28": 4, "7,29": 4, "8,2": 0, "8,29": 4, @@ -505,39 +540,12 @@ "9,26": 5, "9,27": 5, "9,28": 5, - "9,29": 4, - "10,1": 6, - "10,4": 6, - "10,5": 6, - "10,6": 6, - "10,7": 6, - "10,8": 6, - "10,9": 6, - "10,10": 6, - "10,11": 6, - "10,12": 6, - "10,13": 6, - "10,14": 6, - "10,15": 6, - "10,16": 6, - "10,17": 6, - "10,18": 6, - "10,19": 6, - "10,20": 6, - "10,21": 6, - "10,22": 6, - "10,23": 6, - "10,24": 6, - "10,25": 6, - "10,26": 6, - "10,27": 6, - "10,28": 6, - "10,29": 6 + "9,29": 4 }, "ColStyles": { - "1": 7, - "2": 7, - "3": 7 + "1": 6, + "2": 6, + "3": 6 }, "SheetStyle": { "FontFamily": 0, @@ -545,13 +553,13 @@ } }, "Spans": [ - "3,2,1,2", - "7,2,1,2", - "3,26,1,3", - "7,26,1,3", - "7,4,1,21", - "3,4,1,21", - "10,1,1,3", + "2,2,1,2", + "6,2,1,2", + "2,26,1,3", + "6,26,1,3", + "6,4,1,21", + "2,4,1,21", + "7,2,1,27", "8,2,1,27" ], "PageInfo": { @@ -591,8 +599,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "24,114", - "Size": "894,308" + "Location": "24,99", + "Size": "894,354" }, { "Name": "a0c55ba2-d00e-42f2-ba40-0168dedc4f0d.png", @@ -605,8 +613,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "24,47", + "Location": "24,32", "Size": "894,52" } ] -}//SEFr1v+rU9PX+4I4Gx5s1hlCuAvIngRsiorE+6G/wBXgELhQOQfa2sgKCtbDS6yVddQmtRqObWCnZlygwRicnuFcAYCIcngO5/9im6KHndTPT43BOqGDMXEzsRKOC6oXlA/Nhr4lqMbkZwQc5wD7pdmgfKTffzTVYVTxqvlEeycdlfbISmW8FTuEF6XC9dw6Uoq3/bI4r8+dyk+RGNdg9WGUuckUZY7UHUe0y5CMGMUEeZfwJSAgpejhjrBt4VjiVmc/By48mDXAV/rG4ZGwc0uNsPJpLFWiykAXiLTMU5Z5KWwSvfb1jP6W5CssoMefQCjsh2/z6WXIAeAraOeuZBBOGf6HdtilIe0qnQCXdXI1A9y2j5sej+UW3mpYiFW+zrew4xX5fonnMWkBn3S7hCRmfHW+IfmwTlM3mEkwEo7F6iJxEhmfcKcdvJtEAyH3v5dlCQG+DQ7hcE7fR2YxBIZIyERRFZaJik+9X9j3VIXflC/sF9IgGjNhFqMJoojr6DB/5LOnX5HrZI9ebBLUOi9FsIEnizK494tDXcX1IG+bwxw1cY2lZ1YfohcE8EkT7JvzVOMIoh3aU2X2L+QHjjb9yp9rOdFjT9t/d3+80kQTX55xFfaVN0bzYoaqnoJP6YHzwjuZ5LIsV9CZvkVBiCmhed9aNj+dKhsD2nQ3t2gPpI7fPIburbLIbrtuViw318007KNTEqQqWzFZ/UN8DFogiJ/I11eTBs5vaCwvaz0fbx+a/E4KSXHlJk3cXybOSh7R/1Ls10qIcKbjwJE3H5Gt+2SSOWT4fZwAPh/N9TZF9u7+w6S0F5/VA0i1mzL/LNuw32ETaZ/hUiQDQRM2QgUDnwdtJsCjGB7dTYboL8JGWu0AQ4LbiQQOdQIMkY9ZVEEtWryVCe1LJdaQxdWDSQ==|920 \ No newline at end of file +}//XDw5PYyNRi3b5uMHO3lUuWnWQ6WFhGAZeFSPUwR/jIHJSGJt1mloVXcitiaERDqOLmA6lJwXuWVeysHSpcnkHXTlEGI+V1XjvOEYSWzJZY+VYqOIb2oLm1eMhfaRTvY653uIa9hUd8oxvMSHb/+08vBBE43jgh3Fdhq9gJSnr5qI6hggEJ1ivjf9wxAlYXtkx0MePR6FEMXybups+BilSo/K0EItN/LGQmkojdnyN6uSF6a3wk8bCvbC4UcCg3ysC7kEzDPVcnoj7PvXON1DbELSq+hQsBkDRcPcwda6s0C7De5tm4V6r1EOoT22GnHUilXvMQEFz2QFKIpgIDvgaCarakIyOx9GiHHW9zY5PwTlkiZAKJ5na/wrN3vqcInHxKcls70D8NXfm1E+B0qr778N0b0NKBPFydiBjlninSTqkqs6ZoAf+zDB3bHWPGa+/VpSCbGb2HBy0ZbUp4t8CRmdIchu112aFCj161XoMiBJCydX+xib83bwm/o4qIilAbaQsrCm7ZI+4UMsnlaCbhGuWAOm2/oi0p5lC+QrFIoyojUhQMXLf8DPIstFJT4XtodcSKa8rDOqE6JRVFYKn0+gvOYj+eJ5CJILWPG67WrfFAZi1oIq8dbFLFtWvZp5/RP8xbtFBNC6rzBc4VQtPuXWL1Fv6gdRlCqaFDJpj/v2U165rIcP8pe1P8Z45LdjgpE7pAYBWGxLqPnYz7xks92Gzze7oGBY3c1ZIfs820zeCyOhpJHlFY+SHMxn9wkt4okBKweY8ba77rNhQBqeVJ/ZrtFyWJ5Aj1kJS9kjp4UvQgX+yCvBvgBeFZy0v0V3oKlM/S88IBkXOBeb6UBsYdXMgYwntjn5tFa5V0q7J0SN0HP45rf/ml7+ogynzfoADaUijXnp0AVxu78ukIoIFA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-进展.json b/Pages/任务/任务-进展.json index 07b7671b..9b970f0c 100644 --- a/Pages/任务/任务-进展.json +++ b/Pages/任务/任务-进展.json @@ -3,47 +3,37 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 26.0 } }, "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 26.0 - } - }, - "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "5": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 272.0, "Mode": 1 } }, - "6": { + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } } }, - "Count": 8, + "Count": 6, "DefaultSize": 10.0 }, "Cols": { @@ -145,11 +135,11 @@ "DefaultSize": 32.0 }, "Values": { - "1,2": "任务进展", - "3,2": "新增进展" + "0,2": "任务进展", + "2,2": "新增进展" }, "AttachInfos": { - "3,2": { + "2,2": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -207,7 +197,7 @@ ] } }, - "5,2": { + "4,2": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "77fae08dfbac4664a299aa7ec207218", @@ -307,63 +297,36 @@ ] }, "CellStyles": { - "3,2": 0, - "3,3": 1, - "3,4": 1, + "2,2": 0, + "2,3": 1, + "2,4": 1, + "4,2": 2, "5,2": 2, - "6,2": 2, - "6,3": 2, - "6,4": 2, - "6,5": 2, - "6,6": 2, - "6,7": 2, - "6,8": 2, - "6,9": 2, - "6,10": 2, - "6,11": 2, - "6,12": 2, - "6,13": 2, - "6,14": 2, - "6,15": 2, - "6,16": 2, - "6,17": 2, - "6,18": 2, - "6,19": 2, - "6,20": 2, - "6,21": 2, - "6,22": 2, - "6,23": 2, - "6,24": 2, - "6,25": 2, - "6,26": 2, - "6,27": 2, - "7,2": 2, - "7,3": 2, - "7,4": 2, - "7,5": 2, - "7,6": 2, - "7,7": 2, - "7,8": 2, - "7,9": 2, - "7,10": 2, - "7,11": 2, - "7,12": 2, - "7,13": 2, - "7,14": 2, - "7,15": 2, - "7,16": 2, - "7,17": 2, - "7,18": 2, - "7,19": 2, - "7,20": 2, - "7,21": 2, - "7,22": 2, - "7,23": 2, - "7,24": 2, - "7,25": 2, - "7,26": 2, - "7,27": 2, - "7,28": 2 + "5,3": 2, + "5,4": 2, + "5,5": 2, + "5,6": 2, + "5,7": 2, + "5,8": 2, + "5,9": 2, + "5,10": 2, + "5,11": 2, + "5,12": 2, + "5,13": 2, + "5,14": 2, + "5,15": 2, + "5,16": 2, + "5,17": 2, + "5,18": 2, + "5,19": 2, + "5,20": 2, + "5,21": 2, + "5,22": 2, + "5,23": 2, + "5,24": 2, + "5,25": 2, + "5,26": 2, + "5,27": 2 }, "ColStyles": { "2": 3 @@ -374,7 +337,7 @@ } }, "Spans": [ - "5,2,1,26" + "4,2,1,26" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -412,8 +375,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "24,47", + "Location": "24,32", "Size": "927,328" } ] -}//d48xOJGqDoacACOBxk8WK9Zf2G4hBXxGYQGHBkr6g9se7S19wUd0fOfCOhQtzxJO8rmh+HC7h4WII34mQqfGbuhrvuCFsLMQZTstaZyry/SLfeXuoUaSwIAOLN2+ObP2Q4/m/Kq21xsHX6AfQrALdwy4bm0CtupKxswsTDy4v2xLjX8L10lQ1i5g45I9fOKr3bwpN3U/jhSitxPK/3a8Cu8OvX11gJGuWrxI5VMRMBpfmxZbl3ljLSJ25g3biQxuKLOdpv2C1RervV/RVy3nKpxuHzwHh5ObD3IujLTVr/ORdvgNT5odQDKCg5UXRuV92iAI8qXEy/L4EGI6QkNCLCwT617+PQA608RwNCUpidYtpFv9+sPHWJck0V19UTiuz0fbShPkuXZtfU8MLOME7OwmuWTqcDk4fDZvRc3YCbS1LtqqyV+S5GwrBsnArvr/sh0FWhLdeF/kx1AD6djPuqgTJyLlKsBTI2XiA5+NTHBHydVdQU0mTEr8nThmPiFDOaQlI6gplObC6rFtL2lfVnK2RuhUxW9v3FHlbSy5GLq6H/qYvecAgJXAaaeYyLUNCbhsdxsHwBx6OlLtCsBnuz9IPrXFb6jFDKw6a9NqDpFnKKNjfn2CUjKd3JHGA6c1d9JK5AWgSoMzgwk2u9yGIrx/nAs5zWbUQ6GRvWMrwW0y/SSNkXS1THoT8Hubw5QuvIK44KDfhymTgcDK7WZ1eiDvzsEc3aV1eVk4dsPwBoMsinKiCBiUKH3XmArrtivPyr8dRGu+EqFoNnLPyoku1JmLhKHdugzJA8fkJ4bQcEu6kEJzB9b8MLGvBX/2NJqCM2ALFlgbYSql00s1N++a9avio5GiUuP+6dKM/kpLDIFvXpwPj7k9yLcmut4bDiX0m7vmsDQFAw7CiTyZz6+Xnw==|920 \ No newline at end of file +}//M1i28CuqHqwtorDMuKVPntujXJKfgNG3fCYSoMrmQQgtQAlhIT0bI/b/J4Nj4pfvBA0DQfpde36e5h1jYGtAMhcWXDXwn3dq96HNJaAINlwWfTl0b1rs/B4u0LrRk+9Av4WACAeikIjKb+AGvTpaMUXX3zfqmOqfWUMf0rmVefSqcBPknlbJvhjYDpw8MZhbtI8yAjajE6t0Ofo/wsFhVSqrGcly3W5tQMXnvanVd6ojY2zyW7uxmqmSL1+QNdXp16MQW/KYO9ZlUAEjzAXBvdwVJR5REC4ZmQxytF66MiZM4fgs0RD+JoFA/WgNzF6lKSf7x/r8+511a5piC3fwLCOz400S6H+R/5dHFtcaxqymkXxeWB9NcPO3758LuNQPJvOYqgV6NS95R+/zt+tnqiTP7unmmmc8Fd+iV6Q06muh8ksl95GD4+XBlVH1/aJdv6YgFyNzk/NP5Kx3gXl39QH2KtVQalOzTo9zRfmmFKjXInzRKsJu0JorBRj2gEH7eUd4Aym9QHjFHti9i/BlGXf63W+RXnBW/R+4kUTABPtgqkMZxifdI+3ELvKXxq41pQfHu9iL2dSqi0DBNAGtRSKs+J3k/vlrvT/CYVZT6TwIC3RPIhqMBqIyFvsSCpBa1RP+54fdl/0nwJmiBqhbqFdqMY9cdkEjc380/eGHzZyViIVAiBeBk+QbUx4oWDOxWupF3t0dQC+2GLcrryhjH3Nfx9g6L6dRV13i+xOIHGtUbRNjDDSQLjiifGryX40pHAlPytErOWfoHT5xx8tNPK+r8Ou/qB1Lag46kRAOIcVyLvPjZSpRaNclAIjRyBX5lYaC8H6KP9InRGEaIKPezUEKH5o7WUVmz8RiL8SU+iWPYfWDx80fPsmP5Etaj01Z9ArPU03/NsBhgtfSpckj+g==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 4069765c..139d9b10 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -106,6 +106,11 @@ } }, "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -116,9 +121,9 @@ 0, 1, 2, - 19 + 20 ], - "Count": 20, + "Count": 21, "DefaultSize": 15.0 }, "Cols": { @@ -288,7 +293,7 @@ "12,0": "任务-关联资源", "15,0": "任务-工时", "18,0": "任务-进展", - "19,3": "任务ID：" + "20,3": "任务ID：" }, "AttachInfos": { "1,1": { @@ -414,7 +419,7 @@ "PageName": "任务-进展" } }, - "19,4": { + "20,4": { "BindingInfo": { "TableName": "任务表", "ColumnName": "ID", @@ -812,11 +817,30 @@ "18,17": 2, "18,18": 2, "18,19": 3, - "19,3": 4, - "19,4": 5, - "19,5": 6, - "19,6": 6, - "19,7": 6 + "19,0": 2, + "19,1": 2, + "19,2": 2, + "19,3": 2, + "19,4": 2, + "19,5": 2, + "19,6": 2, + "19,7": 2, + "19,8": 2, + "19,9": 2, + "19,10": 2, + "19,11": 2, + "19,12": 2, + "19,13": 2, + "19,14": 2, + "19,15": 2, + "19,16": 2, + "19,17": 2, + "19,18": 2, + "20,3": 4, + "20,4": 5, + "20,5": 6, + "20,6": 6, + "20,7": 6 }, "RowStyles": { "1": 7, @@ -833,7 +857,7 @@ "3,0,1,18", "6,0,1,18", "9,0,1,18", - "19,4,1,4", + "20,4,1,4", "12,0,1,18", "15,0,1,18", "2,19,1,8", @@ -880,7 +904,7 @@ "CustomNames": [ { "Name": "任务ID", - "Formula": "任务首页!$E$20" + "Formula": "任务首页!$E$21" } ] -}//Q1h3PCzyyuVW16RpAU0xTqNnDcJFywDyaVhvX75k6AN0xePX5ApowHdSQI2ct+237yMdqa+gU6d0JUsrPEpIuegGQyOK/DZIEA/lbjFochHtpr6coXfXgyuyKDTVR64Z4ZM5OBAWDYAZP4Qo/1F4qhNEyq+RwPwt8GjUeVXYYJe5TCjimBD4S2bZO3PDpdc56VFsoPHEAQ85IVXA1E6WXQBPcHVuwi/9BxlSPXDMtIRaHfmWGEAVGx0tgjYQjP3NNWWHGJyAOp6BL5JlPvZCuUvOE3VTc+1ecQElMklD2h7iHRIRlMuvWjFE0gjgoHXjczEpVAKfnIXPHRxEOltfxWv7Oi7wLytmEGhhW26+x9gkYp5eNAhJxa/0yYjU1es16F6mFoVPRMa7HscVFyvbpodE4MsYEAKmAAke0FVJRj5MsaupgR8s5/YUVai/5fIFYiAXpoLxb/dpr3g2vU0nUAvoP4ZKdKqlKnSnIZpRSOSwjjguBC9XkSIA7Qe3BLWUNNuRW1oxv6tRkyypA1CZJvHyzAeirCy7d54wr6pzhIU+j4ZiKsM9Zk2bn2IOirWNjfii3Jya0AU0/eNE5ROirnlNenlbo9YvwGq9nEiq6to9IsiM+isq3fXbhrFnDWCWzxNICY+HsfVtDE8ZmGz8q40ttJJmu0E7BhFDOFS5Wo8/MFJbjBn70u6ZE5iDVH2XV2eU+0m4ViGNl9p9u5BHHsYaRKfTdwKt71l1LjC6kPjNbJjOFhl1EY3hgVAZHD3sRIoS82AHTGVcPCwQXfKnMorNxFjNH5ho4jUaB8IYclkXTu1b+MYatJJmo+Rl+7KfE4K9A+0PvDtPIgHGGKa5AqRZ005QTC9Caty5cNTa62IV1yXhZKf7WQtL6yXgxtWLm/Lg4GxG+6uoVy6zrwWCZw==|920 \ No newline at end of file +}//aZdK146YgWuEr9XDzFHxDp4IaqQToICs0Js23g9Oj59EsblCRlbji2dFWCvMYXJAh27QTc5It9BFvNN7ABUk3WGiAp3FAVOT6iWgd3FU/Coh5eL8BS6USEI4HHIMeoodZY5TRj0ecNYW2KpGruZ8JUBfB7pg77jFVGWEaYIaHJVBSiBwMeR6CVI7E9x9jCY86kmVRmgj8P70hIqhNXX+Om1ewD73bFL0aeOKXCo4Y9lOa3/R9zKNrrnAUjEIqKKIaJsjSlIFfN67ZOUAuZVqYSNfrB2BfcNzN+O/+4UebxkE1WEB4rlIUu1GaMoq6EPWZMjUU/xtYb+k+A9+ODaGxrvOg/qXBBBz/3tFjHcQErw+SiBF1fVa2g7Gf1Bb0vp0xYVqliqJ1HmKC4tl0w0A2xk2/YIb+1rwtX/R8XSnoREJ+rs2DfJc/Hl+4edlrAXgwcUtITmufA9dx/TsGteIjAHQLaTH/inCj1kU/Sj9ztQmNC0pYx8mwErUxvjmwZy/MkSolIvgCRps8oQox8uc9pDKk6pT8g6C8SNcHzoYOCYctejv8eOfeisz/SeA316fq/wm5tplaDnUNeeDyKoKthDw9sZOGSVXW9drEVRslKbpdcWM2bydFQ65lNz8AaiHtgGKkMvK0BS8o+isgwtk1v2MXn6HRhhlixdvJdqZ3fgMIJpFJiHww9NVHqcOHJtfQI1WU+NPJo/TYhda+bzahlYIV18OtpsrjkriHsdn91nPNFMelHJNTt9+c6Lp8Z3CjVAPK1V/twMWUyBFPufBHtW5OqiO1sIEfuGxunQ6voyphzxS2ozu+Uy1zzMg9oeUSKFyghoK5LtI1+kaPhYKjI+8kDEPRyNAIDHJUIxwhJO0shdOtyWbdtLyYZprCGe0833VAUcwfr0JwSrV9o96/w==|920 \ No newline at end of file diff --git a/Pages/任务/工时/修改报工.json b/Pages/任务/工时/修改报工.json new file mode 100644 index 00000000..0ef2516a --- /dev/null +++ b/Pages/任务/工时/修改报工.json @@ -0,0 +1,742 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 177.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 12.0, + "Mode": 1 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 27.0, + "IsHidden": true + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 27.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 18, + 19 + ], + "Count": 20 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 18, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "工时执行者", + "1,10": "执行时间", + "5,1": "实际工时数", + "9,1": "工作进展", + "16,1": "取消", + "16,14": "提交" + }, + "AttachInfos": { + "3,1": { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "53b877bc-0455-4342-a6c9-696bdfafe846" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "266760d8-f826-48c1-8bfe-833fd0921dcd" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "4bd8cb48-23c2-44a5-8e90-4d4ed28311ca" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "3,10": { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "ce404554-718b-43b4-8485-039eb55bdc32" + }, + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "date", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "7,1": { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "dab9133d-40b3-4f28-86bb-648f8b33cfe7" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "min": "0.1", + "max": "99999", + "step": 1, + "precision": 1, + "placeholder": "请输入", + "controlsPosition": true + }, + "DataValidationInfo": { + "NumberType": 2, + "FirstParamValue": "0.1", + "SecondParamValue": "9999", + "IgnoreBlank": false + } + }, + "11,1": { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "b0082507-114f-42a0-ae50-fa8e24ee23e5" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "textarea", + "placeholder": "请输入", + "resize": "none" + } + }, + "16,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "取消", + "TemplateKey": "_RS_Information3" + } + }, + "16,14": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "修改工时", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "报工ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!报工ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "新日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!K4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "新执行者", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!B4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "新工时数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!B8" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "新进展内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!B12" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=修改报工!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!msg" + } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "010c524d-c0c0-46ce-b4ee-6db3e6f03ff6" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "b7d5bc8c-f265-41d8-97be-34c1029db4eb" + } + ] + } + ], + "Text": "提交", + "TemplateKey": "_RS_Main1" + } + }, + "18,1": { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "ID", + "GUID": "273b793f-e407-477c-bc6f-0c946105d9f6" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "Foreground": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 0, + "Formatter": 2 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 0 + }, + { + "BorderBottom": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Formatter": 2 + }, + { + "FontSize": -1.0 + } + ], + "Types": { + "Strs": [ + "Background 1 -50", + "Body", + "[AUTO]General", + "Background 2 -10" + ], + "Borders": [ + { + "Color": 3 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,10": 1, + "1,11": 2, + "1,12": 2, + "1,13": 2, + "1,14": 2, + "1,15": 2, + "1,16": 2, + "2,10": 2, + "2,11": 2, + "2,12": 2, + "2,13": 2, + "2,14": 2, + "2,15": 2, + "2,16": 2, + "3,10": 2, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "3,14": 2, + "3,15": 2, + "3,16": 2, + "5,1": 3, + "7,1": 2, + "8,0": 2, + "8,1": 2, + "8,2": 2, + "8,3": 2, + "8,4": 2, + "8,5": 2, + "8,6": 2, + "8,7": 2, + "8,8": 2, + "8,9": 2, + "8,10": 2, + "8,11": 2, + "8,12": 2, + "8,13": 2, + "8,14": 2, + "8,15": 2, + "8,16": 2, + "8,17": 2, + "9,0": 2, + "9,1": 1, + "9,2": 2, + "9,3": 2, + "9,4": 2, + "9,5": 2, + "9,6": 2, + "9,7": 2, + "9,8": 2, + "9,9": 2, + "9,10": 2, + "9,11": 2, + "9,12": 2, + "9,13": 2, + "9,14": 2, + "9,15": 2, + "9,16": 2, + "9,17": 2, + "10,0": 2, + "10,1": 2, + "10,2": 2, + "10,3": 2, + "10,4": 2, + "10,5": 2, + "10,6": 2, + "10,7": 2, + "10,8": 2, + "10,9": 2, + "10,10": 2, + "10,11": 2, + "10,12": 2, + "10,13": 2, + "10,14": 2, + "10,15": 2, + "10,16": 2, + "10,17": 2, + "11,0": 2, + "11,1": 2, + "13,1": 2, + "13,2": 2, + "13,3": 2, + "13,4": 2, + "13,5": 2, + "13,6": 2, + "13,7": 2, + "13,8": 2, + "13,9": 2, + "13,10": 2, + "13,11": 2, + "13,12": 2, + "13,13": 2, + "13,14": 2, + "13,15": 2, + "13,16": 2, + "13,17": 2, + "14,1": 4, + "14,2": 4, + "14,3": 4, + "14,4": 4, + "14,5": 4, + "14,6": 4, + "14,7": 4, + "14,8": 4, + "14,9": 4, + "14,10": 4, + "14,11": 4, + "14,12": 4, + "14,13": 4, + "14,14": 4, + "14,15": 4, + "14,16": 4, + "14,17": 4, + "16,1": 5, + "16,2": 2, + "16,3": 2, + "16,14": 2, + "16,15": 2, + "16,16": 2, + "18,1": 6, + "18,4": 6, + "18,5": 2, + "18,6": 2 + }, + "SheetStyle": { + "FontFamily": 1, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "16,1,1,3", + "3,1,1,7", + "3,10,1,7", + "16,14,1,3", + "7,1,1,16", + "11,1,2,16", + "18,1,1,3" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [], + "RelatedDataTableName": "任务工时表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "报工ID", + "Formula": "修改报工!$B$19" + } + ] +}//RRApdkFLpUMiXGM+J1HiZieWGCOGBath+QgnbcWsFTHaVp9Pi/qs0eMuH/lkYVU6/yplXLIyhFaTek3Uv4mh0kg2qK8DZsKx1FYA59FyN9A1F18Z9aFgQGwYYcgCYnI7Ape+ZsZ7i3XLyhBAMabXfSk1k6Mrebh620Qo5v1yBVKRWc5wHD6UmhigCTXmttC2Wk4w1y7Cdq/AsuLqiz+Y0l0XypcI9LQUc4pFPD17L8WXWMAUGezRI/SzG61Lrdg+soC3DDwq+DAOm6FhSIpuroPma4kZPKdsuLmEE7UQ+s5b7nfj9cKLedYRPUAF/LbOSlFWB1nWkcojvjbbwyQzMNraN0QIYA8lU7UmWIz3RJAc3EHuqiPflN7IRdGsKOfJtueV6ubzr2JxmVMsatr3owE/8yq5eRXpEhpNc4rvQFVGNGJ8Cwb1epOw51QzmIzwN82XAgUjSidXSV5pGnqroUiLc7AaNl5xjegtnhrTYspqCs9IcRmkQW2NfQgQ+1Ui9PuHZ/LM2NzPSQqf0MmXyh2ymOdkUJK+NnYLNJlWaxxWMCNWdpYr4jYl5yiz+/Bn3osqqaVXxaRFG+VMUPbTBjEAisY5jVTGBrcuQkmiHFS7KXSdYRWt1TtP8lRFVY4/r3evOXpjUgq8KlcpDm9wvflaHBDV4g9OmEo7JDRBQDBm8tpnznTn9j7RrqfeJ+s5lQvfXUQNwYvBVdSpuEXvoWnTRc2tZ+cQoFTfFY/ersie2kQtTRXPZZz0M8qgvr1fHJN1DxSF/eWQTyoDnxNvUQAzEea9T8QI2hH8ynb8/PDGDnPEMGy4qg9/CzIE3C36Y8F4cMhAvmHj+id5bzYsEmlh5GxQJyIc0RuB9obY6vnJruUn6EUaG5eU5HgpkJS+sOcWcBKUFahpnCoEVGEgcA==|920 \ No newline at end of file diff --git a/Pages/任务/工时详情.json b/Pages/任务/工时详情.json index af4e652c..82931642 100644 --- a/Pages/任务/工时详情.json +++ b/Pages/任务/工时详情.json @@ -288,14 +288,14 @@ "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "18ec1226-5655-49ed-9789-01f8b847400c", + "GUID": "826945dc-1596-414c-8e7e-f2bfdfa49a72", "RelationBinding": { "RelatedTable": "用户信息视图", "RelatedColumn": "用户名", - "DisplayColumn": "用户名" + "DisplayColumn": "全名" } }, - "ColumnName": "用户名" + "ColumnName": "全名" }, { "BindingInfo": { @@ -346,7 +346,6 @@ "SerializeProperty": "=工时详情!任务ID" } }, - "NullFormulaValueQueryPolicy": 1, "IsListviewDataSource": true, "CustomColumns": [] }, @@ -666,4 +665,4 @@ "Formula": "工时详情!$E$13" } ] -}//icA8ck23UcbnGHrDqi4LnGpaxu9WTSDmffntsET7aCjUMIM3JYmfVApkzcMVkuQMBGZvFOrqvjjCJXX5tBX8jrV86FfIC68In8CF7TCY6huzvCNmPrnZ5GH7Eo02sGflbEqJwr2qFbZImXOR2v6GcUA6ImZWfvVNrULz5UFikEtG7g2tpAqO+o5mJsZs4fmbE7kw9I5GDDDndLfIuJuKGsDXDtTih7ZnkgB+LJr1wk3SVtxdhR3BNVgKdHeA+6JF6R1l6r8aWMRnF8GU5wVVXJP/AFECd4JHMEiLogtlb1xPO9RwT9uGtU3x4uHDxljUaPK8hAeGiux1jphQRjwRBqrmUHH4c2o7fl27U0nUfO5mqew3HXe8BPRP7h5//LF6x3Ef1lv1h2vZSHXgzh74eoWoz8ukDrX2Fi8TcJVCB6dY5/AuoR+30WPQne1u1dWyme037uTgHCHPF4S3u/7hP5RZaM9qv1p/jFL6gm4vAJDxoBRMe6TCYrKzyRiG6CnfuoFshVthI+6zqQfaVa6dQFjOoOGSwbAQYYiIDXP0BVRgWb8SQEQ+E45Yzut84+LdWZb7F4mW7d4e4uuh9a/V6cw5wX5D8wBRO+9D4lDW8YEi/fxHobYs9Lpthty+JqrZVMb2Sry82Xbu279LYxTY2K6AGl2f/L5GgYmnPNk/UO8tfAv+ThHayKeK17QeLlyzdM4sHB02TPOf4V+nmg2Bo1SVbKZ6DNNexXbt8gzFn9ubsGQwHw85C6rDLAUu8G5qcheiNt/4ooWCSbSIUZfrPULHDReg/g5WQ+vqOJQessTbpOoxYXjCqYCUhLFjNG96sbb1ali4y/Qsayw71lk9EjhsksiWDJiulE/9E/JEwCz8PXOsdPGFRVNJlzFOtE42oncCK2WDjTteO26Ip1eWNQ==|920 \ No newline at end of file +}//85x1m9iTBfUU8qlS8js9Iu+vYPAbYcn3T3Pc9LOgQ60kzMkljAR0Ow2e9j3XcWrGC+JJavpLry5RPvXaJaVSZ3JX8LrG7WzxtuYduI/yvxp3xzyoI0cG9EOt6RpAldbCNQG1a8rCxKDi5P2ucSKXQVWDwQ3YwDFc1W32Mm70ryj/CU2mceyNh8hKEiugru7X2zTY32+JtesnDnqrrZYtqWU1NxStgFofhxDcyTbxzGLUO1sHK6tJlfggWYY23LT1oVNvthJe6pSkTS6HyFTaTYHBHPAijPNgOJ9w4RzGf4YLMEauLAySMy/gswMVkyttqBReDggHeEhXFojav+n+6l2fkARnZzfmYZBeEQdy7nGcLiZfYeNuCZpIqCxWM/xD0/j5qCRrvjeTNi9xJ8o/Scp3r7Ze2laj9OGNe8Y7uKy5VNxd9Ak0eYvP2wxfW+Gb9N86ziIUZa48bRrQtE2tIhcJx1MS0ycy9kWgdqxd0nccZOxsFkZQLzApKI+0ExW40f9u7Isq/MqpKzU4tsloN87EynPwKkaQZyCe9TxoE7IR5+Y9TzcjuE5XWkxt5+PX5oUFt1hNeIvcJcl4jU4+5FcdPnFIbacMh/q2ERERHg+UvdWMnQo7p/5lwFrsSjqTKIoBx7JHVmPgkoFSYfxHtFa1iGr0QXCXvStTtdfy91WE0II60SWp6WtXEp7xjvbIZBt36yaDVDXofuglk1ezNSpTJlOwiC1ckvmWaFbWQVknByRPanZzn9CQ9BYi0sPBDaTdFixeQcwCAc1UElgi0MqZHv34x/pl0cpfAuG9DiVlft5oDCcn8t4XHhoN/7Pat6oF3VHinZ0B7bE3kHAGRivJu22/Yy6otQM0yndE8kcHYRcAleA8IotGJjDUsIuOjCDi6V2LrsEBLu3538Welg==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json new file mode 100644 index 00000000..9070b83e --- /dev/null +++ b/Pages/任务/新增任务.json @@ -0,0 +1,1596 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 29.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 23 + ], + "Count": 24, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + } + }, + "Count": 40, + "DefaultSize": 32.0 + }, + "Values": { + "1,21": "任务说明", + "1,37": "编辑", + "5,1": "工时核算方式", + "5,5": 1, + "8,1": "执行人", + "8,9": "计划日期", + "9,1": "%CurrentUser.UserName%", + "11,1": "所属项目", + "11,9": "分组", + "11,21": "备注", + "11,37": "编辑", + "14,1": "任务类型", + "14,9": "任务版本", + "17,1": "参与人", + "21,32": "取消", + "21,36": "提交" + }, + "Formulas": { + "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" + }, + "AttachInfos": { + "1,37": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "MD编辑器", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!V4" + }, + "TargetCell": { + "SerializeProperty": "=MD编辑器!编辑器" + } + } + ] + } + ], + "Text": "编辑", + "ClickMode": 1, + "TemplateKey": "_RS_Main" + } + }, + "3,1": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "placeholder": "请输入标题", + "resize": "none" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "3,21": { + "CellType": { + "$type": "editormdPlugin.editormdPlugin, editormdPlugin", + "Pren": true + } + }, + "5,5": { + "CssName": "singlebox", + "CellType": { + "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", + "Style": 3, + "PrimaryColor": "Background 2 0", + "SecondaryColor": "black", + "CellDefaultValue": 1, + "IsBounding": true, + "DataSource": "工时核定方式", + "ValueColumnBindingInfo": { + "TableName": "工时核定方式", + "ColumnName": "ID", + "GUID": "fcf51035-9f55-4d46-85c3-86e6fe9e33e1" + }, + "DisplayColumnBindingInfo": { + "TableName": "工时核定方式", + "ColumnName": "核定方式", + "GUID": "b29ddaca-6a1d-46a8-a4c8-c92acd7a092d" + } + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "9,1": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "%CurrentUser.UserName%", + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "e12e73f3-6f7c-4179-8dc0-5f6a6adf56e0" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "758f86c6-9040-43a4-bc53-79ae14377973" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "9,9": { + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "daterange", + "placeholder": "请选择", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "11,37": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "MD编辑器", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!V13" + }, + "TargetCell": { + "SerializeProperty": "=MD编辑器!编辑器" + } + } + ] + } + ], + "Text": "编辑", + "ClickMode": 1, + "TemplateKey": "_RS_Main" + } + }, + "12,1": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "f949dc87-b547-4dd5-a5b2-40b931ea2475" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "0119688d-1066-4993-b1f6-d009b644855c" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "12,9": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目分组", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目分组", + "ColumnName": "项目ID", + "GUID": "9c18bfa8-f1bd-4204-b981-f11fae98c3ef" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目分组", + "ColumnName": "分组名称", + "GUID": "61bc7005-5f31-4301-8ae8-d95065a4d193" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目分组", + "ColumnName": "项目ID", + "GUID": "7312cf22-060f-4b8b-83d6-52f802b773e8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!项目ID" + } + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "12,21": { + "CellType": { + "$type": "editormdPlugin.editormdPlugin, editormdPlugin", + "Pren": true + } + }, + "15,1": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "任务类型", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务类型", + "ColumnName": "ID", + "GUID": "33115e3e-534a-4e60-a496-5fa3a393b2cd" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "任务类型", + "ColumnName": "任务类型", + "GUID": "06c93fa4-e82d-4813-8b02-638d2db77f76" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "15,9": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目版本", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "ID", + "GUID": "204af5f8-2187-40b4-b47c-6235c33c0c54" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "版本名称", + "GUID": "3b7b2429-0052-4349-8a8b-8a919d5fc1c1" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本", + "ColumnName": "项目ID", + "GUID": "58f1edc3-9608-45dd-941e-4de01cb09196" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!项目ID" + } + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "18,1": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "2c2f9576-3f47-4755-aa8d-51deb10d2a8d" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "962a03a2-2603-4861-b3a0-a44974d69a19" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "multiple": true, + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "21,32": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "取消", + "TemplateKey": "_RS_Information3" + } + }, + "21,36": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!J10" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } + } + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "新增任务", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!项目ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "父任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!父任务ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务标题", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!B4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!B10" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "开始日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!开始日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!结束日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务分组", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!J13" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!B16" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务版本", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!J16" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "参与人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!B19" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务说明", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!V4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "备注", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!V13" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时核定方式", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!F6" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=新增任务!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "提交成功" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "3a12056a-4a46-4eb0-99ae-c8669557a213" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "出现异常", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "fe408ad0-0bfe-4d9f-8879-bffc267af3f6" + } + ] + } + ], + "Text": "提交", + "TemplateKey": "_RS_Main1" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "Formatter": 0 + }, + { + "BorderRight": 0 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 3, + "Formatter": 4 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 5, + "Underline": false + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 6, + "BorderTop": 0, + "BorderLeft": 0 + }, + { + "BorderTop": 0 + }, + { + "BorderTop": 0, + "BorderRight": 0 + }, + { + "BorderLeft": 0 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 3 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 6 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 3, + "BorderBottom": 0 + }, + { + "BorderBottom": 0 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "BorderBottom": 0 + }, + { + "Foreground": 3 + }, + { + "Foreground": 6 + }, + { + "BorderBottom": 0, + "BorderLeft": 0 + }, + { + "BorderBottom": 0, + "BorderRight": 0 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Formatter": 4 + } + ], + "Types": { + "Strs": [ + "\"所属任务：\"@", + "Background 2 0", + "Body", + "Text 1 50", + "[AUTO]General", + "Center", + "black" + ], + "Borders": [ + { + "Color": 1 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,19": 1, + "1,21": 2, + "1,22": 3, + "1,23": 3, + "1,24": 3, + "1,25": 3, + "1,26": 3, + "1,27": 3, + "1,28": 3, + "1,29": 3, + "1,30": 3, + "1,31": 3, + "1,32": 3, + "1,33": 3, + "1,34": 3, + "1,35": 3, + "1,36": 3, + "1,37": 4, + "1,38": 3, + "2,1": 0, + "2,2": 0, + "2,3": 0, + "2,4": 0, + "2,5": 0, + "2,6": 0, + "2,7": 0, + "2,8": 0, + "2,9": 0, + "2,10": 0, + "2,11": 0, + "2,12": 0, + "2,13": 0, + "2,14": 0, + "2,15": 0, + "2,16": 0, + "2,17": 0, + "2,18": 0, + "2,19": 1, + "3,19": 1, + "3,21": 5, + "3,22": 6, + "3,23": 6, + "3,24": 6, + "3,25": 6, + "3,26": 6, + "3,27": 6, + "3,28": 6, + "3,29": 6, + "3,30": 6, + "3,31": 6, + "3,32": 6, + "3,33": 6, + "3,34": 6, + "3,35": 6, + "3,36": 6, + "3,37": 6, + "3,38": 7, + "4,19": 1, + "4,21": 8, + "4,38": 1, + "5,1": 9, + "5,5": 10, + "5,19": 1, + "5,21": 8, + "5,38": 1, + "6,1": 11, + "6,2": 11, + "6,3": 11, + "6,4": 12, + "6,5": 13, + "6,6": 13, + "6,7": 13, + "6,8": 13, + "6,9": 13, + "6,10": 13, + "6,11": 13, + "6,12": 13, + "6,13": 13, + "6,14": 13, + "6,15": 13, + "6,16": 13, + "6,17": 13, + "6,18": 13, + "6,19": 1, + "6,21": 8, + "6,38": 1, + "7,19": 1, + "7,21": 8, + "7,38": 1, + "8,1": 14, + "8,9": 9, + "8,10": 3, + "8,11": 3, + "8,12": 3, + "8,13": 3, + "8,14": 3, + "8,19": 1, + "8,21": 8, + "8,38": 1, + "9,1": 15, + "9,9": 10, + "9,19": 1, + "9,21": 16, + "9,22": 12, + "9,23": 12, + "9,24": 12, + "9,25": 12, + "9,26": 12, + "9,27": 12, + "9,28": 12, + "9,29": 12, + "9,30": 12, + "9,31": 12, + "9,32": 12, + "9,33": 12, + "9,34": 12, + "9,35": 12, + "9,36": 12, + "9,37": 12, + "9,38": 17, + "10,19": 1, + "11,1": 9, + "11,2": 3, + "11,3": 3, + "11,4": 3, + "11,5": 3, + "11,6": 3, + "11,9": 2, + "11,10": 3, + "11,11": 3, + "11,12": 3, + "11,13": 3, + "11,14": 3, + "11,19": 1, + "11,21": 2, + "11,22": 3, + "11,23": 3, + "11,24": 3, + "11,25": 3, + "11,26": 3, + "11,27": 3, + "11,28": 3, + "11,29": 3, + "11,30": 3, + "11,31": 3, + "11,32": 3, + "11,33": 3, + "11,34": 3, + "11,35": 3, + "11,36": 3, + "11,37": 4, + "11,38": 3, + "12,1": 10, + "12,2": 3, + "12,3": 3, + "12,4": 3, + "12,5": 3, + "12,6": 3, + "12,9": 10, + "12,19": 1, + "12,21": 5, + "12,22": 6, + "12,23": 6, + "12,24": 6, + "12,25": 6, + "12,26": 6, + "12,27": 6, + "12,28": 6, + "12,29": 6, + "12,30": 6, + "12,31": 6, + "12,32": 6, + "12,33": 6, + "12,34": 6, + "12,35": 6, + "12,36": 6, + "12,37": 6, + "12,38": 7, + "13,19": 1, + "13,21": 8, + "13,38": 1, + "14,1": 2, + "14,2": 3, + "14,3": 3, + "14,4": 3, + "14,5": 3, + "14,6": 3, + "14,9": 2, + "14,10": 3, + "14,11": 3, + "14,12": 3, + "14,13": 3, + "14,14": 3, + "14,19": 1, + "14,21": 8, + "14,38": 1, + "15,1": 10, + "15,2": 3, + "15,3": 3, + "15,4": 3, + "15,5": 3, + "15,6": 3, + "15,9": 10, + "15,19": 1, + "15,21": 8, + "15,38": 1, + "16,19": 1, + "16,21": 8, + "16,38": 1, + "17,1": 2, + "17,2": 3, + "17,3": 3, + "17,4": 3, + "17,5": 3, + "17,6": 3, + "17,19": 1, + "17,21": 8, + "17,38": 1, + "18,1": 10, + "18,19": 1, + "18,21": 16, + "18,22": 12, + "18,23": 12, + "18,24": 12, + "18,25": 12, + "18,26": 12, + "18,27": 12, + "18,28": 12, + "18,29": 12, + "18,30": 12, + "18,31": 12, + "18,32": 12, + "18,33": 12, + "18,34": 12, + "18,35": 12, + "18,36": 12, + "18,37": 12, + "18,38": 17, + "19,1": 13, + "19,2": 13, + "19,3": 13, + "19,4": 13, + "19,5": 13, + "19,6": 13, + "19,7": 13, + "19,8": 13, + "19,9": 13, + "19,10": 13, + "19,11": 13, + "19,12": 13, + "19,13": 13, + "19,14": 13, + "19,15": 13, + "19,16": 13, + "19,17": 13, + "19,18": 13, + "19,19": 13, + "19,20": 13, + "19,21": 13, + "19,22": 13, + "19,23": 13, + "19,24": 13, + "19,25": 13, + "19,26": 13, + "19,27": 13, + "19,28": 13, + "19,29": 13, + "19,30": 13, + "19,31": 13, + "19,32": 13, + "19,33": 13, + "19,34": 13, + "19,35": 13, + "19,36": 13, + "19,37": 13, + "19,38": 13, + "20,1": 3, + "20,2": 3, + "20,3": 3, + "20,4": 3, + "20,5": 3, + "20,6": 3, + "20,7": 3, + "20,8": 3, + "20,9": 3, + "20,10": 3, + "20,11": 3, + "20,12": 3, + "20,13": 3, + "20,14": 3, + "20,15": 3, + "20,16": 3, + "20,17": 3, + "20,18": 3, + "20,19": 3, + "20,20": 3, + "20,21": 3, + "20,22": 3, + "20,23": 3, + "20,24": 3, + "20,25": 3, + "20,26": 3, + "20,27": 3, + "20,28": 3, + "20,29": 3, + "20,30": 3, + "20,31": 3, + "20,32": 3, + "20,33": 3, + "20,34": 3, + "20,35": 3, + "20,36": 3, + "20,37": 3, + "20,38": 3, + "21,1": 10, + "21,2": 10, + "21,3": 10, + "21,4": 10, + "21,5": 10, + "21,6": 10, + "21,7": 10, + "21,8": 10, + "21,9": 10, + "21,10": 10, + "21,11": 10, + "21,12": 10, + "21,13": 10, + "21,14": 10, + "21,15": 10, + "21,16": 10, + "21,17": 10, + "21,18": 10, + "21,21": 10, + "21,22": 10, + "21,23": 10, + "21,24": 10, + "21,25": 10, + "21,26": 10, + "21,27": 10, + "21,28": 10, + "21,29": 10, + "21,30": 10, + "21,31": 10, + "21,32": 18, + "21,33": 3, + "21,34": 3, + "21,35": 3, + "21,36": 18, + "21,37": 3, + "21,38": 3 + }, + "SheetStyle": { + "FontFamily": 2, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "9,1,1,6", + "9,9,1,10", + "3,1,1,18", + "12,1,1,6", + "12,9,1,10", + "15,1,1,6", + "15,9,1,10", + "18,1,1,18", + "23,1,1,3", + "1,1,1,18", + "5,1,1,3", + "5,5,1,14", + "1,37,1,2", + "11,37,1,2", + "12,21,7,18", + "3,21,7,18", + "19,19,1,2", + "21,36,1,3", + "21,32,1,3" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [], + "RelatedDataTableName": "任务表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "新增任务!$B$13" + }, + { + "Name": "父任务ID", + "Formula": "新增任务!$B$24" + } + ] +}//XMfmd1bcRi8YBJospOz+rRfrJ9llHbVFFDgZ7TGR1ZtHUfe+McUlAvxi8bLrCaH4mMrWEx5NRgasNCeQgrs3i5mEjzlp9NWpKoowcoVOLPkblu7SeQQyVdFsVUBxpUiwunTSYMr1Dx6oWlA0HdGkSoxTRFGfa8CLVqj8WCFaFe3JkK3vLt5+lVe8T7n4ut4jLeKv+4vrnucDNJv88dhMQ8Ej6jK+0+oQgo5Oq6C0mZAGG3Lydn9jJQwua7o6meSGAW2QeNJcOtmi6H6p/uObjiHZsK/u+fp8i/ef9u5e5UJ6MiwgyUL20m3+qFKuK5+Y6spVLHEjPiY3u0o6tgvtWOnQmC9zy33qmYd1T6sgh+8ymXjsDx84z5PnPZC4e9NY6jG0FR51LnNVsrKgWWyn6IuQG+OHvMvjDqf1WjFe4kAr5ZLNmv9H+EF43K2nua7VrF1TgFzRcXb+ozFePT5IjkbuGO6L9mXBbbRM7+c4sk4x1mZkizafMiws0xdLIhdTFtWIzuX0F9fJrcSNzyVDwagkTfNRVc00EKp6mZuRbC1mSLYil6YXxh1+ItIzHypYjUSo1G4ZHo1lEIi0wV1Phhh7+phpQyCmz7rWwGltGKD/L7SjDic0VWx6JDA20NIkDyFwFCkDtSOG9ed0ffDlkzYykvc/liElar2xwb4kBDbiUu63Oz4foBTqianYggijfYSWOf81swCj9cZ0gEYu3reHVY6kxCAuBZJy1zASysvvcMYYDvWdKdWqQdm8iRWkEWkaKMYi7KeK+Wt37hTc5s9OfnA/pljXCWXO5UC5s7QF+BQaYxyjIxlutp6OnYS3VOqggz6ViJOeGsHQqpUZ2gC5hAranCuYq3DbCp8GBP0D3B6WqsqnQbqwSlDZewH9M0QLS9zgYehryF358FFDtQ==|920 \ No newline at end of file diff --git a/Pages/项目首页/子页面/任务列表.json b/Pages/项目首页/子页面/任务列表.json index b54ee511..51e84ce4 100644 --- a/Pages/项目首页/子页面/任务列表.json +++ b/Pages/项目首页/子页面/任务列表.json @@ -287,6 +287,23 @@ "1,9": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增任务", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!项目ID" + } + } + ] + } + ], "Text": "新增任务", "TemplateKey": "_RS_Main3", "Icon": { @@ -607,4 +624,4 @@ "PaperSize": {}, "Margin": {} } -}//LVVrwL1368D+k28jEVxJdquFdtf0LSJukJwtVEeIql/Lfj+1ikRTOqx26z8XxM1d5eq6SSYCoIT+6NO5pVQLUTWfklPhEM73qWJxoTWx1Rslt4gK8MIo3Eerz1i+nU7azXVW31r2mjO3SaA+oF1XfRVeCNyvrHj3U7lOwI6HLWxPzqGpp28OHZjaacEnbw4Ruo+dd3UTIwZuzoNj9AdJ9SKTVgMPHPNzob3gH/iNm8X1fHyvfMeBxbMdxzg1MikrfrorjMechYSFIj2AJNnBOETHA03Jzh55OaygoJsOTBz3/18DX6jkEkZ01Nqqja7sL3p7gDZ1uiQdbT5aNawAtcI3Jzi5/6rOsc/EBYrm+lrCU9r8bwtw2VBlohccCG9lz//YyJRjOIdb0YIX460bmbYwUB6W44Eqm1YCgBVvEi0U5mae3Qp881ARHOmQza53mX3LCyC1jWNMGbHV5ULu/eevIoZcJpxM7+rCtV512OLguHow3xHvNHPW1oW7oR/SDeIc1F6jsp7rPKMpkSrcnL7+y3mMjrKCeKOP8UoU55bXTyOeSeyPU+6MdMSyqsuUaHYdzmRkphKwUOHAaj6kjMWK+2PhAu+8ycIwodmFmHO/aWNqcP0MwxHWRFWewizOskZW8mgvG6fmhDy0aJaPx49xof2Rt6+JJ+HfCnIqYaiSL/fODipZbtvdNin+v0pemT0i80gJRBgZi4E8s5orCQ9G2c6vs1FyyZxp8HS+ZO1tImD4fnKt2e+vwMDJ2/V38J15Bjj5Bb7muyMbPteFAYYGDcn5b8m8I0ZNWgSjWQXOrlaKwWv/ip+pjnWU7oFE7HbJwIqtJJvEDq+uExAIaNwc3DZV0fYuqgs1o/Tg6Mjq8zdI2c4q+IyBrMmd93xx2bmgmpkUZoJtOVvqWszeuw==|920 \ No newline at end of file +}//XOdf7gozaugWGwLrTiE/0BrQx72KPqLnM+b14MVrgqSSNBXHwG4jWZAoQb7nj29VV9bwcLml8si1pwQo20unyNWFHj2CTj2pQNU4SpQBaoehWVQRA4CVj5C/HmoYOcvqcCD9MW1vR6UOqwxuLR/0WrRfiAWWCjSOZFJ8nR39Rd/0MpjOIq5toSunUn6WsO4246H4k74y18zj6geYlE2l4yM6jCmJeH6YGs3nZbG8KuAsL8gJ6nSW+JTw95LpbjkcrMktqUDy8kXyktYT5C8TxfJhoTG62aIFVTlALDEdVx3zk34C8PcphZmZbYyrHvpFBmwyCVDzWCM0/YAsvndFKEDUbsK0L2Tc3UieTtu+c3a8yl/7M/IlRoqO1JhC/KnyPdM/trpCSiCEcpMfvMuYoFb/eBt49oDxUFX1/aUj3mErM20M15C/VTXBFXRqwdK7yzpWaK/kPRyHR0V/Z/Oq4vd7TnGcThK7ztCh7vJ1EOfmmvGR6cjsTSKwQ4T6FKwZsbnJuXG1NAmg1xw2WiHPpvVEugVbOVz7P9cxUUnRo3jE9xss5uoI9ZFaLXgPZcDuuq+C7ENiwpfVSWxXYNDE3fUikN9klzK23d87cyAMioULB6GgFyU+GazSevfyC0OQROXqB9GxCumJtoI7jlj8Ja/0IllRppMSDZVjur1qxA8egfhNKWFO07qrzEClQYyemvuAFXGGaHDranMLHv/xuHG7Swf5KPeXCOHq/3inJf6GanjoMA6ZkR5rnHtpJwljtJZxbt61u4hbArrttFLFDczUARWiK7V3nlljiVbSQ+uUHuPA9A07Z2OZ/cfo25d+7FcDZQp8xGU9M93MRUnIVfMe/NLB8WVFK467feRxn9EN4ijtiwqe7kXuQo8l/JAyXIVJBXogq6UGOUCEu4jLVA==|920 \ No newline at end of file diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json new file mode 100644 index 00000000..ac19a28e --- /dev/null +++ b/ServerCommands/任务/新增任务.json @@ -0,0 +1,263 @@ +{ + "Name": "新增任务", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.ServerCommands.Models.PostRequestTrigger, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "父任务ID" + }, + { + "Name": "任务标题", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "执行人" + }, + { + "Name": "开始日期" + }, + { + "Name": "结束日期" + }, + { + "Name": "任务分组" + }, + { + "Name": "任务类型" + }, + { + "Name": "任务版本" + }, + { + "Name": "参与人" + }, + { + "Name": "任务说明" + }, + { + "Name": "备注" + }, + { + "Name": "工时核定方式", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "ff76b3a3-881e-4719-a83a-14d0f634497d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "0247aa38-8c81-4940-bc75-302de35a7c4a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "72503d5d-bc91-4c1f-be04-a8e04c7c886d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务标题" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "执行者", + "GUID": "240a30c9-0088-4974-853b-e3c0a737b89c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务标题" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "参与者", + "GUID": "1537acb2-7621-45ad-824a-0f04bb5cfbcb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与人" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "开始时间", + "GUID": "122bed43-b1c8-4082-b4a1-8e58b9f7c7a8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开始日期" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "结束时间", + "GUID": "6c1281e9-205c-466d-94eb-8020781bbd91" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=结束日期" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "b20ec680-9479-4d02-a930-c88311d82b6c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务类型" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "分组ID", + "GUID": "c2071865-f380-419e-9e77-20642d0121bc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务分组" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "32dfbe51-6077-4e79-a99b-8ac3944b0e08" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务说明", + "GUID": "3bb00b65-95b4-4d34-b640-98130db8a89c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务说明" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "备注", + "GUID": "262c8ecc-2af6-456d-8f28-fd14d84d5c8d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=备注" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "工时核定方式", + "GUID": "76825213-c1b2-43df-8521-7889a516f1f8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时核定方式" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "663d69a6-3cb7-4362-863d-284768b26135" + }, + "Value": "0" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "新增成功" + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/工时/修改工时.json b/ServerCommands/工时/修改工时.json new file mode 100644 index 00000000..a31c242f --- /dev/null +++ b/ServerCommands/工时/修改工时.json @@ -0,0 +1,467 @@ +{ + "Name": "修改工时", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.ServerCommands.Models.PostRequestTrigger, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "报工ID", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "2" + }, + { + "Name": "新日期", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "2024-03-01" + }, + { + "Name": "新执行者", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "administrator" + }, + { + "Name": "新工时数", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "40" + }, + { + "Name": "新进展内容", + "TestData": "测试" + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "报工信息", + "TableValue": { + "TableName": "任务工时表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "f250f3d4-306f-4f2f-b1d3-0be7458a2623" + }, + "ColumnName": "任务ID" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "2309d652-ed06-48e9-bbf9-fb9583aca0ce" + }, + "ColumnName": "工时类型" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "09989c87-5b7e-40eb-be4c-9ba87b32b467", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务状态" + } + }, + "ColumnName": "任务状态" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "ec846c2f-3aa5-4484-95ef-1972503a07b3", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务状态", + "NextRelationBinding": { + "RelatedTable": "任务状态", + "RelatedColumn": "状态码", + "DisplayColumn": "任务状态" + } + } + }, + "ColumnName": "任务状态文本" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "ID", + "GUID": "cabb4369-8835-48c1-a904-84a5e39c961c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=报工ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "08a93b043f414bad996c1d2f2c516c4c" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "执行者", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "f0683fc3-36ac-4c4b-ab9a-dd9886a93fa5" + }, + "ColumnName": "全名" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "负荷", + "GUID": "50c4d16c-d1aa-4984-9701-89ad5d48ef41" + }, + "ColumnName": "负荷" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "d1335a82-4ec2-4bd6-8097-b8cde857970b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新执行者" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "62c361ee22e4405e96f2e66576c96c73" + }, + { + "$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": "=报工信息.任务状态" + } + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "统计时长", + "TableValue": { + "TableName": "任务工时表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "f3ff96b9-45fd-4ef8-b770-a8d687a57989" + }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "fc31ce71-9de3-410e-9bbe-e0c4f47901b4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=报工信息.任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "24a62ccf-962a-4f4b-b401-6ba78e64281a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新执行者" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "58bd9aa1-8b1f-4302-ae42-6182aa229f65" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=报工信息.工时类型" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "ID", + "GUID": "3f29fdbd-f187-451e-b7f7-964742413192" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=报工ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "fc7683a1-dd0d-4616-852a-bd0571eb863d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新日期" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "6f71560168554d95937ce8d8597f8d79" + }, + { + "$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": "=报工信息.工时类型" + } + }, + "value": "计划" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "最大负荷", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(OR(执行者.负荷=\"\",执行者.负荷=0,执行者.负荷>24),24,执行者.负荷)" + }, + "ID": "3315ab13956142d98db874dbb6d85684" + } + ], + "ID": "874adf86-99b3-4d05-ba83-f3a7392422f0" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "最大负荷", + "ParameterValue": "24", + "ID": "8d185b9ac0734ccca2814b16b5b62eca" + } + ], + "ID": "26ed4dcb-8918-48fb-9a3e-182863a109b0" + } + ] + }, + { + "$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": "=IF(统计时长.总工时=\"\",0,统计时长.总工时)+新工时数" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=最大负荷" + }, + "compareType": 5 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "ID", + "GUID": "1a75f32d-f665-4ec1-838a-9fc3b661edf3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=报工ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "a7499f28-816b-4847-aaab-35b90c7ce942" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新日期" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "21b0cae0-c6d1-4e89-862f-1d3213e791d6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新执行者" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "c8a590ce-4e0d-4794-a5f5-13042a5e27f1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新进展内容" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "1cc7e19f-312e-48a6-9cea-f19461825e84" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新工时数" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "更新成功" + } + ], + "ID": "db78052b-f630-4b4a-b526-fea681effc86" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"你提交的工时超过了\"&执行者.全名&\"设置的最大负荷\"&最大负荷&\"小时\"" + } + } + ], + "ID": "caa50012-ca70-4365-a388-15c10cbaef7e" + } + ] + } + ], + "ID": "644a39c8-965f-4aa3-8208-5c7d0aba82b6" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前任务状态为[\"&报工信息.任务状态文本&\"]，无法修改工时！\"" + } + } + ], + "ID": "110c39a0-614b-4903-91ce-0289a3db5db2" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/工时/新增工时.json b/ServerCommands/工时/新增工时.json index f61f937e..2f52d174 100644 --- a/ServerCommands/工时/新增工时.json +++ b/ServerCommands/工时/新增工时.json @@ -89,7 +89,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "b1249d88-174d-4f42-b82e-87c775a5ec16" + "GUID": "443f2b0d-af7e-4ac1-9c22-7a04789c5675" }, "ColumnName": "项目ID" }, @@ -97,7 +97,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "dfd8dba3-a9e7-46af-82b0-e6346ced04c1" + "GUID": "32c54bbb-3010-4305-979c-afceecd898bb" }, "ColumnName": "任务状态" }, @@ -105,7 +105,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "17d042b8-e5cd-423f-a4f2-5bfca0a2de16", + "GUID": "34e3e030-33d1-4702-b671-9d80aff1878f", "RelationBinding": { "RelatedTable": "任务状态", "RelatedColumn": "状态码", @@ -118,7 +118,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "执行者", - "GUID": "45d69552-542b-431e-9153-d5f2f886ac89", + "GUID": "f955d975-fc25-450d-a340-a0348b1770a0", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 5, @@ -133,7 +133,7 @@ "ColumnBindingInfo": { "TableName": "任务表", "ColumnName": "ID", - "GUID": "77617259-ecbf-4a0a-943a-bc9523d74a4a" + "GUID": "7a204e75-e430-43dc-9c86-429583d827aa" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -143,7 +143,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "40fc605c55a049edb4ddfa172010d1fa" + "ID": "4b2c214a5f994ff090f13264d24b40c3" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -168,7 +168,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时数" }, - "ID": "3c523ae8bad44c56803f29297f525e6a" + "ID": "17ae0d0a18d24ffc99da37a3bea6c9ae" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -177,7 +177,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "47a4bd79866c44a68d4a8130857e0e0e" + "ID": "5d5f82547d254cbf864287ef61108e71" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -201,7 +201,80 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "60a04c424d0b4a51a96e2eb557cf1df9" + "ID": "3775019110024537bd38cf500a9a7c58" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "统计工时", + "TableValue": { + "TableName": "任务工时表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "ce66991b-0d8e-4d0c-9d58-08670f889a3b" + }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "6c5abdb9-f1f9-4f93-8966-a5de658d187e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "1f0d5e7e-310f-4f4e-b9fc-063bab50acc0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "ce3bfc81-bd71-4997-8575-39fba998a519" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行者" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "11614c3e-2e4d-45a5-9893-7e2fb712f669" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "a8f97b3ecff64f2183b9661fd518d352" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -221,133 +294,49 @@ "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "统计负荷", - "TableValue": { - "TableName": "View_任务工时统计", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计划工时", - "GUID": "c293ccd3-0a01-450a-9c96-4a22b5f40bba" - }, - "ColumnName": "计划工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "88d7be4e-bac7-4366-9e82-5ec0e43d3cde" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "45422432-e2a6-4c0e-ae7f-85d15794298f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行者" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "工时日期", - "GUID": "b38537dd-3794-42b1-b349-46edd53fbca9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前日期" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" + "ParameterName": "执行人负荷", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(OR(任务信息.执行者负荷=\"\",任务信息.执行者负荷=0,任务信息.执行者负荷>24),24,任务信息.执行者负荷)" }, - "ID": "1a7c7a0561d24027953d7057ac3caa93" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.执行者负荷" - } - }, - "value": "0", - "compareType": 2 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计负荷" - } - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计负荷.计划工时+计算本次分配工时" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.执行者负荷" - }, - "compareType": 2 - } - ] - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(当前日期,\"yyyy年mm月dd\")&\"的最大工作负荷超出限制，请重新编排提交！\"" - } - } - ], - "ID": "b539d26d-1d71-4ce6-b60b-527c90f86132" - } - ] + "ID": "e6c17fbe939f404a86a2202cd0fb333e" } ], - "ID": "d6558544-652c-44af-81eb-31dec04f33b2" + "ID": "c4642a97-a10f-42d5-b742-e4abfb383a4c" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + "value": "实际" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "执行人负荷", + "ParameterValue": "24", + "ID": "688762495ecf42728377db40799fedf2" + } + ], + "ID": "a6c78a62-0e06-4a39-8ffa-100924338ac1" } ] }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预计增加后工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+工时数" + }, + "ID": "d99f897ea0ff419e846e224d637397f2" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -358,135 +347,173 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=index" + "SerializeProperty": "=预计增加后工时" } }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配天数" + "SerializeProperty": "=执行人负荷" }, - "compareType": 4 + "compareType": 5 }, "CommandList": [ + { + "$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": "=index" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配天数" + }, + "compareType": 4 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算本次分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" + }, + "ID": "8f33fe4ca9764403aa6b64d560452ff2" + } + ], + "ID": "3a68d9c7-f9d8-4e0d-ba86-42d4512b7c13" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算本次分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待分配工时" + }, + "ID": "e35aa196929541b980131a3874132cae" + } + ], + "ID": "2515088d-3dad-4ad0-ac3d-f06e56e8edd4" + } + ] + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算本次分配工时", + "ParameterName": "待分配工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" + "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" }, - "ID": "cb78ce7bdd4c440b9b449d7af1470fd9" + "ID": "18bfc113ae4b448dbdba213446cdf103" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "89a862aa-235c-4422-a18f-fcd4644b5d36" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "ba269f5e-db97-4e17-9cb8-a15f44846c81" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "c97ed24d-b14b-469b-9074-66d4ed98d5c6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前日期" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "48d6e343-9b6c-43b5-9778-9b868ccd55df" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "df8c4912-a0e0-4088-a341-be55e3db2ca1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行者" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "173e91d1-15ec-4f9a-a54e-98ddd185b4af" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "2bf153a9-56fd-4599-97f4-7f317af68b46" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算本次分配工时" + } + } + ] } ], - "ID": "52096b70-4bfb-4135-9f7c-a3a984edea0b" + "ID": "fcf70c56-6464-42a7-8a70-825884a0ffd8" }, { "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算本次分配工时", - "ParameterValue": { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=待分配工时" - }, - "ID": "308e266c05e3417f9d13962caff1095b" + "SerializeProperty": "=TEXT(当前日期,\"yyyy年mm月dd\")&\"的最大工作负荷超出限制的\"&执行人负荷&\"小时，请重新提交！\"" + } } ], - "ID": "60f32b23-a3f2-4b49-b84a-11eb342d4799" - } - ] - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "待分配工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" - }, - "ID": "0a0b3c873fcf4de9b94766fc7c44005e" - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "62460558-f2bd-4b87-8cea-6fc0dadf3b39" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "acc1cf0b-5748-40bc-b1b2-5bb59df509a1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "d8afca37-aace-413f-8d57-1fba6d54b77c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前日期" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "1dd01750-f4f3-4c1d-9afb-37c8caa80b30" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "29749b4c-60d8-4963-9ced-4fc1c4d52d67" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行者" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "3e99bd55-10d7-4f5d-9dd8-a866365961a2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "d9623657-4a05-4e47-a927-0e188c5fa69a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算本次分配工时" - } + "ID": "f3875778-80dd-40b4-b317-4f21ef53e746" } ] } @@ -500,7 +527,7 @@ "Message": "提交工时成功" } ], - "ID": "67983164-51fb-452a-ad85-bab842928a39" + "ID": "5abf293f-a8c6-4f12-bb5d-6e1819ef38b7" }, { "CommandList": [ @@ -513,7 +540,7 @@ } } ], - "ID": "876ca00c-e70e-4e57-beb3-7f440cb828b8" + "ID": "89048532-fdfa-4235-9972-20d722f6d461" } ] } diff --git a/Tables/项目任务/任务状态.json b/Tables/任务/任务状态.json similarity index 100% rename from Tables/项目任务/任务状态.json rename to Tables/任务/任务状态.json diff --git a/Tables/项目任务/任务表.json b/Tables/任务/任务表.json similarity index 99% rename from Tables/项目任务/任务表.json rename to Tables/任务/任务表.json index 50971228..597651a6 100644 --- a/Tables/项目任务/任务表.json +++ b/Tables/任务/任务表.json @@ -190,7 +190,7 @@ }, { "PrimarySchema": null, - "PrimaryTable": "任务版本", + "PrimaryTable": "项目版本", "PrimaryColumn": "ID", "ForeignSchema": null, "ForeignTable": "任务表", @@ -223,7 +223,7 @@ }, { "PrimarySchema": null, - "PrimaryTable": "任务分组", + "PrimaryTable": "项目分组", "PrimaryColumn": "ID", "ForeignSchema": null, "ForeignTable": "任务表", diff --git a/Tables/项目任务/任务进展.json b/Tables/任务/任务进展.json similarity index 100% rename from Tables/项目任务/任务进展.json rename to Tables/任务/任务进展.json diff --git a/Tables/项目任务/子任务视图.json b/Tables/任务/子任务视图.json similarity index 100% rename from Tables/项目任务/子任务视图.json rename to Tables/任务/子任务视图.json diff --git a/Tables/工时/任务工时表.json b/Tables/工时/任务工时表.json index f06fbf87..c1d8610b 100644 --- a/Tables/工时/任务工时表.json +++ b/Tables/工时/任务工时表.json @@ -84,7 +84,7 @@ "$type": "Forguncy.Model.Tables.StatisticColumn, ServerDesignerCommon", "AggregateFunction": 4, "DataColumnName": "工时", - "Name": "总计划工时", + "Name": "总工时", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], diff --git a/Tables/项目任务/任务分组.json b/Tables/项目任务/项目分组.json similarity index 96% rename from Tables/项目任务/任务分组.json rename to Tables/项目任务/项目分组.json index a4070493..c8297616 100644 --- a/Tables/项目任务/任务分组.json +++ b/Tables/项目任务/项目分组.json @@ -1,5 +1,5 @@ { - "Name": "任务分组", + "Name": "项目分组", "Columns": [ { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", @@ -49,7 +49,7 @@ "ExternalDatabaseInfo": { "AllowModifySchema": true, "ConnectionId": "业务表", - "SourceTableName": "任务分组", + "SourceTableName": "项目分组", "SourceTableSchema": "dbo" }, "PrimaryKey": [ @@ -62,7 +62,7 @@ "PrimaryTable": "项目表", "PrimaryColumn": "ID", "ForeignSchema": null, - "ForeignTable": "任务分组", + "ForeignTable": "项目分组", "ForeignColumn": "项目ID", "RelationTypeOnDelete": 0, "RelationTypeOnUpdate": 0, diff --git a/Tables/项目任务/任务版本.json b/Tables/项目任务/项目版本.json similarity index 83% rename from Tables/项目任务/任务版本.json rename to Tables/项目任务/项目版本.json index 383172b2..41d99e10 100644 --- a/Tables/项目任务/任务版本.json +++ b/Tables/项目任务/项目版本.json @@ -1,5 +1,5 @@ { - "Name": "任务版本", + "Name": "项目版本", "Columns": [ { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", @@ -15,7 +15,7 @@ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", "DatabaseColumnType": "bigint", "MaxLength": -1, - "Name": "任务ID", + "Name": "项目ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { @@ -49,12 +49,24 @@ "ExternalDatabaseInfo": { "AllowModifySchema": true, "ConnectionId": "业务表", - "SourceTableName": "任务版本", + "SourceTableName": "项目版本", "SourceTableSchema": "dbo" }, "PrimaryKey": [ "ID" ], "Indexes": [], - "Relations": [] + "Relations": [ + { + "PrimarySchema": null, + "PrimaryTable": "项目表", + "PrimaryColumn": "ID", + "ForeignSchema": null, + "ForeignTable": "项目版本", + "ForeignColumn": "项目ID", + "RelationTypeOnDelete": 0, + "RelationTypeOnUpdate": 0, + "IsDetailTableRelation": true + } + ] } \ No newline at end of file diff --git a/Theme/CellTypeStyles b/Theme/CellTypeStyles index e655b1dd..716c9b73 100644 --- a/Theme/CellTypeStyles +++ b/Theme/CellTypeStyles @@ -1 +1 @@ -{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}]} \ No newline at end of file +{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}]} \ No newline at end of file diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css new file mode 100644 index 00000000..a5d6fe3a --- /dev/null +++ b/UserFile/BaseCss.css @@ -0,0 +1,13 @@ +/* 优化弹出窗口背景和圆角 */ +#fgc-popup-dialog{ + border-radius: 8px !important; + overflow: hidden; +} +.FUI-dialog-cover.FUI-show{ + backdrop-filter: blur(3px); +} + +/* 单选按钮圆形 */ +.singlebox .fgc-toggle-button { + border-radius: 20px; +} \ No newline at end of file diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 0b4e209c..602dd3ed 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ diff --git a/image/图标/未选择.svg b/image/图标/未选择.svg new file mode 100644 index 00000000..51ddc51d --- /dev/null +++ b/image/图标/未选择.svg @@ -0,0 +1 @@ + \ No newline at end of file