diff --git a/.collaboration b/.collaboration index b86379de..f482aae3 100644 --- a/.collaboration +++ b/.collaboration @@ -430,17 +430,7 @@ }, { "ModuleName": "PCPage/FGC_我的待办", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:04:45.4256243+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我的待办.json", - "Pages\\流程页面文件夹\\FGC_我的待办.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我发起的", @@ -552,31 +542,11 @@ }, { "ModuleName": "PCPage/项目首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T21:20:19.1679982+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页.json", - "Pages\\项目\\项目首页\\项目首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T21:12:19.2521837+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -584,49 +554,15 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T21:18:43.1681863+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T18:54:20.390694+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T21:19:52.8640091+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.rd", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.json", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", @@ -666,17 +602,7 @@ }, { "ModuleName": "PCPage/任务版本详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:52:33.3073371+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", @@ -712,17 +638,7 @@ }, { "ModuleName": "PCPage/预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:05:32.195178+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\预算申请\\预算申请.json", - "Pages\\项目\\项目首页\\预算申请\\预算申请.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请审批", @@ -746,17 +662,7 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:10:25.8738331+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/任务", @@ -764,17 +670,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:08:46.6888572+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -790,17 +686,7 @@ }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:30:10.1287335+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-任务信息.json", - "Pages\\任务\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -828,17 +714,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T18:47:44.7649598+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -846,19 +722,7 @@ }, { "ModuleName": "PCPage/参与成员管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:12:58.3019994+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务成员\\参与成员管理.json", - "Pages\\任务\\任务成员\\参与成员管理.rd", - "Pages\\4efeb9a87d4e43c88bafd4aeae13e20.json", - "Pages\\4efeb9a87d4e43c88bafd4aeae13e20.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/任务/任务创建助手", @@ -878,31 +742,11 @@ }, { "ModuleName": "PCPage/修改报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T21:00:06.4100167+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\修改报工.json", - "Pages\\任务\\工时\\修改报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:19:29.5559711+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -1138,16 +982,7 @@ }, { "ModuleName": "ServerCommand/变更任务状态", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T19:06:44.2537161+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\变更任务状态.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/修改任务预算工时", @@ -1311,17 +1146,7 @@ }, { "ModuleName": "ProcessItem/预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:06:28.2715615+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\预算申请.json", - "Process\\预算申请.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/反馈处理流程", @@ -1337,17 +1162,7 @@ }, { "ModuleName": "ApplicationSetting", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T21:10:28.7060045+08:00", - "ModuleType": 8, - "ToRemoveFiles": [ - "ApplicationSettings.json", - "favicon.ico" - ] + "ModuleType": 8 }, { "ModuleName": "Theme", @@ -1679,19 +1494,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T21:15:46.4363607+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -1711,46 +1514,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T21:38:32.5983615+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_6_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_2_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1902,17 +1666,7 @@ }, { "ModuleName": "UserControlPage/Git仓库卡片", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:54:26.3346634+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\Git仓库卡片.json", - "UserControlPages\\Git仓库卡片.rd" - ] + "ModuleType": 31 }, { "ModuleName": "Image/gitee.svg", @@ -2152,17 +1906,7 @@ }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T18:49:17.2333439+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/页面反馈录入", @@ -2238,34 +1982,11 @@ }, { "ModuleName": "ServerCommand/在线获取仓库某日提交数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T20:35:28.0874665+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\在线获取仓库某日提交数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/项目代码", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T21:11:34.2837107+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.rd", - "Pages\\557031284d494486b3b32eb2329c19a.json", - "Pages\\557031284d494486b3b32eb2329c19a.rd", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.json", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.rd" - ] + "ModuleType": 1 }, { "ModuleName": "image/登录方式", @@ -2321,16 +2042,7 @@ }, { "ModuleName": "ServerCommand/新增任务", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T18:46:19.2896479+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\新增任务.json" - ] + "ModuleType": 15 }, { "ModuleName": "TaskScheduler/仓库新增事件", diff --git a/ApplicationSettings.json b/ApplicationSettings.json index d5e7d607..295a5491 100644 --- a/ApplicationSettings.json +++ b/ApplicationSettings.json @@ -27,12 +27,8 @@ "StartPage": "首页", "StartDateFiscalYear": 1, "BaseOnStartingMonth": true, - "SuppressedWarningMessages": [ - "选择Git仓库->按钮(AK2)->命令->条件->对象操作（SetPropertyValue）：选择行, 在命令条件之后的命令可能不会被执行，因为此时页面可能已经跳转到新的页面。", - "选择Git仓库->按钮(AK2)->命令->条件->条件, 在命令条件之后的命令可能不会被执行，因为此时页面可能已经跳转到新的页面。" - ], + "ProcessUserInfoDisplayMode": 1, "SyncUserInfoCacheForBuiltInView": false, - "PageLoadingMode": 2, "MultipleLanguageSettings": { "Languages": [ { diff --git a/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json b/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json index 59b39c6f..bbbf7e39 100644 --- a/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json +++ b/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json @@ -166,7 +166,7 @@ "Message": "操作完成" } ], - "ID": "006ed5f3-af9a-4777-9ea3-a73feea5fb05" + "ID": "7a045c94-d7ca-435f-a59b-fc2079bc3439" }, { "CommandList": [ @@ -179,7 +179,7 @@ } } ], - "ID": "7fe324dc-4dcc-4357-b4bd-40a2b6b1d20f" + "ID": "896e0012-7c50-4f63-8175-4e47ed184731" } ] } @@ -272,4 +272,4 @@ "PaperSize": {}, "Margin": {} } -}//kdlK4ZgfM3Q68fMgkNE1XdQX3yXDd1RVTaN4QzWpy+ZpA3WpgfUHJJCakO4qM1yc6aVrGf2bsZI4eTKFXoepdzOEy2NEqlOlb1l98phiQTye3weUmKgWqZgcV5HGaTkpNurgnwxqJVF1OW9t15BShlMI2H4a1xwbXzwXOUUPmE5uT6jpLEQ0RCX7UYn1E3jfr6vY3X8hK0Q+mgSgdbfId9f3OgrjpuFjbwedRBS2BP2x9tJvVyZz9AUvXpAuyXQY0K/eR9xnamedi0ADSCRjrbsIAJoPhEZ08TtCHKHv/B4J4kDCyUEAgCNbobKWybYIiyiU8XqZX2xPwqkNlaehRC/9AeN3gqL+frwFuryeuF5Ds+MXgcMpVn9O1tLfR0kELNY0kLC7maHz8LPSXTtKjt62tv0MfzfoaGbwGHCW/CGjW3+8OX4smM1qeXUl0ITMWniAbybI20q51qJGGG49L/OXnm6V5MXVJV2VvMqZEg9s2s8YoBqGYMPAg80T7xgW7HquOojry+IzNPTvOlW8J0fSgSi8ugmPrZ6/wEhoyz4TB17TYGbHHTclGQkUJendqIWJxla7/JiduDEt7MiamOUk12mG2oWnp91O3UeLp6JlpprqL9vJPnjlELlpMJBcbTlrJSBZOjzNm6OjL6mtOnrkJKh13Vbp5oqcEfIub3eRMA5+QgI08LsBEyJLj64tvmEVeIm6cjsUaHUyT8B4q73CjIHNHlchpXIhVAgqWDBxe7fV96Kooy0LILjk4m2G53pr+dkSNOQgirqcAoDYXAnJkek1xBK0S07JIjd0/z5JfvEYqcBFkioaBf2dPQOZIAACnAiYsH8v64zDbj30nLfcLHWnKSXIA0u95L/hzOJw2gBQdwcbZRR567G2iTA6B/OHa2DWEI6h9O7Zr/wYhg==|920 \ No newline at end of file +}//ejWFP6spcz9IjwgKBqqhxhL5JqAMSPPjDsSWrCIy1GzpINgsZmkCiq5XSKPwH07Ast4uc/oFARgEnnUyaKmufNJ/mYh4pgD4uL4BybHsZjHC/bb+A+3z9OQyvkXz9YfhWN97UsXYUMMBxNXV5NLkBROkCiHap6p6HWw8jXm2sPkMW3gEp3i/Dk11EK3tc/0logGsYKp1MrothHl1LJfEDp9l2GMxoCLk/AvEY79MW2G0/ewP8o5CtoYIFdhxzpISxB+pcDIbHxY9SFe8lqqkIz/zhZXOMiLHTQO95DlfaQ9POAJ+FD8CGCOsP+sHybv6ym78qbYYU2iH8TdiCxZI0qE872DvmnTNc//0+js5kZDR/vbon2dTbI2mGeXjsM22hRFmypMqrmn1ikr6kkavV682qDWmlMLDo8qlv61INNxncq5Rm2eFkLnD0JDd4/xuPIXXeBbV95bXq5DhoiGUUS1VsjsgSx3y1TaCqaI5kaN8XUBlP5sDFflRYAUKfd98+AdkXcT8CEb0+RPqXubyg+S7eOfRwkIL+2S22aQjABcZW/bBmhioVP0q52ItvAwbVwI/7ivxbCyTUBlmtv+rpKG4afqTBL+rv+Ki6GnCF2F2VMavh/3qdmHpbtglgx28U2iSOEtT+V3r51SCntWIWPiDPHSsVxOpXwG71VizLjIUy/vF5GmPIrTpdR4NAddTq3c9GT3WXPMvy/wakxqdDSRFKOsefRcM4EVLypg7v2TfKwavQhR7AThZn1pf+wL6Kxd9aP9DGMaqLddjIM2syNFF1sgqqNR2HR42AY40Ane7akgnCPBMa3jMOxOcyfSRtboT9VydtRcX8us0zLCEhuKqlQmVmR2U9pvRFZiRqquOInvPtBSN5El6IOJ6ccDASEoX6vZPMpH5ezha3qqwBw==|920 \ No newline at end of file diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 039996ce..1aca4609 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -154,7 +154,7 @@ ] } ], - "ID": "5aabeacc-99aa-46e0-bc46-d8403e879e09" + "ID": "d668112d-0a37-4ca4-93c1-d3449c0c9fb6" } ] } @@ -228,7 +228,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "25d61e60-e4d5-4ecd-9059-0de8b4761d65" + "ID": "0fb639e2-6636-4a83-886c-dc57ddbac710" }, { "Condition": { @@ -258,7 +258,7 @@ "Message": "复制成功" } ], - "ID": "e2a1d1b4-2404-4e84-8122-3fefa7e43349" + "ID": "21ae0183-3d39-4e74-9ba9-ff448a18a379" }, { "Condition": { @@ -335,7 +335,7 @@ "Message": "操作成功" } ], - "ID": "2e0de9ad-c2b8-4ea3-92ac-39adf7788a2d" + "ID": "7f638f88-33be-4579-895b-33d292c1b25d" }, { "CommandList": [ @@ -350,17 +350,17 @@ "BtnText": "知道了" } ], - "ID": "7de33e7b-a95c-4a5f-a30e-d8c3a4313c49" + "ID": "e89b140b-7910-4f29-97b1-194bb425d10b" } ] } ], - "ID": "3f652702-db27-4ec9-9d05-3a27d47b4e6e" + "ID": "c78d335b-7f4a-4e1f-b8f9-27fc74d7cf26" } ] } ], - "ID": "414212fe-00c3-458c-b53d-c0ae1fbcb199" + "ID": "bff39552-4b98-4727-8a19-c78f1f41b625" } ] } @@ -455,4 +455,4 @@ "Size": "24,24" } ] -}//P0mjxv/7G/mavUECp3s3Z5oyqJ1Uo2T8myvd9/wdp2JS8YuMikzRvrzOKcYj/U6IwRYkcPhebJy04qj4q18l+UtkKr2pWtL80vWapDpoWss+OeLIxZAbh7VGfSWAOrZGOvBN73ytq5+dDcDxzMvzxLT/d8gf7C1qnn4IHf1bFT2GQXA4MvP9MFWRw0JP2m8DnDYik2eGyyYPSpjkJAbwmO9CXEF4zehV6jLbrm1+P+6iuMnxAtFEfN3xPSr+DhG7MuNTPMrosKLhAWX5wVIhX5M+F2MgaSbeCIIjSwEHSnnwAeM9y3109aeQgGvMzp8GIo/6024qiKq8zua0YT26UgA+BGGRAc6CDNLB/dcdvCj/RISlaoBsyZZRkJPNENY/w+tQhah0hRw4rG8TFwGW329KBVv4z1eQqIZffqhJP8g2jeEA/UptRN48g+kM3TXihyD81b7AdsN152tpb4OScLiL3M8YQhkJ9a7CAUbZbk6CLkEtRvUzVSiyf35H+zXifOQa8xI2RSPLKKTtrtBzleNRlzVDocDiuPKa/h8NKpxCxx60H1rp4daKORJsbuxXYhvGTqcNj53x+Wmt2f5jKRSXWXF4Z/m4S/REJOPXEAoAtj5AnQ5953N5x94TcgunI0OY8NTqzvcQzl760h11XGznxwSJ5Num6zbEfrCwBYM4MB0UOP6T2wJZnTPjqoBSi3iervWBri83inT4j61O/lSkNBdcFBddqMAduyWko7rq/6ED6EPedhulaQCt2us/NUIPZV/09MrwBUgmWvG3nKj4DIqJvbuGZfmCoSEFPp/ekMdwwUZSjaICkv6PVTsGiLnkuBOj+WRZMQcMvIQO2vXVeQvQvfJYvVa/Vq0mhK+D/KEGuhXTiXIfQn5pB8d7RR5tSbNFSVrlZwJCY3/L+w==|920 \ No newline at end of file +}//NKrAdr1gw7TSXXQAlE3RUq9jswljh8grQc7gbMUFYkh8UbphVOcBnsJZ3Pr8lFwkea4BODpmRQl93vWbKe4KQWArjHqkso8xYMd2HHXmDcFmJyMUu5mrWSahnfxF2YLO3qLTS+NLu4Cq9UXUOXw32IMyqVXJHq4jngJ01LzrKv/jUGD5N3xF+Lnb5kwG5r1O4qOfH7M+KN5Nli7WEqH7niieNRYADxVjrCxpLODxdxRAKXmiNHP8xy+EytARNEPCwW2gc7a4hAOrjoGxE4uz7l0UiLMtRkEqUTuH1FHMnqWpQ2oPvPE4J1EVLwcDuRVaijm0XHuLS+v77pn2czMQUPvbHYBpOP1f0zjvxIqtu5FqecSsKdAR6UmhJcdaQ6GCLZzlhbuoq7zYSgY4rm7jcYU/5gyYEZHE+BF74uQ4npU0Osa3652HhTCAXm/dCnpqfw4P5UTPFMPuv+3PKLHX9LHliaVMKV1w+e8l9hpP2PfARA2mLXtOzRRJg3Ic4Zc9zmWUkM7F1wceXleTFCIKPLP0RnQz5giMV2aSpQrNJqxPu4yefyVuuSUK9X+D2yJ/JwFaXJWEHNJPuzw82S8G5D/Sh4NdV9ipmKDI+alRcu8VRvzoKfsZl0MOvRESCxAGfKwqRLruIlIrta4Jf8k7Vic8wgOJwiZhQE6KaWfMxP+BD2Uc0hv2PL51LpXr7FS7YOn7mpe+/PSjvfLrYoaVBx2W7oN6Qx+wTt8fwqaq8CLs0GGZ2DIcPA50+0nU3VF9M9aHMxpMOg4vGbw0BGQWPZte6V9mIVwWamlQsvSkFGXmWx+XaK3WXRVXBfGkKOOj3IYl+pY81+2e7SGHBQmx2FWchT/1Kobz2jPzJnaoW2LKGaIJH/dAFi0FHW447BAVBmU31zcORajiYF85cjOQYQ==|920 \ No newline at end of file diff --git a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json index c66641ec..90a08fbe 100644 --- a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json +++ b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json @@ -33,14 +33,13 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 1 + "DesignLengthInPixel": 26.0, + "IsHidden": true } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 28.0, - "IsHidden": true + "DesignLengthInPixel": 26.0 } }, "8": { @@ -56,7 +55,7 @@ } }, "InLogicalVisibleIndexes": [ - 7, + 6, 9 ], "Count": 10, @@ -425,4 +424,4 @@ "PaperSize": {}, "Margin": {} } -}//7XbPWQf0nIw9bVQ0cRCmXbuLtYj2ffSwXiaqL6r1nXEjd020N5YtCiV+pwhBPivB160Og3V2Wozhi64yF60DI6EsBR5tMdMM5LC9NRsK5/+L67y2KR6ztHINKHHa4Ih064zbajAH5YbtNjnsLatSfS/xwGPgJjDJoGFb5VqSYno6QyvxgrSyAenRLFBATqMsYW28Q1wxcHeHPBDH+4PKyDrIS154oQay0SVH6Ekz9IzDzxMF34P8QTN4X5KZ/m+tTN2hVwQ88lRzHuuWIb9WB0M6Olgy5cllJT6G9TlJK4HzTlP/LV2N8aRtgkVhk8o8xrEddGgvvKJZffswtBajiTu8SW17sPhFoaW4Gkg7ct2VW9A7qs9V/kCfvacRmXze1ubF0mDRjFLIzcKWQE/AZAhLQdzMqpKS57XhyYFEoLScvJrNkD1qo4cTuur4Kar+Iwd1IVMT6xMbhKcCor4WV4yCE2dbvRltZlDwekwROOMd9lacgtoAqu7wLawLt7kSYXk7DIWjn0lgaQ0vYXbQXhoidpgEHJfIVFkeSfw7qQSK/8lsG1YvnuU/r2PajP7x8rJJd8zWYkbT0XlxgDB5/1C/lV6YWZwpvtESq8MhPMLAIGYEToBcz0o1Jhp9P3psVys1sHdKJ6YV3oh9ZluZlD3Tf8qmAMrr7GCaspq+Wn+3fff9YNIw/w4glm2K4s3pq1AG1rMzVnpGqe0kWWUkiQMT0UqF5lQcWP0UhAfPJ09JlKgY3xuTF5m7dZWjHlA7x3NOWZPwvReNZliAbNM4eIIMbblfTmmU2HMFs51amzfMU+H+IZbib7J7JfwMUOtruhuY4DpB6unwyfrsbMuzMgKec31FpdqTrds5UcZ8iORIyUOruR7Tadaa6j53Nq1LsaCIAUXLu6OQPKHEUFlz9w==|920 \ No newline at end of file +}//QYMZTQAfHVZIJBuGZQuCYwouJ/WoEGogOw3OvVpn8s6+MXSi7nqkrWpjog8OqQToou/UUO19SFr584EEp9l5LkpTQEBfxUqzcEZyiC98HdN8mz6CqRx41bCT84wSLE38HiRiFy6SzmMTDDcPRv4J7YwGjwzvGL8p3bMx1MFtgFC1K/BXTNoYY4rPUJdpL+ADzyrvyUebzomDA2/ZdOs2Gl7A2viVTXHpGW8y4lJpMwzsiHqveA20WspAkH04S0ABhLnXK9/SeZgopLkeUJ4M+ivYC+3bmyYsltUGtS6TmdWkAl4uHjPxicf4y7D7aZHOcAKxSxXpynUrNI2+sfc5/ldquI6WSpV27+2AKtaqob7KBuLPoJYEYQ+yWoTZdEFU5PhcYXzzWAsyWY19nbVzWj0BObwSKyIN0EnDXVcx5DLHRH/bH5nGmxxk+mk6H9LgxhEDHRTo/RIjPAAZqAcFmO95W6tzPrvtZUf+vclLFpqXzHnu996a3ICvk1N6RIYhNGHSEo1g50aYOHAOQ8ZAQ7d3zpyWeGmlksuSP/C67EFh5Yrw1A4KLrSz9HIlg/8UDbmy0KlscKpF0h+GdpNOVZHh39YInfFXtEvSHDLVOee8ATiZLBhrzVZZe4W60IWbmmaz+OqmJZX/Zfv7RNEg9frTaT231zI89FSJOF1bfXzB3DbAHzDDz1WrFcSevf9uWu5YEAKcuT+cS/2kxCK1sgONr3hXCoMXfRst83RGF9Y2Ln4FOrKSHOLRSsyJZcaIIXOeUdiMEIWMcvKJLMHaSvrexfU5ycia7EExnjKv5UcRZK0bnzUPPbOkyez0FJqrj2QF6Q3TiWgGW2oJYmzoSVoHHwmjdeAifX0zKdp50v1K6BvEMJ2aKDs+QQnWxbjKoDYkSSUPYNSe9j90/FhsJw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json index e17e18c9..19285de8 100644 --- a/Pages/任务/任务-任务信息.json +++ b/Pages/任务/任务-任务信息.json @@ -249,7 +249,59 @@ }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], + "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.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "690c597c-3392-4d9d-878f-bfe30a550e63" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!任务ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "ca4cf04d-f5e3-417f-a966-acdc7fc74440" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!C4" + } + } + ] + } + ], + "ID": "fce11cef-6a14-4d79-af6f-b09e2f9e5c02" + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -368,7 +420,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "66776aeb-3e26-405e-8b6d-e231477839d3" + "ID": "cd17d708-b010-4dbb-b1ef-4d921bef9fe8" } ] } @@ -458,7 +510,7 @@ ] } ], - "ID": "99430db2-c330-4dd2-8473-b18e82cad154" + "ID": "d2dcd0c0-7f0c-441d-84b5-a4b5ba700b22" }, { "CommandList": [ @@ -475,12 +527,12 @@ ] } ], - "ID": "1d1fdc87-9f1a-4755-b210-4b74d5a4fb58" + "ID": "79166c25-857c-4e8d-b104-96beed88f0de" } ] } ], - "ID": "aaf2cebe-e336-47c5-91fc-3e6f8d4b711b" + "ID": "9faad235-11d7-4b34-abfa-5b8271e0cf23" } ] } @@ -550,7 +602,7 @@ ] } ], - "ID": "11326b27-6b77-4fd2-b7b8-21adef347042" + "ID": "b4cd77df-84cf-4f85-a07a-84633d3f29b4" }, { "CommandList": [ @@ -567,7 +619,7 @@ ] } ], - "ID": "8f685edc-61fc-4c19-b542-34fdba245c65" + "ID": "c9615878-00fd-43e3-bfe4-3cd38c58b367" } ] } @@ -655,7 +707,7 @@ ] } ], - "ID": "69181848-99b6-4e08-b4f1-b7a1c08cc6d1" + "ID": "da5688c5-a14e-453b-8607-96b07d942049" }, { "CommandList": [ @@ -672,12 +724,12 @@ ] } ], - "ID": "17fba5d5-6c3a-4f50-8003-c00076e73456" + "ID": "ca255871-9f76-4880-a272-5c25ea691da2" } ] } ], - "ID": "5b16b26e-db9f-45e4-b215-0af54054a014" + "ID": "05f4a0c0-e930-4998-b449-96cc0b6c00c6" } ] } @@ -747,7 +799,7 @@ ] } ], - "ID": "00496d34-0538-469b-9aa8-6043fd0ad0d0" + "ID": "a2d9859b-c815-4a56-ab3c-e8dde26c34fb" }, { "CommandList": [ @@ -764,7 +816,7 @@ ] } ], - "ID": "b146b73d-2603-4b29-a221-21105e4e3b40" + "ID": "f839abe7-c296-4a69-81b9-762c757c4d46" } ] } @@ -1028,7 +1080,7 @@ ] } ], - "ID": "d0ce7db3-b9d1-4eb8-82ed-eda73bbd2997" + "ID": "af025153-c0e9-439a-b492-78d0daca196d" }, { "CommandList": [ @@ -1045,7 +1097,7 @@ ] } ], - "ID": "856735c7-8145-442c-bd23-f5bec6ffb11e" + "ID": "702d5121-b3c7-4529-abea-4bf8845b81f9" } ] }, @@ -1079,7 +1131,7 @@ ] } ], - "ID": "7bfa93bf-c4b5-4ac3-a736-030212d4324e" + "ID": "43a41316-6a69-4638-b186-f519e4a5421c" }, { "CommandList": [ @@ -1096,7 +1148,7 @@ ] } ], - "ID": "deaa642b-ae36-4a7f-a013-e3e2a78a087a" + "ID": "4955b4f3-6bf9-4906-a7a6-e53dfb72e043" } ] } @@ -1158,4 +1210,4 @@ "Formula": "'任务-任务信息'!$S$14" } ] -}//7Byp63FID751bolmqHmqGzvLXIIigKW9TlC0Ni7cYTTn4j+rF1fCSBnRlZ3nhcyMhxkULer6FBLGGWpLylxHbE1A8ZCYaFDpyeV3Idr13+CoaBzKsZ7BvvoAYTzBKZOyrn27V70+6eZWtwsdqt6r44Fi9dGYq/4JOk6imqlZqFl+AOFPCKtC+vrmiKUWmHR/zq0fMDsOjdwWoRErRmaiIeGfdcPiKLhzl7bAxzP0NxQpBZijycqkWuUtzkxJguHx9cQgr0F1oDaRIBPs3mmRAPU0wDkSecddj8rFouz5XsF8MhgpZb6/aAhQrTJHNoNNhCTiHeQY1urqKRjbY/49C+RNdacbUeRblcQyEjLYiFfN5bF4hwlhx/DQskd/JPDpwKSqFSHMuA1IH1R7JALVYbT5R4+lbcLFTHAK7VcLO0NuzTiV/She3hFFUVIEzn+CJfL/hrBTf0oW+GCLiVE9P5807XQ31KQk88q8xv6i9SVkNfF9bEZHZx4Q3pX4DNNM5y15VgmVz4z0ZCy5Wy2zGsTZqPsBtrqog8429nD6xOOKldGdM4WQpbCxw8cVxD58oNKNe4KimWhFyYVV8PaZS1eKRd8qe/s0D/xjyJ6/N5SUegi8zwdPzAcMtfIONPXh68aUU27b7C8SeAlplAYF55azHtd+o4drkaXCHfq6kqEJ/1RkxllroHBJpEWgQnc7Vz9nyp8IygpTMy1F7nBppxKsvEfLvD9524aX8GifFowD3OiRsln3aKMvquOaXSWpi1nn1xGzxpC82U32pkV8G9u7XeslwaTAdXR+4HIMh51jwZ07j/IC2dSDAh4oLeYfictZjAE744/3wxXuu6kELcs6HYpBbP3uHluTaJHeVsmpLV5ddATAg0Jo7dZZTlFubfFkUJDZ+prNWtDV+Nw/ug==|920 \ No newline at end of file +}//UdhNoraD62eWCv4AsoBnU4g9VdeF9Z3ydwh9jSts7o19fil4PavI/bmIMlyQ0hghSgaLCB5e2OVsG0gHK8zSMuBraiLHqycl6tKQo1orzlP8YTu/w5BomjQfS1YUVes+8mRzMzZzkbLPh7iLfXoQ6j4hPrcvru9zj5owNAT1WMYh/DT4AQ7IIhAkwMYvTz5HffyDMgsJSH5bp/bfHX33aXyWjU0Rd6zZ/M/Wj7fGFm1zt5d1BIBTWw3U+h0QfdAHeLMODSr02t+HujNvgTzbu3tz9goEgYD2ErGX9WkQ/dnKk0B03JD/63bSIriUPVOvcNfUs2giuaW/8EaT0EdRcxF1Pnbb1+d+qQLLlHKfSYbKYBO6Rsjj13b+0+QVVBs5hruX1P4Vy9ECJNf0Q1HTigoYL6vsoI96gpwOtpQb+aYOb5OdSi1TgexXVt8VHVHGrA+gCgijH1ayIb3aAhvNZBUCoBnxzzfmKj0PUsr0WRPCeq+p3uLlcZgQygKDEzGmERJvMQOqqdb0rti89glY0LZ58uatZx+5LluCgL4+lLZbbpQzTYDl05NRjmBMKV2aH5tECM7sRdnMrU2xrvbCfNJrWGmO/vOQmCWfciHTwU+7bWQPvgcKD7ecGLNyOQqH1NMQ6sCwXNQMu76AU8QsNomg6I3mrQaqQTSjvVKt+AVaJqDhu7AGX+bRyeK5NQ6KaBnAM2/+d65uVOcHwfXsArKdDOQnxfW0NC4lz7ZCXX9TSmyFwGTIYzh1A/6pAT9gb6qL9Q88J+Z7K+MMyTnCeLDZKl8W7Ji6dytM8xbfDWa36I5qMK10JuXRBm1e7/8Inhu6HrtYLKmSS3N3wz39FdWiCfPD21/vbyOzAvDsNx7Vc0t8Cl7eTSzwIcqc7U7hEZZGuBfhs5/ChlLEaP0N5w==|920 \ No newline at end of file diff --git a/Pages/任务/任务成员/参与成员管理.json b/Pages/任务/任务成员/参与成员管理.json index 0abe4ef9..4454425a 100644 --- a/Pages/任务/任务成员/参与成员管理.json +++ b/Pages/任务/任务成员/参与成员管理.json @@ -343,7 +343,7 @@ "Message": "添加成员成功" } ], - "ID": "aca21a52-e2cb-476c-861a-0db1e71bf82b" + "ID": "dc32071f-bb37-486a-bc93-9afb9680ce61" }, { "CommandList": [ @@ -362,7 +362,7 @@ "MethodName": "Focus" } ], - "ID": "1acf34be-d728-430c-9fbc-50c6d4b78496" + "ID": "cbe4c43b-b043-4148-922b-bc9683db672f" } ] } @@ -441,7 +441,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "7eedd126-e19e-4f34-b74b-c7292a9b3ce9" + "ID": "3f6a1234-2f79-4086-b143-f3d9b1dbc4f2" }, { "CommandList": [ @@ -451,7 +451,7 @@ "Message": "未找到该项目成员资料" } ], - "ID": "84253958-90e2-4b3f-8f42-18b350da863a" + "ID": "9962edb9-1f05-474e-9399-86f51804c7fe" } ] } @@ -553,9 +553,9 @@ }, "8,1": { "BindingInfo": { - "TableName": "项目平行视图", + "TableName": "任务平行视图", "ColumnName": "ID", - "GUID": "11f17a1c-6ba9-48b5-aac4-f9463c280376" + "GUID": "c2f63c91-4b45-4133-9350-0149f561944c" } }, "8,4": { @@ -651,9 +651,9 @@ "1,1,1,14", "1,16,1,3", "3,16,1,2", - "8,1,1,3", "8,4,1,3", - "8,7,1,4" + "8,7,1,4", + "8,1,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -702,4 +702,4 @@ "Formula": "参与成员管理!$H$9" } ] -}///uNM6KRETjINhSToivxGR8NeExr2Bwb1booK8MPIzsS/fCEm409pBGWzbNmBkLmgdLG5nJh3I8SpCeGPo3i15+IY+CChVD8dTd8ZrcnzCQ58UZaU7ON4yAc0njK5xvrCBj3Mtb2xAFDB7APW8HhqYf5I21KEzYyoAp0XiGsVAhRJAf+fGxcFhdsUw2Np9iSk1i2EdvFEWTc/OVmK5s6D7Jm1+wQ6qanKi3Loow/iu1C6Qc72ymIe2wK4VEid6dbINlbsNXIWSF7w2cvCLZE0Q8sBaTSuQGzFPUgmM9LtzfXEHuG8C7ayNv8/saCjJGSIOX12yfd/rPcyeraLc4uQdHypMbTcZfNP8DpUQs976N3wvDGr9z722dSZgh6MP6tcREMAcWd3/K0lUZLTPOIxtgXAS0OYite68I037Zqv+zg31/7Ldci8ykWKy+FtJ/cRAQoVvE+u85ZwjJ3t0A19PY4U95Ulu9FD+DuORbQkfyMkzMwsqdpEkQNq/trlJ/XeKNEw0ZrNUv1y712MqyVZWgHajxOzCmIOBkgK/AS+Ls2z/l9a5mxi6qnGkHFQ3Wd9OvLTbXSDXJGpZLYfCRreB+o/WsSdqO/0D5bEVtXunjrwxtUqU1rAedLipn1t6cA5kYt7ZjQcK0R8gWSDNx8IU5h8M31trZZkHh1kt0cDBFbLSKXJWPSxBeDmJmFAv6zxE7GI96lGMpe1/gI1RP5uKQmUy9G5t7umaIGZfGZbyTgWeK3CHSMzWxpSdLmKqCeRsH2v5W+dhNqXx+fppnTeLbiMwtR3m3kbp3eiktBtygL69zhvcu3Raha70XZLa68B40DNeQx8+l2IlzhJ5YMDUCOu0z2pQCZlc1tZMajJEvFoeCcCikhg+J2h3zOA98D37cGg9nDFSA505Bxj5LHQzA==|920 \ No newline at end of file +}//ioqnGp1rX7kCfAb1MIIBZP53gXq66Zs9SKi8CUCzCYBuoeCn2qk+gkmZ/IRTsX66Pn4MpTZSaJbq6mqUwXWdMC0nEss65m+KXxpvHJCZMu9VX90WNoypbqYgLl9wO4FNgHNDxF3FWvTxrPdrMCkhroUeVsSnt8eiYy7d7qm5bFe4q7NAcBybLGfEfRbFjUI1j7TLy1MdBYMk2ZzigA0Lwq+F7hRES+6zkhCh6qA/AS8BHPQu+raJ1Yjs3p0ckQ/uNo9HU6eKjcpQLFikZkYfrNXr6ZKJo024EwKNcLs0Ef8o7sRaKUUbVqi8rte9CrDttGpsJdHPlk4ydgiQniu/GPEs7FfVQQ9cEc9U4D/Gvv0Dw8q6qzVDn7pl0PEHUhAoK36KVuWM3QwG/W+ctjP936rAno16PT/cDyPamD7h5PrgzSgc7nsLZT9SbqXUkkDSu3sXeny92f/6JQ9zSOqY6RXIiQGQp0lZznwbG+Fop5HI/zNDJFH4yRY5zvxtaVS4SVuF0z4/HjsnqV5qgWSR9XpA/5J0z7kA9f+3hYuh4Or0YMDAIPLLbSeDHkutHfPrmLdA2CMrmiIuKdlvEybOO2kMy1fzd6kCJdN3tBhBDOkJyjXJbcDVMPZAfhacNFyfQ9GscNVYGRSPjnmJp5Z5bOenxXgBC1gUBiT1TbjMtnzKyWKHRMK3KwjqIHQJCWGnvwq0701z9Jv+2N4uH30sQ+jEsXynWWM7lKOOcA28BSGXctlcfhPil1bLwrZgVaG99R97Q+iwWnOI1989jamBAV/PQt/PYVGLvonqCJZqsE462qFxIXiK7nmim+vNOK+Yvlv+pZFyldAdBdmoAIeu/qjUx1JjaCy4eFxAy8DUx5c6hMblesljR2C5TVXRDB1b1YG0Fe7NhXsK1Z49hRQFAQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 2eebd93a..05cc45a4 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -278,32 +278,6 @@ "CellType": { "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", "PreCommands": [ - { - "$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" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "CheckDataValidation": false - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -314,33 +288,81 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=任务首页!code" + "SerializeProperty": "=Action.Name" } ] }, - "value": "0", - "compareType": 1 + "value": "提交" }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "failure", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!msg" - } - }, { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", "Title": "加载中", "VBalidate": true }, { - "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "任务发起流程前校验", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!任务ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "CheckDataValidation": false + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务首页!code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "failure", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!msg" + } + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" + } + ], + "ID": "2d62058b-3c55-422a-b000-d0d6555f5264" + } + ] } ], - "ID": "7d7a077b-3e88-4c52-b75f-40c3b7b41772" + "ID": "d058f3d4-5bb5-49ee-8627-d00949a6c95d" } ] } @@ -350,6 +372,9 @@ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" } ], "TemplateKey": "同意", @@ -464,7 +489,7 @@ "PageName": "FGC_审批记录" } ], - "ID": "7ab673fb-4bb7-49d7-86fd-a34b0b225751" + "ID": "daf82788-ae7e-4c67-b7be-8154aa27c2ba" }, { "CommandList": [ @@ -524,7 +549,7 @@ } } ], - "ID": "dc1333ca-ece3-419f-a059-ae77b09643b9" + "ID": "f70b07e1-89aa-49d9-8f09-f982975683b7" }, { "CommandList": [ @@ -537,12 +562,12 @@ } } ], - "ID": "b8064771-8571-467a-b6a6-75d2898ea839" + "ID": "e21015f9-3f75-4ab9-9668-882dcb3fc44c" } ] } ], - "ID": "0979af3d-8805-43b0-9425-7046db992b7a" + "ID": "80161dcf-4fd3-4a06-8319-057ed4bc4b06" } ] } @@ -657,7 +682,7 @@ } } ], - "ID": "e7e0eb27-5f64-40ba-8a47-7bc7da4b8e2a" + "ID": "13badffe-55c5-47af-9e70-2b7709e03a2c" } ] }, @@ -698,7 +723,7 @@ } } ], - "ID": "cc334536-3b98-4ffb-9340-c8c1c971fc50" + "ID": "60a423c6-56ec-459c-8fdb-3f1afe6e9499" } ] } @@ -760,7 +785,7 @@ } } ], - "ID": "1799cd8d-3e55-4fbf-a27b-47d9ddeca313" + "ID": "6424ad55-e841-413f-8a70-289ac5c849bb" } ] }, @@ -801,7 +826,7 @@ } } ], - "ID": "b3b13984-bd90-4d0c-ad27-a906e1a9cbae" + "ID": "d73aa3e0-7a42-4fa7-b4a6-70921b84e1e4" } ] } @@ -1428,6 +1453,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], + "PageLoadingMode": 1, "ConditionFormatRulesCollection": { "Rules": [] } @@ -1482,4 +1508,4 @@ "Formula": "任务首页!$S$8" } ] -}//cpyfngDPy63Y7rLS4qE76J5jB2gUEZPl7VMuC5lCyK/nUsiYrkHJRJFNkTjFxt9o5Cp0j9q4xmNAwQ2XePHk06NXD1SaP4umSpRwti9rM635JJVKQQKqSHpCMDU9PzqfY6qKN5HF+CclGcrPDcOklLztPFN8jNrHF4/MdVmJSUWyV5bHSuXHflqd8erhdu0xexCX0R6GHD95FqI1c/fyfS6zQUHrnQnWRcJyChUwBGYYmoLlq+2gfP7B2mcTEuXPeVZeduj6al8sdMAXEKW2QNeJKb0B8YqqkOuJai11ySWclwXAsoR6GEE7yQELXyQkwjqziocVoj2v1KbqOukzxY99DOBQXYSHMw55u8UX2dPUA1Ja2tAUCOmW7pWsBFTIL6GYMVbhT16pm4uwbuGMAEwb/R+VHFbBQcHqd/J4mkqm90U5kEAX+9d61BnD+It6JcrfltRZqh13e5ChoyuKGB51n1pSxDzv3vMnFqa7v3F52Lo3XjDSF8GAzKaio46+GI2xuW/p1mIzjR5z8vgxc8Jvg5WUXcl+eNUobwd2k5sr8XD41PB52BwAfuKcyoRu0eWagcR1n+lmWDak0vsdhNphozsu7fxBOJZLTlV49MNIgjBn7QVFAbpWPyrdwPUHtu+sv9xYuo/W3256fLrJPvgjy2IVFWzAOMmISEQXnLdtEsQSahhn85g0ZSQxnGL/BSmNgg6/7xlE52r2lmLZvHYhhXW+O2ka+PrFsRsEIN++bKLLsUiOMBkVXu9Qo6x5MWcurNUCMXnV5e5wLsQqUBpkSC2cyrdTFdR7hwoj2t7yJF01Gx0uAbyFcj284i/F6cTMfdF7j0DhgR8FcqkFMGMVHxjAs9bgywKi9TYXNA8Jgci+kCqUdNQJBEf5minDUBQ0gT/fXnZPvL0TTKr99Q==|920 \ No newline at end of file +}//VfuYxnrub9lqT6UAIHbeC4rsfIXFjYbS2DOMz7McKgVzEllw8X0+XGDnW+8BuT2qs+NPvVvL5XGzTxkWnq/iDCU7h5P1cX3kZ+Xf4/svx0mqzbRm/xDDADLwIFZ1hOTRPfyG06HV8kPv/QtvxD+7OvllouK0EiPNUHmm/KHA8J98nga9MkOwjDoSAycstK5TqRXRIQWUAG8mpss50M0SuvDBw+jjY87KssH6MH2tuXSGK/HBt8JwZz7ehpOU8ZXv2PTPUHRrlC8/LDf7DmirYbhI1LfBDLa37LHwh3t3eajZiI/76chfK1Ffghu0QSQy0XhRdmOImVuJdUPlNAoFmyVA+T/2fg0HdFMaZnVvMYlBjY0Du4QLsQQBDArvtAtAPSG9HgqTpKtW93rGOtVZj7eDZ65Mtg0vyTyphwSSVAfZkfJkZBmXaiWKR+mc47hkZeoh1EirxBUGoulffsLrxZuvNAxy9k+aYA7/H3MaLjjlIUR/MLIveejpmRveyXytlmfBho7uxzJHS7qpfEER1owOtcw6A+RJCiJxW3q6V/mjdYIO9mN/O9Pze5ty6tVkzdTmk702+KdRW6m3+BHjRls+UZ+RKS2k5tIHSglP1wotCBygSJovwl7qud5pI10jHLSV0wCeZ6ZCJYpT9YC53G+QHWVuQuEiZYdAqkJVQ4f/Mnzp4WDYlj06Qa4tTAT10PvoNEuDrf/FVqIyHQ+/GCeA1tXxDb0JA1Wm2pOWmAAWBWcon/Rv7zbmSMZdy+uJ7oeK8XMoM6BjnTVBIE12RXMBKfHfO4Uan/OhAvPbuCDP8CNf2oEshjOq8Oz5EN6FJxYxJGGf+pSJfa8mfPTN186RWhsWh45hZZ0BBkw9rJBxWfyqvcjR6hfU2Qg5KnjctzrFjXuFTAhyHq1Hsa+BOw==|920 \ No newline at end of file diff --git a/Pages/任务/工时/修改报工.json b/Pages/任务/工时/修改报工.json index 615d6aef..f300e41c 100644 --- a/Pages/任务/工时/修改报工.json +++ b/Pages/任务/工时/修改报工.json @@ -45,7 +45,7 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 97.0 } }, "16": { @@ -565,7 +565,7 @@ "ReloadData": true } ], - "ID": "f66d6bdf-ecc9-4f47-b670-0f284009cd77" + "ID": "6af3bc10-da58-4b3c-9fc6-bc60aa90f99f" }, { "CommandList": [ @@ -580,7 +580,7 @@ "BtnText": "知道了" } ], - "ID": "dc993996-f686-45ce-b3a7-593e86561468" + "ID": "9a01aaf8-a607-4995-80eb-f603186a2f86" } ] } @@ -879,7 +879,7 @@ ] } ], - "ID": "745338e0-448a-441d-b312-d010beae41ab" + "ID": "053dcf16-cb3c-42c3-a767-9e21bf6a2ba2" }, { "CommandList": [ @@ -896,7 +896,7 @@ ] } ], - "ID": "7c4de2ce-58c0-4424-8f99-08ec744fc636" + "ID": "735c05d4-ef1d-4d97-b4b7-90be89dcd49c" } ] }, @@ -953,7 +953,7 @@ ] } ], - "ID": "5d5bcf85-1d83-48d8-9771-90127aadabd7" + "ID": "21916420-1fb3-4415-a56b-f14d8a5868b0" }, { "CommandList": [ @@ -970,7 +970,7 @@ ] } ], - "ID": "674df329-59dd-4090-ba38-fe80bb5a3837" + "ID": "7fadfe8d-86f1-44d6-bc3a-ceb26d92fda0" } ] } @@ -1003,4 +1003,4 @@ "Formula": "修改报工!$B$23" } ] -}//lE95giFs8zOtvuMQSFTE/zCm/0JRTkxTybzbykZzfWic+akxQDeika7imj1Jm856hCs1A9eQQlVRk7zwBMu/7JTiULnwbBijsx7ghfEdsYPxcFoGmsUm2b9g4Bn3fjVy+il0lVuP09Ik75fIXpf14f0zVKcVwICXNu8I63t2LYIN2tReKJrfUwNhByDVEPie63x2mWMv3bbXMMAIUqXneQAz+U5Ycv+go1+4KJ1ynWa9uqE8Qfc38MKhpSfCrWbPvVU95gHAEEQOGUfTihMSaPq3NFW3RjpHXb5qE5Temdc5FPCVx7c27FflBQQ2jlp6IbjrxogLjdWSTnaSYGuc0M82QOPd0rW7L+wUYp0pAO5SCaetNqIWHwqIFYbna2ClTzC94Hx/bb4JMubiBcKQKE1VFI57xqi+05r9k2N7MXLnsedax04S991nYCR58ycm1hhS8e0Q9neCiYN89B52DCv1gNyDwhE3pBwowld+z91iYm3UH5W8DeTjPW5CBBr/DwKaTk5ct3VVLBEO59zS+wvQBlIWolzEB14hLrMVLtTTFA4ydVy0o0Haf6tDPuOEdB3FqOxSmQC/IH9CPAOXMquWpLnpUsWCnW0dveG1rfjv0WROEBroPlRARzQ11eCrQUiUzgl7/enlEgk4zmwyaNowOIFFwUUXQ6CyCdblKf/b7dOY8XzwCfid/Q3cTaB6a1NyKfRRza7ZLCXo59208rqNWe3xRI0SS9BtAKLPOvrMiP43XL1Z7OzBNMEBocgOBDQEbfedVcmRq90W0KgKbY2hVbqftGM9dUDlj0OjefzEMurBTBRL7kZIWBoQdBLpsl+dPR7+5b4LEsGh9ouAjC3YkzkaGSpVZQKw9H7R71UBT0ewj6KctLrrpPLY1Bg6OWd1azra3uj4fZBB+M9lrQ==|920 \ No newline at end of file +}//Mhx0l5t+ruRH2rr1qWbnw4cjg9ayrqxe/RF29hogQcxFvPV9CfJl7Gk5f5oMjpCEbSHWPAGNxRuJITvRbqkkUJOUx7cb6+DqCFEdTqpQbeXBphtp2FyrsG05L4Nmj9sPGvTjBGPc2T8Ge6DDVGNPRTbVpD9+aaqJfUEfNxI0wjBz+0p5twLo7Q9B0EMPJkSN+5Umz8jL+y2SBmbpUJczl/KyEQY5sZJHTdk07pyR7kJpoKy+SaTU10jHTygsjL+jBlYZLa/iP+rrdsiUthnI+SjHImYHVBoYgYYsYBsuDmyeH5aKRkV1ii5+oD9Wb/XMCVmyqO1tF0yCgWC2PPXtPdEJGqfttsoWbUOAr2idumuSONQafwdCxcEi/a5LrlMcjxnwYN+BWHsJU9b86BF/49jdMnhQZU/Wch5ZQ4SMlfOyGcodN0mNhmHzZPmmvbeIOgaAuw5A2xSbRy3b0b0lmzuV3JHmlk9IsPfyNHoK+DXPZveJmaui1/ILEQ3I3R4TVbdPzuzrbB69YI7KgmJugw+2wLtCnCpL0Sc5hcb7TdfU8kGd4628QF3Nk3u/RuSCPt29700rskMZQtLEwv0nlyw7ZVCPV6+EuxMiS9BNuLehbpRcwVDLPaJdyEUe85D6EbZw5uOoUAsOEgmlalnmLr1Ijhax80NixcK/ppAjPiY/TKqFE5dj/qn5T2CVPHjxPp39khg1Q3KjVF0NC9VLlRoiRKB6GUUar6LbyZ9n+4yPWjitxOOGNSaC8YObrPEaMvE/KV4FoKoYFjQyY7EJrDuMaX9MqGhkUeWjVRRcHY6OTUT5Xlm3x1d7JsB2o57ntp33c+/3AWLwZw1+x8JU/cD8CKAxJETP0kXoHEu+2dZsNlsI+oYB9rFQVwFCRZsmlbQ+0YVVLP/3MZbghulnLg==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 75c7d816..6baaeaea 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -152,6 +152,12 @@ "DesignLengthInPixel": 27.0, "IsHidden": true } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 27.0, + "IsHidden": true + } } }, "InLogicalVisibleIndexes": [ @@ -160,9 +166,10 @@ 17, 18, 29, - 30 + 30, + 31 ], - "Count": 31, + "Count": 32, "DefaultSize": 24.0 }, "Cols": { @@ -219,7 +226,8 @@ }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "14": { @@ -259,12 +267,13 @@ "12,1": "工时数", "16,1": "特定时薪", "20,1": "工作进展", - "20,14": "从Gitee分析", + "20,13": "从Gitee分析", "27,1": "取消", "27,14": "提交" }, "Formulas": { - "29,5": "DATEDIF(F30,N30,\"d\")+1" + "29,5": "DATEDIF(F30,N30,\"d\")+1", + "20,13": "IF(仓库ID=\"\",\"从Gitee获取记录\",\"从\"&分支名称&\"分支拉取记录\")" }, "AttachInfos": { "2,1": { @@ -546,7 +555,7 @@ ] } ], - "ID": "b9608d4f-a59d-4292-acb6-a8c908394454" + "ID": "45f46f1e-ef3d-4a74-b98b-1a68bc3d134f" } ] } @@ -619,7 +628,7 @@ "InputMessage": "留空则系统按照项目设置自动计算，除非你针对此次报工有特殊调整" } }, - "20,14": { + "20,13": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -645,40 +654,45 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", - "currentUserProperty": { - "UserProperty": "GIT用户名", - "PropertyType": 4 - } - }, - "value": "%Null%" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", - "currentUserProperty": { - "UserProperty": "GIT密码", - "PropertyType": 4 - } - }, - "value": "%Null%" + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "c9cb6b63-e8c1-4be4-ad93-b2c246a02403", + "RelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "仓库ID" + } } - ], - "RelationType": 1 + }, + "value": "%Null%" }, "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本", + "ColumnName": "ID", + "GUID": "18f33063-3dca-4746-8af3-7ed6ec586f98" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B32" + } + } + }, { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "完善Gitee资料" + "PageName": "任务版本详情", + "LoadBindingDataOption": 1 } ], - "ID": "cc1e36e3-f71a-4be4-bc6d-c2feedf095ff" + "ID": "2a5f91bc-4236-4206-8eaf-83c8d2a7e40f" }, { "CommandList": [ @@ -705,7 +719,7 @@ "ParamName": "仓库ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!E31" + "SerializeProperty": "=新增报工!仓库ID" } }, { @@ -713,7 +727,7 @@ "ParamName": "分支名", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B31" + "SerializeProperty": "=新增报工!分支名称" } }, { @@ -739,6 +753,11 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新增报工!结束日期" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "过滤无效信息", + "Value": "1" } ], "ResultErrorCodeTo": { @@ -785,7 +804,7 @@ } } ], - "ID": "fd6fbf04-b232-4f1d-a08a-9d3a83eb1370" + "ID": "e8f0f30f-dc17-45e0-9e40-727e8dc8c4da" } ] }, @@ -799,7 +818,7 @@ "Title": "加载中" } ], - "ID": "7b1c0ad5-5eed-4704-9a82-b454d6f9c14d" + "ID": "da2eae93-452c-43e7-bd2b-a1980ed287aa" } ] } @@ -996,6 +1015,10 @@ "value": "1" }, "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { @@ -1080,8 +1103,12 @@ "ResultMessageTo": { "SerializeProperty": "msg" }, - "RefreshAfterFinish": true, - "CheckDataValidation": true + "CheckDataValidation": false + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1105,7 +1132,7 @@ "ReloadData": true } ], - "ID": "fb1a1d29-c88d-49a3-89f3-0541ae909586" + "ID": "10582620-c86d-4d60-9e53-a488c3f99a17" }, { "CommandList": [ @@ -1120,12 +1147,12 @@ "BtnText": "知道了" } ], - "ID": "1d3dc967-952e-4a2e-8c47-4b5971465e1f" + "ID": "1a8ee6d7-831d-406c-a72e-1564175d08ff" } ] } ], - "ID": "ba48f4c9-d6d4-4b41-97e3-fa7f83c8ec6a" + "ID": "1e58143b-e41d-44bf-ac88-5e254778b33d" } ] } @@ -1202,7 +1229,7 @@ ] } ], - "ID": "1462f67b-c95e-46d6-a751-e2a02bd41232" + "ID": "ebfbfc1e-f449-4e1b-8055-52ac57ab2bfb" }, { "CommandList": [ @@ -1217,7 +1244,7 @@ "BtnText": "知道了" } ], - "ID": "8fcf19d1-303c-485f-8577-4cda20353009" + "ID": "652dc1d8-9eca-4941-b2db-b6b1ed86e194" } ] } @@ -1263,6 +1290,13 @@ "DisplayColumn": "仓库ID" } } + }, + "31,1": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "814577e8-390d-4042-aa33-c899dc2d839e" + } } }, "StyleDatas": { @@ -1500,8 +1534,7 @@ "20,10": 1, "20,11": 1, "20,12": 1, - "20,13": 1, - "20,14": 6, + "20,13": 6, "20,18": 1, "21,0": 1, "21,1": 1, @@ -1579,7 +1612,6 @@ "10,1,1,17", "18,1,1,17", "6,1,1,17", - "20,14,1,4", "27,14,1,4", "29,13,1,4", "29,5,1,3", @@ -1587,7 +1619,9 @@ "2,1,1,17", "29,1,1,4", "30,1,1,3", - "30,4,1,3" + "30,4,1,3", + "31,1,1,3", + "20,13,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1622,7 +1656,7 @@ ] } ], - "ID": "380cffc3-2f9a-47a4-b087-2117745daefc" + "ID": "3f9f4d0a-fbda-4c76-8871-64a0b886ad50" }, { "CommandList": [ @@ -1639,7 +1673,7 @@ ] } ], - "ID": "c4dfc705-446a-445e-82f2-adab27f1cad0" + "ID": "3365816b-8067-46d2-8f98-dc34aa82cc8e" } ] } @@ -1660,7 +1694,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "项目表" + "RelatedDataTableName": "任务表" }, "PrintInfo": { "PaperSize": {}, @@ -1694,6 +1728,18 @@ { "Name": "结束日期", "Formula": "新增报工!$N$30" + }, + { + "Name": "分支名称", + "Formula": "新增报工!$B$31" + }, + { + "Name": "仓库ID", + "Formula": "新增报工!$E$31" + }, + { + "Name": "版本ID", + "Formula": "新增报工!$B$32" } ] -}//A5l6TXDPSEB2I43W6BLB+LNgkalWIAyF5skzRGyvus22xNRvFzqr4BcdQDEPWGLZ01728h93lEuxitWmmgdO+FBXWQKMLDepwLkhkNKgkYiQ4o8+MLVA5SWlp6pAlhib4jQDSRF4Kh+CyqHAVqEfvx6Om3/vsXrRSLgF3+LEQhcvO+a05U5zx5O0bh8h0xqm+yT06HB8bVfzNP6Gb+xyTf7gbpXHCvvo4BndTZJDYhNsAcF1B+aL4B/m+g+RRnPhwHjXYDmNL/M3HceTPKLDym37bXkSyo1x/OAO1DAzDDreZBR1mHrn2FYG7AZyx5jonajuO8igszOMiMvlTAi74JV78eq+RCx4/eS+2vSbK2aaq5ucWyfUXzKErvXaGMWPL/Y7HTSnvefuUBKSFfahOUV5BmO87sJJOz4bfA9YVwffhY/x3oolbl0TdMMAjy555XSc3+zVsulEyBF4geQ/HEKubKUlIz6cVXndxnv2+g67GgCOi8CA16OPuLUTB3yn8HPWjY3cw8xn2w/AfuGtqM4JatWDkKmy40IXLlskM74XtnISfBKXx7KlorLQIDFLR+nPvqY72rw0nADkpYS8PS+vKJEz8NiIUpW4aNUjYJGnIONs75nL7hY3jQ071TjQGpqPjdRkDQMd0LxOluLWwUSw3HZmKMsFvjMgaCf4WOLz4mMblRdHgPwQNeupAqoYxl8RweO4rydG0m3/ZJL6roMvQ8AAtD9Cly1Yb9hPXzuVyi/ah0fWVKiuEEoBCOzsQ96tyMGZBlc/Xww5YlvBO4e4bzIlFQCLgARW9U4a7IOfLWKCgMmEopCEIWZcIwvGUnIqUhCPiUjnKgTeQEoOW8g1T9hmHPmHJprQ9REq33n2xodv58XuIPSD2FYMWUPFAB2JnkHb4ZaXcJXSoWWHrg==|920 \ No newline at end of file +}//t1JPrwrnfmF2E1ERN6KRsKw6Nrv169QVUPCNjGdGTCKFBvcaXuKnBVdCkFz59e2JOsK5R3YKtDGOaqkADGhckcgkXsaUZyalAsVhqZgCQyX/9/0xnW+wM1c6XcmASA8QSiQ5LXIxdv7HPUVcecC7qi1r1TRP3XoX8bCcVwx2o4hb3oV7SJYfVuuTItPpPF2P40rTXn5UueR49eqBb5l1lz80fc9xEb9L4ah7yx2BvVA7t0YwQr8xm1OutXyPrVbw7/mMNFs+zYD0dbXPRB/JNa8soxEdcICQlpRj5xhXFDCc5EM49sAn5c/7JqbqlbaitGl/qDfQkLUr1HBHFntcV5aXXzDXF5J3lJVFXjl2sNbQYD4ipPUCfjbCtntmVRb94G7d2Nbhnbt7BpxAmYAcyEzrL8W/59xmmUGaeeElU0TBxoFhigMjLg0z0PCq69bfylGDs0GSnImbMzpBLZOx2O1yFG4Pu2DrnSs436TvJzRvu3uZsKV+tREcjGjlsOwAUEijYUq4JwxlR4ESjKzQp1wV5hzvkXDD9Q1MIWbEwOlQN991gxaLISLPEUn6A7QqynzebjFkR1dp1MCWdR6Q/udk877Pu9apJegsgluLzwgkJIaszT08s12z2/CD7cB08MvSmRdhDyq0r3jZ3mCpS+qrBgSIrM6CYsaUas+NinlEqg50i49BTETmh4otHZBChWILNkge3kunRbWhZYWAyFpDaFR/xCAEIRt6Cmj4NNKyn/s3dJR7T0S3hxpX6IJXw42YdNs7rnPq2Yqg6qqNNg6PAMWT1+OTgAzt5hfIBExvcBTP2mX+NNj3A8jIuCe4pTT6mvgXXDD92LY/iE0gfGtjDGuCbCX2g2Vooh1x2fYJD/QLT5v387dgY6Aa6+7gLbcwdmOq6/01BYWpwLvNGw==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.rd b/Pages/任务/工时/新增报工.rd index 59e11c20..e6493c36 100644 --- a/Pages/任务/工时/新增报工.rd +++ b/Pages/任务/工时/新增报工.rd @@ -1,9 +1,10 @@ { "PageType": 0, "ColumnCount": 19, - "RowCount": 31, + "RowCount": 32, "Formulas": { - "29,5": "DATEDIF(F30,N30,\"d\")+1" + "29,5": "DATEDIF(F30,N30,\"d\")+1", + "20,13": "IF(仓库ID=\"\",\"从Gitee获取记录\",\"从\"&分支名称&\"分支拉取记录\")" }, "CustomNames": [ { @@ -33,6 +34,18 @@ { "Name": "结束日期", "Formula": "新增报工!$N$30" + }, + { + "Name": "分支名称", + "Formula": "新增报工!$B$31" + }, + { + "Name": "仓库ID", + "Formula": "新增报工!$E$31" + }, + { + "Name": "版本ID", + "Formula": "新增报工!$B$32" } ] } \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index e9c50fec..0668f294 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -498,7 +498,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "2527a371-17a9-4e71-bc39-169620d34b3b" + "ID": "865351ec-0568-4c1c-9c5c-5229f4013b12" } ] } @@ -743,7 +743,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "dd4648dd-ded5-4683-8455-6dca0adf1ffe" + "ID": "86a6325d-d8a6-4f44-b864-3b50b3ac1db8" } ] } @@ -1190,7 +1190,6 @@ } } ], - "RefreshAfterFinish": true, "CheckDataValidation": true }, { @@ -1198,6 +1197,58 @@ "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": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true, + "ClosePopupReturnValues": [ + { + "Name": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!新任务ID" + } + }, + { + "Name": "关联页面", + "Value": "任务首页" + } + ] + } + ], + "ID": "4c43dc99-ba1a-4329-ab16-a538839327cd" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!msg" + } + } + ], + "ID": "17609583-225a-4c41-9085-1677e63b068d" + } + ] + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -1284,7 +1335,7 @@ ] } ], - "ID": "361f4438-d6f9-4a3d-aef2-6c06857d5cd4" + "ID": "c0072769-0580-4ad6-8c59-9b91b9c70c76" }, { "CommandList": [ @@ -1297,12 +1348,12 @@ } } ], - "ID": "689c98f6-5425-4f7d-bbb7-808cf158cfca" + "ID": "c0fe796a-a10a-44d2-aff1-4b4717571fa5" } ] } ], - "ID": "dc9361ac-9503-4d9d-9096-65aa168184df" + "ID": "199b5937-3906-4c40-b4ac-10c1c423587c" }, { "CommandList": [ @@ -1315,9 +1366,10 @@ } } ], - "ID": "5c91d120-0f6c-4ede-a324-64aa8ccbeb03" + "ID": "d5547dc9-29ef-4540-8360-ef25598d35de" } - ] + ], + "Disabled": true } ], "Text": "提交", @@ -1768,7 +1820,7 @@ "MethodName": "Focus" } ], - "ID": "b856e798-0d7b-4f7c-b79f-fe84316d09aa" + "ID": "6858fd42-5542-4fa7-87e7-4ae78123ba5f" }, { "Condition": { @@ -1802,7 +1854,7 @@ ] } ], - "ID": "f3fba1a5-03eb-47b0-916d-b77d281b5b94" + "ID": "4ee30c8f-c71a-42b4-a49e-a17665b22b23" } ] } @@ -1918,4 +1970,4 @@ "Formula": "新增任务!$B$33" } ] -}//epNlRS+tQ57M9P33PxfLoerORScUrpUpzDrY1fo/vrkMVvIJ10fs8+8OjZ+NjQjyuIxDuSwN5YNutLHxz5DrXGDmpmPpNjcBibh3c+Grq3Dy3frjpA/niDIOMnHkFydQNpsHFWWHbqN7D69Uz7PCpyEFQjuRMtX9rRJdT6BthzqqyqEkUecrrcnXyLtgI1goameXqvYUo4EYLHNufjV0l/S/JXlhI6axzZOeRhIHBKdaVVcbf++TQGPuBkOMbrJHNPfXZF0ysm3bUJCe/bvQND8Mzg7TkSW8wFb/4p0ZmObOfbmdtIBKmfbrTJ/QliO+g0Ht11o8fPjZBOiiIs/Fjv0xF9XFV68sPMtAQtulBMmN2rnEXyUb2Srzos5s0+gMIcEeBah83xBp8/xW+N4JAURxQ8pjRf8w5RQtDQ5aRn3IfhOmTh/pb3OTJ5x92W81fF2qKVdD2NwQYiypyZzbd7hd8U4DwIq65Spi81VHu69lc759u4ZxcQ1EBmmVbq0nqUvpgeFgWBYsrqPcCOpByOklqwmEHlqyvYqr3wQ96bJpAW+plsp1mPZ+YQ2Nc/2bu6o1yJCvZD1FLqYjupy0RT3pjmvddga/nXRpldUgmh/og6m0dcqSHfP4QLVe8Rg2TdLTXncb/cbi1UJpXPq/TkKXQIKVQLYxbpnX4Q61kXQVgCWyOY0q5+Z9bQhizq87DwN00zF5phYO8/AlZBCB5j/YRZ7aet9XxXsD3E4r5mUnjW4f5rm4IRkIjgdi7ivFAzvNFtppj6ks43DWw9JJOjBakZflHsrJNC97VJigL+bzHGE1KhvNsZ6uYP/tW5sp1H/vpl4n3yb6Nhd1yAgI0eavXm8kAz59g5jcqQUeT5y1oTOOassCDWmLLPeRf9SsR1pZxy4zek87bt1yFZudxA==|920 \ No newline at end of file +}//KrIBmDkTxDxyla578ZJ4z763cEWUn7eP2U9iT1+HMiY5afGw0G5ISLvKclpOjpeSVA/ClRB7MAi1M7G82VOb9DPN2Z5Uw/ef3GsEV5ecLFmcWhZEgjHspRl5imRlOBBs1eWR2TS8cSpXFdMqxKWc2xJijfTJCCKqgzy+xcLPTGoF1eeFoGWz7kQMjYoTP7nTfrhDVpKYjCY4Hpbk42NRF20BkGFD+uceqO70ZvEXt1s+dVWJgLEzh2jEdzkYqNAoGqv9F113neQK0Uwzyrtxhfnc5mBY1Vc+UO/HQH9TQy0UfvkGU7ubpHmKFM7uUjKflprE8HfDJ1BhYCLJ0wKT/w/bNjRcPhXCdPefCE5pSShlxe7CAcmEccH1+9f+/rrPmswPMUddib0nbxVGAgSdHSi9TEcrttqkDBEo1C/MvFyA2ZWvOBSNOtCqiXGFCWbwogsIbWQurO0mLvSfr0WswzS1ExsaK2yFvoQvbxOe1j6fWZkvWkuvRlKWbgrk6i7edlLzSBm/edFy6owOy5f+RWm8Cnu3tloQojPBvhXPgMlhVWxP5XeJKkuWnWeZd8ilXIUHqeZgdCSNSz84JRmUU+FnMTKW45RoPSrapRhpLSzjO4JlYIDCV6pp5yBo2xK8FWeohnmZVoX5vi3qgWKzfVHHDTNbN+SVOg+VjU7xVQ7IolUINsFKXvhyhDgjgxdgyXGuyheIBknwMk0yQ9TSxYwt0ydBqS8j39zANen1wOHOIL0wZEUoUQamRCXons63lsogTrd+rRpL7IvI8uIMlVhyRaTSCvHY+Hvp1imYvG/5H9moK4e6gensp1kQeWzq6vPj4goWPeOpQrt/HmJierpdy5yaVgS1jD0TuCtgbb04TREOZHyCCkpkht3pXbaeclR6TQf2jMrc+XbVoXwapg==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的待办.json b/Pages/流程页面文件夹/FGC_我的待办.json index 3426d6a2..5c8f3c00 100644 --- a/Pages/流程页面文件夹/FGC_我的待办.json +++ b/Pages/流程页面文件夹/FGC_我的待办.json @@ -719,6 +719,26 @@ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "ShowDrawerHeader": true, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_我的待办!B4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, "ValueFormula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=FGC_我的待办!行数据.关联页面" @@ -884,4 +904,4 @@ "PaperSize": {}, "Margin": {} } -}//Mj8jAY9ecwysWXM4YGr6+W81LZaVF4JirTDSW3thCI1+5dmVMta46pwwvHyU6qDjf3URBvtGJf8+Ne2s8al/6WlR0K/LqhyAUNLhUNUIbydG+zDqaTlsHUFxuqOmSL4JmNHWj7O909A2h5CitFb2Zl3KWweJWWIdUgAP74ZGn/IrigFRmHLQuPdmfLtGzoYc9qBruRsQgiJX4DBlNfza6ZJ5F3Sx+on2KX6Q65YFzoM4IzbRSLixmFMiWGqZkkdhDhtw4BRmv3SpDMx7zC7Sx9+YmHDqKj8tKk10vj/j7DJ+K28FO4ssLg3oM1zhylBS+COM1Y2rNjiGN1QBervHCBlnMh1pxrso4mA5Ni5buEjKpcSIurZ2qX6sBrDq/zz28N36vK3Ddio5Bzwn3micVAcIyMVqE4aInQRgPv+2z/mhZhzJSTuA4yrjKSpykaCKUTsch7s+GIMmK3G9qGZ5a7CusJ6eM+A1JGfbql4LRIz/UOztGB/5tcMufTPRNQAHOOSrvEhrcT5LJXgUlDd0QmNmrlGkMWkYp/P2AKBgWDY1p3bUqz22XfPmOWUo3jPLVHy7qbUzJdtyuSz0kEd8pgxNx27C7dgnGqGfo0Mb6XJ2h2KEC0gs9EG+jkAKy+4E2672nrkPkmLvESKla/SVXzU68GavJpCP5spcm+138WjErn8Ss3P2YK8B7pHjVFVkLQ0MJ1/XKRZ2VKoO6P7azl/cl4hJnk+ixmTbhhGnSmIbd+sLkuo1u0XnkqVaBCLkJV5ls7nUrzRmrI7VBBZCIXL79aFAa9YHhFOSvP5emrxVwCp5jvMWs3oY4yihCmXhiGVY+PDJVZagikoATcFHNTSZwK/WDxWzsnROejuvnGQErRPNPdl8GkkbPeLzpsuL8Xj84k/wCYhGDHNSdMy2cQ==|920 \ No newline at end of file +}//DEVug9nxvJj9Qi7Nh9nesFaSo0FjpTyqEe28hskslMXYaacUJWcuRMV2V0d+MwgwwDeLXts5RL/ezgwZsx5He8Bv4uJJtrywVxsfprmgPkzmPGUzty+irKgfizOfqVNPEMaLYJO+/ho4oQdTPjJlBOA89kGxvJF25IMPHO9jF0pX8Ps+Ge+bKjkMYsFUEVQ4GplJ/x2+QGNVz6JTTBYp8TfzDpu/s/TvHgdVn6nZkcBMiTdui1tgbYmZC5Bg3NFk2nLh+fNKqTCRHN93nLH2qeUUVUJtyEz9+yL4BAiQ3mXZyFfIyf//6DfyTriaBfMB9Nf5yZF6O5LqaVKWJH6996SyvwF3VmQ3TGXF/pYcC1n2rk5ZIGsPvgVoZFKl+J7EOOZFa9UENF4oXIgCkoiQ8bY/nai1Le/V5oKJ4mxpRZCukdpK3u/1T43xn4ZHNHFu8AGSJkzCxXNa9Ypl7zzvmfkhh+L30y8xCJf7EWspV36Q/5uOXnsKEyBLxNKkUJ661Ig5wzhaO5qgkJlBRD1feDJCyWPsfGy2c4z8qChTaBr3lW5LUdZtkoNNK2ejV1eHKwmZ4uR9je9gJBnYjGWff8IR11skFZkVZcfghYcgwUhnR/zZ9Ih1Vtw1w6kBsRqCcF/PgvpXeJMglcRMP6AuZ2l6wwMvV7T9MR3v34p8xDcjS9MAZpgvbk+e2ZOw34XAUdW2ixipavqlXEywF7i1wRnt5R8xEFYqEMBmY6w9DVAIk7UKte4oM6TJzYHO4Qb3a1uV5GK/iVt2osdgO/rIjvJ4zkh888qZRHl762Y7TLKkBgiBss0C2lE3hwjpwlIptAgkmXCCFH1k+jhErLZPMldzabW8/UfTuHKSf4pe///6dQkvhAxF3gvghriqoGTIWoDdOlpuwuGUiYus9NdnWw==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index 70473bed..3d3ed769 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -8,27 +8,27 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 28.0 } }, "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 32.0 } }, "7": { @@ -38,25 +38,35 @@ }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 32.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 500.0 + "DesignLengthInPixel": 32.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 500.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -64,9 +74,9 @@ } }, "InLogicalVisibleIndexes": [ - 12 + 14 ], - "Count": 13, + "Count": 15, "DefaultSize": 32.0 }, "Cols": { @@ -181,38 +191,98 @@ "DesignLengthInPixel": 40.0 } }, - "32": { + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 300.0 + } + }, + "34": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 33, + "Count": 35, "DefaultSize": 32.0 }, "Values": { - "1,1": "工单编号", - "1,9": "所属项目", - "1,17": "紧急程度", - "1,25": "状态", - "4,1": "项目经理", - "4,9": "提交人", - "4,17": "联系方式", - "4,25": "创建日期", - "7,1": "反馈类型", - "7,9": "相关功能", - "7,17": "关联任务", - "7,25": "下一节点处理人" + "1,33": "FGC_审批记录", + "3,1": "工单编号", + "3,9": "所属项目", + "3,17": "紧急程度", + "3,25": "状态", + "6,1": "项目经理", + "6,9": "提交人", + "6,17": "联系方式", + "6,25": "创建日期", + "9,1": "反馈类型", + "9,9": "相关功能", + "9,17": "关联任务", + "9,25": "下一节点处理人" }, "AttachInfos": { - "2,1": { + "1,1": { + "CellType": { + "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", + "PreCommands": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + } + ], + "PostCommands": [ + { + "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon" + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "TemplateKey": "同意", + "ActionButtonStyleTemplateInfos": [ + { + "ActionTitle": "提交", + "TemplateKey": "同意" + }, + { + "ActionTitle": "同意", + "TemplateKey": "同意" + }, + { + "ActionTitle": "回退", + "TemplateKey": "回退" + }, + { + "ActionTitle": "终止", + "TemplateKey": "拒绝" + }, + { + "ActionTitle": "拒绝", + "TemplateKey": "拒绝" + } + ] + } + }, + "1,33": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "FGC_审批记录" + } + }, + "4,1": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "工单编号", "GUID": "ac1027b9-db95-45ef-9df8-4ddbd1e9061f" } }, - "2,9": { + "4,9": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "项目ID", @@ -224,7 +294,7 @@ } } }, - "2,17": { + "4,17": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "优先级", @@ -266,7 +336,7 @@ "disabledVoidColor": "#EFF2F7" } }, - "2,25": { + "4,25": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "状态", @@ -278,7 +348,7 @@ } } }, - "5,1": { + "7,1": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "项目ID", @@ -294,28 +364,28 @@ } } }, - "5,9": { + "7,9": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "提交人", "GUID": "22a023cc-2ca3-4dc0-a902-f6e19f906a70" } }, - "5,17": { + "7,17": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "联系方式", "GUID": "4f49cf43-d936-45e2-aa65-a22f52af3376" } }, - "5,25": { + "7,25": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "FGC_CreateDate", "GUID": "d43a588a-879f-4477-b218-424e5caf2586" } }, - "8,1": { + "10,1": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "反馈类型", @@ -403,7 +473,7 @@ "IgnoreBlank": false } }, - "8,9": { + "10,9": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "功能", @@ -439,7 +509,7 @@ "IgnoreBlank": false } }, - "8,17": { + "10,17": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "关联任务", @@ -539,7 +609,7 @@ "clearable": true } }, - "8,25": { + "10,25": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "处理人", @@ -622,7 +692,7 @@ "clearable": true } }, - "10,1": { + "12,1": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "内容", @@ -632,7 +702,7 @@ "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor" } }, - "12,1": { + "14,1": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "项目ID", @@ -644,13 +714,17 @@ "Styles": [ { "FontFamily": 0, - "FontSize": 13.333333333333332, - "Formatter": 1 + "FontSize": 16.0 }, { "FontFamily": 0, "FontSize": 13.333333333333332 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, { "FontFamily": 0 }, @@ -687,97 +761,67 @@ }, "CellStyles": { "1,1": 0, - "1,9": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "1,9": 1, "1,10": 1, "1,11": 1, "1,12": 1, "1,13": 1, "1,14": 1, "1,15": 1, - "1,17": 0, - "1,18": 2, - "1,19": 2, - "1,20": 2, - "1,21": 2, - "1,22": 2, - "1,23": 2, - "1,25": 0, - "1,26": 2, - "1,27": 2, - "1,28": 2, - "1,29": 2, - "1,30": 2, - "1,31": 2, - "2,1": 3, - "2,9": 4, - "2,10": 1, - "2,11": 1, - "2,13": 1, - "2,14": 1, - "2,15": 1, - "2,16": 2, - "2,17": 1, - "2,18": 2, - "2,19": 2, - "2,21": 2, - "2,22": 2, - "2,23": 2, - "2,24": 1, - "2,25": 3, - "2,26": 2, - "2,27": 2, - "2,29": 2, - "2,30": 2, - "2,31": 2, - "4,9": 0, + "1,16": 1, + "3,1": 2, + "3,9": 2, + "3,10": 1, + "3,11": 1, + "3,12": 1, + "3,13": 1, + "3,14": 1, + "3,15": 1, + "3,17": 2, + "3,18": 3, + "3,19": 3, + "3,20": 3, + "3,21": 3, + "3,22": 3, + "3,23": 3, + "3,25": 2, + "3,26": 3, + "3,27": 3, + "3,28": 3, + "3,29": 3, + "3,30": 3, + "3,31": 3, + "3,32": 3, + "4,1": 4, + "4,9": 5, "4,10": 1, "4,11": 1, - "4,12": 1, "4,13": 1, "4,14": 1, "4,15": 1, - "4,16": 1, - "4,17": 0, - "4,18": 1, - "4,19": 1, - "4,20": 1, - "4,21": 1, - "4,22": 1, - "4,23": 1, + "4,16": 3, + "4,17": 1, + "4,18": 3, + "4,19": 3, + "4,21": 3, + "4,22": 3, + "4,23": 3, "4,24": 1, - "4,25": 0, - "4,26": 1, - "4,27": 1, - "4,28": 1, - "4,29": 1, - "4,30": 1, - "4,31": 1, - "5,1": 5, - "5,9": 4, - "5,10": 1, - "5,11": 1, - "5,13": 1, - "5,14": 1, - "5,15": 1, - "5,16": 1, - "5,17": 4, - "5,18": 1, - "5,19": 1, - "5,21": 1, - "5,22": 1, - "5,23": 1, - "5,24": 4, - "5,25": 6, - "6,0": 1, - "6,1": 1, - "6,2": 1, - "6,3": 1, - "6,4": 1, - "6,5": 1, - "6,6": 1, - "6,7": 1, - "6,8": 1, - "6,9": 1, + "4,25": 4, + "4,26": 3, + "4,27": 3, + "4,29": 3, + "4,30": 3, + "4,31": 3, + "4,32": 4, + "6,9": 2, "6,10": 1, "6,11": 1, "6,12": 1, @@ -785,7 +829,7 @@ "6,14": 1, "6,15": 1, "6,16": 1, - "6,17": 1, + "6,17": 2, "6,18": 1, "6,19": 1, "6,20": 1, @@ -793,7 +837,7 @@ "6,22": 1, "6,23": 1, "6,24": 1, - "6,25": 1, + "6,25": 2, "6,26": 1, "6,27": 1, "6,28": 1, @@ -801,93 +845,148 @@ "6,30": 1, "6,31": 1, "6,32": 1, - "7,0": 1, - "7,1": 0, - "7,2": 1, - "7,3": 1, - "7,4": 1, - "7,5": 1, - "7,6": 1, - "7,7": 1, - "7,9": 0, + "7,1": 6, + "7,9": 5, "7,10": 1, "7,11": 1, - "7,12": 1, "7,13": 1, "7,14": 1, "7,15": 1, "7,16": 1, - "7,17": 0, + "7,17": 5, "7,18": 1, "7,19": 1, - "7,20": 1, "7,21": 1, "7,22": 1, "7,23": 1, - "7,24": 1, - "7,25": 0, - "7,26": 1, - "7,27": 1, - "7,28": 1, - "7,29": 1, - "7,30": 1, - "7,31": 1, - "7,32": 1, + "7,24": 5, + "7,25": 7, + "7,32": 7, "8,0": 1, - "8,1": 4, + "8,1": 1, "8,2": 1, "8,3": 1, + "8,4": 1, "8,5": 1, "8,6": 1, "8,7": 1, - "8,9": 4, + "8,8": 1, + "8,9": 1, "8,10": 1, "8,11": 1, + "8,12": 1, "8,13": 1, "8,14": 1, "8,15": 1, "8,16": 1, - "8,17": 4, + "8,17": 1, "8,18": 1, "8,19": 1, + "8,20": 1, "8,21": 1, "8,22": 1, "8,23": 1, - "8,24": 4, - "8,25": 4, - "8,32": 1 + "8,24": 1, + "8,25": 1, + "8,26": 1, + "8,27": 1, + "8,28": 1, + "8,29": 1, + "8,30": 1, + "8,31": 1, + "8,32": 1, + "8,34": 1, + "9,0": 1, + "9,1": 2, + "9,2": 1, + "9,3": 1, + "9,4": 1, + "9,5": 1, + "9,6": 1, + "9,7": 1, + "9,9": 2, + "9,10": 1, + "9,11": 1, + "9,12": 1, + "9,13": 1, + "9,14": 1, + "9,15": 1, + "9,16": 1, + "9,17": 2, + "9,18": 1, + "9,19": 1, + "9,20": 1, + "9,21": 1, + "9,22": 1, + "9,23": 1, + "9,24": 1, + "9,25": 2, + "9,26": 1, + "9,27": 1, + "9,28": 1, + "9,29": 1, + "9,30": 1, + "9,31": 1, + "9,32": 1, + "9,34": 1, + "10,0": 1, + "10,1": 5, + "10,2": 1, + "10,3": 1, + "10,5": 1, + "10,6": 1, + "10,7": 1, + "10,9": 5, + "10,10": 1, + "10,11": 1, + "10,13": 1, + "10,14": 1, + "10,15": 1, + "10,16": 1, + "10,17": 5, + "10,18": 1, + "10,19": 1, + "10,21": 1, + "10,22": 1, + "10,23": 1, + "10,24": 5, + "10,25": 5, + "10,32": 5, + "10,34": 1 }, "RowStyles": { - "3": 7, - "4": 7, - "5": 7, - "6": 7, - "7": 7, - "8": 7, - "9": 7, - "10": 7, - "11": 7, - "12": 7 + "5": 8, + "6": 8, + "7": 8, + "8": 8, + "9": 8, + "10": 8, + "11": 8, + "12": 8, + "13": 8, + "14": 8 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "10,1,1,31", - "12,1,1,3", - "5,9,1,7", - "5,17,1,7", - "8,1,1,7", - "8,17,1,7", - "8,9,1,7", - "8,25,1,7", - "2,1,1,7", - "2,25,1,7", - "2,17,1,7", - "2,9,1,7", - "5,1,1,7", - "5,25,1,7" + "12,1,1,31", + "14,1,1,3", + "7,9,1,7", + "7,17,1,7", + "10,1,1,7", + "10,17,1,7", + "10,9,1,7", + "10,25,1,7", + "4,1,1,7", + "4,25,1,7", + "4,17,1,7", + "4,9,1,7", + "7,1,1,7", + "7,25,1,7", + "1,1,1,16", + "1,33,12,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -916,7 +1015,7 @@ "CustomNames": [ { "Name": "项目ID", - "Formula": "处理反馈工单!$B$13" + "Formula": "处理反馈工单!$B$15" } ] -}//pli9G8TZCdcHxs07vonu6j9qqVVX5eUWzt+nd898bIWs/Ct13/hqGfGoDANqv6EkmedXQx8fPC94+uRY6H0+4yDgN8TZH+3ReJvs8QGULeBugF0l4y72r9zRMzwTe0PCbWV/Q5ckSKQXJY9L5INQQ8OpgaeucBfHXIv4422Xe/PorbRIYm2aNkZNYmS8p0cmlYiN+Wvofz9NetM1fSMaHnoNEavbQnIft2fjQ8mwlWnj6Va7BxdMcVXSjPvjF1ZDb4mKezrxm7vivkJ5ageMTO0Q/PbeeO29/a6rHsqN2dk0fByJs2hIcM62eEFVmf8Nr0KukMIh2MAuSaN+/Rz7H5NQRr3RD63l+jwtGSYyJ4ANcymecVRS00CBEn4me1nHgRHKV8WodB0Be56z1+6FQqf9bjwmdVKx5PZjbHc8WCaDUlqYE5Tu34TQnTvQ4n8dFVngDW1lc6fPRePwwmcA7yMY6qOnxqctxIwVFZ5vsyzHqbKxfZEEMKi6Q4IEpLhwcpSP07TgnI5l4gKYmwdmOMiEK4kX+YkJYUcXCA/OpbkZh3EQq68sZm2X0Lv/heh9DaszclzHHUJWYdBtASO1o3mZg+8zTaTmlELK1x6jYNJZgzYWMUb3GpZahB3Ib8fOXtklL/eNLt1HRlFRZgraLmonQlL3EN94ed9BjkEFLj9mKFpvMUydG44pQc2wfdpoRWlMj2RkFCmGYR3ivk4+iwlArej6azG50tERMXMgW5r4gWm3iLy7aykrN7rYBINQw3ithUippjyT5Zps5SjogPAuoOnfBMUL81B0g+4+npiTZoZRXDxnE15yEl5IBj5s4bCgzMslSjk5Vn8ohlH9jhsLt26fb8/pycE0xVeYE2fQfwu8lZatq30KuH/FWfHdFuV8Rtzq5DuZPd8qTWvHMg==|920 \ No newline at end of file +}//qgHONaP2j37/l3i/buRRvj58knlf3prZnxsMDGWwkYYSB5HaY3E4BZKdUWp9zatoO9Cp03V3nAE7P8/mQMrpKKxtEBdUR27kBPBD0iYbnLsjSxodw39t1AVlh6FpM0qEvkbf4eO+X8kR9dJMD5/5qV1GIYwikCmAoW2GkOOgG9HXyUG1Nv8eGr2fgbJTaLi+80AIhhg2YQkRFcUfHFD5i42kWLOXTBg/VIFqhrN1Fql8hI/RnTfonpPLWhqUR8EX8FgUgu4zJA9RrL6AWJBijwwdcZzr6+8A7v4Z2Jo94YB7MFq8/cZESamPa6MQaxdx7BkFv9qgvWuHoJLNMbXTuDwOlD7Vh/ToMS2aNuG81KGHmOMJ71Ee4sBgcwstNkdGRpevhAWo4xUIL8v3Zl8F1e7/moMVxVdUrrAk+XSoKYxDkr25qzD6dkDaGJLF03Lwyr4to08FSHuZA+WiupGUlbJxdK5qWYTGKZ1gIlh/NBe2owcgKfWHY9h0Zc6A76NOtiU/Ei0j9fcR7sPYSEdia55L1o1R16zKbgor6QzRfUdGE2PHbqPVf+e+R9YQ58hPOjkKv4ql2r3COakGyOjzO1xXQmR0QQhR0J3y2mWnUDLQf3iEWmFPyu7IHZ/ZArUlkfsFxkxeQcy5YqnxZp4GZ/3gp1m9fijOZlfLAGKcSdtX7UxPzuyfOrEg0z7SuT9K2G3gjjNjhuDMvtBRAUglyWoqDeA7hm52gB86ICHeA1D8hf/vh0+CuAJeKKSH3vUkVNZVmVzcBZ6+Zf+PTUvGJCOPPR7i8N8+ukaUttJBN2+YfJMBoXYJdSJH/nFaObu76sBj+593wNyzyZYcHf0DG3Iq/8gRzMtgbZ9oHnUm255Ers4PZyE8zzPLP4xFnWyQ5oh05OFkSKLyNgGpwS05WQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.rd b/Pages/项目/项目反馈/处理反馈工单.rd index 710526a5..0a315a34 100644 --- a/Pages/项目/项目反馈/处理反馈工单.rd +++ b/Pages/项目/项目反馈/处理反馈工单.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 33, - "RowCount": 13, + "ColumnCount": 35, + "RowCount": 15, "CustomNames": [ { "Name": "项目ID", - "Formula": "处理反馈工单!$B$13" + "Formula": "处理反馈工单!$B$15" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index 8a93202f..5d8a9030 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -139,8 +139,7 @@ "1,5": "加载中...", "1,10": "进行中", "1,12": "自定义", - "1,14": "菜单", - "2,5": "任务列表" + "1,14": "菜单" }, "AttachInfos": { "1,1": { @@ -240,7 +239,7 @@ ] } ], - "ID": "983cfdd5-b00f-44e4-8338-380b5787f7cb" + "ID": "dda15e02-9ff4-4341-94da-5da1d7f47f55" } ] } @@ -367,7 +366,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "22b1f998-c60c-44a9-aacf-fab2a2c09ce9" + "ID": "f79ce8da-9410-4d6e-9224-4f7e52121acf" }, { "Condition": { @@ -389,7 +388,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "e7c007f9-d051-42d5-ac0d-fa4c9ada415b" + "ID": "260f0c73-c33f-489e-a1bc-308feb049138" }, { "Condition": { @@ -438,7 +437,7 @@ "Disabled": true } ], - "ID": "cc178ed2-9060-47ed-91c4-2067da45017c" + "ID": "d87589ed-20a7-4ffc-bbc3-b3473f954eb7" }, { "Condition": { @@ -474,7 +473,7 @@ "Message": "操作完成" } ], - "ID": "8a01bcec-ed79-47f9-b2ed-b7bee3d09e00" + "ID": "2d087976-450f-4e96-a9f7-42a9c2f7e833" }, { "Condition": { @@ -570,12 +569,12 @@ "IsOpenInNewTab": true } ], - "ID": "ffdc0e8a-30d0-49ce-9fb9-520ce4ad0210" + "ID": "8ca4e6b2-5acf-4e51-b1dc-8cbd11014bd2" } ] } ], - "ID": "1525d36d-53dc-4fd9-953f-cb90e974e8fc" + "ID": "d9fd61e8-457e-4621-83e8-e9d1b3739b24" }, { "CommandList": [ @@ -585,12 +584,12 @@ "Message": "当前项目未开启收集需求功能，请开启后分享！" } ], - "ID": "206cd6a7-1666-42f8-9a98-0915ece1702b" + "ID": "b0f4f094-4399-487b-b95c-299774f698e2" } ] } ], - "ID": "e859bce7-61e8-448c-b023-4d289ee220b8" + "ID": "a712a638-4c3e-4f7e-b085-54df30d3e731" }, { "Condition": { @@ -623,12 +622,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "a15967e7-cac5-4a29-b77e-1141321362a7" + "ID": "86b45b16-4a78-4937-84b6-6196a0495d8f" } ] } ], - "ID": "0396da9b-1200-4b2a-b1b2-282f6310c913" + "ID": "fbae9fb1-08c3-4e3a-b53a-addd966714eb" } ] } @@ -702,7 +701,7 @@ ] } ], - "ID": "301edb43-6935-4677-9f97-e454ce926654" + "ID": "ac5409a2-ae47-4863-aa5a-cd8d09b73b54" } ] } @@ -713,7 +712,10 @@ "itemText": "页签标题" } }, - "DefaultValue": "任务列表", + "DefaultValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"ProjectTag\"),\"任务列表\")" + }, "Tabs": [ { "Value": "项目概况", @@ -941,4 +943,4 @@ "Formula": "项目标题!$F$3" } ] -}//FnEOHGjz8Yif1851GulB030v50G4KHHc7qOSDgqTxJHeH8IPbznfMVxo94scw/i062JTxPloaHyPGmBC4CZgx1DKE0Gsd7hzDd/YlT36wuPPiWKskok+3zaVujxmsPg4M8e+0QcXaji9ugbEyWuCsS4Td6pWml4JhkLZEnwEeCa8q6g+EAOGs0LA7rBp1u0dS0fkMv44AvEpvRcHOm6gLWk0pO3J1oBInvd6CYbsMID5OvzxISBVkfyP/cbFS1SUOOYnZ+DqBZIbnpbVDcg4hsk/O1ouHi8mWNFEYso8I8fbcZBLy510apSGLm7pcC/tWDnxjRkQphFoR+Lc1RQXx6fmTZdji8JO9O5hNQUlwUqoBL049ptKX55IbeokrW+L7wviqWdo6SxgIlK9Y9VuG2EvidxjXBAj4G4/MeZnrfZHGsIbhazzznniXQm9sPo4YjNiAxC0NhB9xPR7wtsKjC+4N0trKddDrNApqzjlYiBq3x2xbhW/AlbIwKurpKcMgLg3jd/1vuvLgdp2RBmPMEvXH+0Wa84d2anCk4ctHZmmYPlCcsnHixPFQcd6dXbpOf7E+Lzz9pHHEZVsM4wKug9JfIZTuf2GluDrF9yw2clBMvQMhsQLoQZjy/8kUcoqUWZByJ23e0FXSsdMaXwDy7Chm8urEvlE00+kxc5zb3neUDBUAeW5La0JZvIOc4piRQJqf565x94UdIRfb2mM4t6IBRpPn2wBMPmpQDfLTXdOWsMDTwd4DnLfirlRynoI8kX6aKzXfvenlm84T96d5boAtkj9puDQAVpEobKsbPnxu0TQQVGZqJIenl7KKf/xU5rIVQn0C6JW2BuvH1DIrYJeS8PoU3zJxKEiLboAX7Um+qyuljAOYfSxkhOZGQh01L7CQ/sL1yOnUU3VSpFpow==|920 \ No newline at end of file +}//pLP46qN8Rk1fWUr5c+c9FIlSY/Dy6hUrNZz0yXVfNLeg0T0hNo2SYapxJM6ypgQeXlAJ9ssxQnu5+chigo7iSUYNfcwX9FsHKBC6+kKc+Jvpl5Nj/hx138KhjwagcrA4CTMbI4aZ58uPHYd7rJ2BmCJE/QvcUCSxG8+HN7VLwDDt7NNvx52XfCpgXMy04EPurrVPikbmvLTDaOdh5eAB6yU5bjBsrvk2o25Xik/pV8fBshXeEKBSoyXa3iw5xWgReTgb/3Cn+FziLNfnuNBHSEJfCd1DgX+BeYgafd88qfv+3yFHonCH7Q7tJh6CWbH+vKuaa7GFW4czwZX0B1c4qO4c7vpaR6kpet6wS6DfvpflBC8IwXhkDLlbDouuvWFmdvAeWVuTAeIqIqXoNS0IGp+TBR7IE5X8YjWCGM68cswANd015TzcjcjYMFyKjlT1650+iuFuXfn3hOJ6JkWGJieLewEjQsQGLyhLnfdDAUHqsBbQJbdBr3YqyZ5ypHfsbwNnwqGtjjfqbC3n0KeEIbDo8tjWg2PiCYGnSzEsWorotxOgmmh5QKwM+fKro9xC8Qr5L2XgYdqRlTvWHUCvrlPlMAUMSNg2WbdCPOE3CUnRG+9bOQ86tj898UhOq4cVbyblThMZZo8XqcmSkOdezr06dCpkOORD4h94q2+g5CPydsSpanAMY3j+cxBHHXAL0I+f6xHJrGZ0fvv2wRK/+lbpL/xY5Xj5KJf8/4WTl9uGruwV9y+cSwNq8pTGcN3WOAwdVhuyTd+Z9RL7o2OJ1oNBiqyZCQunOLtLEF8GYB6tgpoJEAeoOZXo0RgUbV9FNVhCWlPUsDiYeGbdF937Q08SKl77+EfVJ1mh0mQlRN+jL5ei4lV0YBunlllSTRKsUeEKoaiLhQovpUISvKceGw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index f89bfc31..ed99a657 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -485,7 +485,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "c604da30-cb73-4934-8544-26b41d9f59de" + "ID": "76e70880-d1f4-4b6c-8266-df2ad56ee072" }, { "Condition": { @@ -519,7 +519,7 @@ ] } ], - "ID": "c9e4aef0-06ea-467b-9434-6d70ee1189d8" + "ID": "aa65002e-a0b2-4265-b967-0617871e11e4" }, { "CommandList": [ @@ -572,7 +572,7 @@ ] } ], - "ID": "3f38e4d3-4aed-4402-b817-156caf6699c8" + "ID": "46c1d52d-f765-443e-82f4-5b138b8a1bd1" } ] } @@ -596,7 +596,7 @@ ] } ], - "ID": "8fe7e679-514e-4029-90d9-dc6389b8c7fa" + "ID": "c26a6b68-88e4-4d6b-a123-ac56d4d0e8c6" } ] } @@ -1126,7 +1126,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "a1f3c87f-0939-4025-873d-db34789413c0" + "ID": "8088f337-fb2a-42d0-b031-e0ba463bc2b7" }, { "CommandList": [ @@ -1165,12 +1165,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "ff756337-3fd1-4951-aa30-c949db64ac51" + "ID": "2092ea2b-e4ed-43b4-af2d-fbfc6d0d1392" } ] } ], - "ID": "beb6e3d9-1402-42d0-a52d-408233206293" + "ID": "e4724a3e-7de1-4b28-8516-6d2f48723ce9" } ] } @@ -1541,4 +1541,4 @@ "Formula": "任务列表!$B$13" } ] -}//wVhsMK09ZUHunBdJuYkxMPn3a1RVyzQFNcD3JaEJ2VRkyb4Y7Z5/TCLQY3jkSI052zg1OigIDLe8vdla8POqpAOdKfGVXjD/Zb7YnGfvH5d4zMJODyuxXbEqQSjEt/BYkk98/IOqB/lTXyakfVVFA6N6FBm/nuRN+o0in4WxTXkQksC6eFe53uuHimKFqw7XFBV8C/oE8EjairMzt8qE+LQhmfFY7Q4xGoadfklH0wtLgTbW8hC2Y5WIRc+rL53rCSLu7QxMFf/C1BQSs3pWxwAhjmQWKpNmCb7O1OmxuJOyPHKctZsZKq+TUxrRjzDW+rt15aNQ05o5iOt/RLEMHflrEmhlTwB11NpqjSNbfTMzr3h9nlwhLoaPW7d4Q3X6fRU3zBDV6pajcbOnGR88ahR0KvQPv4O6s1J01wzpn7TdKfBjnqjhWEOmgEOrfUEegsd7kE12oxgof4egphtsH7DZKDY6dIM6dTHrejRfovMALiv8pVuPXq5BOpOt5+pOv+nhX+3xsaEnFiSB+NqU+Hq6SwkP4Hx7sfeUQDqMmTjDMHysG99qTV7oiNoK/VceUI2msJW/AhgxDhP+qqlZXeBkQHhj2VmWdSlT18VwjLZLRuSZUngRh6xYox8gO4fXrdsY8mFYbQ1qc1O9sfwcvmJ3wZ8FPyV1BtpgeFCU4ujHQUJ2+H/dZFq7IcC6pZPIZYWOXlINEQxdkKZndr+eTb4ScWbUrnQjx3c0HpGlLnQdy7UZ7pdb2FdUKYXbW6aPxypM5JjWmksnH9VJmNucc0UY/2TpLVs0zVje4qie91cBkdrtCLbXndlloQDVO064IRqnS0847obGAcituBxxOdho+q6WcuGe+zlWbbCpNe6GKBoeKD2NVPSfL0m4Z1YFgsw721fLQGPWvd714XwOZg==|920 \ No newline at end of file +}//6Us7tQaRbrtlnKkqFiUn+zyKFHt0/sIsf/cqowDzFt38eR4sn24HaQk4Au8DFGln67J9M52LgoxE3eQJ69vyEIQenKXw1FYPNgdtsYiPG/kA5yfp19rfOjiIcI4yG8YoZrBgxdgA6f9xT4xXtCn2veBzL2es4xY8TTfrMA119CokOb0Z99oodhk4fBY+liWPqZRCmEhcbZfIFaqbp80QjwOjxInR8N4U0DYizOM2ax1IzSwuPXmk1N23WjUcCZe34hIKcJ++Xqt186Z9Bc2EcRGxX+lVKd69oumgL9M+glaPTuMtfGKifP/ORLHQc8gxz4IPLwvubdQaNdXZ/yIAgjQhVYgMkKxDTm3npRvD9YUeEWB01KuOLM1WBrwK6hrABPGM8ykIWXJAw8PYiC2bRH0Vaq/VA9Wf+ZVxGxNMVp2uhZKlzrxDzvuMNRgFFXnkhZK9tfIHowD2tJFSxdGsi//u+QtRxtqyqJBAG5OdIDcl/QG+LZM3TUc8toEQCj2nmbEfXHQWGua1KJ1qd2e76q9kcBBryGEWwwZVPkrjx3ViWC6rqRJu01ctzG5oRCdRYyQREvH1tVEDNGGDKn+4FrK+T5HxER/ba8WgB98f1EHgU8UNxbb7lvkNSS5EgGz714f2KqRR3adi+uOQLfjOwgNRCziOKFREhc67wxYbsxcjnsXwIG9q7DS2IRfwrrrbIz2Onk/drbb4PjJBxzb3qyWVaz+R8G4OQgPb1SMhSe2Q7mBHlomehZEdHfx6h8P877Vs30VRSrQdyQKUH/SxGw7iFtQ1799JTVi5jkAl69c2W3WaYRudDGbLwcn36qr+K+NYSsWEG/SkvEE/Jc172F2LeN1tpQdtwrn7RgnVUg0OAbxIRbLFP/1CXoCSYiiet1EuG6TNimMKl2GnyIg9jg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json index 2a44d7e3..ecd7b7db 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json @@ -562,7 +562,7 @@ "Title": "加载中" } ], - "ID": "173a9595-1173-4f1e-9034-0cda8d0a64cf" + "ID": "d35d832c-480f-46e1-bcb7-eb15536201be" } ] } @@ -575,7 +575,7 @@ "PageName": "选择Git仓库" } ], - "ID": "9f2c7fca-0cc5-4ca0-9472-df29ac6f42fd" + "ID": "e2a68bcb-428b-4159-8151-74bab3777c30" }, { "CommandList": [ @@ -751,7 +751,7 @@ ] } ], - "ID": "cf06f688-44d3-4f05-8e39-7ba1dc03043d" + "ID": "4e2b6f0c-fa87-46d4-8714-4421222bfe56" } ] } @@ -765,13 +765,34 @@ "PageName": "完善Gitee资料" } ], - "ID": "b2b1d556-52b8-4e28-800b-c285e6d3456d" + "ID": "828704b4-407d-4077-ae4a-d73d2e0f9388" } ] } ], "ParamProperties": {} } + }, + { + "CommandName": "绑定加载完毕", + "Commands": { + "Commands": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!刷新仓库分支" + }, + "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" + } + ], + "ParamProperties": { + "空间路径": "空间路径", + "仓库路径": "仓库路径", + "仓库ID": "仓库ID" + } + } } ], "PropertyValues": [ @@ -966,7 +987,7 @@ } } ], - "ID": "c08f47fa-509d-4b3f-8114-57a06de86d4c" + "ID": "8c8d247f-ce94-48d2-9a1a-754609796700" }, { "CommandList": [ @@ -983,12 +1004,12 @@ } } ], - "ID": "54f6e78f-e72f-4269-9163-ba8e01abb00d" + "ID": "5f3c3bf6-b005-4187-b77a-4d366ccaec29" } ] } ], - "ID": "f8b69155-c7ad-45e7-9745-bdc775b4300d" + "ID": "ca01de9b-73e5-4298-b00a-90a3e4a21570" } ] } @@ -1008,6 +1029,7 @@ }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -1334,12 +1356,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "c56e2e2d-95b4-4211-89a8-a71eb86d8e5a" + "ID": "855c7989-5b32-49a9-97e8-ce50145841e2" } ] } ], - "ID": "e82f7a4c-9568-462f-a7ba-cb943da38b92" + "ID": "5d640893-3a5e-482d-b01d-9834f6ec0259" } ] }, @@ -1368,7 +1390,7 @@ "ReloadAfterSucceed": false } ], - "ID": "860e13f8-e562-418d-b4a8-eaf29403bedc" + "ID": "b2dbe1a1-d1d0-4704-bef6-64322e3fe8a7" }, { "CommandList": [ @@ -1379,7 +1401,7 @@ "ReloadAfterSucceed": false } ], - "ID": "e0e9ed4d-e2f7-4ea8-b377-06fa4eb98e60" + "ID": "e5fe1730-ef9d-471f-b4a4-cab4fca3f95d" } ] }, @@ -1512,44 +1534,6 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "PageLoadedCommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "项目版本", - "ColumnName": "仓库ID", - "GUID": "85cad560-f8af-45fd-8333-e92c700503a5" - } - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!6:6" - }, - "Value": true - } - ] - } - ], - "ID": "56937ddf-95f5-4376-b799-348065eb0992" - } - ], - "Disabled": true - } - ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -1608,4 +1592,4 @@ "Formula": "任务版本详情!$L$10" } ] -}//+QYWaAiRuRSwDgma+7dyKTLYGD3V+sQLQBLrgCJI4Vxh6XQanypJ5D1a+f1GjStVdHplMIc6QAc/m0Ov3Gd1CGjIoxtD4yF4mAo3gce6tjK5IBaxWkN+L52HA4mVZqmq4tjP5eaa7Jn6SYRSYwH90o2ro0SVPzwUe7ZhX5Z9Lx2ya83GuRZXQ5V+OLPTrQ7w2iarNfsJy4fRiQ/mRKHzO50BQ5XPfPQF5n+sZhyNW2DEdhdl0QmiUIpruKjbB3CCbE22o3rh4tWgz8jJ4QK5B0oEo4c4zmerTtzlClwa6ceHxwKshExc4hb789tAMRci9CuAwA6f2rTYYlMWXH63TAY8TBI+YswkN83aAsTfTBa9dComud5lZ7anv3OIp6ZdoPkoQDEHCnu/HLGaoWIZZkNtVK/moHmV5JMTlHtBaeRa+8Mjz13MuEpK2mUlUHTfuzEppea9oR9anZSbaeuUwKrMMPC9LSnJooIQZ+ohaAV1rIDOPKwJZyG/cA8xQN5PffKg7e6z12YWnTMKp3cCL0Kc4ds7lHojZ3STKK3lR4jw2jFjrda2aHzuVx3tgEFFGO890FH6o2D9XeDQo2INHg4tZPzFs9fKxIl3nteJMpNutYlY1WvnAzh4ebiV3KH+p704gu3Zr/wMu+kMxsT0dVHeSPLvAnhAzhkXIvk2IrMQpNEJJcgdpJqh1tTfJcq7W6Xr3Siat7cjpbqNiiLWo79aw1JsCo5z48DMYlvlHZP98RFaSywIXeZ2mqVmevyE7xFKRLDoVgicQ1uoBoGiKIY06lHiJPNqg24jCUUJpNHSqqZlD2jU9qeTNwVt8qm2Vy8tu0NeYAmt02FN/uwoTkx9UuwewoRydzqDu0Aw/T5Qil2cMkfRCXz6mgSjN6WOwO8/JbmDSsNrnkbfIKQUJQ==|920 \ No newline at end of file +}//WAZ351OJ0dH9ckL6QNgdyvY4cNEaj+UffG4A05V2xXoygTjghQLkCK2iWojCg8zDS/nIseSmxrxlVNTQSAB6VeRB1VVk1ofHjzQSsiMqX7MgPNDzSQ2VNTBTR5Y1/FY+e8aiGyuCrhc0E2IC6vqXf8zhemNzl9h49YuH86x9MssDjAOnKxQ+MAZap+5eXib1P9zRMgqSvKtKdcwrOrD2ysbfTjFvVOMRIk8cuyISPMQWDeaNKOTrP9zkl/SgAJ1xf0f1bJoVo4r4LS/BvAV+MZZXz0nQmExldaniD1d/MekDgok4QqX4EorXHSgZP56ltnvPTHqd1Sj/3RutOhCqbx9NdmtCY/IlGXLFDv23xnQIle54i/Fd9dveY1wQnw+wGn2GeL8ilnm7YVdo31s4NdBGJgRccTI/Z41EFvQNBIh4ht1XgO6NMSJNd14DMu32JnFNReIdwXYJhT3hMWISau1W8RL7b3McgSZ0HbUdz6WejKG0eAuy7fIN5r2rcALCyFrT2MKZKVDzFRQKA8vmvCQjNo5XYawV0Gj59Gy26RwDhfBrHTXrf8ZD2DLpnFFHq8smp8Iz6/ZiSMfb+ClrUYJ+P3QbpgzNdnYgELro4xiMXel6ocYe4x7hqfVXWNER2SFdQPE/p8U90/7eq78PuimR3i3fEqGUpmsHYHaiQhNvB2iuZNBfUQ6vLa+bUMN3KC/eqcFGnUP+uuSYzwfq7RT90519NfTh1joeex8yRXjOtfN/DxBzhfxvQPH0W194dE7QTljXHWiWvV+ewCRJPY2JukJ3b8ckZq1StOSJDNnL+ugVtrrhSxmyVc7nx+7zRtTfqnfJmHXR8aR7YdhpDHyMvVQnoXrulPEjEHHBlC4LGxmKE4Qic9DiC/IPz5EiaVNRs4w18pZTgQ8K8bVbcA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json index b92acc54..ac8e7753 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json @@ -429,7 +429,7 @@ "ID": "6912426144fa4151a7665384b46d6a22" } ], - "ID": "cb9ff474-fe4c-4e7f-9432-f40ed3affa5a" + "ID": "f71a0412-febf-477d-aeec-f41fceec5001" }, { "Condition": { @@ -501,7 +501,7 @@ "ID": "4a25d702e22141f495cad5baf9ff1a9a" } ], - "ID": "1680ae6d-e659-4fbd-9503-d0b7687615d2" + "ID": "391778bb-7b33-4ff2-ad3e-ea7ff0126f1b" }, { "Condition": { @@ -571,7 +571,7 @@ "ID": "e22633b6551e4332ae99e03268670571" } ], - "ID": "e08bbebf-de99-4c01-b34b-ea6e4974818d" + "ID": "83c2042d-3491-4eee-92dd-97eea145cd91" } ] }, @@ -607,9 +607,20 @@ "align": "center", "headerAlign": "center", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "filter": true, "multipleFilter": true, - "key": "abc74a0e-25a6-4b9b-9cab-4a4bad475182" + "key": "abc74a0e-25a6-4b9b-9cab-4a4bad475182", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] } } }, @@ -629,10 +640,20 @@ "align": "center", "headerAlign": "center", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "filter": true, "multipleFilter": true, - "showOverflowTooltip": true, - "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] } } }, @@ -653,10 +674,20 @@ "align": "center", "headerAlign": "center", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "filter": true, "multipleFilter": true, - "showOverflowTooltip": true, - "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] } } }, @@ -677,10 +708,20 @@ "align": "center", "headerAlign": "center", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "filter": true, "multipleFilter": true, - "showOverflowTooltip": true, - "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] } } }, @@ -811,7 +852,18 @@ "align": "left", "headerAlign": "center", "colfixed": "false", - "key": "e616fdd9-6122-4ac4-ac2c-e7e6f47f11ec" + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "e616fdd9-6122-4ac4-ac2c-e7e6f47f11ec", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] }, { "$type": "ElementUI.ColumnSetting, ElementUI", @@ -820,7 +872,18 @@ "align": "center", "headerAlign": "center", "colfixed": "false", - "key": "abba2432-3191-47d6-aad5-3555abf1dfa6" + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "abba2432-3191-47d6-aad5-3555abf1dfa6", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] }, { "$type": "ElementUI.ColumnSetting, ElementUI", @@ -829,7 +892,18 @@ "align": "center", "headerAlign": "center", "colfixed": "false", - "key": "9248be33-cd39-4d85-9241-91901ffd7543" + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "9248be33-cd39-4d85-9241-91901ffd7543", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] }, { "$type": "ElementUI.ColumnSetting, ElementUI", @@ -838,18 +912,57 @@ "align": "center", "headerAlign": "center", "colfixed": "false", - "key": "d2a0a8cb-6a0f-4dbf-a3b1-165603525ce5" + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "d2a0a8cb-6a0f-4dbf-a3b1-165603525ce5", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] } ], "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "编辑", "shape": "default" }, { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "删除", "styleType": "Accent 5", @@ -977,4 +1090,4 @@ "Formula": "项目工时!$B$6" } ] -}///AhMnG+nVyzNY7p1QJhNu3MEYTMwren30ZI8yXCHKLkoKMwU/nLve0BfdkFfn5/4lCaTxaI0wDf1Jk9qTm2Pjh1Tdg3uiszk+ZlwGUkI/ZZbJsP5SjwMzgnKJousX4JwWmP85oCL9SM0fEAXLeUfQuF32GHfkKbQtO/hT9B2nQBLe8O+WfMp+vH04xf/rVTEbiDpQwi1EwGIlutYSLoaAI1MwsCUoW1lTsUAyIbJjTom4+ne/sc6OnlcIVhJ9ELYU5vTd7tmLRTVF+b+PrxJ7KoA/L7bafSPTFupbZTVin9uDfIgYG2Dq7Udr7dv7j4iAGTKYz0yaYe2xYNTNpykkRbDc7Wk4ibeSntgAEyxCV8b0Zyh64iAs9X4zsnH3RESSjhVfPGvxNm3fNpkYvi22zaqh+wKgwewkDkfadPDh1ItSsGLH4+iSKRQ9DgxLouG34WRkHB1Y/f0y0JJWu5K7QZxMygD/yDQSgXL68oYtzVtKs+MyDc6FInlUdcMdY8xD4kaqP0fh22QRPfN/N5iwZV2jRDP74GhqwyXXiu/oSNJDRBIg3hQDGCaE62uzrX/P8bYaY1NuT38lu5+SJuVK3B59vx6JHvbdyDmv1e51/4toyAD+/GYMh0j9WJY0+X00DCOpjeBTuovQ9tkwFgVhDQmeytUrAD7tIY2naMY5kleKFrb/HSaYCDh4Tr7lO0rhOpBF8b7xZn7/oPGucvnrtVu3uyO0xTi06Zh/3kcNn4pJ2b/pLmDuFnqAI5R99mJRavXPAlaPbjkIwUbgxdbDh3pPiBpbpAdCbi8gPtEqdcpF9x1mOHdOzeuprqOJsSiBoYGSNWnZvd+QvhW42P1iX1Vb7zRiimvtvkTIwXATZ8cgM6bgPUflfwUWbC2a+HkLe3gesFhCEgTG5tAeMk3CA==|920 \ No newline at end of file +}//W8sNNteT/S0wMsMn770nN1IB7Bic/Vt5TmXgN6S6KxXAHbjud5Ywv2DKRUObkwp3yCi5Pvq1zVUsMkYddRL4d3m6moRkq90tw64p5oPsf+MjcedHF4jgb3EOiOPWChQZncyPmWgSidSf+dK2jURwI520YDdqhiVazdpmYTyOhNj+fOxgcDKopb0hd2g+lACC60YtzulVidaoV4g1tAMA84gqWTC9pK4cD/5cNJnA/nwSp1Cioho3CdhbBvloXhqM2nZsGiY1sspTC0rbcDCtC60PbFtfV2gc7jrtXcj4z4y9yW0WsUawwmxC8yEPlieyylF0IdGVVkOM/DF7Txilq0ccOkNuMiig+IDmQak+krwurDUqfy3Lx5Rstp3yBsyx3w1FQzFBVv4DVo5GRo+IDjl9p7YFujG/2eMKXkC0qANzYNzqaLpBCbJ6MkXenvSgyZFW/mWIJPIhBlB/EZrQR/z54ZMeUzWB0GDtZNgUrbbEjTXDZFhScc8A7d0nUYfNivQsoOXFjEYMgJA/Yk69krcRR1tN+NF28WBgq5sQTnpQnU1++PLkSPnAaeLwussfIcUQPlM5qTO4Z2Lz0yIEFqL4TiSVmv1mWI5oQn2hNdnNk4EuQUBdcHSU9gdLwEhOByxXmp6dr5ekmZ0rqKpNNv7KLIqDFUKAI8y81ZLBkiKPIVmh9GmqvVw+74WqjunlyWFFfJNpfbAgXyYfU7AQpPZSI1HiBKgSDnQiW4rvl7pqO5LWM264e4Fg/pGF4P3EtAPkMWFOK3TprmOGWqMq69qmdzhWa4gNqiKAGCRFBWobnBy/nUoZTPaA1QZhk4buTSssCOU7fWcSidlEZerfS2pcJwTGF0HbrrrgFuHQtC02TU73BgEzwfnqYFfxpO9s49jPPONOwecEDPt+ajedXQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index 5ab8901d..e85c949a 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -23,6 +23,11 @@ "Mode": 1 } }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 224.0 + } + }, "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 @@ -44,11 +49,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 224.0 - } } }, "Count": 8, @@ -644,4 +644,4 @@ "Formula": "项目概况!$AG$2" } ] -}//dLqf5ijt7kj8mn1O9IwFIAMzTEzVE+tjjGkGagW+Upl6sR6NCR4gGnSHKRO5zy+OGoemMCZ108EiomBZdC6DNvQGs3iDNelCFQsaqV+nDqnk8dGFHe2tcNf3u4P9XtfnZteyrhp1aap87iNgTQWnKqBA4aoPV68MZXo3KIV5ta2ZdLwt5Oa8NAq6m77jbBI5bKbWGmMaLW8pZ6iOXnc8ePE70khrAEUnRP6CjUwP3OrUZv2kehUDLOdUwhTl+RjU/+Ur9Q7hFGFOytzJNPbSbZhMWMc6CIQoUuY5NNEAJehT2py19HxNTY+2bBAUFaPe2SYGxVGoD354Sftd8DkO24ZxvXqGdNqszNOLeNeFcxGDT0uEJEsILqQWPfJHtiDfZ+sMflvX8Xy+23SFWKOUGD2v+BNEh+WKdOHCvj5lb9a3ltW6U5vS/WaZq9eBoypzdvyPtgvacX1145IeHfScczeTpCICI2A2np8gaEZ1efBw8xhAhoPPoifpIgmwtOm8gL7orVOApR9btTa3ry3lmcvRw46Z84DLbbeD5VqM8EQ5nfKX+7BFFwsB1IZ2Isui3oJTo9CwYfPAjdKZQnDwfPWkXjQzFN7niveGiQcLz9w9io3cwZBkHWU15sf6EYdV3j2sYN57vXt6leVE2ax21f0c4QCwJsqQhp8QcgmM4AszFkrCHigtDXpc98XpQ3hYeYRW5Aq6FxmJ79W2I7PQ0xP3SyKRzBlYSngHb2Sq9efa77t09kjBJ19t/eEG8NVVLf1S5MksF7aq+DzhdHreC7F5HmjpWn9B052F34tQwkgYp9xN8hB8Xe24Zos9LvtPOxxxkF1XfimU7eBTouC9fGjgtPMH1JgtSKpx63bBID+G21bfYkH90wj3Qn+H44sytoJT68yX7oXkBKR7u+VgOA==|920 \ No newline at end of file +}///QMUBGicW2/1/RomcxgSi+IzFB0ifo0pLEFyXcL5cKDHpDz8tASvJu4f+7KQaEos4bbQLRcVjVX4zdz9XEfisxyRBI3go8OdUi89TJN5fiSDcR+dvm5/U4eTRdgaaQ1cHHy8DQit+M4jTm9+9CQqUCiZtGcPdfjdWckWdud/tvc5sKOI3AT/stKz08g1rrWfnyHnm7CM0+lzdvbof1pKiGBpxA6t4/59ACqOF6MKlG8Q1Mq9GLeUaWTVcggfs5a0MTs4HAy8R6J0xeDi9M7h1dgK0fNimhCTxhux0qj9sHeF4k7Vft4L7lVsVsp5KWuJbBYKmWkbHs8tnHpmcW+/MulGcQVorVhgoUile8w0F3Qlq8Ggrz/6xkWPzQZ3liu7yZbRdmXmqS0H/79wMoKjnh4xBUcqU9QdZyBeuIKahIv/per7RafA06Luj4JYBH8QwGH3OTdwmHWLn7ayRre5k8PKwpJnE2ORjLeCrSahVC9o9PGL+HfccEPLXWlSx7kGFwQe1h9E6LiuWnt0PF61075jph2rFAvlnv++soMqTugS6GKrAcY99M9lPO7ukhg7VG1u3Pczz0TaiyY4phVZmvzMKXwulVXBOFMmNPc7rzAQsCKKvSlvEZKODVtfTEKmqPYE+iOqQEzRXahVeV4wwUWQDHlTrYCPHDnqnVKW3LFs6nvXJlFwsftFpH2/AtjJ9tj5H7S0X6yJJNd9xNE+XjNBHdU6uink5mCkVZ5E96dTDR9oiBk/Rzo/P/cyk8GOsm2HXOvCgcG2C9lUYO3j6ZTYkTiMBwbCtTAgnBay2XGUc7rG0V8EVBQd4Mg7S2FaylWCg0QDbKD+eJAlGFWL6TkEqu3hI7voeEzW99Z219YbxPIBiB93tKRcXH2YBPy03iy6OtavqMGl8+bx49dy/Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json index 2daea9e0..8843217e 100644 --- a/Pages/项目/项目首页/项目首页.json +++ b/Pages/项目/项目首页/项目首页.json @@ -21,7 +21,8 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -251,9 +252,11 @@ }, "Values": { "0,0": "项目标题", - "1,0": "任务列表", "2,1": "项目ID：" }, + "Formulas": { + "2,11": "项目子页面" + }, "AttachInfos": { "0,0": { "CellType": { @@ -265,7 +268,6 @@ "1,0": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", - "PageName": "任务列表", "OverflowMode": 1 } }, @@ -345,7 +347,7 @@ "Title": "加载中" } ], - "ID": "d9cb424e-85ee-477e-84c3-c10896b4b1ad" + "ID": "893b393b-812b-487c-8509-f6bc13d3caa0" } ] } @@ -387,6 +389,56 @@ } ] } + }, + "2,11": { + "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": "=项目首页!项目子页面" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前子页面", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目子页面" + }, + "ID": "1d779c62b4604965a94b97a4d03b5c35" + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "var pageName = Forguncy.CommandHelper.getVariableValue(\"当前子页面\");\r\nsetURLParameter(\"ProjectTag\",pageName);", + "ID": "9b783f6a83594474bd58c4a4ea74efe0" + } + ], + "ID": "d545a4f8-6fac-4531-9760-e6e33fa66474" + } + ] + } + ] + } } }, "StyleDatas": { @@ -406,6 +458,12 @@ { "Formatter": 4 }, + { + "Background": 5, + "Foreground": 6, + "Formatter": 4, + "HorizontalAlignment": 7 + }, { "Background": null } @@ -416,7 +474,10 @@ "Right", "#FFFFFF00", "Body", - "@" + "@", + "Accent 6 0", + "Background 1 0", + "Center" ], "Borders": [ { @@ -468,10 +529,11 @@ "0,40": 0, "2,1": 1, "2,4": 2, - "2,8": 3 + "2,8": 3, + "2,11": 4 }, "RowStyles": { - "0": 4 + "0": 5 }, "SheetStyle": { "FontFamily": 3 @@ -482,7 +544,8 @@ "1,0,1,41", "2,1,1,3", "2,4,1,4", - "2,8,1,3" + "2,8,1,3", + "2,11,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -493,6 +556,70 @@ "FunctionName": "remove", "Title": "加载中" }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "ProjectTag", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"ProjectTag\"),\"\")" + }, + "ID": "1ee5ad95578c4433b39e83dbf53c919e" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=ProjectTag" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目子页面" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!ProjectTag" + } + } + ] + } + ], + "ID": "507242fd-5761-4926-b28b-6d204b7c9461" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目子页面" + }, + "Value": "任务列表" + } + ] + } + ], + "ID": "30ffbcce-36a0-4885-b516-4bd58ac38c63" + } + ] + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -555,7 +682,7 @@ ] } ], - "ID": "59632660-463c-4b38-af56-6ade7a7fb331" + "ID": "e8689fc2-2353-4874-bd34-f38116ab66d4" }, { "CommandList": [ @@ -575,12 +702,12 @@ } } ], - "ID": "30ddd3e3-6a5b-44f6-b8ee-ad945c527e36" + "ID": "3eb179f8-253f-4b22-aef2-74220c567316" } ] } ], - "ID": "3b883e46-ac47-48b5-9549-6c5bf5ae873e" + "ID": "573cbad1-785d-4a66-aace-57a4524e604d" } ] } @@ -620,4 +747,4 @@ "Formula": "项目首页!$I$3" } ] -}//MiFSnoGHq3qGjgIdylillSS6R17FIy5QVLJOxMRf9wmrYNWsKK10fkkduMdHe7rJZsxLzksuDFd5nzgmKRNxwCLLCN/WMDdt+fFisvVAfj0AOyhqBIA02/K5I17ogH58M9d5rQ88T/zVxMvqI+q/d41NB54t04Roi7hFCoTG/kL9B7vPZtWumTGMUBTGKDtjQWGWMcCeuKHRdfeqr/XjInyirII/uawY6/USTSuMLUoGPPXZpxgJLqzWPV6v6/iEYTajerlzBmpNFdyk71oylHpY9wFiiFOd69WT+Hd9fDpfU6V5UD4M/qXAKtnAxSWsZ17E0PHXsCiuL4QCjVMqGb32omz+LX5ln/i1NncodpYwYNwRv4q1C8xcDnhLTwhT2zK7whYWyJD0USPp41Jjo0npTLCY8sWRbc/XogPpqGK8p9rre4C/f3cg+LntLUrtG/QWUKBbJAbMlnPU37LUuhCZebgqZuLWRULD0qb9ElNCTlq2OMSILQIm5LZbyl7j32hbwai+elOmeGY3c3pbmxbHvzReQSzkZzGzktJ8S2fXAdllaAuVol2aONqDIeqm+L/cLZWfpO+WIX0CklpfgzjuIx4t55Z/RXKkLZQBfT9Pe2JKbulBDXfRIQwTVSpDpiYXn7c/zz9U2FbyFQohBJkjkpcFS8Ven4QAhF6GL0k1jfWWkieG5+GwhF1ort6s3mBcieu2RDXfqwMj2mnMKb3vabAG8uBFbEQ3SopBxIdBPuRhSK935UkzvgLT+xkwo5jjexnWPhqzlaocm99Ce6+i3Ujd9lLbe+hJ02wwt1WtqLHfE+NRlVC9m0yiNu0FYInbkEqWhp6JMv7G4vPYLPtCHO+bjiWjfy8YmWgN0Cvkr8MQsjoTXHMQp2swd1j25JCU+BVSh6RFahlgR8cFXg==|920 \ No newline at end of file +}//iVg1qig+QsSmn2gcyGmDRvkUabyOhlxvhPomzfh9JATyhcE83g+6U3DtKIMCkaQxIfyVlP2cScHU7im7TFSxXzk4h2SaUcOQfb5dSaf6kfcMCvmuLjyelnjFBgnHI8RXZHfZ8pofaKR4KARqrn7fwM1DrB7x8DvNGtReQRFLeiQRhBVD3YKSwGKN5rJzai9UKtAO7EyGdfdc0OoFt/yQ/ajuZumKxPe++fmg4ihtcGcnWHXEXLy6KUSKE7HcWD1LNV3tjM99BFmyXN5bAkLnQN3yztUaJUr1pOgTQtk7vNQRzlSR+H6h690efLxNr/2Dxhza3PyYC/vOOaZOl/z7kqKBdnvt2UgiIGQjazDg1zG/MeOdxSY+H3xj0+6+bJ76j88ksQQhYkV3NV/c4H+E7rRHc26QtNZZdR1t+D3y4d28LFGbGV4T96IXk+K48PDZWI70fxOovkBu3QFjiYKec2nngID2YtKbUsKtKnz8ul0wGvS3t88hbrbZR72WPkBZbhIzgRPpGrwgGyA2mTLE7KF3EVmthm0PrnsrJQkIYUEm0S+rMs36vHf1sqP9c7nS9fWbCGKXRK8xTtHxvHq/EwFot210GG3VltLoB/B650UY61YhhQs/voLrdwqOw52EkHgI0EVWQHVrtRWqQGkWk7S49l+mMRd8f0Pd0w7QpFUUnYRWQv0vdIzZhdumAUjslE28i0a/85e4pXQHtNp8yTteuiogYidAA2WolWLidCUz6DisNw+t9e0AvN2PiOh2/PiZimFtsfggWnjmB3deL5rRlhSWUKAeCyQkob/SDFBUsv0nOtV71C7urEyVPgTrW9/n+chQC7cBOysysoZo2cFqKb2a/8ur8c8HzoaPA5ERg2TcYJG6Hg5LygdVKAPGtSuI2ZfjUSLCeUgYRiZ4Pw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页.rd b/Pages/项目/项目首页/项目首页.rd index 92113107..ed95d854 100644 --- a/Pages/项目/项目首页/项目首页.rd +++ b/Pages/项目/项目首页/项目首页.rd @@ -2,6 +2,9 @@ "PageType": 0, "ColumnCount": 41, "RowCount": 3, + "Formulas": { + "2,11": "项目子页面" + }, "CustomNames": [ { "Name": "项目子页面", diff --git a/Pages/项目/项目首页/预算申请/预算申请.json b/Pages/项目/项目首页/预算申请/预算申请.json index 40fe9c35..b67d8cea 100644 --- a/Pages/项目/项目首页/预算申请/预算申请.json +++ b/Pages/项目/项目首页/预算申请/预算申请.json @@ -3,17 +3,17 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 22.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 39.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 16.0 } }, "3": { @@ -23,27 +23,27 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 32.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 32.0 } }, "9": { @@ -53,42 +53,52 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 32.0 } }, "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "14": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 145.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0, - "Mode": 1 - } - }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 145.0 } }, "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0, - "IsHidden": true + "Mode": 1 } }, "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0, + "IsHidden": true + } + }, + "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -96,10 +106,10 @@ } }, "InLogicalVisibleIndexes": [ - 20, - 21 + 22, + 23 ], - "Count": 22, + "Count": 24, "DefaultSize": 35.0 }, "Cols": { @@ -174,20 +184,140 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "申请项目", "1,19": "申请历史", - "4,1": "申请人", - "5,1": "%CurrentUser.UserName%", - "7,1": "现预算工时", - "7,9": "现预算费用", - "8,1": 0, - "8,9": 0, - "10,1": "申请增补工时", - "13,1": "申请增补预算", - "16,1": "申请理由" + "3,1": "申请项目", + "6,1": "申请人", + "7,1": "%CurrentUser.UserName%", + "9,1": "现预算工时", + "9,9": "现预算费用", + "10,1": 0, + "10,9": 0, + "12,1": "申请增补工时", + "15,1": "申请增补预算", + "18,1": "申请理由" }, "AttachInfos": { - "2,1": { + "1,1": { + "CellType": { + "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", + "PreCommands": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + } + ], + "PostCommands": [ + { + "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon" + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "TemplateKey": "同意", + "ActionButtonStyleTemplateInfos": [ + { + "ActionTitle": "提交", + "TemplateKey": "同意" + }, + { + "ActionTitle": "同意", + "TemplateKey": "同意" + }, + { + "ActionTitle": "回退", + "TemplateKey": "回退" + }, + { + "ActionTitle": "终止", + "TemplateKey": "拒绝" + }, + { + "ActionTitle": "拒绝", + "TemplateKey": "拒绝" + } + ] + } + }, + "2,19": { + "CellType": { + "$type": "ElementUI.TimelineCellType, ElementUI", + "useBinding": true, + "options": [ + { + "content": "活动按期开始", + "timestamp": "2018-04-15" + }, + { + "content": "通过审核", + "timestamp": "2018-04-13" + }, + { + "content": "创建成功", + "timestamp": "2018-04-11" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目预算变动表", + "BindingInfos": [ + { + "GUID": "08de1220-8cfc-4269-8e08-df38dbec79c6", + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "描述", + "GUID": "92f849fb-3f07-4165-b2e5-fe971faa78a5" + }, + "ColumnName": "content" + }, + { + "GUID": "9fa5fafe-dec6-4a6c-a58b-8d2c76a2a1c5", + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "FGC_CreateDate", + "GUID": "0fce9c7c-6228-4d7e-a3c2-f770817128c2" + }, + "ColumnName": "timestamp" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "项目ID", + "GUID": "a3a50794-2d13-4deb-9a2b-5ac663dd784e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算申请!B5" + } + }, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "FGC_CreateDate", + "GUID": "2c23c1d4-b43b-4cac-8463-52047d924eb4" + }, + "Order": 1 + } + ] + }, + "CustomColumns": [] + }, + "sort": "default", + "NodeSize": "normal", + "format": "yyyy-MM-dd" + } + }, + "4,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "项目ID", @@ -231,7 +361,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B3" + "SerializeProperty": "=预算申请!B5" } }, "NullFormulaValueQueryPolicy": 0, @@ -245,7 +375,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B9" + "SerializeProperty": "=预算申请!B11" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -255,7 +385,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!J9" + "SerializeProperty": "=预算申请!J11" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -339,79 +469,7 @@ "IgnoreBlank": false } }, - "2,19": { - "CellType": { - "$type": "ElementUI.TimelineCellType, ElementUI", - "useBinding": true, - "options": [ - { - "content": "活动按期开始", - "timestamp": "2018-04-15" - }, - { - "content": "通过审核", - "timestamp": "2018-04-13" - }, - { - "content": "创建成功", - "timestamp": "2018-04-11" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目预算变动表", - "BindingInfos": [ - { - "GUID": "08de1220-8cfc-4269-8e08-df38dbec79c6", - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "描述", - "GUID": "92f849fb-3f07-4165-b2e5-fe971faa78a5" - }, - "ColumnName": "content" - }, - { - "GUID": "9fa5fafe-dec6-4a6c-a58b-8d2c76a2a1c5", - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "FGC_CreateDate", - "GUID": "0fce9c7c-6228-4d7e-a3c2-f770817128c2" - }, - "ColumnName": "timestamp" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "项目ID", - "GUID": "a3a50794-2d13-4deb-9a2b-5ac663dd784e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B3" - } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "FGC_CreateDate", - "GUID": "2c23c1d4-b43b-4cac-8463-52047d924eb4" - }, - "Order": 1 - } - ] - }, - "CustomColumns": [] - }, - "sort": "default", - "NodeSize": "normal", - "format": "yyyy-MM-dd" - } - }, - "5,1": { + "7,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请人", @@ -495,21 +553,21 @@ "IgnoreBlank": false } }, - "8,1": { + "10,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算工时", "GUID": "5657b97d-0458-4d9e-b431-b807f40a469c" } }, - "8,9": { + "10,9": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算费用", "GUID": "25f5c718-b15b-48b3-bd3b-70429cd0181e" } }, - "11,1": { + "13,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "增加工时", @@ -625,22 +683,22 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B15" + "SerializeProperty": "=预算申请!B17" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(预算申请!平均时薪.平均时薪*预算申请!B12,0)" + "SerializeProperty": "=ROUNDUP(预算申请!平均时薪.平均时薪*预算申请!B14,0)" } } ] } ], - "ID": "6a26246f-885b-4c52-b2bd-0990e41d68b8" + "ID": "c0d6a276-db10-4428-948d-c7978ccd6b54" } ] } ], - "ID": "25d7cfdf-6e56-49d5-ac85-11de8c717cdd" + "ID": "1f7e4efc-bf3b-49c3-bda1-841350ae8d3b" } ] } @@ -669,12 +727,12 @@ "CompareParamType": 4, "FirstParamValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR(预算申请!B12>0,预算申请!B15>0)" + "SerializeProperty": "=OR(预算申请!B14>0,预算申请!B17>0)" }, "ErrorMessage": "申请增补工时和增补预算必须填写一项" } }, - "14,1": { + "16,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "增加费用", @@ -707,14 +765,14 @@ "CompareParamType": 4, "FirstParamValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR(预算申请!B12>0,预算申请!B15>0)" + "SerializeProperty": "=OR(预算申请!B14>0,预算申请!B17>0)" }, "InputMessageTitle": "该怎么填？", "InputMessage": "填写工时后，系统会自动计算大致上还需多少预算成本，如果你有更清晰的预算，请直接手动填写", "ErrorMessage": "申请增补工时和增补预算必须填写一项" } }, - "17,1": { + "19,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请理由", @@ -751,7 +809,7 @@ "IgnoreBlank": false } }, - "20,1": { + "22,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "ID", @@ -762,55 +820,59 @@ "StyleDatas": { "Styles": [ { - "Foreground": 0 + "FontFamily": 0, + "FontSize": 16.0 }, { - "BorderLeft": 0 - }, - { - "FontFamily": 2, - "FontSize": 13.333333333333332, - "Formatter": 3 - }, - { - "FontFamily": 2, + "FontFamily": 0, "FontSize": 13.333333333333332 }, { - "FontFamily": 2, + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "Foreground": 2 + }, + { + "BorderLeft": 0 + }, + { + "FontFamily": 0, "FontSize": 13.333333333333332, "BorderLeft": 0 }, { - "FontFamily": 2, + "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 0, - "Formatter": 3 + "Foreground": 2, + "Formatter": 1 }, { - "FontFamily": 2, + "FontFamily": 0, "FontSize": 13.333333333333332, "Formatter": 4, "HorizontalAlignment": 5 }, { - "FontFamily": 2, + "FontFamily": 0, "FontSize": 13.333333333333332, "Formatter": 6, "HorizontalAlignment": 5 }, { - "FontFamily": 2, + "FontFamily": 0, "FontSize": 13.333333333333332, "HorizontalAlignment": 7 } ], "Types": { "Strs": [ - "Text 1 50", - "Background 2 0", "Body", "[AUTO]General", + "Text 1 50", + "Background 2 0", "0\"小时\"", "Left", "¥#,##0_);[Red](¥#,##0)", @@ -818,225 +880,261 @@ ], "Borders": [ { - "Color": 1 + "Color": 3 } ] }, "CellStyles": { "1,1": 0, - "1,18": 1, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "1,9": 1, + "1,10": 1, + "1,11": 1, + "1,12": 1, + "1,13": 1, + "1,14": 1, + "1,15": 1, + "1,16": 1, "1,19": 2, - "2,18": 1, - "3,0": 3, + "2,19": 1, "3,1": 3, - "3,2": 3, - "3,3": 3, - "3,4": 3, - "3,5": 3, - "3,6": 3, - "3,7": 3, - "3,8": 3, - "3,9": 3, - "3,10": 3, - "3,11": 3, - "3,12": 3, - "3,13": 3, - "3,14": 3, - "3,15": 3, - "3,16": 3, - "3,17": 3, "3,18": 4, - "3,20": 3, - "4,0": 3, - "4,1": 5, - "4,2": 3, - "4,3": 3, - "4,4": 3, - "4,5": 3, - "4,6": 3, - "4,7": 3, - "4,8": 3, - "4,9": 3, - "4,10": 3, - "4,11": 3, - "4,12": 3, - "4,13": 3, - "4,14": 3, - "4,15": 3, - "4,16": 3, - "4,17": 3, + "3,19": 1, "4,18": 4, - "4,20": 3, - "5,0": 3, - "5,1": 3, - "5,17": 3, - "5,18": 4, - "5,20": 3, - "6,0": 3, - "6,1": 3, - "6,2": 3, - "6,3": 3, - "6,4": 3, - "6,5": 3, - "6,6": 3, - "6,7": 3, - "6,8": 3, - "6,9": 3, - "6,10": 3, - "6,11": 3, - "6,12": 3, - "6,13": 3, - "6,14": 3, - "6,15": 3, - "6,16": 3, - "6,17": 3, - "6,18": 4, - "6,20": 3, - "7,0": 3, - "7,1": 5, - "7,2": 3, - "7,3": 3, - "7,4": 3, - "7,5": 3, - "7,6": 3, - "7,7": 3, - "7,8": 3, - "7,9": 5, - "7,10": 3, - "7,11": 3, - "7,12": 3, - "7,13": 3, - "7,14": 3, - "7,15": 3, - "7,17": 3, - "7,18": 4, - "7,20": 3, - "8,0": 3, - "8,1": 6, - "8,9": 7, - "8,17": 3, - "8,18": 4, - "8,20": 3, - "9,18": 1, - "10,1": 5, - "10,2": 3, - "10,3": 3, - "10,4": 3, - "10,5": 3, - "10,6": 3, - "10,7": 3, - "10,8": 3, - "10,9": 3, - "10,10": 3, - "10,11": 3, - "10,12": 3, - "10,13": 3, - "10,14": 3, - "10,15": 3, - "10,16": 3, - "10,17": 3, - "10,18": 1, - "11,1": 3, - "11,17": 3, - "11,18": 1, - "12,1": 3, - "12,2": 3, - "12,3": 3, - "12,4": 3, - "12,5": 3, - "12,6": 3, - "12,7": 3, - "12,8": 3, - "12,9": 3, - "12,10": 3, - "12,11": 3, - "12,12": 3, - "12,13": 3, - "12,14": 3, - "12,15": 3, - "12,16": 3, - "12,17": 3, - "12,18": 1, - "13,1": 5, - "13,2": 3, - "13,3": 3, - "13,4": 3, - "13,5": 3, - "13,6": 3, - "13,7": 3, - "13,8": 3, - "13,9": 3, - "13,10": 3, - "13,11": 3, - "13,12": 3, - "13,13": 3, - "13,14": 3, - "13,15": 3, - "13,16": 8, - "13,17": 3, - "13,18": 1, - "14,1": 3, - "14,17": 3, - "14,18": 1, - "15,1": 3, - "15,2": 3, - "15,3": 3, - "15,4": 3, - "15,5": 3, - "15,6": 3, - "15,7": 3, - "15,8": 3, - "15,9": 3, - "15,10": 3, - "15,11": 3, - "15,12": 3, - "15,13": 3, - "15,14": 3, - "15,15": 3, - "15,16": 3, - "15,17": 3, - "15,18": 1, - "16,1": 5, - "16,2": 3, - "16,3": 3, - "16,4": 3, - "16,5": 3, - "16,6": 3, - "16,7": 3, - "16,8": 3, - "16,9": 3, - "16,10": 3, - "16,11": 3, - "16,12": 3, - "16,13": 3, - "16,14": 3, - "16,15": 3, - "16,16": 3, - "16,17": 3, - "16,18": 1, - "17,1": 3, - "17,17": 3, - "17,18": 1, - "18,17": 3, - "18,18": 1, - "19,18": 1, - "20,18": 1 + "4,19": 1, + "5,0": 1, + "5,1": 1, + "5,2": 1, + "5,3": 1, + "5,4": 1, + "5,5": 1, + "5,6": 1, + "5,7": 1, + "5,8": 1, + "5,9": 1, + "5,10": 1, + "5,11": 1, + "5,12": 1, + "5,13": 1, + "5,14": 1, + "5,15": 1, + "5,16": 1, + "5,17": 1, + "5,18": 5, + "5,19": 1, + "5,20": 1, + "6,0": 1, + "6,1": 6, + "6,2": 1, + "6,3": 1, + "6,4": 1, + "6,5": 1, + "6,6": 1, + "6,7": 1, + "6,8": 1, + "6,9": 1, + "6,10": 1, + "6,11": 1, + "6,12": 1, + "6,13": 1, + "6,14": 1, + "6,15": 1, + "6,16": 1, + "6,17": 1, + "6,18": 5, + "6,19": 1, + "6,20": 1, + "7,0": 1, + "7,1": 1, + "7,17": 1, + "7,18": 5, + "7,19": 1, + "7,20": 1, + "8,0": 1, + "8,1": 1, + "8,2": 1, + "8,3": 1, + "8,4": 1, + "8,5": 1, + "8,6": 1, + "8,7": 1, + "8,8": 1, + "8,9": 1, + "8,10": 1, + "8,11": 1, + "8,12": 1, + "8,13": 1, + "8,14": 1, + "8,15": 1, + "8,16": 1, + "8,17": 1, + "8,18": 5, + "8,19": 1, + "8,20": 1, + "9,0": 1, + "9,1": 6, + "9,2": 1, + "9,3": 1, + "9,4": 1, + "9,5": 1, + "9,6": 1, + "9,7": 1, + "9,8": 1, + "9,9": 6, + "9,10": 1, + "9,11": 1, + "9,12": 1, + "9,13": 1, + "9,14": 1, + "9,15": 1, + "9,17": 1, + "9,18": 5, + "9,19": 1, + "9,20": 1, + "10,0": 1, + "10,1": 7, + "10,9": 8, + "10,17": 1, + "10,18": 5, + "10,19": 1, + "10,20": 1, + "11,18": 4, + "11,19": 1, + "12,1": 6, + "12,2": 1, + "12,3": 1, + "12,4": 1, + "12,5": 1, + "12,6": 1, + "12,7": 1, + "12,8": 1, + "12,9": 1, + "12,10": 1, + "12,11": 1, + "12,12": 1, + "12,13": 1, + "12,14": 1, + "12,15": 1, + "12,16": 1, + "12,17": 1, + "12,18": 4, + "12,19": 1, + "13,1": 1, + "13,17": 1, + "13,18": 4, + "13,19": 1, + "14,1": 1, + "14,2": 1, + "14,3": 1, + "14,4": 1, + "14,5": 1, + "14,6": 1, + "14,7": 1, + "14,8": 1, + "14,9": 1, + "14,10": 1, + "14,11": 1, + "14,12": 1, + "14,13": 1, + "14,14": 1, + "14,15": 1, + "14,16": 1, + "14,17": 1, + "14,18": 4, + "14,19": 1, + "15,1": 6, + "15,2": 1, + "15,3": 1, + "15,4": 1, + "15,5": 1, + "15,6": 1, + "15,7": 1, + "15,8": 1, + "15,9": 1, + "15,10": 1, + "15,11": 1, + "15,12": 1, + "15,13": 1, + "15,14": 1, + "15,15": 1, + "15,16": 9, + "15,17": 1, + "15,18": 4, + "15,19": 1, + "16,1": 1, + "16,17": 1, + "16,18": 4, + "16,19": 1, + "17,1": 1, + "17,2": 1, + "17,3": 1, + "17,4": 1, + "17,5": 1, + "17,6": 1, + "17,7": 1, + "17,8": 1, + "17,9": 1, + "17,10": 1, + "17,11": 1, + "17,12": 1, + "17,13": 1, + "17,14": 1, + "17,15": 1, + "17,16": 1, + "17,17": 1, + "17,18": 4, + "17,19": 1, + "18,1": 6, + "18,2": 1, + "18,3": 1, + "18,4": 1, + "18,5": 1, + "18,6": 1, + "18,7": 1, + "18,8": 1, + "18,9": 1, + "18,10": 1, + "18,11": 1, + "18,12": 1, + "18,13": 1, + "18,14": 1, + "18,15": 1, + "18,16": 1, + "18,17": 1, + "18,18": 4, + "18,19": 1, + "19,1": 1, + "19,17": 1, + "19,18": 4, + "19,19": 1, + "20,17": 1, + "20,18": 4, + "20,19": 1, + "21,18": 4, + "22,18": 4 }, "SheetStyle": { - "FontFamily": 2, + "FontFamily": 0, "FontSize": 13.333333333333332 } }, "Spans": [ - "2,19,19,1", - "2,1,1,16", - "11,1,1,16", - "14,1,1,16", - "17,1,2,16", - "5,1,1,16", - "8,9,1,8", - "8,1,1,8", - "20,1,1,4" + "4,1,1,16", + "13,1,1,16", + "16,1,1,16", + "19,1,2,16", + "7,1,1,16", + "10,9,1,8", + "10,1,1,8", + "22,1,1,4", + "1,1,1,16", + "2,19,19,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1065,11 +1163,11 @@ "CustomNames": [ { "Name": "项目ID", - "Formula": "预算申请!$B$3" + "Formula": "预算申请!$B$5" }, { "Name": "变动表ID", - "Formula": "预算申请!$B$21" + "Formula": "预算申请!$B$23" } ] -}//n/nUj9aaf4OlY2+JF6rUTpx5Uu4AFDMbmpPI1EoDoVfRjCrl0GkloDUpKsEjrZcqXij7fMQGxdXLX8ah09hJH8QcrHe7BSs2zY/iENFJJXJ70ER/wdT+8JcmYBw1xEi6497MYMdEa+FvoOzDfi8THBOJEXfh5ZJww9Fs4IPpOjKXW7hN/ugBYBi54ypNRP9cXfAhdsOzxTwWP1OpEGx5+3D3xACHaoF83e0qC8sySQEzkHWK6EwhC/cO9XJkp489sV3JaOqeNIKRJ9DTu1FUpWrCtDRpyljSYLM2wmIQf8R5WBBXToJmVTPOZASlhMvHY+luL1ihrO4ZPT2hcyMlOKskV80OFz1oyH4/D5PxJj5lUjmpCowTnZYTcet9sjxCJoMfHC/3B+nZnRqmALvIkaAhTFoBuYr1RS/Ug3M7c5KG1DEDaCExKPV0CcOjd4icdJdHTmVW7CCoiEZbviq0r7wBffF/aHv2bmxf61wi+bisYFgRpl78VfO/uaKowtkxe5H8KuTsKPLZz0JEwIlI3Q1FIDfUNUGRZpg1y5s/JIUwwSW1D0Puo7tGvXf9FGPW3rNouZMWQfX8Mj5HsMiTdXHK17/xTICVvmHpjAncrMsVppxV/wC2GsUhg9YYSndUazheELfuv9+FgeT1bj+S/k31ZiHCZpPgh+n/1JzMUEGR+0ET8E2w9QHzNkqOIUhnkS1aOUuD799jg8ypD/bh7iSWybv6xoHmbqra5U8KbdbY9wLHlhF4SrPcaozFo18ADEPbLOTNSZCJXPCdbY+/azs13Tz18wlVcYObJ/L1ejIcjMeJqsCoAKdmVKRbUH7Z9diWEQuqoEogMh6dhqc7QIZI0bLXk2NgzM6lATo3Ne8MBAJD9hg72+CXW2JyKtCXMRNyybgKXtpBF96NLnevzg==|920 \ No newline at end of file +}//zqxD5aDIYd0YCG+2rPECcHXxQp0Ki2KE6f72EkJXGi4mlghPB+c3s9lETiKaHrzVoh1OryBoMUPaZi/fBvMwhaLuO45u7PAjeGGewC4BO4FeeQ/AW3XXVIAHStBWPFESes2iyXFnybaAwzsKz1vQTvXQtWbWq8+dAIZ/WzRAKq0ojQ2/lpqf7uA6rhXwZqnXMmGAPbwgnbrZiJh/giF3A7PasPnjiIi1hcm2eLKAgWapfxF5u4p4BobmKYyyyW6yrgR9W+e7j34S4ICsr6TzN/aIT/YqS2PaB7lR860c8cWvUMOphfVWukpyE3MkrVnRYI1YgdFzvrYapNa+LnEevyaV2TdK23J1fHbXN+zYq8t2MEQmgtsDpLgLYUC8fwYAbYss6c9OD8M/8zuGVK6t6H1+nMRudf8WKalyg1EMkeqPg9WvwztnBJDNWlM92zMyY0xQ9XXWFeTjOZfhQPIoovoItMnlt5wID27SP+/go3G+AHAG3qdi5HQaDKOno6M5QIO9sCwpltudNzzL4/BDVwyH22ohQtRrpH5kLdeUomt+BhzVmczX1CLFpMxG/uxvbTkduv2FnuMmWj2B0zvxeDkXMvWsF4MyI9RjaPW5pW2+dEXH8+INEhNSBw6lmG+LvBAoKglGVykohiPbvcNVLeoJdk8T6iGpiJbnSvKr0XIFVX5yLnSayt/ZPdldJN3HRk/t95fEDnbHTq0xwpxYnslzt7a7zimT/R/wecJ2+d65Hbjm2Rkv9GjPB7y2703ouyfjQZcPdE/AOghnm4XxIwJ48/iwWUAwCy7M5NN4YTzDZXO4LFbrUsYKhvJKI2toj8w3R0A4P8/Ka6dBsdOiTR8H4eQahV+D/AngOFbJoLT2JwJOTtHjgVIIaFyhKe0fB2brdMyU8FWzv229P0vJCw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/预算申请.rd b/Pages/项目/项目首页/预算申请/预算申请.rd index 26631ca1..0fa30ff0 100644 --- a/Pages/项目/项目首页/预算申请/预算申请.rd +++ b/Pages/项目/项目首页/预算申请/预算申请.rd @@ -1,15 +1,15 @@ { "PageType": 0, "ColumnCount": 21, - "RowCount": 22, + "RowCount": 24, "CustomNames": [ { "Name": "项目ID", - "Formula": "预算申请!$B$3" + "Formula": "预算申请!$B$5" }, { "Name": "变动表ID", - "Formula": "预算申请!$B$21" + "Formula": "预算申请!$B$23" } ] } \ No newline at end of file diff --git a/Plugin/UI操作工具箱-9_0_6_0.zip b/Plugin/UI操作工具箱-9_0_6_0.zip index 032edb65..ca568b6d 100644 Binary files a/Plugin/UI操作工具箱-9_0_6_0.zip and b/Plugin/UI操作工具箱-9_0_6_0.zip differ diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index c0caee9e..c7aac14b 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -14,14 +14,14 @@ - + _4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f Flow_0otbu5x - + Flow_0otbu5x Flow_1bfvbmv diff --git a/Process/预算申请.bpmn b/Process/预算申请.bpmn index 1fb1bd1e..4acd4d25 100644 --- a/Process/预算申请.bpmn +++ b/Process/预算申请.bpmn @@ -4,7 +4,7 @@ - + @@ -35,7 +35,7 @@ - + Flow_1y1g7g4 Flow_1mecf6x diff --git a/ServerCommands/Gitee/在线获取仓库某日提交数据.json b/ServerCommands/Gitee/在线获取仓库某日提交数据.json index c3f95731..979dfeac 100644 --- a/ServerCommands/Gitee/在线获取仓库某日提交数据.json +++ b/ServerCommands/Gitee/在线获取仓库某日提交数据.json @@ -26,33 +26,37 @@ "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "33487312" + "TestData": "32969134" }, { "Name": "分支名", "DataValidationInfo": {}, - "TestData": "版本10" + "TestData": "V1" }, { "Name": "成员用户名", "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "Administrator" + "TestData": "shamus" }, { "Name": "开始日期", "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "2024-06-14" + "TestData": "2024-06-18" }, { "Name": "结束日期", "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "2024-06-17" + "TestData": "2024-06-18" + }, + { + "Name": "过滤无效信息", + "DataValidationInfo": {} } ], "InvokeTriggerTestData": { @@ -69,7 +73,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "54a7c9a3-f561-449b-8b3b-4e0e55da1d73", + "GUID": "1b1aa1ce-4afa-4cc1-b1c5-31f42cc3935f", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", @@ -78,7 +82,7 @@ "ColumnName": "空间路径名" }, { - "GUID": "b09a247f-a4fb-4ef5-bcd9-c78513dc4781", + "GUID": "117e3875-1d12-4b85-aa88-a73d87864bcb", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", @@ -87,7 +91,7 @@ "ColumnName": "仓库路径名" }, { - "GUID": "48dee6ad-e67e-4eb5-8812-c7ff36232eb8", + "GUID": "ec2d3691-f0b0-4b74-a1f0-b7b772b5da29", "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", @@ -111,7 +115,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "58567dfba75f43489c48d665b080832c" + "ID": "9bfbac7e547b46b6a4d5dfee70b80159" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -121,7 +125,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "d1f81b25-655d-4777-b555-91c9b1db1eab", + "GUID": "5f95867c-3663-4046-bc97-1aca1622003e", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -130,7 +134,7 @@ "ColumnName": "GIT用户名" }, { - "GUID": "004e06bb-51a5-449a-9ebf-2f2209a88b57", + "GUID": "f2526148-7ca1-4b9f-8b33-a3eaefc2ce2d", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "邮件", @@ -154,7 +158,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "47ea19e71148429da9cd6657d940b4c5" + "ID": "754a819248624485a9abb5c86712753b" }, { "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", @@ -306,7 +310,7 @@ "DataItemType": 0, "Data": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员.GIT用户名" + "SerializeProperty": "=成员.邮件" } }, { @@ -314,7 +318,7 @@ "DataItemType": 0, "Data": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(开始日期,\"yyyy-mm-dd\")" + "SerializeProperty": "=TEXT(开始日期,\"yyyy-mm-dd\")&\" 00:00:00\"" } }, { @@ -322,7 +326,7 @@ "DataItemType": 0, "Data": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(结束日期,\"yyyy-mm-dd\")" + "SerializeProperty": "=TEXT(结束日期,\"yyyy-mm-dd\")&\" 23:59:59\"" } }, { @@ -390,7 +394,7 @@ "WithinLoop": true } ], - "ID": "8939d50a-d3ad-4ddf-9c5a-5cf7cab8cb7a" + "ID": "7fe7f89e-526e-4f6e-ad1e-ac1a08e8c45f" }, { "CommandList": [ @@ -461,163 +465,94 @@ }, "CommandList": [ { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=提交信息数组" - }, - "Operation": 4, - "OperationParamaterAName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=message.Message" - }, - "OutParamaterName": "提交信息数组" - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "Git_事件记录", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库ID", - "GUID": "9ce37e37-e3e9-4b31-bc35-b2dceb6338c5" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=过滤无效信息" + } + }, + "value": "1" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库ID" - } + "CommandList": [ + { + "$type": "GETPOST.正则类.正则_校验, GETPOST", + "JieShouMsg": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=message.Message" + }, + "JieShouMsg2": "^(.{0,3}|[^\\u4e00-\\u9fa5]*)$", + "FanHuiMsg": "内容有效性" + }, + { + "$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": "False" + }, + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提交信息数组" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=message.Message" + }, + "OutParamaterName": "提交信息数组" + } + ], + "ID": "2d5372e0-a0ab-4224-aff8-0c86ac1f49b5" + } + ] + } + ], + "ID": "f7829de8-2958-42c5-b7d3-7c6a6eb60511" }, { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "事件名称", - "GUID": "f12b3f9b-714c-43b8-9526-1f48bc4c4187" - }, - "Value": "签入工程" - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "空间路径", - "GUID": "4bad18a5-23bf-4cbb-8f17-069778faaf2c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库.空间路径名" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库名称", - "GUID": "61b00490-d53c-4789-846d-6b33d7010de4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库.仓库名称" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "仓库路径", - "GUID": "38c3a76e-979e-4544-99af-e3fcedb33798" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库.仓库路径名" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "提交人", - "GUID": "70f98756-135a-4e38-ad6f-818fc61efed4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=完整ITEM.committer.name" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "事件内容", - "GUID": "a3b39d58-d599-408f-a45d-f395f62d4e96" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=message.Message" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "url", - "GUID": "15970ad6-e39c-478e-b844-5247c8976522" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=完整ITEM.html_url" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "git用户名", - "GUID": "af262610-572d-4395-b208-c3f113605928" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=完整ITEM.committer.login" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "日期", - "GUID": "8926f4b8-7f20-4923-b72f-117430e70d88" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=完整ITEM.commit.committer.date" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "内容得分", - "GUID": "2ba07a84-2f9c-43c4-af98-18a820a4bde9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(内容得分>100,100,内容得分)" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "sha", - "GUID": "4b50f1cb-b821-4c19-8e64-338f187accaf" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=完整ITEM.sha" - } + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提交信息数组" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=message.Message" + }, + "OutParamaterName": "提交信息数组" + } + ], + "ID": "6b532a5c-e01c-4a11-ac5d-612c15f05c58" } - ], - "Disabled": true + ] } ], - "ID": "6049a564-9bf2-4fb6-b880-09e49807ed3b" + "ID": "e47d7060-4df2-4745-a399-75f08fd12ab8" } ] } ], - "ID": "5e9ddad9-66f4-41f7-9c42-95e1426346a7" + "ID": "d74ce186-e831-4936-a8dc-87baad6c1079" } ] } @@ -627,7 +562,7 @@ ] } ], - "ID": "99580a51-0499-4fcf-9a8b-6d5634cbfb39" + "ID": "6fcbba48-75cc-40cb-8b47-b662393ede2e" } ] } @@ -686,7 +621,7 @@ ] } ], - "ID": "6987da7d-16d2-4aa6-b8ed-cfd397e97192" + "ID": "2e877980-8a9b-4bf1-a2fc-2dc9ead7fd87" }, { "CommandList": [ @@ -707,12 +642,12 @@ ] } ], - "ID": "d1a93088-d154-48ed-8d9f-df4f2fd21c84" + "ID": "885233d6-7a6c-4e29-98ce-0eba4a16d67f" } ] } ], - "ID": "748992aa-56c0-4299-9ce8-6bff74a52902" + "ID": "674a600e-717d-4eca-a58f-74485a2e8b39" }, { "CommandList": [ @@ -727,12 +662,12 @@ ] } ], - "ID": "10688d9d-087e-4baa-8a4b-8d94286a0848" + "ID": "97568787-a3b7-4efb-bc5e-83a94f7fa580" } ] } ], - "ID": "ea0affa8-ef09-4ec6-9b01-5a8c3cdee520" + "ID": "fd70c2d0-8444-43b7-a271-c3f8550103d7" }, { "CommandList": [ @@ -747,7 +682,7 @@ ] } ], - "ID": "117372da-18de-4a3e-98a7-bd9d6eebeb55" + "ID": "7dd39217-e80e-452c-8ab1-e2d93088127a" } ] } diff --git a/ServerCommands/任务/变更任务状态.json b/ServerCommands/任务/变更任务状态.json index 86ce5422..9aac8c69 100644 --- a/ServerCommands/任务/变更任务状态.json +++ b/ServerCommands/任务/变更任务状态.json @@ -278,12 +278,12 @@ } } ], - "ID": "92023045-2efd-4732-8b87-9ca3defda20e" + "ID": "7307f9cb-0a43-4b3d-9335-72465015f8e2" } ] } ], - "ID": "7d8aff32-3014-49cd-9da4-bab045b1264e" + "ID": "6833cd39-b4c3-44f1-ac37-e7fc1e7556dd" }, { "Condition": { @@ -320,12 +320,12 @@ "Message": "任务执行者不能为空" } ], - "ID": "bd111c49-ad7a-4b6e-84d1-b05b498e2dbc" + "ID": "9f576937-8c65-4748-a948-5cc1b9aa9da2" } ] } ], - "ID": "2428b906-61bc-43c0-9c84-e76628d3aeb9" + "ID": "483b270e-e6e6-4280-990e-9140fafef969" }, { "Condition": { @@ -362,12 +362,12 @@ "Message": "任务执行者不能为空" } ], - "ID": "dcc4a40e-b48f-4392-8ce3-672c386885c0" + "ID": "b1922fb3-0f59-462d-ac9c-b9dadab1b4c6" } ] } ], - "ID": "fa9a7a72-46f8-4771-8846-5cfd3a4d37ce" + "ID": "c6047401-1633-4822-9376-4de5021f3017" } ] }, @@ -451,7 +451,7 @@ "Message": "操作成功" } ], - "ID": "23001280-0179-417f-b1f2-a0da785da4e9" + "ID": "94ecbaa9-2b7f-4aff-9c77-305d5e58a983" }, { "CommandList": [ @@ -461,12 +461,12 @@ "Message": "操作成功" } ], - "ID": "2610caad-cd61-4070-9b64-aaec12185d7d" + "ID": "e9a1e04e-c47f-4eca-aabd-b60cbe20bcde" } ] } ], - "ID": "57e92f57-da41-4500-8b9c-4f427627d742" + "ID": "fd32ee3d-f7dd-4030-a4f0-3fce9ced5372" }, { "CommandList": [ @@ -479,7 +479,7 @@ } } ], - "ID": "63bd9e3b-df5b-4b3a-8434-f5238015049a" + "ID": "7f6ab919-fd03-43b0-a234-c9bd5299c7c9" } ] } diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json index 992ccdbb..123b2d5a 100644 --- a/ServerCommands/任务/新增任务.json +++ b/ServerCommands/任务/新增任务.json @@ -163,7 +163,7 @@ "ID": "d01552992a0c4569864d9ac2ed82875b" } ], - "ID": "7e2a1dd5-2f72-4080-ade7-cf9fbdb84b76" + "ID": "27d8d05a-878e-4e38-9c50-22db2b8ff7de" }, { "CommandList": [ @@ -174,12 +174,12 @@ "ID": "100407c5ad3545a4927cc51a64cc94ba" } ], - "ID": "5dd917ef-5c59-480e-ac2f-df0aebe94bc2" + "ID": "e6d7d559-2e5b-4b9c-aed1-0a8d20cfd618" } ] } ], - "ID": "7e2b7fa5-5bc7-4015-abc7-9f003a4cf8aa" + "ID": "5b452186-29b1-4bf5-a235-68d0a3c9ec15" }, { "CommandList": [ @@ -190,7 +190,7 @@ "ID": "918e2a12022e4e8080c14ece366ea9bb" } ], - "ID": "240fe6ee-509b-46d8-b9f6-e5d42777b55d" + "ID": "dba9b261-35e4-40ef-9aec-5d72b3f23500" } ] }, @@ -438,20 +438,6 @@ } ] }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "新增成功", - "CustomReturns": [ - { - "ReturnPropertyName": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新任务.ID" - } - } - ] - }, { "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", "ProcessDefinitionResourceName": "新增任务流程", @@ -473,8 +459,7 @@ "SerializeProperty": "=新任务.ID" } }, - "ReturnResultName": "发起流程结果", - "Disabled": true + "ReturnResultName": "发起流程结果" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -499,12 +484,16 @@ "Message": "新增任务成功", "CustomReturns": [ { - "ReturnPropertyName": "任务ID" + "ReturnPropertyName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新任务.ID" + } } ] } ], - "ID": "8157c39f-9833-46a2-90c5-6e2ba77dc18b" + "ID": "425d89dd-d4ea-4733-bb9c-7dd1fe62ab63" }, { "CommandList": [ @@ -514,15 +503,18 @@ "Message": "发起流程失败，请手动重新发起！", "CustomReturns": [ { - "ReturnPropertyName": "任务ID" + "ReturnPropertyName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新任务.ID" + } } ] } ], - "ID": "9895df7f-af90-4143-b94a-8926d084ae89" + "ID": "3ae26b74-a588-49d8-beb9-fe32e20bccec" } - ], - "Disabled": true + ] } ], "ReturnProperties": [ diff --git a/UserControlPages/Git仓库卡片.json b/UserControlPages/Git仓库卡片.json index 6f106175..200b5a44 100644 --- a/UserControlPages/Git仓库卡片.json +++ b/UserControlPages/Git仓库卡片.json @@ -458,14 +458,41 @@ } } ] + }, + { + "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon", + "CommandName": "绑定加载完毕", + "CommandParamValue": [ + { + "Name": "空间路径", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Git仓库卡片!仓库.空间路径名" + } + }, + { + "Name": "仓库路径", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Git仓库卡片!仓库.仓库路径名" + } + }, + { + "Name": "仓库ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Git仓库卡片!仓库.仓库ID" + } + } + ] } ], - "ID": "22e1066d-42b2-4ee8-9a2e-0ebdedcaf6e8" + "ID": "281df8e1-f0bc-466c-ae71-4552cade7981" } ] } ], - "ID": "d2956381-c32d-49c4-94c4-c32fad324bea" + "ID": "30543bca-4504-480a-88bd-1f513a38763d" } ] } @@ -588,6 +615,20 @@ }, { "Name": "点击" + }, + { + "Name": "绑定加载完毕", + "CommandParameters": [ + { + "Name": "空间路径" + }, + { + "Name": "仓库路径" + }, + { + "Name": "仓库ID" + } + ] } ], "MethodDefinitions": [], @@ -646,7 +687,7 @@ ] } ], - "ID": "2a603f11-769d-4624-987c-26683576623a" + "ID": "2f4f2558-7b94-41ba-878d-deb9d0627902" }, { "CommandList": [ @@ -670,7 +711,7 @@ ] } ], - "ID": "44745014-7771-4df8-a80f-03e77d619e93" + "ID": "0e9889f5-84b2-4d33-b63d-bd6347468f58" } ] } @@ -731,7 +772,7 @@ ] } ], - "ID": "5f799e0a-dc73-4b9e-ac8c-68c073bdc001" + "ID": "fcb1a1a7-1e4b-4a83-843c-6d91e8501879" }, { "CommandList": [ @@ -755,7 +796,7 @@ ] } ], - "ID": "790865df-6ab1-453f-89c6-2ebdcf157a0c" + "ID": "f04e378f-9bb9-4747-b247-bc01a0567401" } ] } @@ -815,4 +856,4 @@ "BoxShadowString": "3 3 0 7 #04000000" } ] -}//b5CZ/sM/Vx/to/n9AUYxS5deW/zqJtOXOPaTdgOdYRqQGQzgltSXkY8uV4JQ/ky9HTJi2DQF0fs/L8EMm+0tDkmk41O2GsP2LcfoQXYiwciFYwyoemgKbZtsHmy+xpMfFo5JjnsKiZnmq52cXW0LDaMMuc1ETFp3ao9N8ZGBph8LY5opB/UjkXx2tkVG6OuDEahSjORmG9zcFQz3D4N/wjgOTPzaf56qbuyiUeVeFDGNiR75YbS9fqCNh6Ku0KIQQXilrWbAsHnujBzZmmIt/aFqqd68SEUfdYroQzix5jp1VGJLJ9WAWZMIxiI9cCxfHRhmu3u37oKnV9+WPHmRdA41Gtbm1rPksNORNv/aXI/75yU4HrhpLzOQDDVEScjjaCB814uOayWzg3RMXEqJ9a4Xv/eP5pvTFEhHIOt/XmBi+oEqUc/y0xzSZxBptBZizHVeHOp3TejdsjojBBgOlHAmd089672QkibW5ciYATlyXSFSyyZct/TdRDrMh+6a8Nhdj6XrV6cFxVyyOJXBWAPJJ9i24+tfPYyv/zMGD0v5/yU3xzW13mrKydjAtLffCvS9yEv3tek6586Z/RtIvqMGraKuWzqVk+t5/ihXpJsnFECrduL2Vr6/bM4FNh5eyGSZtlrH1t5NSmE/GBfTyakhgg3E9ZTIY4h6Kjg5zkW3lJAx7TFsNT5BI4IozmSWOlXogHHiMxMJP67wLq2OKZAVDUddffe5uNj+KXmilI1MhWkyJTdjsOFUTbD2cDjSughCbNorbgkS6CUBtaP50AINlM3muljW9V74IVTTpKiewE1kPSYoUNhh0Pctu77wgIuX6XdUnTBFf8pLpLvg2dJYn9faoGk1CwhTr2ty7l/2fc7eA+BcspN3Zh9Hl7kOtgRMwlBV6RSNO26EifFaLA==|920 \ No newline at end of file +}//zl6+2pAtKX6KNVDmleeL2SVeYtmUJktBAACBQ6Jc+rneOMPacn+iZi/133bmZNqrCDnQbu1W3Ogw3zRdXtKnncBczt1ou5FlN33B48/+0i9hMRQPnBeezr5qWhA5X5BdfcTEQLtEWkNSB+qUugqqeMFKXF0tlgUabAJTLT2EEMjsz9G0IQG8IhyIriytPv6pYv/8q+f2dp5yEpgSCowPdGhnM4siukXDvWiBfaJtZBzF9dTOlGDoUEBK6QNyHD6unoHIeybl/4YKHa9Bptn6C/8iINCi8AUw8hweN3bafgBxpyCr9xlqR7DqgNzwMz/rBKq3vgnPXxv1xml+IsKxaGUxDqxHttugl+dzgETyuVY7DXkflIxBE2mThQXc3ZgawzCDmb4yAiNgsNJUIHV/MFhnlcdcCmuvfPt0F2jJ1wFZud6yd7u0lM8x/uSrc6UaYlexXoQElOxD8HqzO6lFFdtVFyoD35d85mO4dO1q37hzJ/snuHPOCDfQxDpv31XqpzUd9w0k+WWXyKdbjoIOyUM/3uwfa85WQXUHNQKkClQQK4W0D9U/lLwrk4hWv/u9xLpmYnWG7h7zUMeiuUS50XBXm9I2PKJEEG88MHC96Na31XIUHgQU3O99IOjEYOENsQLarXuqHaX493P/CKjXbkleQ5qUzR6Dbq15QdDIdQeLBEw6kKba5yTUD7nUh8AES69bau6GsIis43uLbKAvj6vnclCqGP2enrstfBzbi47cGDW2bbF9PJSBF/3j6QSdVB5QfUJ9ylAsqFXc5v3mrKyB0T62oUHRGAj7r5f1KEZN0sIrFxk40EOAhSyfTblyAqXQZi5GXlJiYM9uM+0FAYn1Nkk6h0r6pboDbc5y2prUlXoItCppb2wJpPtK7l0qt3+zecZuVm9uDYTVHgUzIg==|920 \ No newline at end of file diff --git a/UserFile/CustomFormula.js b/UserFile/CustomFormula.js index 6e79f709..d4582b58 100644 --- a/UserFile/CustomFormula.js +++ b/UserFile/CustomFormula.js @@ -1,3 +1,26 @@ +// 设置URL参数 +function setURLParameter(key, value) { + // 获取当前页面URL + let url = new URL(window.location.href); + + // 如果传入的值为空，则删除参数 + if (value === null || value === undefined || value === "") { + url.searchParams.delete(key); + } else { + // 如果URL中已经存在这个参数，则更新它 + if (url.searchParams.has(key)) { + url.searchParams.set(key, value); + } else { + // 否则，设置新的参数 + url.searchParams.append(key, value); + } + } + + // 更改浏览器历史记录中当前页面的URL + window.history.replaceState({}, '', url); +} + + //返回时间个性化文本 function FRIENDLYTIMEFunction() { this.name = 'FRIENDLYTIME';