diff --git a/.collaboration b/.collaboration index 588ff1c8..4b146a12 100644 --- a/.collaboration +++ b/.collaboration @@ -9,47 +9,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5723876+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5723997+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5724013+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -74,16 +44,7 @@ }, { "ModuleName": "Table/项目动态", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T19:11:00.5227274+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目动态.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目岗位", @@ -91,16 +52,7 @@ }, { "ModuleName": "Table/项目版本", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T18:31:17.065001+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目版本.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目预算变动表", @@ -236,137 +188,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5724094+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5724133+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5724153+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5724175+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5724192+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.572421+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5724236+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.572427+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5724287+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -407,17 +269,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.572432+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -742,19 +594,7 @@ }, { "ModuleName": "PCPage/项目版本管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T18:22:45.5554699+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.rd", - "Pages\\97bdc47834844e0d8f3a5aef747785e.json", - "Pages\\97bdc47834844e0d8f3a5aef747785e.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本配置", @@ -762,17 +602,7 @@ }, { "ModuleName": "PCPage/任务版本详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T18:22:45.5553166+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", @@ -856,17 +686,7 @@ }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T18:22:45.5558355+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-任务信息.json", - "Pages\\任务\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -894,17 +714,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T18:22:45.5556827+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -1056,17 +866,7 @@ }, { "ModuleName": "PCPage/工时总览", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:59:05.1939829+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\工时总览.json", - "Pages\\工时\\工时总览.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务工时统计", @@ -1078,17 +878,7 @@ }, { "ModuleName": "PCPage/个人工时首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:59:53.1836039+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\个人工时首页.json", - "Pages\\工时\\个人工时首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/个人中心", @@ -1152,19 +942,7 @@ }, { "ModuleName": "PCPage/首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T17:08:07.5099304+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\首页\\首页.json", - "Pages\\首页\\首页.rd", - "Pages\\2d17eefef7c5473fbc54f0c5820a6c1.json", - "Pages\\2d17eefef7c5473fbc54f0c5820a6c1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/AI欢迎页", @@ -1176,17 +954,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T17:08:07.5097102+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1366,16 +1134,7 @@ }, { "ModuleName": "ServerCommand/AI报工数据转日报", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T17:03:36.4568597+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\AI报工数据转日报.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/AI内容转报工数据", @@ -1439,17 +1198,7 @@ }, { "ModuleName": "ApplicationSetting", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T17:03:36.4566591+08:00", - "ModuleType": 8, - "ToRemoveFiles": [ - "ApplicationSettings.json", - "favicon.ico" - ] + "ModuleType": 8 }, { "ModuleName": "Theme", @@ -1797,19 +1546,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T17:30:12.4483687+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -1821,75 +1558,15 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5728476+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\86eb9c3b-133d-4cb0-ba1b-06aa7189f6b7_Animation - 1718097457056.json", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T17:01:08.8801986+08:00", - "ModuleType": 39, - "ToRemoveFiles": [ - "PublishSettingsConfig.json" - ] + "ModuleType": 39 }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T19:51:37.6209357+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\\LottiePlayer.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\加载动画-10_0_2_0.zip", - "Plugin\\发送HTTP请求命令-10_0_2_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\\甘特图-10_0_2_0.zip", - "Plugin\\用户管理命令 V2-10_0_2_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\表格报表-10_0_3_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1957,29 +1634,7 @@ }, { "ModuleName": "ServerCommandPrivate/请求令牌", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T18:17:41.3046507+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\请求令牌.json" - ] - }, - { - "ModuleName": "ServerCommandPrivate/创建一个仓库WebHook", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T19:03:37.7647311+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\创建一个仓库WebHook.json" - ] + "ModuleType": 27 }, { "ModuleName": "Pages/系统", @@ -1991,29 +1646,11 @@ }, { "ModuleName": "ServerCommandPrivate/删除一个仓库WebHook", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:31:40.5603546+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\删除一个仓库WebHook.json" - ] + "ModuleType": 27 }, { "ModuleName": "Table/Git仓库表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:38:10.8697819+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\Git\\Git仓库表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/Git_WebHook", @@ -2025,16 +1662,7 @@ }, { "ModuleName": "ServerCommand/GitCallback", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:36:39.1553383+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\GitCallback.json" - ] + "ModuleType": 15 }, { "ModuleName": "Table/日志表", @@ -2042,32 +1670,11 @@ }, { "ModuleName": "Table/Git_事件记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:35:42.5724358+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\Git\\Git_事件记录.json" - ] + "ModuleType": 7 }, { "ModuleName": "PCPage/选择Git仓库", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T18:08:30.6608165+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\Git\\选择Git仓库.json", - "Pages\\Git\\选择Git仓库.rd", - "Pages\\4347ba70d904424d852fada4b0f0b0a.json", - "Pages\\4347ba70d904424d852fada4b0f0b0a.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/Git", @@ -2075,16 +1682,7 @@ }, { "ModuleName": "ServerCommand/同步一个仓库到表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:20:11.7162188+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\同步一个仓库到表.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/搜索仓库列表", @@ -2092,75 +1690,30 @@ }, { "ModuleName": "ServerCommand/搜索仓库", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:33:39.176116+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\搜索仓库.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/列出仓库的WebHooks", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T16:39:36.2331453+08:00", "ModuleType": 27 }, { "ModuleName": "TaskScheduler/应用部署时", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T17:04:40.296414+08:00", "ModuleType": 16 }, { "ModuleName": "ServerCommands/系统", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T17:07:09.5736756+08:00", "ModuleType": 20 }, { "ModuleName": "ServerCommand/获取版本号", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T17:07:28.3833029+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/列出授权用户所有的Namespace", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T18:08:30.6604619+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/创建一个仓库WebHook", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-13T19:03:37.7647975+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/ApplicationSettings.json b/ApplicationSettings.json index ecbc517e..63c4a067 100644 --- a/ApplicationSettings.json +++ b/ApplicationSettings.json @@ -6,12 +6,16 @@ "ListviewLoadingIndicatorSettings": {}, "GlobalProperties": [ { - "Name": "全局配置", + "Name": "全局_业务配置", + "Value": "{\"版本号\":\"1.0.0\"}" + }, + { + "Name": "全局_AI配置", "Value": "{\"AI提示词1\": \"我将发给你一个记录着某人一天工作内容的数据，为JSON字符串，请你尝试解读它，内容中的[汇报类型]分为`日报`和`计划`。\\n- 日报指的是昨日工作内容的总结；\\n- 计划指的是今日计划工作安排；\\n请你使用为我生成HTML格式的汇报内容，对于日报结构和要求如下：\\n标题为固定格式：YYYY年MM年DD月-某某工作日报\\n内容包含两个主题：昨日工作总结、今日工作计划\\n每个主题下的内容从JSON中总结，可以适当润色，但不可过度偏离源数据中的工作内容,所用工时在内容后面用括号备注，如：(1h)；\"}" }, { "Name": "全局_Gitee", - "Value": "{\"enterprise\":\"GridStudio\",\"client_id\":\"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\"client_secret\":\"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\"}" + "Value": "{\"client_id\":\"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\"client_secret\":\"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\",\"回调地址\":\"https://develop.gridfriend.cn/sims/ServerCommand/GitCallback\"}" } ], "WebSitePort": 26489, diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 9665f99b..d4abd2c3 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index e15beae5..b6842431 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -60,18 +60,6 @@ "DesignLengthInPixel": 176.0 } }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 230.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 230.0, @@ -110,25 +98,43 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 190.0 + "DesignLengthInPixel": 230.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 190.0 + } + }, + "7": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 118.0 + } } }, - "Count": 7, + "Count": 8, "DefaultSize": 230.0 }, "Values": { "1,0": "TeamAction", + "1,1": "1.0.0.0", "5,0": "%CurrentUser.UserName%", - "5,1": "%CurrentUser.FullName%" + "5,2": "%CurrentUser.FullName%" }, "Formulas": { - "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(F2),\"null\",\"'\"&F2&\"'\")&\" and 类型 ne '抄送'\")" + "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(G2),\"null\",\"'\"&G2&\"'\")&\" and 类型 ne '抄送'\")" }, "AttachInfos": { "1,0": { @@ -142,7 +148,7 @@ "IconSize": 22.0 } }, - "1,1": { + "1,2": { "CssName": "pms-menu-row", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", @@ -413,7 +419,7 @@ ] } }, - "1,5": { + "1,6": { "CellType": { "$type": "Forguncy.CurrentUserCellType, ServerDesignerCommon", "CellCustomValue": "%CurrentUser%", @@ -438,26 +444,36 @@ "Foreground": 3, "HorizontalAlignment": 4 }, + { + "FontSize": 13.333333333333332, + "Foreground": 3, + "Formatter": 5, + "HorizontalAlignment": 4 + }, { "FontSize": 13.333333333333332 }, { - "FontFamily": 5, + "FontFamily": 6, "FontSize": 13.333333333333332, - "Foreground": 6, - "HorizontalAlignment": 7, + "Foreground": 7, + "HorizontalAlignment": 8, "BorderBottom": null, "BorderTop": null, "BorderLeft": null, "BorderRight": null }, { - "Background": 6 + "FontSize": 12.0, + "Foreground": 7 }, { - "Background": 8, + "Background": 7 + }, + { + "Background": 9, "FontSize": 13.333333333333332, - "Foreground": 9, + "Foreground": 10, "HorizontalAlignment": 4 } ], @@ -468,6 +484,7 @@ "Normal", "Background 2 0", "Center", + "\"v\"@", "Body", "Background 1 0", "Right", @@ -478,15 +495,17 @@ "CellStyles": { "1,0": 0, "1,1": 1, - "1,5": 2, - "3,0": 3 + "1,2": 2, + "1,6": 3, + "2,1": 4, + "3,0": 5 }, "RowStyles": { - "5": 4, - "6": 4 + "5": 6, + "6": 6 }, "SheetStyle": { - "FontFamily": 5, + "FontFamily": 6, "BorderBottom": null, "BorderTop": null, "BorderLeft": null, @@ -494,8 +513,8 @@ } }, "Spans": [ - "1,1,1,4", - "3,0,2,7" + "1,2,1,4", + "3,0,2,8" ], "PageInfo": { "$type": "Forguncy.Model.Pages.MasterPage, ServerDesignerCommon", @@ -910,6 +929,26 @@ "cssAnimation": true, "rtl": false } + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "获取版本号", + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "版本号", + "ResultTo": { + "SerializeProperty": "=FGC_母版页!当前版本号" + } + } + ], + "RequestAsync": true, + "CheckDataValidation": false } ], "IsBuiltInPage": true @@ -929,7 +968,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Size": "1318,46", + "Size": "1436,46", "BoxShadowString": "0 2 0 5 #175D7183" } ], @@ -944,7 +983,11 @@ }, { "Name": "母版_当前用户姓名", - "Formula": "FGC_母版页!$B$6" + "Formula": "FGC_母版页!$C$6" + }, + { + "Name": "当前版本号", + "Formula": "FGC_母版页!$B$2" } ] -}//2Z1/uoPhJAYGzVNKINO+9ogYhEVcFcB6gYF2jPn41Sl3If1ja6iEoExc6XFF3RmUbvgNMqgYyCkeXpeESCAn6ivill/oavPvEWIf0DHiaAbbuGP7fs9PjceTE1IQOfIvMOA1/rRzdT4+JdweqPG56/a6vFi9JkgbWInl5TjfqIs/tKwQ/suvcUsborWoVmUWNYvqybVQXeGblBpY2DH/WhqTBfnHhFgl9QlOPLkBzAvRQx+SSqRm4KN7WTTLoCV3+4bMJfZAngQOjhKGejEMu2FKhU1F1ieqp05M8/fR+NrlNYTKMpsyqRMfv1zdsowIuc03vQJtVEb9oMfNz464Df9dRvZlf6XHvwDNJzzL1xObhfGqo+G9P8zZCiWX6S2a5QICM9m/+EEW80gqHFXZkvlod0kHLdx6QQpkUUdw+MWNpZwIt/CwOImLJ7LON0QRi34kdlJx71c50BS2mF1NMIkYD4Xv27ev+U04MjGbW9fDZQ2lL1uP1fSiSsueK65EWzc25WZA0moIgg0W+k6bMo/cpY4uEj/YPdVlwidFmisqrGfwMoikKJo6y4vu8XPhBBOG/a5zjPFVBeagpIoezcUXe7XYtm39enFwRX+VTVbTNJQErMYoPEGt6fJTNdmMto/LEB1bUkVqN3tx4WDd7TsMcKXIertRn02t3tS4JKDVcbWM3QTqrh7EVG9NwGPbHVrTm6NaRKxCAK8tRnh5uzISKrmHERTsizb57LHPC/KmqpfwTXZBtuq777ZnO3Q4IeV8eKuTROCySbizeaqf6ozZDzIbWAMZ6J86NQIpDKj5TGH9wOcLBKAugbe7CxQGObApSqGOZJtmQSINJc3450bnt2s+nyYQYdqeOvtR7Ct283dhdzw6aUDv2py6EBW2Mr8Vr9djB8wXbfs0yfcmOg==|920 \ No newline at end of file +}//DqAOLa72l5lm7r5D78FCz4o3r9ferJ2byytTjh4e5CoQkB6u55qoqk0ONnO6UaWD2iN+wblAcyqFC+gNgCvH+4GZkypPXpFwZy6ZAF2YrneV7xIRIyBE7fXWhzlVYAylBfJZmZaaietJN3du4NkuFPOfV97gtNGWc1zNbbf+9ucWw6pa/LVtK+JRYmDmZ8UE+l9umaq+OxA/7WoVdFmPd1hcpGSwe4Xq8y9AFg3TjJ1r4uH0ML2S8qqZgwq7u7jdOFe1m2GFgbfJ4/HBsCexIf8D/p+/wkUrB9PyOOEUfQ0YFTfa30+IeqVBFmSUwbkd9ExIS7FZtPHVXmapeWL2YrB+sgGS6evSZtjaZ4s6FN/8f+8G8JdJk0DM27LCEEHIoxUZRlkSWUkL2CxbuNSdcFPjgQdgn/n2MMPB6QnF+1emTTVrYn2zAmj1r8sNmcBQzHXEwbECNrJboj8QGzhuWn+OE8w3G0JqiOZeiQeud11ZzafKm7KMbc9MBWc4e34ibBWLPcK88Ku4e9Q5IvoWFdun5qlJ2W4cVDXrSkxDoadob5/dqizpPLjHizhzJsOE8wk5i/rpD1PO/rQiRALQhXifvKDzCUTCYPHm3EbNFKCYjy9/M6JyNBwGM6v3tZmS/w18DBO+Rbd/7t2Ss7pegVsFzn3Eq0u5aEiGVM4Be9YgKL9Z6jGrWGpX417QFb7VrFSL8WFLLl3ADv21M8jWpL4qivhVrpfD4WYcOKPu1fR9/8yEAfUFwH3+Fbs3wfsSWAqh+zlDWb/jCPNbmT3svLCC7GrBQ0f3Eq3coTw0PuTmSnj93xElTmKAtuU7SR23G0Py19/2CRsK18Ilc7p5HKHzWzcfvreTOf1c+gl/k0zxrax6BKZIKm8s1fHnkFoV08HhwxaxwTDrtxTQ0qqm7w==|920 \ No newline at end of file diff --git a/MasterPages/FGC_母版页.rd b/MasterPages/FGC_母版页.rd index 5dc649a8..cdc02a74 100644 --- a/MasterPages/FGC_母版页.rd +++ b/MasterPages/FGC_母版页.rd @@ -1,9 +1,9 @@ { "PageType": 1, - "ColumnCount": 7, + "ColumnCount": 8, "RowCount": 7, "Formulas": { - "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(F2),\"null\",\"'\"&F2&\"'\")&\" and 类型 ne '抄送'\")" + "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=负责人 eq \"&IF(ISBLANK(G2),\"null\",\"'\"&G2&\"'\")&\" and 类型 ne '抄送'\")" }, "CustomNames": [ { @@ -16,7 +16,11 @@ }, { "Name": "母版_当前用户姓名", - "Formula": "FGC_母版页!$B$6" + "Formula": "FGC_母版页!$C$6" + }, + { + "Name": "当前版本号", + "Formula": "FGC_母版页!$B$2" } ] } \ No newline at end of file diff --git a/Pages/Git/选择Git仓库.json b/Pages/Git/选择Git仓库.json index e79d800f..73ebd766 100644 --- a/Pages/Git/选择Git仓库.json +++ b/Pages/Git/选择Git仓库.json @@ -301,7 +301,6 @@ "DefaultSize": 32.0 }, "Values": { - "1,29": "企业", "1,36": "确认选择", "26,5": "加载", "26,9": 1, @@ -373,73 +372,6 @@ "clearable": true } }, - "1,29": { - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!当前页码" - }, - "Value": "1" - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!每页显示行数" - }, - "Value": "12" - } - ] - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!F27" - }, - "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" - } - ], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "DefaultValue": "企业", - "options": [ - { - "value": "个人", - "label": "个人" - }, - { - "value": "企业", - "label": "企业" - } - ], - "placeholder": "请选择", - "noDataText": "无数据", - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据" - } - }, "1,36": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", @@ -605,44 +537,46 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择Git仓库!msg" + } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!选择仓库ID" - }, + "Name": "仓库ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=选择Git仓库!选择行.仓库ID" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], - "ID": "c53855e5-b3e3-49df-a381-dc52e67794a7" + "ID": "ff50d34c-ca9c-4f9a-b724-ff89d05c1e6e" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=选择Git仓库!msg" - } + }, + "BtnText": "知道了" } ], - "ID": "b0528c9c-b5fa-4358-bde6-e9e718e3bcd4" + "ID": "e97517bc-77c2-4718-82b9-8b762b757e1b" } ] } ], - "ID": "6225c176-d9dd-4057-9faf-0a0a70eeecbd" + "ID": "bf2f00e8-bbc9-4d3e-bd0e-9f8b80990639" }, { "CommandList": [ @@ -652,7 +586,7 @@ "Message": "请选择一个仓库" } ], - "ID": "3164910c-9f12-4edf-b743-8f077f0d4484" + "ID": "bc65bb2b-a974-4629-b1a7-94784b6239d1" } ] } @@ -884,7 +818,6 @@ "total": "总行数" } }, - "ListviewName": "仓库虚拟表格", "pageSize": 12, "pagerCount": 7, "layout": [ @@ -988,14 +921,6 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=选择Git仓库!每页显示行数" } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "类型", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择Git仓库!AD2" - } } ], "ResultErrorCodeTo": { @@ -1010,6 +935,9 @@ "ResultTo": { "SerializeProperty": "仓库列表" } + }, + { + "ResultPropertyName": "总行数" } ], "RefreshAfterFinish": true, @@ -1084,7 +1012,7 @@ "SampleJson": "[\r\n {\r\n \"ID\": 28499535,\r\n \"空间路径名\": \"GridStudio\",\r\n \"空间名称\": \"罗田县格友软件开发工作室\",\r\n \"仓库路径名\": \"lodop-plugin-application-demo\",\r\n \"仓库名称\": \"LODOP插件应用DEMO\",\r\n \"仓库地址\": \"https://gitee.com/GridStudio/lodop-plugin-application-demo.git\",\r\n \"仓库描述\": \"活字格前端插件\",\r\n \"仓库成员\": \"cuckooent\",\r\n \"创建人\": \"超哥\",\r\n \"创建人头像\": \"https://foruda.gitee.com/avatar/1677043949039184563/5267986_cuckooent_1646218684.png\"\r\n }\r\n]\r\n" } ], - "ID": "897206ce-5cde-422f-ad5c-806e43e4de29" + "ID": "a2982c61-9850-4d6d-bf78-6c0108cc7812" }, { "CommandList": [ @@ -1099,7 +1027,7 @@ "BtnText": "知道了" } ], - "ID": "c77a3d67-ce96-4a18-82ea-a575b70f5ac1" + "ID": "098f4f45-25a9-4e7c-ae37-b731e9d634c6" } ] }, @@ -1120,9 +1048,6 @@ }, "StyleDatas": { "Styles": [ - { - "FontSize": 13.333333333333332 - }, { "FontFamily": 0, "Formatter": 1 @@ -1143,462 +1068,461 @@ ] }, "CellStyles": { - "1,29": 0, - "1,36": 1, - "1,37": 2, - "1,38": 2, - "1,39": 2, - "3,1": 3, - "3,2": 2, - "3,3": 2, - "3,4": 2, - "3,5": 2, - "3,6": 2, - "3,7": 2, - "3,8": 2, - "3,9": 2, - "3,10": 2, - "3,11": 2, - "3,12": 2, - "3,13": 2, - "3,14": 2, - "3,15": 2, - "3,16": 2, - "3,17": 2, - "3,18": 2, - "3,19": 2, - "3,20": 2, - "3,21": 2, - "3,22": 2, - "3,23": 2, - "3,24": 2, - "3,25": 2, - "3,26": 2, - "3,27": 2, - "3,28": 2, - "3,29": 2, - "3,30": 2, - "3,31": 2, - "3,32": 2, - "3,33": 2, - "3,34": 2, - "3,35": 2, - "3,36": 2, - "3,37": 2, - "3,38": 2, - "3,39": 2, - "4,1": 2, - "4,2": 2, - "4,3": 2, - "4,4": 2, - "4,5": 2, - "4,6": 2, - "4,7": 2, - "4,8": 2, - "4,9": 2, - "4,10": 2, - "4,11": 2, - "4,12": 2, - "4,13": 2, - "4,14": 2, - "4,15": 2, - "4,16": 2, - "4,17": 2, - "4,18": 2, - "4,19": 2, - "4,20": 2, - "4,21": 2, - "4,22": 2, - "4,23": 2, - "4,24": 2, - "4,25": 2, - "4,26": 2, - "4,27": 2, - "4,28": 2, - "4,29": 2, - "4,30": 2, - "4,31": 2, - "4,32": 2, - "4,33": 2, - "4,34": 2, - "4,35": 2, - "4,36": 2, - "4,37": 2, - "4,38": 2, - "4,39": 2, - "16,1": 2, - "16,2": 2, - "16,3": 2, - "16,4": 2, - "16,5": 2, - "16,6": 2, - "16,7": 2, - "16,8": 2, - "16,9": 2, - "16,10": 2, - "16,11": 2, - "16,12": 2, - "16,13": 2, - "16,14": 2, - "16,15": 2, - "16,16": 2, - "16,17": 2, - "16,18": 2, - "16,19": 2, - "16,20": 2, - "16,21": 2, - "16,22": 2, - "16,23": 2, - "16,24": 2, - "16,25": 2, - "16,26": 2, - "16,27": 2, - "16,28": 2, - "16,29": 2, - "16,30": 2, - "16,31": 2, - "16,32": 2, - "16,33": 2, - "16,34": 2, - "16,35": 2, - "16,36": 2, - "16,37": 2, - "16,38": 2, - "16,39": 2, - "17,1": 2, - "17,2": 2, - "17,3": 2, - "17,4": 2, - "17,5": 2, - "17,6": 2, - "17,7": 2, - "17,8": 2, - "17,9": 2, - "17,10": 2, - "17,11": 2, - "17,12": 2, - "17,13": 2, - "17,14": 2, - "17,15": 2, - "17,16": 2, - "17,17": 2, - "17,18": 2, - "17,19": 2, - "17,20": 2, - "17,21": 2, - "17,22": 2, - "17,23": 2, - "17,24": 2, - "17,25": 2, - "17,26": 2, - "17,27": 2, - "17,28": 2, - "17,29": 2, - "17,30": 2, - "17,31": 2, - "17,32": 2, - "17,33": 2, - "17,34": 2, - "17,35": 2, - "17,36": 2, - "17,37": 2, - "17,38": 2, - "17,39": 2, - "18,1": 2, - "18,2": 2, - "18,3": 2, - "18,4": 2, - "18,5": 2, - "18,6": 2, - "18,7": 2, - "18,8": 2, - "18,9": 2, - "18,10": 2, - "18,11": 2, - "18,12": 2, - "18,13": 2, - "18,14": 2, - "18,15": 2, - "18,16": 2, - "18,17": 2, - "18,18": 2, - "18,19": 2, - "18,20": 2, - "18,21": 2, - "18,22": 2, - "18,23": 2, - "18,24": 2, - "18,25": 2, - "18,26": 2, - "18,27": 2, - "18,28": 2, - "18,29": 2, - "18,30": 2, - "18,31": 2, - "18,32": 2, - "18,33": 2, - "18,34": 2, - "18,35": 2, - "18,36": 2, - "18,37": 2, - "18,38": 2, - "18,39": 2, - "19,1": 2, - "19,2": 2, - "19,3": 2, - "19,4": 2, - "19,5": 2, - "19,6": 2, - "19,7": 2, - "19,8": 2, - "19,9": 2, - "19,10": 2, - "19,11": 2, - "19,12": 2, - "19,13": 2, - "19,14": 2, - "19,15": 2, - "19,16": 2, - "19,17": 2, - "19,18": 2, - "19,19": 2, - "19,20": 2, - "19,21": 2, - "19,22": 2, - "19,23": 2, - "19,24": 2, - "19,25": 2, - "19,26": 2, - "19,27": 2, - "19,28": 2, - "19,29": 2, - "19,30": 2, - "19,31": 2, - "19,32": 2, - "19,33": 2, - "19,34": 2, - "19,35": 2, - "19,36": 2, - "19,37": 2, - "19,38": 2, - "19,39": 2, - "20,1": 2, - "20,2": 2, - "20,3": 2, - "20,4": 2, - "20,5": 2, - "20,6": 2, - "20,7": 2, - "20,8": 2, - "20,9": 2, - "20,10": 2, - "20,11": 2, - "20,12": 2, - "20,13": 2, - "20,14": 2, - "20,15": 2, - "20,16": 2, - "20,17": 2, - "20,18": 2, - "20,19": 2, - "20,20": 2, - "20,21": 2, - "20,22": 2, - "20,23": 2, - "20,24": 2, - "20,25": 2, - "20,26": 2, - "20,27": 2, - "20,28": 2, - "20,29": 2, - "20,30": 2, - "20,31": 2, - "20,32": 2, - "20,33": 2, - "20,34": 2, - "20,35": 2, - "20,36": 2, - "20,37": 2, - "20,38": 2, - "20,39": 2, - "21,1": 2, - "21,2": 2, - "21,3": 2, - "21,4": 2, - "21,5": 2, - "21,6": 2, - "21,7": 2, - "21,8": 2, - "21,9": 2, - "21,10": 2, - "21,11": 2, - "21,12": 2, - "21,13": 2, - "21,14": 2, - "21,15": 2, - "21,16": 2, - "21,17": 2, - "21,18": 2, - "21,19": 2, - "21,20": 2, - "21,21": 2, - "21,22": 2, - "21,23": 2, - "21,24": 2, - "21,25": 2, - "21,26": 2, - "21,27": 2, - "21,28": 2, - "21,29": 2, - "21,30": 2, - "21,31": 2, - "21,32": 2, - "21,33": 2, - "21,34": 2, - "21,35": 2, - "21,36": 2, - "21,37": 2, - "21,38": 2, - "21,39": 2, - "22,1": 2, - "22,2": 2, - "22,3": 2, - "22,4": 2, - "22,5": 2, - "22,6": 2, - "22,7": 2, - "22,8": 2, - "22,9": 2, - "22,10": 2, - "22,11": 2, - "22,12": 2, - "22,13": 2, - "22,14": 2, - "22,15": 2, - "22,16": 2, - "22,17": 2, - "22,18": 2, - "22,19": 2, - "22,20": 2, - "22,21": 2, - "22,22": 2, - "22,23": 2, - "22,24": 2, - "22,25": 2, - "22,26": 2, - "22,27": 2, - "22,28": 2, - "22,29": 2, - "22,30": 2, - "22,31": 2, - "22,32": 2, - "22,33": 2, - "22,34": 2, - "22,35": 2, - "22,36": 2, - "22,37": 2, - "22,38": 2, - "22,39": 2, - "23,1": 2, - "23,2": 2, - "23,3": 2, - "23,4": 2, - "23,5": 2, - "23,6": 2, - "23,7": 2, - "23,8": 2, - "23,9": 2, - "23,10": 2, - "23,11": 2, - "23,12": 2, - "23,13": 2, - "23,14": 2, - "23,15": 2, - "23,16": 2, - "23,17": 2, - "23,18": 2, - "23,19": 2, - "23,20": 2, - "23,21": 2, - "23,22": 2, - "23,23": 2, - "23,24": 2, - "23,25": 2, - "23,26": 2, - "23,27": 2, - "23,28": 2, - "23,29": 2, - "23,30": 2, - "23,31": 2, - "23,32": 2, - "23,33": 2, - "23,34": 2, - "23,35": 2, - "23,36": 2, - "23,37": 2, - "23,38": 2, - "23,39": 2, - "24,1": 3, - "25,1": 3, - "25,2": 3, - "25,3": 3, - "25,4": 3, - "25,5": 3, - "25,6": 3, - "25,7": 3, - "25,8": 3, - "25,9": 3, - "25,10": 3, - "25,11": 3, - "25,12": 3, - "25,13": 3, - "25,14": 3, - "25,15": 3, - "25,16": 3, - "25,17": 3, - "25,18": 3, - "25,19": 3, - "25,20": 3, - "25,21": 3, - "25,22": 3, - "25,23": 3, - "25,24": 3, - "25,25": 3, - "25,26": 3, - "25,27": 3, - "25,28": 3, - "25,29": 3, - "25,30": 3, - "25,31": 3, - "25,32": 3, - "25,33": 3, - "25,34": 3, - "25,35": 3, - "25,36": 3, - "25,37": 3, - "25,38": 3, - "25,39": 3, - "26,1": 3, - "26,5": 3, - "26,9": 3, - "26,13": 3, - "26,17": 3, - "26,21": 3, - "26,25": 3, - "26,26": 3, - "26,27": 3, - "26,28": 3, - "26,29": 3, - "26,30": 3, - "26,31": 3, - "26,32": 3, - "26,33": 3, - "26,34": 3, - "26,35": 3, - "26,36": 3, - "26,37": 3, - "26,38": 3, - "26,39": 3 + "1,36": 0, + "1,37": 1, + "1,38": 1, + "1,39": 1, + "3,1": 2, + "3,2": 1, + "3,3": 1, + "3,4": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,9": 1, + "3,10": 1, + "3,11": 1, + "3,12": 1, + "3,13": 1, + "3,14": 1, + "3,15": 1, + "3,16": 1, + "3,17": 1, + "3,18": 1, + "3,19": 1, + "3,20": 1, + "3,21": 1, + "3,22": 1, + "3,23": 1, + "3,24": 1, + "3,25": 1, + "3,26": 1, + "3,27": 1, + "3,28": 1, + "3,29": 1, + "3,30": 1, + "3,31": 1, + "3,32": 1, + "3,33": 1, + "3,34": 1, + "3,35": 1, + "3,36": 1, + "3,37": 1, + "3,38": 1, + "3,39": 1, + "4,1": 1, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,9": 1, + "4,10": 1, + "4,11": 1, + "4,12": 1, + "4,13": 1, + "4,14": 1, + "4,15": 1, + "4,16": 1, + "4,17": 1, + "4,18": 1, + "4,19": 1, + "4,20": 1, + "4,21": 1, + "4,22": 1, + "4,23": 1, + "4,24": 1, + "4,25": 1, + "4,26": 1, + "4,27": 1, + "4,28": 1, + "4,29": 1, + "4,30": 1, + "4,31": 1, + "4,32": 1, + "4,33": 1, + "4,34": 1, + "4,35": 1, + "4,36": 1, + "4,37": 1, + "4,38": 1, + "4,39": 1, + "16,1": 1, + "16,2": 1, + "16,3": 1, + "16,4": 1, + "16,5": 1, + "16,6": 1, + "16,7": 1, + "16,8": 1, + "16,9": 1, + "16,10": 1, + "16,11": 1, + "16,12": 1, + "16,13": 1, + "16,14": 1, + "16,15": 1, + "16,16": 1, + "16,17": 1, + "16,18": 1, + "16,19": 1, + "16,20": 1, + "16,21": 1, + "16,22": 1, + "16,23": 1, + "16,24": 1, + "16,25": 1, + "16,26": 1, + "16,27": 1, + "16,28": 1, + "16,29": 1, + "16,30": 1, + "16,31": 1, + "16,32": 1, + "16,33": 1, + "16,34": 1, + "16,35": 1, + "16,36": 1, + "16,37": 1, + "16,38": 1, + "16,39": 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": 1, + "17,19": 1, + "17,20": 1, + "17,21": 1, + "17,22": 1, + "17,23": 1, + "17,24": 1, + "17,25": 1, + "17,26": 1, + "17,27": 1, + "17,28": 1, + "17,29": 1, + "17,30": 1, + "17,31": 1, + "17,32": 1, + "17,33": 1, + "17,34": 1, + "17,35": 1, + "17,36": 1, + "17,37": 1, + "17,38": 1, + "17,39": 1, + "18,1": 1, + "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": 1, + "18,19": 1, + "18,20": 1, + "18,21": 1, + "18,22": 1, + "18,23": 1, + "18,24": 1, + "18,25": 1, + "18,26": 1, + "18,27": 1, + "18,28": 1, + "18,29": 1, + "18,30": 1, + "18,31": 1, + "18,32": 1, + "18,33": 1, + "18,34": 1, + "18,35": 1, + "18,36": 1, + "18,37": 1, + "18,38": 1, + "18,39": 1, + "19,1": 1, + "19,2": 1, + "19,3": 1, + "19,4": 1, + "19,5": 1, + "19,6": 1, + "19,7": 1, + "19,8": 1, + "19,9": 1, + "19,10": 1, + "19,11": 1, + "19,12": 1, + "19,13": 1, + "19,14": 1, + "19,15": 1, + "19,16": 1, + "19,17": 1, + "19,18": 1, + "19,19": 1, + "19,20": 1, + "19,21": 1, + "19,22": 1, + "19,23": 1, + "19,24": 1, + "19,25": 1, + "19,26": 1, + "19,27": 1, + "19,28": 1, + "19,29": 1, + "19,30": 1, + "19,31": 1, + "19,32": 1, + "19,33": 1, + "19,34": 1, + "19,35": 1, + "19,36": 1, + "19,37": 1, + "19,38": 1, + "19,39": 1, + "20,1": 1, + "20,2": 1, + "20,3": 1, + "20,4": 1, + "20,5": 1, + "20,6": 1, + "20,7": 1, + "20,8": 1, + "20,9": 1, + "20,10": 1, + "20,11": 1, + "20,12": 1, + "20,13": 1, + "20,14": 1, + "20,15": 1, + "20,16": 1, + "20,17": 1, + "20,18": 1, + "20,19": 1, + "20,20": 1, + "20,21": 1, + "20,22": 1, + "20,23": 1, + "20,24": 1, + "20,25": 1, + "20,26": 1, + "20,27": 1, + "20,28": 1, + "20,29": 1, + "20,30": 1, + "20,31": 1, + "20,32": 1, + "20,33": 1, + "20,34": 1, + "20,35": 1, + "20,36": 1, + "20,37": 1, + "20,38": 1, + "20,39": 1, + "21,1": 1, + "21,2": 1, + "21,3": 1, + "21,4": 1, + "21,5": 1, + "21,6": 1, + "21,7": 1, + "21,8": 1, + "21,9": 1, + "21,10": 1, + "21,11": 1, + "21,12": 1, + "21,13": 1, + "21,14": 1, + "21,15": 1, + "21,16": 1, + "21,17": 1, + "21,18": 1, + "21,19": 1, + "21,20": 1, + "21,21": 1, + "21,22": 1, + "21,23": 1, + "21,24": 1, + "21,25": 1, + "21,26": 1, + "21,27": 1, + "21,28": 1, + "21,29": 1, + "21,30": 1, + "21,31": 1, + "21,32": 1, + "21,33": 1, + "21,34": 1, + "21,35": 1, + "21,36": 1, + "21,37": 1, + "21,38": 1, + "21,39": 1, + "22,1": 1, + "22,2": 1, + "22,3": 1, + "22,4": 1, + "22,5": 1, + "22,6": 1, + "22,7": 1, + "22,8": 1, + "22,9": 1, + "22,10": 1, + "22,11": 1, + "22,12": 1, + "22,13": 1, + "22,14": 1, + "22,15": 1, + "22,16": 1, + "22,17": 1, + "22,18": 1, + "22,19": 1, + "22,20": 1, + "22,21": 1, + "22,22": 1, + "22,23": 1, + "22,24": 1, + "22,25": 1, + "22,26": 1, + "22,27": 1, + "22,28": 1, + "22,29": 1, + "22,30": 1, + "22,31": 1, + "22,32": 1, + "22,33": 1, + "22,34": 1, + "22,35": 1, + "22,36": 1, + "22,37": 1, + "22,38": 1, + "22,39": 1, + "23,1": 1, + "23,2": 1, + "23,3": 1, + "23,4": 1, + "23,5": 1, + "23,6": 1, + "23,7": 1, + "23,8": 1, + "23,9": 1, + "23,10": 1, + "23,11": 1, + "23,12": 1, + "23,13": 1, + "23,14": 1, + "23,15": 1, + "23,16": 1, + "23,17": 1, + "23,18": 1, + "23,19": 1, + "23,20": 1, + "23,21": 1, + "23,22": 1, + "23,23": 1, + "23,24": 1, + "23,25": 1, + "23,26": 1, + "23,27": 1, + "23,28": 1, + "23,29": 1, + "23,30": 1, + "23,31": 1, + "23,32": 1, + "23,33": 1, + "23,34": 1, + "23,35": 1, + "23,36": 1, + "23,37": 1, + "23,38": 1, + "23,39": 1, + "24,1": 2, + "25,1": 2, + "25,2": 2, + "25,3": 2, + "25,4": 2, + "25,5": 2, + "25,6": 2, + "25,7": 2, + "25,8": 2, + "25,9": 2, + "25,10": 2, + "25,11": 2, + "25,12": 2, + "25,13": 2, + "25,14": 2, + "25,15": 2, + "25,16": 2, + "25,17": 2, + "25,18": 2, + "25,19": 2, + "25,20": 2, + "25,21": 2, + "25,22": 2, + "25,23": 2, + "25,24": 2, + "25,25": 2, + "25,26": 2, + "25,27": 2, + "25,28": 2, + "25,29": 2, + "25,30": 2, + "25,31": 2, + "25,32": 2, + "25,33": 2, + "25,34": 2, + "25,35": 2, + "25,36": 2, + "25,37": 2, + "25,38": 2, + "25,39": 2, + "26,1": 2, + "26,5": 2, + "26,9": 2, + "26,13": 2, + "26,17": 2, + "26,21": 2, + "26,25": 2, + "26,26": 2, + "26,27": 2, + "26,28": 2, + "26,29": 2, + "26,30": 2, + "26,31": 2, + "26,32": 2, + "26,33": 2, + "26,34": 2, + "26,35": 2, + "26,36": 2, + "26,37": 2, + "26,38": 2, + "26,39": 2 }, "SheetStyle": { "FontFamily": 0 @@ -1607,15 +1531,11 @@ "Spans": [ "3,1,21,39", "24,1,1,39", - "26,1,1,4", "1,36,1,4", "26,9,1,4", "26,13,1,4", - "26,17,1,4", - "26,21,1,4", "26,5,1,4", - "1,1,1,27", - "1,29,1,6" + "1,1,1,34" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1652,10 +1572,6 @@ "Margin": {} }, "CustomNames": [ - { - "Name": "选择仓库ID", - "Formula": "选择Git仓库!$B$27" - }, { "Name": "当前页码", "Formula": "选择Git仓库!$J$27" @@ -1673,4 +1589,4 @@ "Formula": "选择Git仓库!$B$2" } ] -}//HeaY0i6k95vHnAZ+cyQWKcu++j7cBE2DFjd10U1HCRduTKYYy30rNUwOi6aZEmeofweOir15YhA/qOF9NXx3f4k9WbO+fwmO/IRg0/h292Irex3NN8zj+UFCn9b8n9JFrCOTjz2HOvZNLbBNPH5D5cJP0U5QAzPhReBaLL0/4Sp2XEx20Kij5nsFEt1+8JA2EPBJjQZp/V50d/GR6a139F61M4j2mSnoBfnhtVLm6DO9dMK37MNqP/5woemHNnkOh1C7ozatS1/glZ9snvFauWr3CmuFVfxgAieTSFhr5F/AwOsS62WKtCpk+cJxdYJp5sOFGD72VSFXx50I4h9yDg9Q+7ZOKU2lqwUmMxJGR7VzhI+g5BHaU9VOGBXM84UUXHzIRciLqU0xheJaeytFlG0zb9fRB6cgvKFfqYzhEIgvLt4EquD4AgeI6aoX81jm/xfo23oh6yFD5xjBC5JHbMBeh0d4D/K+Kn6NA72Uja5tMTKtjeX0eKWMU2DXLezExwJFJdE8S3QvSSHGiCHyuSaorZkdZAgHJi2uCU6DcwEIU1UrRdkH1I48ObOj5v+/ujICu3bVt0ImC2DixyXBBEd+rfyGapJgqngYLxK82yA8JEgGis3TyOCicaNHzWQ1FUz0ubmFQ4tgg79ionKTStKXFMncGy0e0BaQIzRbh3EV5rasvRP5dhVeXFifbfm7X0NrT/kMyes5Hr7CGulx5yi+yEwWpJwA70tuXjXRRDwi3uJSsK8STaCjis2LR6w6SwY8xpKiJLjDOPsA0nmSF1oxzoILp4kjBYJ7bCniP2wgqMigDVfHqiI0RSrYN0OaAmD/7dRnJCms+aDgKlm1Ftmtuo8T7CaJ//cvujikPJvvOFJIZpzBaS4BFCxkSda1PWR9ZP7yvHkd3zhkvpzFAw==|920 \ No newline at end of file +}//33gKGmXjO0Y/fAO90ARlOk4TcS0PP+FU66+I/cOjJ2Pm4903TjAp/PsSrQtWZsGm4gQ3v9yuW1zVTNPcIHp9L3fTjvQ6dUvZSzzv0iHMSlVs0koPOg6Ho/B0pJs38ulKWRMI5tZrINK3Fexc8MuAcnPrC7zxdz2n8wqXqGzGlkQyzyUA7uVL2rP1MThxIsY0trXwNffKKDUFkhtWi0594fPWZTn4PUeToN3wLLxFGFGUUW15kKqURgN26uy2zKzYLrpmBtPaQsF+c8v8eZ+EYewgPnttGcIpOhaD1/YoN7GIU6xU+iIDjkSgb1ZSZdc1w9xhYIBbQzpCLKRwyGNd8TJu6eE1nMDt1UFuwXCyCi5Ut+ciExoiJKQgpfIXo7iVlx+QYUGfOqhOfuluIbHYRb4ppCKVN9VFdGV5dJjHfbx3CVNE3av3ke+v0kcI6IQBBqJmLgDPLl1IVknsLQGkCa5RLKGXB0v5/+qQE6LIk+rC/pkusPPxfPwwax/K+h+eG3bq3OCVsqpsRTae7/NFtgPveFv3+QpGlipuVaaGk+uTIteZbqmWkf02iUHslGsiIyacZXkxaG5YWhE6WpqldzhdyiiPWzJNC96jEWpce/M6ZHJHyb0LgGFgskQznr0YVwWgCCpzwcPjTuuTnlawTkBT6kXD7+ajwEjBrKfeUSmmD2914FM2yx6Q7jGExNbPuNEhIH87IvagWvUhooef+zR/mLNz6oaLjT16IZz57PeopybBQ1f/1azEOpXN6VtdekmLfFn992yfiKgsBkn+9rwBD4Ra7DgGqYNQu3pbDYr64npmCTv8SQKYJL7j6xclMbvVzzhFdTiPUJKLTk5QNpndHB4UpaI4kBChRadC9O13DhDOF1o33ZfeKuFfPUU2EUSGCsvGfAYjyN5RlcaUug==|920 \ No newline at end of file diff --git a/Pages/Git/选择Git仓库.rd b/Pages/Git/选择Git仓库.rd index 9423922c..01fc73d6 100644 --- a/Pages/Git/选择Git仓库.rd +++ b/Pages/Git/选择Git仓库.rd @@ -3,10 +3,6 @@ "ColumnCount": 41, "RowCount": 27, "CustomNames": [ - { - "Name": "选择仓库ID", - "Formula": "选择Git仓库!$B$27" - }, { "Name": "当前页码", "Formula": "选择Git仓库!$J$27" diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json index 6da3dff1..ab6aa5ea 100644 --- a/Pages/任务/任务-任务信息.json +++ b/Pages/任务/任务-任务信息.json @@ -368,7 +368,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "7fc8ad10-5ebd-4fbe-81d5-2a96ed6199d1" + "ID": "49067081-06a7-47e4-b71f-6bb1f6c977ab" } ] } @@ -458,7 +458,7 @@ ] } ], - "ID": "23d6decd-442e-433c-b957-d4778e6a1a24" + "ID": "58fcd20b-2839-48a8-a997-0ffd88f66526" }, { "CommandList": [ @@ -475,12 +475,12 @@ ] } ], - "ID": "15c9e7bf-75e6-4a00-9b53-758710b42052" + "ID": "96f7418a-3ba8-4852-8471-bad0e9d3cd15" } ] } ], - "ID": "35a985ac-9d1a-4755-a59a-3019e5889393" + "ID": "ebbe9c87-953e-4c49-bbf9-a503a9537f57" } ] } @@ -550,7 +550,7 @@ ] } ], - "ID": "31483ac2-7401-4f0b-a52a-6a1c12f4cf3b" + "ID": "b2ec47f3-2334-4867-b25e-f6f33abfe114" }, { "CommandList": [ @@ -567,7 +567,7 @@ ] } ], - "ID": "69e7d37d-2f01-4644-9ed7-31037a1e6079" + "ID": "e250e99c-ff69-4958-ba8e-14f69fc2c9f9" } ] } @@ -655,7 +655,7 @@ ] } ], - "ID": "02a8ca40-c244-4783-ab30-43105650447c" + "ID": "25088740-a4bb-47fd-be9e-471bd83f0b5e" }, { "CommandList": [ @@ -672,12 +672,12 @@ ] } ], - "ID": "61b95591-1563-4557-86ee-43c4629a423c" + "ID": "39893087-c3db-42f1-99f3-088b7c36ad6a" } ] } ], - "ID": "4f90c79b-4719-40e8-9a27-a08ffa1151be" + "ID": "a46d0ae7-b63a-4bd1-9756-a53b6c756495" } ] } @@ -747,7 +747,7 @@ ] } ], - "ID": "26e855b0-e75a-402d-b23f-b5444121abfd" + "ID": "bcee987a-3bca-4a69-b717-64f0a15aed3b" }, { "CommandList": [ @@ -764,7 +764,7 @@ ] } ], - "ID": "240d1f06-deed-4118-a162-e49c6f4e481a" + "ID": "056edeb2-ba91-4e85-a495-918c0230d118" } ] } @@ -1028,7 +1028,7 @@ ] } ], - "ID": "cd01a0e9-2f60-412b-9a09-c7e7c90eeb69" + "ID": "695875b5-2a4e-40a3-88ec-99f64fdad8c9" }, { "CommandList": [ @@ -1045,7 +1045,7 @@ ] } ], - "ID": "46efadda-fa73-486d-b795-d6e35c38ddf6" + "ID": "8a6b6f9a-827f-4355-945b-3b898f9cac3e" } ] }, @@ -1079,7 +1079,7 @@ ] } ], - "ID": "2f78c1eb-f440-4f7b-8ca0-47e583f5683b" + "ID": "84e7b339-d665-4db8-9e68-f1852855ba83" }, { "CommandList": [ @@ -1096,7 +1096,7 @@ ] } ], - "ID": "b4e4ce1f-ea9b-4b29-891b-0ac80e27a07f" + "ID": "df01d0ae-fd51-4243-ad48-9a130aa21d42" } ] } @@ -1158,4 +1158,4 @@ "Formula": "'任务-任务信息'!$S$14" } ] -}//rW9yAczguNqWGjUqWqK3DbY8SRnT7AXzgDUWO3JTFb2wtv3KgJ0btim8N/2wg5EX96yXIFnWRWyrVOpS0ObnGwYU0hDCysUBEzdnBkpHN1v7hlxoUhhsKuh3m1v65mR3CJo2SecaaHExdVU5a4tzMC9eTfJuAP4Z8qujqUTOw2qZxbuBuTi280XLjZLxiQi5HC+id3ffMoNWrz4mmoLfG0MAujIdy816rAltoDj05LZcwYXPj4tSiXcjBy4tFioj4Zr/zdBGK2H9H6OyyVrnGKNkU2kzQJlsbGKF6LMXr40e/8+JLLYOZTeqvzybCRDWVAS5+4W3tOcNUC6caXH1G/bld84tGGYzRtzAzSe9maOva8Nr6rnJO9W9201RUOt4JvsYgWgJZkZQFkqkyodSQunCu/ioOAmRNrT20QQRAgqhm0TbXugCcIgv32+2nHJiPBnJtJmaSoC9gSM8wFC5Vizt+7XCHjMeSotcIlSPEZwAJIijAyBynTnp+ay7gGn5kOGLn8OrlaUsQb/3Aeyo+ajsVWGHk8XbgMjNbkng0LKvyLM9gVN50eEsQfnj/+v1BApXn3JMYRq2Zwgvmpyj/giAmAzRQIDQL/GRSeK8tX1FoVWihx+bbw0lbHarbNH9x+nB+VkAAe44+9P7ZFPiHZ6UUy+Wyf7lxlO4cUaNIwepPKuvydqB9VtkJsIzLbooHFx9qVUZu+XQsQ56UDBEcNd+5U8Ke66O30tFrzzmWq6PtcIEM6LDtq42v4TLombAvMrwbP0i8VevGUXQWj/ASqtCUf6SGtnGVqNZRybzDJ1SWdWhFK4I1w+NZKtS0L7BtEaZsGbbmmtHXlQQessy2BhMj9oJviP7mZHD+9O9XBQQOfL8F+uq1LfTuWbSSNn5uJazpUU6jlq2wCjpUc8eqQ==|920 \ No newline at end of file +}//L5Qe0S2f7K5lTdtgGjvmg1oO3kvUa6YB+ANV4+T2UCiGZNEvcDwbuRjYz/YnIzxgxIFnGrb/f4SRYYPMxBIvGVMSgj6P9LjW6pqVUZNDSVfOkzBWt9IFQbppSk1WRcJiuXMzVCG6wEj/O2d7OyLuMuYFyrP/pqopEKqk53PQfHffdQs+ZfpALhHzbn8rzvEs4hCfxwYWjo1d6SqC441uA9tcN0/iR57QLRNO9eisAxrHD5BqSIMDn0t/ATNKY69lL3x1emN+WY3o9MD23QPhGM39jgp0zoJZZ0AHf5qWQ+8JYjvNg9X4pUOVYOcDBCrBwPKWNgQYITJm54FfVPxiWxgEcKK9CJwCNnbgi8CWWeAiNUieiqUiT98iZ1NOrpWvU6iGrBLdivtJs//rgipyLXBszpy5nbw4m5TXQ5UtQC5PUTBiwZ97zZirdNDQljpSbeZ8EWc6zYS5sT9/SBLj9yUjc3yTXwmVFwA2/1ezBwAZOed5IDrs2EHQqIAokmCEpHLOXi5GqvWdwPHNdGKjYF4Ou+soX4nDzVVrgJmf7WnFmwcR3TDhCIpdQP6FErtWRTcnTohxjXsGVX2A34q1LtGflXaFiUgCEfdnP5ArmWh4TfPUUdoCFz22+egeDbL9kKuvNvNyIRLtXvAb0t2QCm9uKMWoS/idAyOEVqT22ZTSnrHxLoCxbNcZroWnMIzdj+0Y7ugOXcEQ9Oq7fLGN659esYdh17uBNhqJvyyxuOBXrmqxpowmOrcaSeW9DoV7LsorbnX/8HvtbyoUauqztZGKhkWEbgTJhVpPWUxst+NQf1iCxpcj9wtCWlhjoLHvmnnpfKec1S6E9gD5+jEToHsQT+hTP2kWnNQVbVBg3z9nC0CQbYUhKy/V/XoNo1x0qG3F1n/YwjV+EfUWol1qfg==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 56f15714..c141c893 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -564,7 +564,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "a6008ea1-547e-4ddf-bb98-ae7ef1294f45" + "ID": "eee63b09-5ec9-4c3d-8e6b-11ee88fed5d4" } ] } @@ -832,7 +832,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "300b65b9-5c09-47fc-b467-1693d61e742f" + "ID": "66362171-c241-49d5-9a25-36e811d45441" } ] } @@ -1256,7 +1256,7 @@ "ReloadData": true } ], - "ID": "4c05e90e-ff20-490d-8813-79ca3dea9eb5" + "ID": "c4533079-32c4-42d4-8c1f-3dbb7e9abd3f" }, { "CommandList": [ @@ -1271,7 +1271,7 @@ "BtnText": "知道了" } ], - "ID": "2ddd83c7-6b07-446f-b695-e08ea030c727" + "ID": "ae66ad44-670e-4710-9497-fc896f54ffbb" } ] } @@ -1853,7 +1853,7 @@ "MethodName": "Focus" } ], - "ID": "f5eab659-994b-487a-ac4b-a88f3a11cde0" + "ID": "49a41927-451b-48bc-8dd7-841364df0fc8" }, { "Condition": { @@ -1887,7 +1887,7 @@ ] } ], - "ID": "e91cf315-0f8d-4fbf-8aec-9e58964c0900" + "ID": "31a8d90d-5a79-4825-9ed9-6fa6c54f845e" } ] } @@ -1947,4 +1947,4 @@ "Formula": "新增任务!$E$26" } ] -}//MVWz/+0UayD5hyh3tunEUgpZEtQn9itMHODY08N+oNaLh9rJ5pwWemLZdGWAD0NgqJn6fAqnwPYiMbSgPDVzb7wMlXpv7+q62D7/W+S50OClm8IFdwQQj05cElgVado05C3dNuwXTQSmy1Rhg5TLEQXSAcM7J6ZLzOWUFUHS++tMWeHtPzDEAneW8C6A7G1MPawp9Yw+A4D+yCsC35z4thPyQou9nmTwFhvKNyawnw/L0QEEN2SUhjNtD8rnPBFP/gfbiTRsMr4MNwW1b0rQaZplNrqvskc1UU4MgFkNnv+8pWWIbK0jzhh/07+3aHUthYOzwCwR3kL344+7KD8PyTFjeFp0XaDUMRnByMhW8PP3jHOwRdZ2r0dWWNm3ZAn2YYFeptcb0ubpkseqbjo4qNsr1dUa9FB+j4GszkDNpCUUtzhvTTztlXjWYk2caI1D4ex5t3DAk1dfqHhIjDYKiP7UqXPtjeJ0k0nodj4a1R91sC00/1S9xEkuJxJMioa3xTM+Xh3EwO0/DX2JL4aS+FtY5ls5ofjoJl8/PSa5vVrIQNhc2oX3YHxk3+YZiqeOaGLLO7cp+iBAfLn02w2T9if4A86yASHZJ07UQm4Fz+Q4omtrfSXK3KGHwezF6fhrBz5a/bVSFU5aeuzbFZLA1TbCiz1BH7Txw6m6ZuXvgx0hStDSXljPAcPBremFVWwJMSAzJx1aRtNp/UaIeirHdyFJpBh401U1W+L+OPvkF2RIxAtuLfxKiAT6cDoYZXuMurTPcVVyqnj+kfCg/HfV+kLqpA/kKcdd/sxW7anXuw56FWszqbD/eDKgi6byFyMzWd1pP7aAfBA3VATDZyGmmod0Sk318JwABkGkzkmYa5dsqFCfO5DHvqMRYpGOV9biIprGAsiIHyzdCZNNzbUTFw==|920 \ No newline at end of file +}//JjDioPejuaOpTRsPMKfohh9xXiH+042kb3Nl8DgWQJ7sXk3puuugk4gtcaSF//wVnRmPb2prDs00NYDUJcg3CrsJFOUTS1ajDsbqTu0z/MD9ALLSqtl1259/ewSyWnMP0r9f0PIPjIvZY73kwp8ZsheN60ESfLXvi5SGeZYnAJucqKn+rjSZWZ5wt7gbMOZ7cGYra4YO34x1cybCQMavqcVL68v2ItzPPweqP7VDBWGGmtQo0lYxL1Q/pp4sSiR6wfh+6k2EuOjUJl0o2Cv/cY3w0BG05xPPY9fE8hlGo8/zJx3F6aJURNxXVcOsSw2RE3MVOkz5cA/LQuswltMk/vgSHGLFKrlWu+dZXrlAlAyMsGMBcIGD3wyWXGxqWF8Nv4qwesI36+aLXdcqz++6Sd17CdNgbLsEFCR1jeCd9TCjR+FjPCFGeZNB+8KbCMaAtys/tztDYZ7IdW8Jfrtng14jURKdaja/T5AVVdkytwSm76EHUh3eAFB/d0P0y19dx4zJte6rRwoz5wpgOdcWdpwpOF1DPAnjVB8XznnX6hvKRNXXOYJK1lVuEs07H2zEPE+wmDVzFCePmlPCGjWsY/nhPQPG8rIs5DwZ78VeHXiUefSIDF5UqEZ+VpdVUQWTjpc2jlJNzJRle9tXNmwF0Fl3jzDRt5I1b8eMsw7zmbA0fWZCKDWG/11Z4zsVWFPGo9sXCv85y3a2gzVlgIOWr7pLSS4pqf+PXz+GdNCZZYiTx+zWlRB3MBzvsO8q2G0xZOC8tVe+cKaft+hOiB9g7+84UoZPbphomHzfWa6//NoRp+AG7zP3lkuIXsvx7e9ggxYAkjUu9Tn6GfgwKqnvdVDTJIWkWZm7pJ8gGblEwl9q/6fWvMUryfvhMaswYeG9QIin/PbKhI4Fx7eaL+dU7Q==|920 \ No newline at end of file diff --git a/Pages/工时/个人工时首页.json b/Pages/工时/个人工时首页.json index 274760ce..d9c3c809 100644 --- a/Pages/工时/个人工时首页.json +++ b/Pages/工时/个人工时首页.json @@ -407,270 +407,9 @@ "5,4": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时首页!D4,个人工时首页!S4" - }, - "Value": "%Null%" - } - ] - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时首页!B9" - }, - "TargetType": "ReportSheet.ReportSheetCellType, ReportSheet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", - "MethodName": "ReloadDataSource", - "ParameterValues": { - "target": null, - "isMaskVisible": true - } - } - ], "Text": "重置", "TemplateKey": "_RS_Information3" } - }, - "8,1": { - "CellType": { - "$type": "ReportSheet.ReportSheetCellType, ReportSheet", - "dataSources": [ - { - "Id": "141d0a40-9917-4134-ae60-0f84c1bd1319", - "name": "工时详情", - "bindingTableOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_任务工时统计", - "BindingInfos": [ - { - "GUID": "289afb53-8e72-4206-8dab-c3fc4384709e", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "ID", - "GUID": "63eb8fa4-de0a-42bc-8da5-3a944ca612f5" - }, - "ColumnName": "ID" - }, - { - "GUID": "3a4cd9f2-fc26-4afd-944d-9483f06ef49c", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "cad5af6a-d063-488e-9fff-95292c48ef8d" - }, - "ColumnName": "日期" - }, - { - "GUID": "f36fcf8a-27fa-42d5-b25b-c8431b3c638e", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "30227fed-3fa0-4dce-9c65-31290bfe96c0" - }, - "ColumnName": "执行人" - }, - { - "GUID": "51541237-8df4-44d4-847c-8655b4d8af82", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "5a3bb8f7-259f-40b1-9365-5e77455ddb77", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - }, - "ColumnName": "执行人姓名" - }, - { - "GUID": "0d23193a-c985-45cb-901b-dbe09c4de637", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "11497995-2e35-4129-9df0-e4124813ad9d", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" - } - }, - "ColumnName": "项目名称" - }, - { - "GUID": "9049c998-072f-4dee-97eb-ed10a9d2c4ac", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "af984443-6fd4-4aed-9ff7-45481fc52eb9", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "任务名称" - } - }, - "ColumnName": "任务名称" - }, - { - "GUID": "ecdf22b2-3e03-44fb-ab33-57b7c603971e", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "时薪单价", - "GUID": "44acabe2-2f67-45c6-951d-7d9bd261e159" - }, - "ColumnName": "时薪单价" - }, - { - "GUID": "510b2219-bd4e-402d-90f7-a8088c57b543", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "提成系数", - "GUID": "549de302-441b-47cd-8560-3b98f26d1279" - }, - "ColumnName": "提成系数" - }, - { - "GUID": "fa83ffe8-08d4-4fce-a590-ddd8c43f3c1e", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计划工时", - "GUID": "9e7df56e-9a27-4c8a-bfd1-52ad7c727c07" - }, - "ColumnName": "计划工时" - }, - { - "GUID": "42ad5559-b5a7-43d1-b5e9-9bba75e16847", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "实际工时", - "GUID": "fa9c5ea0-e5a4-48f7-89e5-43ab7da14042" - }, - "ColumnName": "实际工时" - }, - { - "GUID": "64f6ee2b-7b42-4b88-9b6b-f66cb2afd740", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "上报工时", - "GUID": "65536567-87bb-409b-8de7-62648c1fb801" - }, - "ColumnName": "上报工时" - }, - { - "GUID": "aab0b0df-75b9-4c3a-9a80-ff5995a948a6", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计算提成", - "GUID": "a1648e3a-fb0a-4fcc-897c-d9a61b0af38b" - }, - "ColumnName": "计算提成" - }, - { - "GUID": "ef7203f1-c443-4aeb-a75e-c0bc712d3e33", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "请款单ID", - "GUID": "a23bca2e-003a-4a60-b653-5bbf0d35fbdc" - }, - "ColumnName": "请款单ID" - }, - { - "GUID": "3f85adcd-18ee-460b-ac2d-618ab0d8e388", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "请款状态", - "GUID": "7d6e9f47-a73d-4fb7-890a-8bce28545fb1" - }, - "ColumnName": "请款状态" - }, - { - "GUID": "7554270f-9246-4f93-b391-43328badb406", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "工时完成比例", - "GUID": "866ef252-7891-4f3b-833c-ef09908cecbb" - }, - "ColumnName": "工时完成比例" - }, - { - "GUID": "496b28d6-9960-4e6b-b67d-2d5924e3a173", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "剩余工时", - "GUID": "5196b3f3-1fff-490d-b422-fb0d38ee8f70" - }, - "ColumnName": "剩余工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "456fa2df-a379-4a27-b114-906649816b20" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时首页!D4" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 3, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "2bba4db4-ad99-464e-94c7-9a823b0b728b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时首页!开始日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 5, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "9c60552c-5f73-4451-9e70-28d63834ffaa" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时首页!结束日期" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 1, - "CustomColumns": [] - } - } - ], - "config": "{\"version\":\"17.0.5\",\"name\":\"\",\"sheetCount\":0,\"scrollbarMaxAlign\":true,\"tabStripVisible\":false,\"newTabVisible\":false,\"allowDynamicArray\":true,\"customList\":[],\"numbersFitMode\":1,\"defaultSheetTabStyles\":{},\"activeSheetIndex\":-1,\"sheetTabCount\":1,\"activeSheetTabIndex\":0,\"sheetTabs\":{\"report\":{\"template\":{\"name\":\"report\",\"isSelected\":true,\"rowCount\":142,\"columnCount\":5,\"activeRow\":6,\"visible\":1,\"theme\":\"Office\",\"data\":{\"dataTable\":{\"0\":{\"0\":{\"value\":\"项目\",\"style\":{\"backColor\":\"Accent 1 80\",\"hAlign\":1,\"vAlign\":1,\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1},\"bindingPath\":{\"type\":\"Static\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Vertical\",\"pin\":\"Column\"}},\"1\":{\"value\":\"任务\",\"style\":{\"backColor\":\"Accent 1 80\",\"hAlign\":1,\"vAlign\":1,\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1},\"bindingPath\":{\"type\":\"Static\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Vertical\",\"pin\":\"Column\",\"spillDirection\":\"None\"}},\"2\":{\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"vAlign\":1,\"themeFont\":\"Body\",\"formatter\":\"yyyy/m/d [$-804]dddd\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"None\",\"vertical\":\"B2\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":false,\"autoExpand\":\"Horizontal\",\"binding\":\"工时详情[日期]\",\"alias\":\"日期\",\"spillDirection\":\"Horizontal\"}},\"3\":{\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"formatter\":\"yyyy/m/d [$-804]dddd\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1}}},\"4\":{\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"formatter\":\"yyyy/m/d [$-804]dddd\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1}}}},\"1\":{\"0\":{\"style\":{\"backColor\":\"Accent 1 80\",\"hAlign\":1,\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1}}},\"1\":{\"style\":{\"backColor\":\"Accent 1 80\",\"hAlign\":1,\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1}}},\"2\":{\"value\":\"计划\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"3\":{\"value\":\"实际\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"4\":{\"value\":\"上报\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}}},\"2\":{\"0\":{\"style\":{\"hAlign\":0,\"vAlign\":1,\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"textIndent\":2,\"showEllipsis\":true,\"imeMode\":1,\"isVerticalText\":false,\"textOrientation\":0},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":false,\"autoExpand\":\"Vertical\",\"binding\":\"工时详情[项目名称]\",\"alias\":\"项目名称\"}},\"1\":{\"style\":{\"hAlign\":0,\"vAlign\":1,\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"textIndent\":2,\"showEllipsis\":true,\"imeMode\":1,\"isVerticalText\":false,\"textOrientation\":0},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"None\",\"vertical\":\"A3\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Vertical\",\"binding\":\"工时详情[任务名称]\",\"spillDirection\":\"Vertical\",\"showCollapseButton\":false,\"alias\":\"任务名称\"}},\"2\":{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"C1\",\"vertical\":\"B3\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"工时详情[计划工时]\",\"spillDirection\":\"Horizontal\",\"showCollapseButton\":false,\"alias\":\"计划工时\"}},\"3\":{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"C1\",\"vertical\":\"B3\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"工时详情[实际工时]\",\"spillDirection\":\"Horizontal\",\"showCollapseButton\":false,\"alias\":\"实际工时\"}},\"4\":{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"C1\",\"vertical\":\"B3\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"工时详情[上报工时]\",\"spillDirection\":\"Horizontal\",\"showCollapseButton\":false,\"alias\":\"上报工时\"}}}},\"defaultDataNode\":{\"style\":{\"vAlign\":1,\"themeFont\":\"Body\",\"showEllipsis\":true}}},\"rowHeaderData\":{\"columnDataArray\":[{\"style\":{\"font\":\"14.6667px Calibri\",\"fontSize\":\"14.6667px\",\"fontFamily\":\"Calibri\"}}],\"defaultDataNode\":{\"style\":{\"themeFont\":\"Body\"}}},\"colHeaderData\":{\"rowDataArray\":[{\"style\":{\"font\":\"14.6667px Calibri\",\"fontSize\":\"14.6667px\",\"fontFamily\":\"Calibri\"}}],\"defaultDataNode\":{\"style\":{\"themeFont\":\"Body\"}}},\"rows\":[{\"size\":27.666656494140625},{\"size\":27.666656494140625},{\"size\":32.666656494140625},{}],\"columns\":[{\"size\":169},{\"size\":168},{\"size\":53},{\"size\":53},{\"size\":53}],\"defaultData\":{},\"leftCellIndex\":0,\"topCellIndex\":0,\"spans\":[{\"row\":0,\"col\":2,\"rowCount\":1,\"colCount\":3},{\"row\":0,\"col\":0,\"rowCount\":2,\"colCount\":1},{\"row\":0,\"col\":1,\"rowCount\":2,\"colCount\":1}],\"selections\":{\"0\":{\"row\":6,\"col\":0,\"rowCount\":1,\"colCount\":1},\"length\":1},\"rowOutlines\":{\"items\":[]},\"columnOutlines\":{\"items\":[]},\"cellStates\":{},\"states\":{},\"outlineColumnOptions\":{},\"autoMergeRangeInfos\":[],\"shapeCollectionOption\":{\"snapMode\":0},\"names\":[],\"printInfo\":{\"columnStart\":-1,\"columnEnd\":-1,\"rowStart\":-1,\"rowEnd\":-1,\"paperSize\":{\"width\":850,\"height\":1100,\"kind\":1}},\"frozenlineColor\":\"\",\"showFormulas\":true,\"gridline\":{\"showHorizontalGridline\":false,\"showVerticalGridline\":false},\"keepUnknownFormulas\":true,\"sheetAreaOffset\":{\"left\":2,\"top\":2},\"templateSetting\":{\"templateOptions\":{}},\"type\":1},\"reportName\":\"report\",\"name\":\"report\",\"sheetType\":3,\"renderMode\":\"Design\",\"printAllPages\":true,\"dirtyStyle\":{\"decoration\":{\"cornerFold\":{\"size\":6,\"position\":1,\"color\":\"#FF3D00\"}}},\"parameter\":{\"成员\":\"\"},\"index\":0,\"order\":0}},\"namedPatterns\":{},\"customFunctions\":{\"GETRESOURCESTRING\":{\"name\":\"GETRESOURCESTRING\",\"minArgs\":0,\"maxArgs\":255,\"IDt\":{\"description\":\"获取资源\",\"parameters\":[{\"name\":\"resourceKey\"},{\"name\":\"formatString\",\"repeatable\":true}],\"name\":\"GETRESOURCESTRING\"},\"typeName\":\"\"}},\"dataManager\":{\"tables\":[],\"relationships\":[]},\"forguncyData\":{\"hiddenRowsVisible\":true,\"hiddenColumnsVisible\":true,\"dataSourcesScheme\":[{\"id\":\"141d0a40-9917-4134-ae60-0f84c1bd1319\",\"dataSourceName\":\"工时详情\",\"tableName\":\"View_任务工时统计\",\"columns\":[{\"id\":\"289afb53-8e72-4206-8dab-c3fc4384709e\",\"name\":\"ID\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"3a4cd9f2-fc26-4afd-944d-9483f06ef49c\",\"name\":\"日期\",\"type\":300,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"f36fcf8a-27fa-42d5-b25b-c8431b3c638e\",\"name\":\"执行人\",\"type\":100,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"51541237-8df4-44d4-847c-8655b4d8af82\",\"name\":\"执行人姓名\",\"type\":100,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"0d23193a-c985-45cb-901b-dbe09c4de637\",\"name\":\"项目名称\",\"type\":100,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"9049c998-072f-4dee-97eb-ed10a9d2c4ac\",\"name\":\"任务名称\",\"type\":100,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"ecdf22b2-3e03-44fb-ab33-57b7c603971e\",\"name\":\"时薪单价\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"510b2219-bd4e-402d-90f7-a8088c57b543\",\"name\":\"提成系数\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"fa83ffe8-08d4-4fce-a590-ddd8c43f3c1e\",\"name\":\"计划工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"42ad5559-b5a7-43d1-b5e9-9bba75e16847\",\"name\":\"实际工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"64f6ee2b-7b42-4b88-9b6b-f66cb2afd740\",\"name\":\"上报工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"aab0b0df-75b9-4c3a-9a80-ff5995a948a6\",\"name\":\"计算提成\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"ef7203f1-c443-4aeb-a75e-c0bc712d3e33\",\"name\":\"请款单ID\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"3f85adcd-18ee-460b-ac2d-618ab0d8e388\",\"name\":\"请款状态\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"7554270f-9246-4f93-b391-43328badb406\",\"name\":\"工时完成比例\",\"type\":200,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"496b28d6-9960-4e6b-b67d-2d5924e3a173\",\"name\":\"剩余工时\",\"type\":200,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false}]}]}}", - "eventSettings": {}, - "permissionSettings": { - "edit": [ - "FGC_LoginUser" - ], - "add": [ - "FGC_LoginUser" - ], - "delete": [ - "FGC_LoginUser" - ] - } - } } }, "StyleDatas": { @@ -839,7 +578,6 @@ } }, "Spans": [ - "8,1,1,34", "5,1,1,2", "5,4,1,2", "3,1,1,2", @@ -891,4 +629,4 @@ "Formula": "个人工时首页!$F$11" } ] -}//fgXRM3jI2DE9qxtzpg1bogUXUnQsyD2xnCcCfJP2ERlDlSAahatilgmRUy8k/4Kiz+MXqGdYj9bjKmprbeqWZIr+So+T0QSc7R8tEBb0g3XoVCwdVwipNuDM7jR+h3Hy/tFCdOTRKB9z90eHRleUNsyOn5SlP8Pxk9FcYA+GY+/GoRlEEuVYJnraVZJ551+UnkOKBISc3GU+nUKakHQisVxIfJ+4zgFmMlWsHHpOCyS+y99tiwtvjRXABSMIvkXijLkuaF4UQBpG+Obg7b2Gn9usilA9EujtzvokP3VM7mtGrD3zm7y9tWYHcsRsKLChCUDN3e5ClGRZNaDHzJkeowcxJRh710+IoCTYUtywxK/jnuzuOnrcAQNUePReycz/PncALl2x05CNkuROjm7idjDiNrDejli4aOZnoVA7LmEJqleNE0EHhQyHZ11FHkdLnwQX3B4CzJt6z2+SIhnhHze51BtS/YX0KDVZ2is8w4HAlmAyHOKmMhgi6XQ+Qe9a5O23NGyN/yD+k47E19es9DG09H+zeMGvghKs/ESdmHxnSCZzmh/Bz/Z0K8aMQ4RFopQNYeWnE0Prkxzl2l9z7RTTNJCKJVtaMg+5kAJ7i3noDrySDX2iBtRC8PSGUryAjweOtP4ZSiuQFlTH4QAilGn8JQ6tWmVFKZcf2d1nSZsSA/ceWM0CiQa8VecHIc+BIJXreIslyoMATQqgU0lQrwlNGf7u101hkGCea6wwUjdwKwo2o1INJcGo94J5eVZc0mTsSwQFJ+FyIXM7OH/7LNvCeMtAxD1EHEGT0LhoBpdk359PI5yfzHpCz18LjMFOHFDr1Iewlg2LxiqI6dXIjv/0B3II0Vtno9uY1QowtImVSYXBVdcgSKiJfI2mjKFrE0FIeTvgVz3ddz3yDQ60eQ==|920 \ No newline at end of file +}//S5uOHV+pSAycgTQsZgBOtk0dbRzY/24doBnWSJ1IeAK0J4H7bVonGNb5RuRh8B1rrxXV2djc1dukNF454N2GvqTUWQ5rTIrzPXcStnSvHaH8hbwqgCJRYJiJcj9hMnH4ItZBAPsydRchI96QUkDQEXGxsB1cQoWV9fo4Sb7Eu2Mb6QpT5CInxcbdvP/p/t/dpCIZPZkfGbNS1t8mowlz66K/mW5rAu45Z8+pqB1a0W/iJrgrJDng9wgOUHrF+W/waRpLLRNV1JKKxZ6tWMzNxmyTMO5dO/3lBBRoJg9OGtxYLKKm6mN18J+X0sCgIukSyDidgf1axcQC9p64dHwSTvPD7L5yKdewvX3rYpE/ow/jr3EzMlJteIlhmZpeKOnLE6cKCcCBwvqkUboxfvWfcbaii6P1HmVf/epPBoi+XShNBYwXKCUqqXU3tEVquleW0nWXOc62yn8uXiTNLUyAwZvIQX/4rV+afC/nl34mhHaOvFYjC9Gkk4gZlVmDpU1044iR0MoDdNwD9XNKTjt8IVUfsJfeyJLRP0qrf3tLwkLJPVJPRulQLlHRs2GDJAnZu88/E+HAC0pe0+ZAPQFgp7HeFBrzMUO6WI7wDrhjgq3yp+TTo86vy7KpTydSgbjj5TPX+P7XSFWbnIhju/klvoQbYgCuBebT3aVMwpWxBqijWkeRMyToeBvEWxZd/DrpeYgZK44Ppq6sjie9wPExKNx6IRnpPgSOU2njsjeInaRnzGvxQvJc2T5dNBJle0jwAyILrdK34kySHBmVKLiy2ETFRA4fI4fgGGAhMy4UIJsWbw6QRMlXM6goUlVGTPbgE1FHfeXbjomxWXYFHmSKIU3JZnJVrZi4KnATWtkL3hhqLnUxCGhIJ8Dw0L8SiMiYECiDcfAH7IxAxmRfWhlAIg==|920 \ No newline at end of file diff --git a/Pages/工时/工时总览.json b/Pages/工时/工时总览.json index 514b9f2f..b51621ac 100644 --- a/Pages/工时/工时总览.json +++ b/Pages/工时/工时总览.json @@ -286,31 +286,6 @@ "1,3": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时总览!B4" - }, - "TargetType": "ReportSheet.ReportSheetCellType, ReportSheet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", - "MethodName": "SetParameter", - "ParameterValues": { - "parameter": { - "$type": "System.Collections.Generic.List`1[[ReportSheet.Designer.ObjectProperty.Parameter, ReportSheet]], System.Private.CoreLib", - "$values": [ - { - "name": "年份", - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=YEAR(工时总览!D2)" - } - } - ] - } - } - } - ], "UIPermissions": [ { "Scope": 2, @@ -343,24 +318,6 @@ "1,30": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时总览!B4" - }, - "TargetType": "ReportSheet.ReportSheetCellType, ReportSheet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", - "MethodName": "ExportToExcel", - "ParameterValues": { - "filename": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=YEAR(工时总览!D2)&\"年度项目工时总览\"" - }, - "password": null - } - } - ], "Text": "导出Excel", "TemplateKey": "_RS_Main3", "Icon": { @@ -371,362 +328,6 @@ }, "IconSize": 14.0 } - }, - "3,1": { - "CellType": { - "$type": "ReportSheet.ReportSheetCellType, ReportSheet", - "dataSources": [ - { - "Id": "4dbf2918-0b74-4133-b91e-b68a89aef288", - "name": "项目表", - "bindingTableOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_项目统计信息", - "BindingInfos": [ - { - "GUID": "34fdb17e-8425-46c0-b4e8-b18a62a81d42", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "9492c755-2a3d-4b0c-98bb-0959a320276f" - }, - "ColumnName": "项目ID" - }, - { - "GUID": "1cb1fc3d-4745-472c-bfeb-e17f2f1792e5", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目标题", - "GUID": "31762cad-beda-4702-8031-9fdaa26d3d7c" - }, - "ColumnName": "项目标题" - }, - { - "GUID": "277537d6-f781-4d4b-b725-c3a3ed67d499", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "cb528067-49c6-4339-a03c-9f388c11f888", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目代号" - } - }, - "ColumnName": "项目代号" - }, - { - "GUID": "15bf2ea4-f557-4d8e-ae4b-c11227e6d7ff", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算工时", - "GUID": "138942cf-039d-4216-aae2-51314b1eeee1" - }, - "ColumnName": "项目预算工时" - }, - { - "GUID": "cf5c0665-6cab-4f8c-b09a-e144ea7d94dc", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算费用", - "GUID": "8ed6022e-da16-4e5c-9a6e-fba567d9763a" - }, - "ColumnName": "项目预算费用" - }, - { - "GUID": "4868c27d-e630-4a9e-b611-dbdddab5de0e", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "已分配任务工时", - "GUID": "e1ff286a-5f10-487a-a766-772499fcf7f1" - }, - "ColumnName": "已分配任务工时" - }, - { - "GUID": "f0142e5c-7eba-4cc6-8e17-2fd2e71620d6", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总成本", - "GUID": "4dbc01f9-205a-4e3e-93b9-003e5aef071b" - }, - "ColumnName": "总成本" - }, - { - "GUID": "b271b0e5-09d0-4fb0-bf14-475972da2562", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总计划工时", - "GUID": "88362956-71c5-47d2-be08-17edeb922931" - }, - "ColumnName": "总计划工时" - }, - { - "GUID": "c69728e3-1593-4a8f-94c7-dc928b553549", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总上报工时", - "GUID": "7abef433-e879-4f9a-9cdc-551a4e39f334" - }, - "ColumnName": "总上报工时" - }, - { - "GUID": "a97ddfbd-b2eb-44f0-9e30-0d3594cf9b89", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总实际工时", - "GUID": "a06a4482-7ae9-44c5-84ec-38f080a486e7" - }, - "ColumnName": "总实际工时" - }, - { - "GUID": "6adbc2b0-26ce-4af1-8274-5169104814b9", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目成员数", - "GUID": "f27366a1-242c-4098-81d0-5f617d697109" - }, - "ColumnName": "项目成员数" - }, - { - "GUID": "922835ef-df3b-4d27-9442-b5ce2c42c29c", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总任务数量", - "GUID": "5322f7f0-0b28-456b-ae5d-d612c04420cf" - }, - "ColumnName": "总任务数量" - }, - { - "GUID": "86d26930-69aa-40b1-af38-44b12a9312e0", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "已完成任务数", - "GUID": "4635ce27-e58f-442d-831a-9119a124de77" - }, - "ColumnName": "已完成任务数" - }, - { - "GUID": "86634c08-e56f-4fb3-acaa-4004da0c4bb6", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "未完成任务数", - "GUID": "2249bf4b-efdc-4a98-b5d0-8c4d28ceba70" - }, - "ColumnName": "未完成任务数" - } - ], - "NullFormulaValueQueryPolicy": 1, - "CustomColumns": [] - } - }, - { - "Id": "3736fbc1-0867-4e34-9b4b-f76b6ded88ab", - "name": "任务工时", - "bindingTableOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_任务工时统计", - "BindingInfos": [ - { - "GUID": "8ef2388c-8717-429d-b523-390ac129cc38", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "ID", - "GUID": "f266879e-48fb-4c50-baed-10fd62dfb23f" - }, - "ColumnName": "ID" - }, - { - "GUID": "e968bb23-0539-4801-bf3c-5bcbd5d5bed1", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "b0045f33-d7b2-477e-a2ba-fbb96034a0a6", - "AttachType": { - "$type": "ForguncyDataAccess.DateColumnAttachObj, ForguncyDataAccess", - "ColumnAttachType": 1 - } - }, - "ColumnName": "日期_年" - }, - { - "GUID": "81fd2b5a-b921-4901-a8b5-d14e6c190c2e", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "3d8250c8-2bf9-4a83-a2b1-c66b487ebfa5", - "AttachType": { - "$type": "ForguncyDataAccess.DateColumnAttachObj, ForguncyDataAccess", - "ColumnAttachType": 4 - } - }, - "ColumnName": "日期_月" - }, - { - "GUID": "9999edca-212c-4623-ae15-2cb3ed815959", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "660318ac-24de-4baa-996d-5af0b42c680b", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - }, - "ColumnName": "执行人" - }, - { - "GUID": "bd1bcf8b-3d03-45c9-a6c7-8e3728da7755", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "61d8e24b-ee53-43f8-8e1a-8772c47c2c95" - }, - "ColumnName": "项目ID" - }, - { - "GUID": "f419df6f-6b2f-4e9f-a1b7-2ab7983f4d51", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "4a123ad5-476f-4095-8ae8-dc0ef67d01d7", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" - } - }, - "ColumnName": "项目名称" - }, - { - "GUID": "69c990ce-2c4f-4209-aac4-e06fc9179ff3", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "时薪单价", - "GUID": "58c32078-dd4e-41d6-8091-767082952742" - }, - "ColumnName": "时薪单价" - }, - { - "GUID": "2d747180-7b02-46cb-a9a1-6b468692677b", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "提成系数", - "GUID": "a7cb90e2-098d-4e21-bff4-4811b10007a1" - }, - "ColumnName": "提成系数" - }, - { - "GUID": "c426365c-2a41-4e11-b3d7-a686ef06dba7", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计划工时", - "GUID": "d1c4b202-f48b-484b-87c0-4940071a59de" - }, - "ColumnName": "计划工时" - }, - { - "GUID": "ffde13b2-d509-435a-8246-efc673af6332", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "实际工时", - "GUID": "6993d2db-ad68-4f18-bcea-a23abffa246e" - }, - "ColumnName": "实际工时" - }, - { - "GUID": "39dbcc23-e7e6-43e1-b706-96e3dd589fdc", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "上报工时", - "GUID": "c72a589c-99a0-4e02-85f5-8824579bdfba" - }, - "ColumnName": "上报工时" - }, - { - "GUID": "ccbf7e5b-fbf0-4105-9295-d608dc0c34a6", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计算提成", - "GUID": "b6fa48b2-1030-491f-a00b-15348209c8d5" - }, - "ColumnName": "计算提成" - }, - { - "GUID": "759a65b8-929a-4aef-ba3a-f498f562aa92", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "请款单ID", - "GUID": "c88ee92d-3fa6-47dc-affb-17ac2514b4da" - }, - "ColumnName": "请款单ID" - }, - { - "GUID": "b05c1f57-ded8-4a06-a59f-3cb719b39da3", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "请款状态", - "GUID": "b6d94ee2-5b5b-4b05-89fc-116c26126d53" - }, - "ColumnName": "请款状态" - }, - { - "GUID": "ce68b415-35ef-4763-bac3-e0aeebe59f57", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "工时完成比例", - "GUID": "79ec23ca-6e50-41bb-a68c-fdd9526d9145" - }, - "ColumnName": "工时完成比例" - }, - { - "GUID": "c4b847bd-67cc-4c2e-9d7f-0804a3b759eb", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "剩余工时", - "GUID": "1461d007-25b8-4bd7-9c7e-af65a8122e9b" - }, - "ColumnName": "剩余工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "90d7bea1-a08d-4f79-b5e3-604d1a6f66be", - "AttachType": { - "$type": "ForguncyDataAccess.DateColumnAttachObj, ForguncyDataAccess", - "ColumnAttachType": 1 - } - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=YEAR(工时总览!D2)" - } - }, - "NullFormulaValueQueryPolicy": 1, - "CustomColumns": [] - } - } - ], - "config": "{\"version\":\"17.0.5\",\"name\":\"\",\"sheetCount\":0,\"scrollbarMaxAlign\":true,\"tabStripVisible\":false,\"newTabVisible\":false,\"highlightInvalidData\":true,\"allowDynamicArray\":true,\"customList\":[],\"numbersFitMode\":1,\"defaultSheetTabStyles\":{},\"activeSheetIndex\":-1,\"sheetTabCount\":1,\"activeSheetTabIndex\":0,\"sheetTabs\":{\"report\":{\"template\":{\"name\":\"report\",\"isSelected\":true,\"rowCount\":13,\"columnCount\":7,\"activeRow\":12,\"activeCol\":2,\"visible\":1,\"theme\":\"Office\",\"data\":{\"dataTable\":{\"1\":{\"1\":{\"value\":\"项目/工时\",\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0}}},\"2\":{\"value\":\"项目/工时\",\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0}}},\"3\":{\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"font\":\"12pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0},\"fontSize\":\"12pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":true,\"autoExpand\":\"Both\",\"binding\":\"项目表[项目代号]\",\"alias\":\"项目代号\",\"spillDirection\":\"Horizontal\"}},\"4\":{\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"font\":\"12pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0},\"fontSize\":\"12pt\",\"fontFamily\":\"Calibri\"}},\"5\":{\"value\":\"合计\",\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"showEllipsis\":true,\"imeMode\":1,\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"6\":{\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"showEllipsis\":true,\"imeMode\":1,\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}}},\"2\":{\"1\":{\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0}}},\"2\":{\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0}}},\"3\":{\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"showEllipsis\":true,\"imeMode\":1,\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0},\"cellButtons\":[],\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":false,\"autoExpand\":\"Both\",\"binding\":\"项目表[项目标题]\",\"alias\":\"项目标题\",\"spillDirection\":\"Horizontal\"}},\"4\":{\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"showEllipsis\":true,\"imeMode\":1,\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0},\"cellButtons\":[],\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"5\":{\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"showEllipsis\":true,\"imeMode\":1,\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"6\":{\"style\":{\"backColor\":\"Accent 1 -50\",\"foreColor\":\"Background 1\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":0},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":0},\"showEllipsis\":true,\"imeMode\":1,\"diagonalDown\":{\"color\":\"#f3f3f3\",\"style\":0},\"diagonalUp\":{\"color\":\"#f3f3f3\",\"style\":0},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}}},\"3\":{\"1\":{\"value\":\"总计划工时\",\"style\":{\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":null,\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"2\":{\"style\":{\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":null,\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"3\":{\"style\":{\"foreColor\":\"Accent 2\",\"hAlign\":1,\"font\":\"bold 10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.0\\\"小时\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":null,\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"fontWeight\":\"bold\",\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"项目表[项目预算工时]\",\"showCollapseButton\":false,\"alias\":\"项目预算工时\"}},\"4\":{\"style\":{\"foreColor\":\"Accent 2\",\"hAlign\":1,\"font\":\"bold 10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.0\\\"小时\\\"\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":null,\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"fontWeight\":\"bold\",\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"5\":{\"value\":0,\"style\":{\"autoFormatter\":{\"formatCached\":\"0.0\\\"小时\\\"\"},\"hAlign\":1,\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":null,\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}},\"formula\":{\"si\":0}},\"6\":{\"style\":{\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":null,\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}}}},\"4\":{\"1\":{\"value\":\"人员\",\"style\":{\"backColor\":\"Accent 2 80\",\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"2\":{\"style\":{\"backColor\":\"Accent 2 80\",\"hAlign\":1,\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}}},\"3\":{\"value\":\"工时配额\",\"style\":{\"backColor\":\"Accent 2 80\",\"hAlign\":1,\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}}},\"4\":{\"value\":\"占比\",\"style\":{\"backColor\":\"Accent 2 80\",\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"5\":{\"value\":\"配额\",\"style\":{\"backColor\":\"Accent 2 80\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"6\":{\"value\":\"占比\",\"style\":{\"backColor\":\"Accent 2 80\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}}},\"5\":{\"1\":{\"value\":\"计划工时分配\",\"style\":{\"hAlign\":1,\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}}},\"2\":{\"style\":{\"foreColor\":\"Accent 1\",\"hAlign\":1,\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":false,\"autoExpand\":\"Both\",\"binding\":\"任务工时[执行人]\",\"alias\":\"执行人\"}},\"3\":{\"style\":{\"hAlign\":1,\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"任务工时[计划工时]\",\"showCollapseButton\":false,\"alias\":\"计划工时\",\"filter\":{\"condition\":{\"and\":[{\"dataColumn\":{\"tableName\":\"项目表\",\"columnName\":\"项目ID\"},\"column\":\"项目ID\",\"operator\":\"Equal\"},{\"parameter\":\"年份\",\"column\":\"日期_年\",\"operator\":\"Equal\"}]}}}},\"4\":{\"value\":{\"_calcError\":\"#DIV/0!\",\"_code\":7},\"style\":{\"foreColor\":\"Background 1 -35\",\"hAlign\":1,\"formatter\":\"0%\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}},\"formula\":{\"si\":1}},\"5\":{\"value\":0,\"style\":{\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}},\"formula\":{\"si\":0}},\"6\":{\"value\":{\"_calcError\":\"#DIV/0!\",\"_code\":7},\"style\":{\"autoFormatter\":{\"formatCached\":\"0.0\\\"小时\\\"\"},\"foreColor\":\"Background 1 -35\",\"formatter\":\"0.00%\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1}},\"formula\":{\"si\":1}}},\"6\":{\"1\":{\"value\":\"人员\",\"style\":{\"backColor\":\"Accent 4 80\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"2\":{\"style\":{\"backColor\":\"Accent 4 80\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"3\":{\"value\":\"工时配额\",\"style\":{\"backColor\":\"Accent 4 80\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"4\":{\"value\":\"占比\",\"style\":{\"backColor\":\"Accent 4 80\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"5\":{\"value\":\"余额合计\",\"style\":{\"backColor\":\"Accent 4 80\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"6\":{\"value\":\"占比\",\"style\":{\"backColor\":\"Accent 4 80\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}}},\"7\":{\"1\":{\"value\":\"计划工时余额\",\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":null,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"2\":{\"style\":{\"foreColor\":\"Accent 1\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":null,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":false,\"autoExpand\":\"Both\",\"binding\":\"任务工时[执行人]\",\"alias\":\"执行人_1\"}},\"3\":{\"style\":{\"foreColor\":\"Accent 2\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":null,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"任务工时[剩余工时]\",\"filter\":{\"condition\":{\"and\":[{\"dataColumn\":{\"tableName\":\"项目表\",\"columnName\":\"项目ID\"},\"column\":\"项目ID\",\"operator\":\"Equal\"},{\"parameter\":\"年份\",\"column\":\"日期_年\",\"operator\":\"Equal\"}]}},\"showCollapseButton\":false,\"alias\":\"剩余工时\"}},\"4\":{\"value\":{\"_calcError\":\"#DIV/0!\",\"_code\":7},\"style\":{\"foreColor\":\"Background 1 -35\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0%\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":null,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"formula\":{\"si\":1}},\"5\":{\"value\":0,\"style\":{\"foreColor\":\"Accent 2\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":null,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"formula\":{\"si\":0}},\"6\":{\"value\":{\"_calcError\":\"#DIV/0!\",\"_code\":7},\"style\":{\"autoFormatter\":{\"formatCached\":\"0.0\\\"小时\\\"\"},\"foreColor\":\"Background 1 -35\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.00%\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":null,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"formula\":{\"si\":1}}},\"8\":{\"1\":{\"value\":\"月份/人员\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"2\":{\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"3\":{\"value\":\"实际工时\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"4\":{\"value\":\"计算提成\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"5\":{\"value\":\"总实际工时\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"6\":{\"value\":\"总结算收益\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"#f3f3f3\",\"style\":1},\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}}},\"9\":{\"1\":{\"style\":{\"font\":\"bold 10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"m\\\"月\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":null,\"fontWeight\":\"bold\",\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":false,\"autoExpand\":\"Both\",\"binding\":\"任务工时[日期_月]\",\"alias\":\"日期_月\",\"filter\":{\"condition\":{\"parameter\":\"年份\",\"column\":\"日期_年\",\"operator\":\"Equal\"}}}},\"2\":{\"style\":{\"foreColor\":\"Accent 1\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":null},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":false,\"autoExpand\":\"Both\",\"binding\":\"任务工时[执行人]\",\"alias\":\"执行人_2\"}},\"3\":{\"style\":{\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":null},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"任务工时[实际工时]\",\"filter\":{\"condition\":{\"dataColumn\":{\"tableName\":\"项目表\",\"columnName\":\"项目ID\"},\"column\":\"项目ID\",\"operator\":\"Equal\"}},\"showCollapseButton\":false,\"alias\":\"实际工时\"}},\"4\":{\"style\":{\"foreColor\":\"Background 1 -35\",\"formatter\":\"[$¥-804]#,##0.00\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":null},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"任务工时[计算提成]\",\"filter\":{\"condition\":{\"dataColumn\":{\"tableName\":\"项目表\",\"columnName\":\"项目ID\"},\"column\":\"项目ID\",\"operator\":\"Equal\"}},\"showCollapseButton\":false,\"alias\":\"计算提成\"}},\"5\":{\"value\":0,\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderBottom\":null,\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"formula\":{\"si\":0}},\"6\":{\"value\":0,\"style\":{\"foreColor\":\"Background 1 -35\",\"formatter\":\"[$¥-804]#,##0.00\",\"borderLeft\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderTop\":{\"color\":\"#f3f3f3\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":null},\"formula\":{\"si\":0}}},\"10\":{\"1\":{\"value\":\"已耗工时\",\"style\":{\"backColor\":\"Background 2\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0}}},\"2\":{\"style\":{\"backColor\":\"Background 2\",\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0}}},\"3\":{\"value\":0,\"style\":{\"backColor\":\"Background 2\",\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0}},\"formula\":{\"si\":2}},\"4\":{\"style\":{\"backColor\":\"Background 2\",\"formatter\":\"0.0\\\"h\\\"\",\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0}}},\"5\":{\"value\":0,\"style\":{\"backColor\":\"Background 2\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"formula\":{\"si\":2}},\"6\":{\"style\":{\"backColor\":\"Background 2\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.0\\\"h\\\"\",\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}}},\"11\":{\"1\":{\"value\":\"结余工时\",\"style\":{\"backColor\":\"Background 2\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"2\":{\"style\":{\"backColor\":\"Background 2\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"3\":{\"value\":0,\"style\":{\"autoFormatter\":{\"formatCached\":\"0.0\\\"小时\\\"\"},\"backColor\":\"Background 2\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"formula\":\"D4-D11\"},\"4\":{\"style\":{\"backColor\":\"Background 2\",\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"formatter\":\"0.0\\\"h\\\"\",\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"5\":{\"value\":0,\"style\":{\"autoFormatter\":{\"formatCached\":\"0.0\\\"小时\\\"\"},\"backColor\":\"Background 2\",\"formatter\":\"0.0\\\"h\\\"\",\"borderLeft\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2}},\"formula\":{\"si\":0}},\"6\":{\"value\":0,\"style\":{\"autoFormatter\":{\"formatCached\":\"0.0\\\"小时\\\"\"},\"backColor\":\"Background 2\",\"formatter\":\"0.0\\\"h\\\"\",\"borderTop\":{\"color\":\"rgb(0, 74, 141)\",\"style\":0},\"borderRight\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2},\"borderBottom\":{\"color\":\"rgb(0, 74, 141)\",\"style\":2}},\"formula\":\"SUM(D12)\"}}},\"rowDataArray\":[null,null,null,null,null,null,{\"style\":{\"hAlign\":3,\"vAlign\":1,\"font\":\"14.6667px 微软雅黑\",\"themeFont\":\"Body\",\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"14.6667px\",\"fontFamily\":\"微软雅黑\"}},{\"style\":{\"hAlign\":3,\"vAlign\":1,\"font\":\"14.6667px 微软雅黑\",\"themeFont\":\"Body\",\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"14.6667px\",\"fontFamily\":\"微软雅黑\"}},{\"style\":{\"hAlign\":3,\"vAlign\":1,\"font\":\"14.6667px 微软雅黑\",\"themeFont\":\"Body\",\"locked\":true,\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"14.6667px\",\"fontFamily\":\"微软雅黑\"}}],\"columnDataArray\":[null,{\"style\":{\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},{\"style\":{\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},{\"style\":{\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},{\"style\":{\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},{\"style\":{\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},{\"style\":{\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}}],\"defaultDataNode\":{\"style\":{\"vAlign\":1,\"themeFont\":\"Body\",\"showEllipsis\":true},\"tag\":{\"setDefaultStyleCompleted\":true}}},\"rowHeaderData\":{\"dataTable\":{\"6\":{\"0\":{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"14.6667px Calibri\",\"imeMode\":1,\"fontSize\":\"14.6667px\",\"fontFamily\":\"Calibri\"}}},\"7\":{\"0\":{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"14.6667px Calibri\",\"imeMode\":1,\"fontSize\":\"14.6667px\",\"fontFamily\":\"Calibri\"}}},\"8\":{\"0\":{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"14.6667px Calibri\",\"locked\":true,\"imeMode\":1,\"fontSize\":\"14.6667px\",\"fontFamily\":\"Calibri\"}}}},\"rowDataArray\":[null,null,null,null,null,null,{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"14.6667px 微软雅黑\",\"themeFont\":\"Body\",\"locked\":true,\"imeMode\":1,\"fontSize\":\"14.6667px\",\"fontFamily\":\"微软雅黑\"}},{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"14.6667px 微软雅黑\",\"themeFont\":\"Body\",\"locked\":true,\"imeMode\":1,\"fontSize\":\"14.6667px\",\"fontFamily\":\"微软雅黑\"}},{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"14.6667px 微软雅黑\",\"themeFont\":\"Body\",\"locked\":true,\"imeMode\":1,\"fontSize\":\"14.6667px\",\"fontFamily\":\"微软雅黑\"}}],\"columnDataArray\":[{\"style\":{\"font\":\"14.6667px Calibri\",\"fontSize\":\"14.6667px\",\"fontFamily\":\"Calibri\"}}],\"defaultDataNode\":{\"style\":{\"themeFont\":\"Body\"}}},\"colHeaderData\":{\"rowDataArray\":[{\"style\":{\"font\":\"14.6667px Calibri\",\"fontSize\":\"14.6667px\",\"fontFamily\":\"Calibri\"}}],\"defaultDataNode\":{\"style\":{\"themeFont\":\"Body\"}}},\"rows\":[{\"size\":29.666656494140625},{\"size\":35.666656494140625},{\"size\":30.666656494140625},{\"size\":51.666656494140625},{\"size\":45.666656494140625},{\"size\":37.666656494140625},{\"size\":45.666656494140625,\"visible\":true},{\"size\":37.666656494140625,\"visible\":true},{\"size\":45.666656494140625,\"visible\":true},{\"size\":37.666656494140625},{\"size\":36.666656494140625},{\"size\":36.666656494140625}],\"columns\":[{\"size\":33},{\"size\":159},{\"size\":107},{\"size\":117},{\"size\":117},{\"size\":104},{\"size\":104}],\"rowHeaderColInfos\":[{\"size\":40}],\"defaultData\":{},\"leftCellIndex\":0,\"topCellIndex\":0,\"spans\":[{\"row\":3,\"col\":1,\"rowCount\":1,\"colCount\":2},{\"row\":4,\"col\":1,\"rowCount\":1,\"colCount\":2},{\"row\":1,\"col\":3,\"rowCount\":1,\"colCount\":2},{\"row\":3,\"col\":3,\"rowCount\":1,\"colCount\":2},{\"row\":6,\"col\":1,\"rowCount\":1,\"colCount\":2},{\"row\":8,\"col\":1,\"rowCount\":1,\"colCount\":2},{\"row\":3,\"col\":5,\"rowCount\":1,\"colCount\":2},{\"row\":10,\"col\":1,\"rowCount\":1,\"colCount\":2},{\"row\":11,\"col\":1,\"rowCount\":1,\"colCount\":2},{\"row\":10,\"col\":3,\"rowCount\":1,\"colCount\":2},{\"row\":10,\"col\":5,\"rowCount\":1,\"colCount\":2},{\"row\":11,\"col\":3,\"rowCount\":1,\"colCount\":2},{\"row\":11,\"col\":5,\"rowCount\":1,\"colCount\":2},{\"row\":1,\"col\":1,\"rowCount\":2,\"colCount\":2},{\"row\":1,\"col\":5,\"rowCount\":2,\"colCount\":2},{\"row\":2,\"col\":3,\"rowCount\":1,\"colCount\":2}],\"selections\":{\"0\":{\"row\":12,\"col\":2,\"rowCount\":1,\"colCount\":1},\"length\":1},\"defaults\":{\"colHeaderRowHeight\":20,\"colWidth\":100,\"rowHeaderColWidth\":40,\"rowHeight\":25,\"_isExcelDefaultColumnWidth\":false},\"rowOutlines\":{\"items\":[]},\"columnOutlines\":{\"items\":[]},\"conditionalFormats\":{\"rules\":[{\"ruleType\":1,\"style\":{\"foreColor\":\"#8B0000\"},\"operator\":4,\"priority\":2,\"ranges\":[{\"row\":7,\"col\":3,\"rowCount\":1,\"colCount\":1}],\"value1\":\"0\"},{\"ruleType\":1,\"style\":{\"foreColor\":\"#8B0000\"},\"operator\":4,\"ranges\":[{\"row\":7,\"col\":5,\"rowCount\":1,\"colCount\":1}],\"value1\":\"0\"}]},\"cellStates\":{},\"states\":{},\"outlineColumnOptions\":{},\"autoMergeRangeInfos\":[],\"shapeCollectionOption\":{\"snapMode\":0},\"names\":[],\"sharedFormulas\":{\"0\":{\"formula\":\"SUM(D4)\",\"baseRow\":3,\"baseColumn\":5,\"lastRow\":11,\"lastColumn\":6},\"1\":{\"formula\":\"D6/D4\",\"baseRow\":5,\"baseColumn\":4,\"lastRow\":7,\"lastColumn\":6},\"2\":{\"formula\":\"SUM(D10)\",\"baseRow\":10,\"baseColumn\":3,\"lastRow\":10,\"lastColumn\":5},\"nextIndex\":3},\"printInfo\":{\"paperSize\":{\"width\":850,\"height\":1100,\"kind\":1}},\"frozenlineColor\":\"\",\"showFormulas\":true,\"keepUnknownFormulas\":true,\"sheetAreaOffset\":{\"left\":2,\"top\":2},\"templateSetting\":{\"paginationSetting\":{\"paperSizePagination\":true,\"paginationOrder\":\"DownThenOver\",\"titleRow\":{\"start\":1,\"end\":3},\"endRow\":{\"start\":10,\"end\":11}},\"dataEntrySetting\":[{\"name\":\"回写规则1\",\"tableName\":\"项目表\",\"fields\":[{\"dbColumnName\":\"项目标题\",\"formula\":\"D3\",\"isPrimary\":true}],\"includeUnmodified\":false,\"skipRecordWithEmptyValue\":false}],\"templateOptions\":{}},\"type\":1},\"reportName\":\"report\",\"name\":\"report\",\"sheetType\":3,\"renderMode\":\"Design\",\"printAllPages\":true,\"dirtyStyle\":{\"borderLeft\":{\"color\":\"#000\",\"style\":1},\"borderTop\":{\"color\":\"#000\",\"style\":1},\"borderRight\":{\"color\":\"#000\",\"style\":1},\"borderBottom\":{\"color\":\"#000\",\"style\":1},\"diagonalDown\":{\"color\":\"#000\",\"style\":0},\"diagonalUp\":{\"color\":\"#000\",\"style\":0},\"decoration\":{\"cornerFold\":{\"size\":6,\"position\":1,\"color\":\"#FF3D00\"}},\"mask\":null},\"parameter\":{\"年份\":2024},\"index\":0,\"order\":0}},\"namedPatterns\":{},\"customFunctions\":{\"GETRESOURCESTRING\":{\"name\":\"GETRESOURCESTRING\",\"minArgs\":0,\"maxArgs\":255,\"IDt\":{\"description\":\"获取资源\",\"parameters\":[{\"name\":\"resourceKey\"},{\"name\":\"formatString\",\"repeatable\":true}]},\"typeName\":\"\"}},\"dataManager\":{\"tables\":[],\"relationships\":[]},\"forguncyData\":{\"hiddenRowsVisible\":true,\"hiddenColumnsVisible\":true,\"dataSourcesScheme\":[{\"id\":\"4dbf2918-0b74-4133-b91e-b68a89aef288\",\"dataSourceName\":\"项目表\",\"tableName\":\"View_项目统计信息\",\"columns\":[{\"id\":\"3344e01c-bdb8-4a43-a619-35d3a391a2bc\",\"name\":\"项目ID\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"95ec7441-a7ad-4456-9bfa-6855b5069fc8\",\"name\":\"项目标题\",\"type\":100,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"c9913cf0-8d5b-4677-8eab-2b9f7e0cb32e\",\"name\":\"项目代号\",\"type\":100,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"c28bd654-8cce-47aa-a790-9f567382ca17\",\"name\":\"项目预算工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"8cf746b5-e61f-49ad-9fff-1a6da12f28f9\",\"name\":\"项目预算费用\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"562aff13-a11b-4d46-876c-b4557bdf1148\",\"name\":\"已分配任务工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"d0990d89-3ccb-436c-803f-8100b5060a4a\",\"name\":\"总成本\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"d9c5bb60-cfb8-4e8d-b110-7ee9bdfcdd7b\",\"name\":\"总计划工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"775d956e-e559-46f4-96db-62cbd3807f97\",\"name\":\"总上报工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"58aefef9-4395-4975-ab42-75a1be90a5fe\",\"name\":\"总实际工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"c8ae3639-4b06-4939-80f1-2c1338532b23\",\"name\":\"项目成员数\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"29cba71c-4e8a-4228-82d6-23197f76b21b\",\"name\":\"总任务数量\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"305529b5-e01a-4b3c-9842-d63aba1f56b7\",\"name\":\"已完成任务数\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"1663900f-0a16-4202-aa01-1a511047f6fa\",\"name\":\"未完成任务数\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false}]},{\"id\":\"3736fbc1-0867-4e34-9b4b-f76b6ded88ab\",\"dataSourceName\":\"任务工时\",\"tableName\":\"View_任务工时统计\",\"columns\":[{\"id\":\"262c1d50-5625-453a-851c-833217e5a9d4\",\"name\":\"ID\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"04fa508e-59c2-42b9-9582-659dbf8f8196\",\"name\":\"日期_年\",\"type\":200,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"73d5a3cd-7817-40a6-97bc-8b329eeaed66\",\"name\":\"日期_月\",\"type\":200,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"9389bfd1-7ae0-4596-9040-371eb47bcec8\",\"name\":\"执行人\",\"type\":100,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"1bb9fd08-08b3-48ef-8520-aad2b7a70444\",\"name\":\"项目ID\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"fd3fe92a-9fe7-4f9d-a32d-493faddedd1c\",\"name\":\"项目名称\",\"type\":100,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"6f7f66d1-5d3b-49c8-879e-b91c79a31982\",\"name\":\"时薪单价\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"e6ca9b3d-e60d-445a-b0df-bc2fe443b020\",\"name\":\"提成系数\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"9528465d-27b8-4158-b5c9-fe596a75ca7f\",\"name\":\"计划工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"4074d984-c914-4e01-ab82-fdb9d2ab16a5\",\"name\":\"实际工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"b0436ee8-3e1e-4086-b9fb-3246f791bd1c\",\"name\":\"上报工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"4d0c6a27-a29d-4942-8ddf-8cac4732f2c2\",\"name\":\"计算提成\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"18ac6af0-a2de-4b92-aeaa-91c51a0f4bd4\",\"name\":\"请款单ID\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"d649d173-a25c-48c6-8453-f831e3541a44\",\"name\":\"请款状态\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"919f93d7-84fd-47cd-847a-dcb36c9d81d0\",\"name\":\"工时完成比例\",\"type\":200,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"4c850bbb-ee24-49a6-aa14-2d6b045c706a\",\"name\":\"剩余工时\",\"type\":200,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false}]}]}}", - "eventSettings": {}, - "permissionSettings": { - "edit": [ - "FGC_LoginUser" - ], - "add": [ - "FGC_LoginUser" - ], - "delete": [ - "FGC_LoginUser" - ] - }, - "allowEdit": false, - "allowAdd": false, - "allowDelete": false, - "isAutoSubmit": false - } } }, "StyleDatas": { @@ -775,7 +376,6 @@ } }, "Spans": [ - "3,1,17,32", "1,30,1,3", "1,3,1,6", "1,1,1,2" @@ -811,11 +411,5 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - }, - "CustomNames": [ - { - "Name": "财务中心子页面", - "Formula": "工时总览!$B$4" - } - ] -}//WaM9hbmrTlgeg23yILZ2pLpbXOr5HdzncLugaqoFg358herEtyDvYeT/hQ8r8x9OQsnjx7Kh5qk9CWeotVTvGsVTRojXJ5Nr1s/CYqr7Hg0VoZBz/5VUnkOh6ABG5VkdO/MP7Enn12brK8oU/iOY3uvdZ94ySnWTPkvouJsSclx3TzTs5ahZQrO5r+9MPeJXY0mrh4LS11eX2P9NqlnKfer1jPGAKMTpRtl8kalHrA0XJNlLFQAhO7lRx73jYfP0WadhWIyi7Fs2i9gsvi/3+fDvhWYcRrniV7oOVLFp0ZD30dE25hJlb6afWhjGwEOyeXlIw2r1PMs/lgmdDMlyVPTYr1bacdrlhFIYYRSbVMoQ0p+ykwTbRL0N+WGR0aNFoGi4cDx3SegGSFwjEiK9ieprnvlr3B4OIzu79ms7tD2Q2bFtcKXXsIyDeSk9BOTNzISLy0ry0635Mk/8Z6bEKhcWvqieTVfOYCH0zOz95uYN+N/gHdFMU8vO9vO+LNtDTApBE6CvfQnBxs4HAX13fkRkNv5VHjHn5q05YVq8tVz7oPuCh0XZerIWr2BZRzmlNY9pQ/tQfaX7ibI6Cl+cGhCF8+EDQ11UXqvdLlZqMs4Mk19TbbRq0O6NDtJwVjUaFlTt1uuGx+HFLKUkt5HQ5Dq49bQypvUs8kxUZUZshHdPdkeJwhdvMylL2c0JaX5AReRrlTfrWRwGjoUw3io07/djbWUAslhyemTqfXw1kpuUIHWkVDp/kV4sarSbUgF8lkYEU3jRHovBRdYdzk0/2I3rKXXmUu7KVaAmO+8jzyAWuP/Kl+GmkyjiSZahs7dDoqRp8WkFVLNKBhoZ7KLoZCEF31SgEatEG4VDsqGJ3h2dCuqLzhVABLGHANuK4vPPsAiOXS/sbu+kXFOLN93fLw==|920 \ No newline at end of file + } +}//JfFi9CcLiS7N7YZ44W1WnogeCIKIXkK9jIgIWzwJCRNtVLqAGEopDjwswmwcXOHVCkNTksAvOya1IRP/AI7UxegCgyLIu321SDeE8qxie+C9fKPAi40FcMpwD0gDEwmn1a3fJhBugxyl32ohFw3dOP7j/RqW+dzhMkad8OZKCW73RAGAtgK61ASxx+UyUrf9ZEk87x0e1ts6x8lmbNuJGktWjXw15W2naMse4SX0dDsgZUIt509oXFmLNIp035CfFa/oFxuVIE1vuyGWky3bo3AOOMnUbOqG8/fgAfJrkk8ARi6ZZVSPyFsDeyEvcwHDXqpslyT3Hi8fWFR9/qd0J6zMPINuTGs+m7cRPKaSdaMF+ulkrWWDGoplhuyK8RJXPRIL2R8E0cLT1DOLU+5PzsdfKhHw69HrinyOFyyrtzyzsmqs9PJeqUdz1NZJf0AMV5t/tGptKd5wCPYi1WyNPb9ek5fSvoMlr16ZzkCJyyBA1J4DBctuFb9hd3TSnY1CHSJRg3l/Mv2/doOt9kiwlghR7nfECYnxwlxnufrE9gg40hazS8DwRStYvanQWyMP7dU44jXt9M6SzJ2nf6YCjinnwdHbH5rkv8CdcKyE9H/xfsYftCfkrkB8MROsBfPvmimGXJk+M0o56FHLdChXoSIvxyy7G0soJNKKeog5MsL70lpJJ+XLnCQqNd3Ri3DyUVjusxzkwGjdmWPUFQWdROqrQBu2pfO47KZHvewaXiVgm1yAkyCj4ALPEDMa+g8LOA4gjFRFSf2sRjMcP5x9A76d6D3JvQ9nbGybfpPVvkLyzrYNgEw0u+QCot0Ihn+yZfos2FZyqvLRG6WPGBsHY2dbOn/d3wqAi9wiAy1UQAGMSmletBV2dM3bJ6dOblrYMMVJQiViHFm0gUTZ+KB37w==|920 \ No newline at end of file diff --git a/Pages/工时/工时总览.rd b/Pages/工时/工时总览.rd index 590457d5..5245e64c 100644 --- a/Pages/工时/工时总览.rd +++ b/Pages/工时/工时总览.rd @@ -4,11 +4,5 @@ "RowCount": 21, "Formulas": { "1,3": "TODAY()" - }, - "CustomNames": [ - { - "Name": "财务中心子页面", - "Formula": "工时总览!$B$4" - } - ] + } } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json index 05c5a5f4..37e4745f 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.json @@ -32,21 +32,26 @@ } }, "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "7": { + "10": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 } }, - "8": { + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "9": { + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -54,10 +59,10 @@ } }, "InLogicalVisibleIndexes": [ - 9 + 12 ], - "Count": 10, - "DefaultSize": 32.0 + "Count": 13, + "DefaultSize": 35.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -118,9 +123,10 @@ "Values": { "1,1": "版本标识", "4,1": "绑定已有Gitee仓库", - "4,11": "更多仓库", - "7,1": "关闭", - "7,9": "保存" + "4,11": "选择仓库", + "7,1": "订阅", + "10,1": "关闭", + "10,9": "保存" }, "AttachInfos": { "2,1": { @@ -162,21 +168,82 @@ "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "选择Git仓库", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本详情!B6" - }, - "TargetCell": { - "SerializeProperty": "=选择Git仓库!选择仓库ID" + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务版本详情!是否为确定" + } + ] + }, + "value": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=仓库ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!B6" + }, + "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ReloadBindingItems" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!B6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!仓库ID" + } + } + ] + } + ], + "ID": "436354e6-f37b-465f-bd1b-c730c021ddea" + } + ] } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "仓库ID": "仓库ID" } - ] + }, + "PageName": "选择Git仓库" } ], - "Text": "更多仓库", + "Text": "选择仓库", "ClickMode": 1, "TemplateKey": "_RS_Main" } @@ -185,11 +252,10 @@ "BindingInfo": { "TableName": "项目版本", "ColumnName": "仓库ID", - "GUID": "9991c901-3f0d-4daa-847a-fd4e6380f4a8" + "GUID": "6b04f158-bb63-40f4-9d68-84d4326cab57" }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -261,7 +327,31 @@ "noMatchText": "无匹配数据" } }, - "7,1": { + "7,12": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "勾选后系统可接收来自Gitee的通知", + "Size": 14, + "ImagePath": "提示.svg", + "UseCellForeColor": true + } + }, + "8,1": { + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "Git订阅", + "GUID": "b01c4660-cd3b-41fc-b7be-4bd36eea96a8" + }, + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": " 订阅GITEE通知", + "Style": 1 + }, + "RulesGuidList": [ + "d8a27f0e-467f-4073-8e4b-2d06edd8fd9f" + ] + }, + "10,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -273,7 +363,7 @@ "TemplateKey": "_RS_Information3" } }, - "7,9": { + "10,9": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -301,7 +391,7 @@ "ShowConfirm": false } ], - "ID": "94bacb06-58e1-42e6-84c4-600ca7c64408" + "ID": "3e3fd88f-15f9-4a81-893d-9f8097a2c34f" }, { "CommandList": [ @@ -311,7 +401,76 @@ "ShowConfirm": false } ], - "ID": "740ddf25-d72b-4104-955f-4b9fcc118f66" + "ID": "2868f5af-eae8-40f0-a66c-1da85800c086" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目版本", + "ColumnName": "仓库ID", + "GUID": "630c924a-ca23-4406-b82e-62c93342476b", + "RelationBinding": { + "RelatedTable": "Git仓库表", + "RelatedColumn": "仓库ID", + "DisplayColumn": "订阅成功" + } + } + }, + "value": "1", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "ParameterValue": "%CurrentUser%", + "ID": "6730aa3d85934aff97c67b0573f07959" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "创建一个仓库WebHook", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!B6" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本详情!当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "回调地址" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RequestAsync": true, + "RefreshAfterFinish": true, + "CheckDataValidation": true + } + ], + "ID": "4e5cd85c-3505-4ec2-8d19-6f418a3f7066" } ] }, @@ -331,12 +490,24 @@ "IconSize": 14.0 } }, - "9,1": { + "12,1": { "BindingInfo": { "TableName": "项目版本", "ColumnName": "项目ID", "GUID": "86c17174-92f5-4f03-a856-e90623674b17" } + }, + "12,4": { + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "仓库ID", + "GUID": "bbd5cda7-3f40-4614-8ea6-287af51ddeaf", + "RelationBinding": { + "RelatedTable": "Git仓库表", + "RelatedColumn": "仓库ID", + "DisplayColumn": "订阅成功" + } + } } }, "StyleDatas": { @@ -351,13 +522,27 @@ "Foreground": 1, "HorizontalAlignment": 2, "Underline": false + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 3 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 4, + "Formatter": 5 } ], "Types": { "Strs": [ "Body", "Accent 1 0", - "Right" + "Right", + "Text 1 50", + "black", + "General" ] }, "CellStyles": { @@ -373,11 +558,36 @@ "4,10": 0, "4,11": 1, "5,1": 0, + "6,1": 0, + "6,2": 0, + "6,3": 0, + "6,4": 0, + "6,5": 0, + "6,6": 0, + "6,7": 0, + "6,8": 0, + "6,9": 0, + "6,10": 0, + "6,11": 0, + "6,12": 0, "7,1": 0, "7,2": 0, "7,3": 0, "7,4": 0, - "7,9": 0 + "7,5": 0, + "7,6": 0, + "7,7": 0, + "7,8": 0, + "7,9": 0, + "7,10": 0, + "7,11": 0, + "7,12": 2, + "8,1": 3, + "10,1": 0, + "10,2": 0, + "10,3": 0, + "10,4": 0, + "10,9": 0 }, "SheetStyle": { "FontFamily": 0, @@ -386,11 +596,13 @@ }, "Spans": [ "2,1,1,12", - "9,1,1,3", - "7,9,1,4", - "7,1,1,4", "4,11,1,2", - "5,1,1,12" + "10,1,1,4", + "10,9,1,4", + "12,1,1,3", + "5,1,1,12", + "8,1,1,12", + "12,4,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -410,7 +622,22 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "项目版本" + "RelatedDataTableName": "项目版本", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", + "Operator": 3, + "Value1": "=1", + "GUID": "d8a27f0e-467f-4073-8e4b-2d06edd8fd9f", + "StyleInfo": { + "Foreground": "Accent 2 0", + "Underline": null, + "Strikethrough": null + } + } + ] + } }, "PrintInfo": { "PaperSize": {}, @@ -419,7 +646,11 @@ "CustomNames": [ { "Name": "项目ID", - "Formula": "任务版本详情!$B$10" + "Formula": "任务版本详情!$B$13" + }, + { + "Name": "仓库是否订阅", + "Formula": "任务版本详情!$E$13" } ] -}//iF7NUnONJVvTaVf+6+diwChfTfbX2EpP8d2QPLoXiQPXO1AHiwjNVPJH1ts+kolbD4nvrNdiLzNBkOHa2pNCQHCU1r6qfcjYwQJJpHY7tQRiMan2a8QA4wMoI2v7gOGoSbg1beWm3JljJCNNta32X0hvGoIC74mnbuoce9HRQcOuayqRwm8M50Wc5QflY2nDl0eflx1F6jfPDhRusz2+umfugu5Iy9t+yJ7y4wFOmpsMEC3JvSHoBKq78bcJlxR5tXabYq00htyvNjFeOWZK2ujNquwTYCBtnkVSv/XK4T26rW7tzqCadaq/jjMnwLfzw7zE+XaXcMj1WiOMusrKsBexfjXR8nAJxo8Mn7G/Uiuvzgm9xjjJZutSmBEFp217xzh30eLecW4VqmFIupvLIIaI2U36VRl68b5PjmIaicEIQtysz8lugS4+HtFben7NiNZ8+/cr3o6f8+0W20Tq4t40kKOEPIEoFtxYoZuJaxInItxiNLbkUX5w67COen3dZ34nH76PeX15eWHopmjacAwhev69106cSEbr/PBRAQVvCBL9zpDQTDGtzNjx4FHLSG+KxpMBheZ8zI53jDapN0E2OVJV0/nDAHSWQz2NpgCuko44DGuM03F2urfgpX8zdbfnEUixuBUiLTHE3cSgBKovO0w2dZNdgqZhGtMjFCF3VHmKK+73Fgk38HIfEWSDBk3NvZS8tGaSSsMei26fOZUTu/eSbE0CqAvUCk/RBDiw3yTZ8WDpK7gog05kD0NmtRIIodVqLumjuNDNsEp93tQ1zyvkVF84tRkIfXiTW7L2tXWFsH4sTRXs8xxEVu1IJBiIZZ337tlpJLkvAfzgFd9zOSM6a6GkrzrpmFbonlre4mHtOXyeJjv6exj/OKBaviua0txL+ewpB3ftPhDODw==|920 \ No newline at end of file +}//Q1E6dQFN1YRKHKf6JcJMIXEAzdGgZUaLtHQK85rPjXHOOygA0QPFTBWVjwXZLEwEVJxudVwnQhVp0TNp/DhQ85YHD152lYRB/XAUedXze/zM8wP6y5B3ilxVve9l30Wt9GRutQsra+mrIPGb2Dv1qKNlPuDZPr4kc0GfvFlU53Ur8qk582c88ZdiAmdoqsQmtnUC9Vp9TVFv3Ck6wLDRbgBuZ73fMl976Ae2k5FtgNNmawuv/CbqGdE5dYqwXCDX0aNS0oCmZmVromELfNvqMOkmamaPIqdGI1i5yaqfYQo8o/YIA3XuHem9/4Q+5/TFWHQlBCFGAhhHX+qaXrhicwNJ6YImYN8MIIbZVsxT6T6YRh+aMqN5evCkEk5iAt0RXm/gj2cGldfGnDmsYjGc47jL1mtErOCIAxowLonhCNlsidZ7tffDcOKQ6xfe6FFmgDmwIr4ao+0zR4D/fp08kheqJlyDcjTT+xIhzVLvg3h70MpXuSojxIyuf1dOrHQAKQnAhdQTOGcOtFB+l81GVuKUjT2BcMaTw+h5DzUVbJ5NQtwP2ULHcgs/Y3U2t7aJwVVmC+Ud+3v3eTGmCvJVZCMFiNLJUVFcLy2w/izuKt/gfegUAYeSOYxkF/KDkey+5DkdNVBmIAjMlfJ01HKkDzi3p6MIqGsstpsBFzAr1707p1A2L/Ho152LIyAVUGl6JZmYSXdHrf+VX2ZC0grdPnuxNF7NC6vkiqTFqGt0l7OnIXNBU0LrETWcfDQppAbtbr8DtF8RO8xR0srMrnhMcVnHbTCmAqW4OaUjU6yPrgh/T9xK2onSH00PjTz/0yB09SQY2gRyUeZwIKcSNKBvu/j8vJpzRKIKzECN7eMWcKk3UWFpM+Tej5I9u01271zACLKJMu7sTG5K0lJZgZkivA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd index f77b76c8..c45d7148 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务版本详情.rd @@ -1,11 +1,15 @@ { "PageType": 0, "ColumnCount": 14, - "RowCount": 10, + "RowCount": 13, "CustomNames": [ { "Name": "项目ID", - "Formula": "任务版本详情!$B$10" + "Formula": "任务版本详情!$B$13" + }, + { + "Name": "仓库是否订阅", + "Formula": "任务版本详情!$E$13" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json index d572759a..ff25eb33 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json @@ -644,7 +644,7 @@ } } ], - "ID": "86482f48-f333-4edc-9e0d-a18903d9106d" + "ID": "e0759d63-76b5-43ae-ab98-e65f1dd61934" } ] } @@ -747,7 +747,7 @@ } } ], - "ID": "936ffb54-a17c-488e-b263-410efa6cfd9a" + "ID": "d4d10bd0-1167-49cf-8840-a5adda5146db" } ] } @@ -884,4 +884,4 @@ "Formula": "项目版本管理!$B$6" } ] -}//GOG5FwS1Ynjoub6GdGXP9bQl5nfYDz+1zp2fOtu1gxupVwaZVsBTQajfHXo9CFIJ9r/4eOPXW9Sja2t6FpDAguqkALhANdKbjuG9OA4hVab99WtbVBdIARBGrllNYWw7wWyzSMd/ThBVZCvPhZ7kIrthoMo8cwcJ4Iako8YrjFj1OLycR5+eIs7kEYXVrie2nayNegTV4R0iDOcW2zDfEsxaXGi5r7SCqUu6RtXJoto/kk3uAH8o1zqYs2bTILeL/vvcMwGTMkTfzw5IQNVoAs/9fyNoB3IzzOs13xIdM9pUaCCOwh73sZzP6vUwubwGDsV9UcrhR6smaq38eAdsCtI/kmTN9wdwG9wl9hJMYV2YT1Zq9Tl1V7jozdJ3fFy64ucHl4EShMBAhJPP6qOzZvmAWNgJnViYr3UQ+pfBBLiYlNt5fAWRMEyUYon/CUpkQwJTjwLjK9LYVRidvCV48phu6B+ghIinqPKP4EWil3a7EzLgHB8+14Hz6glRdWsmuIxnn4uVeQrDoyBu0uG0lhc0hO7CHfcurZY+lGDF1qZeAEdp5btcgtv6a0HNQ1+6C/gbl/GYd9ncLhNcubNN00fkZvqnVOKwlWw4I7bwQJ/Vr8grm+gCvwG+YKYmHjuzZT9K2fzQUQVj+qR7NQHOyVSG7l6uDOvvGMoz+gjTHzdLPyyHCyvL1Ksg/rsS6SuDTGlpRR5v2k7mhuPVCd43tQ2U8vKnk7qsxm38axeIWhUIf/wz6VTaIbChsKofYGwfVsOGRGygjubn4TplOHcw+oLWq2sQSlJucFLM+14ClOYhzxAYVGRKoTFjRy2zyJhxWFM7rcUzxXvzhDtQQ3odd/xNRsX0737I+3czWgLKbUIBCBYz1pqXEEar0iw/ib3YCRxxpNJcNwNXNWCLFStv5g==|920 \ No newline at end of file +}//cgk/NLmvO1Xw4aFm+qK2dSwMzR0NVJU4KsWvEJFQRztHlGf340UQCi7C9J3xHT8VuX3xGpjAP3Xeyr/fkBf8zQcANr9IN2EIY2ezmlVkbcrQKjPRKg/dAmY/DWhbh70N0UiFs/TCmhNxMKkvMd/rjuifQnzlaDD/08K7+AwQ0E34CgY1quHLV1DTLasmLZBKsBmdJACezTkabKkyn2Hds19t5cvIHN2MtI4KSn4l31MseM/JH3gYeNaDGoRy/+BliwRU/J/X55xqDG2jbwJsaUg1xgk1GFJeW0shenfwPLlqAyfNKTF+5wrZxgWvodQIhZi4amyD5rndw5o/7dV5KIXuryb3Jqgi15Sn/mVr4Po9lwMLN1PCzBXcKnFGVhSiHuffQzZP64AA8B7qQ4ZDEYxGOFSDA8BgYUr5NszVj9+UozgMJFNh0nSQOHQ+1r/eGfC3B05w52RR3A1endE+RbElSFTLEZSM9fzW3mfSFXv8NV3uwj3qHORflb6tiY+GXuZkZw6k+umH+4bkuEeHg6M5+nr0/UbIOO1goFqEoZlT2r7E/u3IRY1jnzTwMpVbyaUo2y8nYbXWvyL68XTmM7MZU7RaqYZbMSHRlrbtRJ/I1n2nJKSXK1oQogJNA943GSX64z3g/m+QRcL+tErYwgK18EB5zHfZj6hBvhrg9s9ZIeMGFK3AEoboIgqDpSKk1gAsUbIlwPmVJ5cywiM2lmwcneVt18zZvvJ0p6rEH8WdEDM/b7WeWAYpLEBU90wi5aPoSa5eOZKqoSyi3v5ajMWgXy8DFsv1GegULDZfsLF9mdYQvZo9HXt2svMgR8eBDmk6Zt/lyEytRTG6i4Z1t5sTL+n3GfuOtkCx2xV+m0kFeNE6yxAOhjiJpeojEe014AXvacuNy04q5TocKBHFyQ==|920 \ No newline at end of file diff --git a/Pages/首页/首页.json b/Pages/首页/首页.json index 91883bf7..cdadca78 100644 --- a/Pages/首页/首页.json +++ b/Pages/首页/首页.json @@ -344,7 +344,7 @@ ] } ], - "ID": "b5f12fb6-d65c-4198-9daa-1afb57b8595d" + "ID": "e769eef4-75ce-4b34-944e-8b1ca2c4d134" }, { "CommandList": [ @@ -364,7 +364,7 @@ ] } ], - "ID": "367b7b36-3cf7-463b-9411-3bcb6438fee7" + "ID": "897e1d5c-15cd-4c53-b8ba-82a41ab0e942" } ] } @@ -614,7 +614,7 @@ "Millisecond": "1000" } ], - "ID": "98eec3bc-c494-4456-bbea-822dff04e57c" + "ID": "ce04fc32-c8c8-4690-acb0-26ab537cbc6d" }, { "CommandList": [ @@ -634,7 +634,7 @@ ] } ], - "ID": "eff74857-495a-433b-a4e5-7e9cbf890790" + "ID": "88cc11c5-fa8c-401d-86c1-795fa0444c12" } ] }, @@ -780,7 +780,7 @@ "CheckDataValidation": false } ], - "ID": "5ce8e2e4-763e-464f-a2f4-0c87da24cd10" + "ID": "6274134f-3de2-470f-8733-7695a2da5c56" } ] }, @@ -970,4 +970,4 @@ "Formula": "首页!$B$2" } ] -}//MGejl9vVMbw/4F4yL6lcdItBGXPJKUg4jy96SfRDwv8ijH2uzemJT/cgL5Fj9s3Hm54jNSbqCA+VzJDRh8ohqbpO1gjWGrCua2deCxYT+q5z8/Bsc88mSlBVt4WDVgOenjxAqoz1g9fonqDaytpd8z8bk1Aa/nK8P9YGtyZnHBQWiSrlp3Bwu4oS5YMzMZl2I6+oe7v6iVhao+7gtaqE2ETcvMgvw+dN2OkM19wnrquDoXIUw7q3nCMizdBnj7JvBPb3O1SQruEPzIjuiWL5P07VbDY1sqtqUG1mzz7LAubW/yigsBrRX65lHIyrFZDRAEfWnLwf8FawvKA5spnULY42OXYoh7J07fsFZ/2QPV4Rd0bLUXXkeyeLUMoVtazpO/Xe9d6deIbw5RLubbsGrO1HCBCSCdiX+GC9HyFQk7s3bPoeKP7jLXg5YFwlW4VSrYQsf4f6ry0GaS1rJu/OqsD7uptuq15VnRXpjCLHOA4YMvi/NjvVN3Ldvs7cSpmCqUb8PLut50JhQd+kdLMsdQvY3Ielru4ya+8RsnXEKPzpIeHhIUGOSaCxXimXm1CtjWs7kCf2PsxUZ/8QStqZMqBvRRO14vPjgjFyKm6tnze0v1CDGUGAPC9y2P2/H4jqtSLqruYO86py0Ak5IeIzI2QxtSXHcDhU3f1PS8juEblx6ZRW484cSyEoj3g8WaqTqXPYlXgYzZ9HcGdTAiH63wDTSSkH/AYMuQ8TylBRY4fbTOULoA6jfnjX5ViCc3BeJLn5p+E6weCTrcS8n7Bt4+HyEJHK7ZdGf7TI993f6m0afXSB0W8J5IBLcerD+DLD9HJVgROUFPN2Ad93bgpH6aqsg2sSwRuf2CIGiIEwIxvNHMRGY0AG/8QYH7LMeE03tW3GBBGTfY+5raw9C/0/gQ==|920 \ No newline at end of file +}//VeyUEpQrKTseGdTkllxOHv1Lw0cbh9tfUKpC3EPuF6rk/koMQw+tw+eDzLWH/QH9owpr4ZLk2XBTA1EPKupIw6wvkTosciBLS+Anb4nQWBa7rq8Ut71AC86XT6jCs/DZtEVQExURLgXC3/m2f1On0LM4mIZOsNLECECfM4RWE9AyPO+Di7UdZ6yEe7wh8QKC/ritTkkmnitiLA8PeLYj0YT6jVpLLUFkG5qB1n3u00XRLPrEvsTXSNUXg/rfN2n+G4MIoKtAE/LCODY/SfHYJ9HyTq9qqTcwWG1KEmG8oa3bJQSUS1/R0PHjRyujvq2IvzPdAO0wvAdvUnIqgOPrvpBSgrw4PaAb6uGQxXItanYSRps0pl4s9j7iX+H2Vtu56bNF9OYftYs3uOW48eTbP7xumtzyALvuz9dIJC98tUTHirygTwdPFOuTTANLWtQV7MnrGccnC+ltp8oK2zYN9FNSFs77OFbqe7F5d3uk8eIeZf0vhtoVggGbYxyGFvCt5R4ukNyueAhoFZFiiL7j69tQKyUlHBUiHVDvyXz6zR+CAtGW8kYYxCgjOrwvKLJUb2m0zpHBTcuL5A/bIUNQXvTVh8/tckYhuWjH5ydtszOjeqiSnsFgiZY3knLbSCbvIyPQbMbbMGSOCG1CjyTgqZNNa/6FSrC3qVw/clni+OzvU9d04iHwZYJFNADaTD+4jbj78pQ9zeUhtHdowwr6vH4/A1SSjIkNdSxI45HWn6v2fcPp9ShD8Iz5IUjU1pchsJOu4PDL8FQFQ91b2efRWzO13x/N/LL5VL94H6+zJnHHps/a+nWGwceDq3ZWb/wDGAEpJsDNqO6/mNqw/7UX9gXIaIxFqZs6/8X2ARZNsvJipcO1/zMNjrdv+khHdX+kAOxnl2QvZlGvQpq30nR6vA==|920 \ No newline at end of file diff --git a/Plugin/表格报表-10_0_3_0.zip b/Plugin/表格报表-10_0_3_0.zip deleted file mode 100644 index 9a10ea02..00000000 Binary files a/Plugin/表格报表-10_0_3_0.zip and /dev/null differ diff --git a/PublishSettingsConfig.json b/PublishSettingsConfig.json index 9f8a4f6f..2ef7dd0e 100644 --- a/PublishSettingsConfig.json +++ b/PublishSettingsConfig.json @@ -1,14 +1,14 @@ [ { "Name": "格友服务器", - "ApplicationUrl": "https://1.117.103.252/pms", + "ApplicationUrl": "https://develop.gridfriend.cn/sims", "Remark": "腾讯云服务器", "PublishSettings": { "IsPrivateServer": true, - "ServerName": "1.117.103.252", + "ServerName": "develop.gridfriend.cn", "UserName": "Administrator", "SitePort": 443, - "AppName": "pms", + "AppName": "sims", "AppStartPage": "首页", "TakeServeronline": true, "Https": true, diff --git a/SchedulerTasks/应用部署时.json b/SchedulerTasks/应用部署时.json new file mode 100644 index 00000000..2f7696a9 --- /dev/null +++ b/SchedulerTasks/应用部署时.json @@ -0,0 +1,77 @@ +{ + "Name": "应用部署时", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.AppReDeployTriggerSaveData, ServerDesignerCommon" + } + ], + "Commands": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=全局_业务配置" + }, + "SampleJson": "{\"版本号\":\"1.0.0\"}", + "ToParameter": "业务配置" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "版本号", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=业务配置.版本号" + }, + "ID": "a259420da6d342f2b652f4100fd8d01a" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "新版本号", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(LEFT(版本号,LOOKUP(2,1/(MID(版本号,ROW(INDIRECT(\"1:\"&LEN(版本号))),1)=\".\"),ROW(INDIRECT(\"1:\"&LEN(版本号))))-1)&\".\"&(RIGHT(版本号,LEN(版本号)-LOOKUP(2,1/(MID(版本号,ROW(INDIRECT(\"1:\"&LEN(版本号))),1)=\".\"),ROW(INDIRECT(\"1:\"&LEN(版本号)))))+1),版本号&\".1\")" + }, + "ID": "a081deb0a9854e059b034311411a164f" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "Operation": 3, + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=业务配置" + }, + "OperationParamaterName": "版本号", + "OperationParamaterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新版本号" + }, + "OutParamaterName": "业务配置" + }, + { + "$type": "JsonUtilityCommand.JsonSerializeCommand, JsonUtilityCommand", + "SourceObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=业务配置" + }, + "ToParameter": "业务配置字符串" + }, + { + "$type": "Forguncy.Model.Commands.ServerChangeGlobalPropertyCommand, ServerDesignerCommon", + "ChangedGlobalProperties": [ + { + "Name": "全局_业务配置", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=业务配置字符串" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "自增版本号成功" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/Gitee/GitCallback.json b/ServerCommands/Gitee/GitCallback.json index 804a91c9..cfd76d7f 100644 --- a/ServerCommands/Gitee/GitCallback.json +++ b/ServerCommands/Gitee/GitCallback.json @@ -73,54 +73,67 @@ "Disabled": true }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "Git_事件记录", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "事件名称", - "GUID": "fccc431d-e253-40c4-8afa-1b29b8d0efa2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.hook_name" - } + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.commits" }, + "LoopItemParamName": "Item" + }, + "CommandList": [ { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "hook_id", - "GUID": "ffc4bb74-08a8-4e4e-95a2-b4e9d3d7fbcf" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.hook_id" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "提交人", - "GUID": "d55ad806-94ce-4bc7-aa3a-0f92603c0ea7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.commits.author.name" - } - }, - { - "BindingInfo": { - "TableName": "Git_事件记录", - "ColumnName": "事件内容", - "GUID": "db739f7c-5d74-4a80-80f8-e0e541b13569" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=钩子数据.commits.message" - } + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "Git_事件记录", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "事件名称", + "GUID": "b8714ad4-5742-4115-9873-9fb493234164" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.hook_name" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "hook_id", + "GUID": "95971d9c-d698-4047-9b88-f9e44fb21db9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子数据.hook_id" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "提交人", + "GUID": "3924cbf8-fb60-4a3d-8078-9ef7bbfb330e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.author.name" + } + }, + { + "BindingInfo": { + "TableName": "Git_事件记录", + "ColumnName": "事件内容", + "GUID": "87c9243c-b42f-4266-bd23-52c6abe2ab90" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.message" + } + } + ] } ] } diff --git a/ServerCommands/Gitee/列出仓库的WebHooks.json b/ServerCommands/Gitee/列出仓库的WebHooks.json new file mode 100644 index 00000000..4dce9b55 --- /dev/null +++ b/ServerCommands/Gitee/列出仓库的WebHooks.json @@ -0,0 +1,354 @@ +{ + "Name": "列出仓库的WebHooks", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "Parameters": [ + { + "Name": "仓库ID", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "33487312" + }, + { + "Name": "用户名", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "Administrator" + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "ba26ad6b-e153-4018-acbf-19fd62234227", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "GIT用户名", + "GUID": "68ee86fa-88ce-4787-9175-7fb4b1f4639f" + }, + "ColumnName": "GIT用户名" + }, + { + "GUID": "88d30da5-84dc-4d11-b8ef-f8f545176b56", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "GIT密码", + "GUID": "4ca2adb0-be71-4cff-a7f0-0f319f33fc35" + }, + "ColumnName": "GIT密码" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "e3ee2272-9867-43eb-97ee-199cb94862de" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "46e29f04b4fd462f8586231d02327d70" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "仓库", + "TableValue": { + "TableName": "Git仓库表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "eab47598-bcd0-4b61-ab21-f4499617214f", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库路径名", + "GUID": "2c41e2fb-0784-4414-a2f6-e7bf48e1a825" + }, + "ColumnName": "仓库路径名" + }, + { + "GUID": "72c9972f-e241-4bc7-8414-58a9ecdcd638", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "空间路径名", + "GUID": "a4dc7e40-113c-4634-a254-bd3d364169e2" + }, + "ColumnName": "空间路径名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库ID", + "GUID": "7aa0116e-f6a8-4a54-9dc1-10755107fdf9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "a2fa9d23eaeb4e18ba0abc7c6ba18b88" + }, + { + "$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": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "请求令牌", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "强制刷新", + "Value": "0" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "最新令牌", + "ResultTo": { + "SerializeProperty": "TOKEN" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$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": "=code" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "url", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&仓库.空间路径名&\"/\"&仓库.仓库路径名&\"/hooks\"" + }, + "ID": "fbb123be017a4289846192ec2842aebb" + }, + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", + "PostData": { + "DataItemType": 1, + "Data": { + "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", + "Data": [ + { + "Name": "access_token", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TOKEN" + } + }, + { + "Name": "page", + "DataItemType": 0, + "Data": 1 + }, + { + "Name": "per_page", + "DataItemType": 0, + "Data": 100 + } + ] + } + }, + "JsonString": "", + "WebUrl": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=url" + }, + "Method": "GET", + "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", + "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", + "NewParameter": "result", + "Header": [], + "Timeout": 100.0 + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "完成", + "CustomReturns": [ + { + "ReturnPropertyName": "钩子列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result" + } + }, + { + "ReturnPropertyName": "ACCESS_TOKEN", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TOKEN" + } + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "SampleJson": "{\"message\":\"\"}", + "ToParameter": "错误信息" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=错误信息.message" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "钩子列表" + }, + { + "ReturnPropertyName": "ACCESS_TOKEN", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TOKEN" + } + } + ] + } + ] + } + } + ], + "ID": "f3b11adb-460b-462a-a407-eb24c1edf879" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "钩子列表" + }, + { + "ReturnPropertyName": "ACCESS_TOKEN" + } + ] + } + ], + "ID": "5151823f-c28b-4635-a478-2b8d6a34cc97" + } + ] + } + ], + "ID": "0fe2bd70-2110-4273-a51b-c8cc82e24dff" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "仓库不存在，请先同步仓库到系统中", + "CustomReturns": [ + { + "ReturnPropertyName": "钩子列表" + }, + { + "ReturnPropertyName": "ACCESS_TOKEN" + } + ] + } + ], + "ID": "76ade898-cb5c-498d-a048-1ce527c4ccdc" + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "钩子列表" + }, + { + "Name": "ACCESS_TOKEN" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/Gitee/列出授权用户所有的Namespace.json b/ServerCommands/Gitee/列出授权用户所有的Namespace.json new file mode 100644 index 00000000..3485a559 --- /dev/null +++ b/ServerCommands/Gitee/列出授权用户所有的Namespace.json @@ -0,0 +1,288 @@ +{ + "Name": "列出授权用户所有的Namespace", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "用户名", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "Administrator" + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "请求令牌", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "强制刷新", + "Value": "0" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "最新令牌", + "ResultTo": { + "SerializeProperty": "ACCESS_TOKEN" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$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": "=code" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "url", + "ParameterValue": "https://gitee.com/api/v5/user/namespaces", + "ID": "e09586acb7f74d1db8d88b8f48c345c4" + }, + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", + "PostData": { + "DataItemType": 1, + "Data": { + "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", + "Data": [ + { + "Name": "access_token", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ACCESS_TOKEN" + } + }, + { + "Name": "mode", + "DataItemType": 0, + "Data": "all" + } + ] + } + }, + "JsonString": "", + "WebUrl": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=url" + }, + "Method": "GET", + "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", + "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", + "NewParameter": "result", + "Header": [], + "Timeout": 100.0 + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "OutParamaterName": "企业列表" + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "类型", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(ISBLANK(Item.type),\"个人\",SWITCH(Item.type,\"Enterprise\",\"企业\",\"Group\",\"组织\",\"个人\"))" + }, + "ID": "a3da1376a2bf434fb27a08ef4c99d602" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "名称", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.name&\"(\"&类型&\")\"" + } + }, + { + "Name": "路径", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.path" + } + } + ], + "OutParamaterName": "当前企业" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=企业列表" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前企业" + }, + "OutParamaterName": "企业列表" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "完成", + "CustomReturns": [ + { + "ReturnPropertyName": "企业列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=企业列表" + } + }, + { + "ReturnPropertyName": "ACCESS_TOKEN", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ACCESS_TOKEN" + } + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "SampleJson": "{\"message\":\"\"}", + "ToParameter": "错误信息" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=错误信息.message" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "企业列表" + }, + { + "ReturnPropertyName": "ACCESS_TOKEN", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TOKEN" + } + } + ] + } + ] + } + } + ], + "ID": "40a76140-62e2-473a-b500-798654e3beb8" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "企业列表" + }, + { + "ReturnPropertyName": "ACCESS_TOKEN" + } + ] + } + ], + "ID": "309a88e0-a443-4d5e-82f1-506ed8887c9d" + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "企业列表" + }, + { + "Name": "ACCESS_TOKEN" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/Gitee/创建一个仓库WebHook.json b/ServerCommands/Gitee/创建一个仓库WebHook.json index d9e48be1..98524684 100644 --- a/ServerCommands/Gitee/创建一个仓库WebHook.json +++ b/ServerCommands/Gitee/创建一个仓库WebHook.json @@ -3,7 +3,23 @@ "Enabled": true, "Triggers": [ { - "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, "Parameters": [ { "Name": "仓库ID", @@ -18,6 +34,10 @@ "IgnoreBlank": false }, "TestData": "Administrator" + }, + { + "Name": "回调地址", + "DataValidationInfo": {} } ], "InvokeTriggerTestData": { @@ -26,6 +46,15 @@ } ], "Commands": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=全局_Gitee" + }, + "SampleJson": "{\"client_id\":\"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\"client_secret\":\"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\",\"回调地址\":\"https://develop.gridfriend.cn/sims/ServerCommand/GitCallback\"}", + "ToParameter": "Gitee配置" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", @@ -34,7 +63,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "79da2071-159c-4a8d-8796-be57ae391a1f", + "GUID": "c26e601c-dffb-46f1-be97-ce46d5deadcc", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -43,7 +72,7 @@ "ColumnName": "GIT用户名" }, { - "GUID": "68731a57-db25-4f90-bd1f-35011ff221a7", + "GUID": "b594d85c-3422-4cb3-a063-69e472c32537", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT密码", @@ -67,16 +96,68 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "4d5b1b1010f84c79946ac09278aa8d66" + "ID": "ea6babeddf554a1eb8f46e195877e952" }, { - "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", - "JsonString": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=全局_Gitee" + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "仓库", + "TableValue": { + "TableName": "Git仓库表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "375548fd-8c18-4c87-9511-bdb646a7a88a", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库路径名", + "GUID": "2c41e2fb-0784-4414-a2f6-e7bf48e1a825" + }, + "ColumnName": "仓库路径名" + }, + { + "GUID": "4a543850-eab6-45df-9a9e-40fdac47d12c", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "空间路径名", + "GUID": "a4dc7e40-113c-4634-a254-bd3d364169e2" + }, + "ColumnName": "空间路径名" + }, + { + "GUID": "cd748bcf-8be5-49ee-9828-0d140beb2581", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "hook_url", + "GUID": "b34b70ae-08b3-4667-be01-afce405fb9bc" + }, + "ColumnName": "hook_url" + }, + { + "GUID": "3175ee74-7815-4217-b3b8-257b3cfbce93", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "订阅成功", + "GUID": "01bbed57-b961-4d6b-b4ee-dba6636960af" + }, + "ColumnName": "绑定成功" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库ID", + "GUID": "7aa0116e-f6a8-4a54-9dc1-10755107fdf9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - "SampleJson": "{\r\n \"enterprise\": \"GridStudio\",\r\n \"client_id\": \"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\r\n \"client_secret\": \"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\"\r\n}", - "ToParameter": "Gitee" + "ID": "c7607e00ea68441eb59a50ac39babf53" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -88,47 +169,13 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Gitee.enterprise" + "SerializeProperty": "=仓库" } }, "value": "%Null%", "compareType": 1 }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "仓库", - "TableValue": { - "TableName": "Git仓库表", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "f86fee2d-71be-4386-986f-58efe124ddbd", - "BindingInfo": { - "TableName": "Git仓库表", - "ColumnName": "仓库路径名", - "GUID": "2c41e2fb-0784-4414-a2f6-e7bf48e1a825" - }, - "ColumnName": "仓库路径名" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "Git仓库表", - "ColumnName": "仓库ID", - "GUID": "7aa0116e-f6a8-4a54-9dc1-10755107fdf9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库ID" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "18b47cd732ea4f5ca35425f3f67f2068" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -139,63 +186,56 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库" + "SerializeProperty": "=仓库.绑定成功" } }, - "value": "%Null%", + "value": "1", "compareType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "是否存在hook", - "TableValue": { - "TableName": "Git_WebHook", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "a39b5b84-ec17-4474-a3f1-024ba1e931a3", - "BindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "hook_id", - "GUID": "a9ffabfc-9ef2-4051-bf27-4ac4bb9612a3" - }, - "ColumnName": "hook_id" - }, - { - "GUID": "07448f15-a30a-46e3-98f5-454569fd9b9f", - "BindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "url", - "GUID": "4ef09151-35ae-4d70-afa6-b779ea5dd6c9" - }, - "ColumnName": "url" - }, - { - "GUID": "56c3cff0-bec6-4060-8500-5184a071b6df", - "BindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "password", - "GUID": "5d84189e-bd75-4b4f-800d-a273ba9b1ef8" - }, - "ColumnName": "password" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "仓库ID", - "GUID": "62db27c9-59da-493e-a58b-8fd48148a5ca" - }, + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "列出仓库的WebHooks", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=仓库ID" } }, - "NullFormulaValueQueryPolicy": 0 + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" }, - "ID": "4d967288116a47b58360492b81f91672" + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "钩子列表", + "ResultTo": { + "SerializeProperty": "钩子列表" + } + }, + { + "ResultPropertyName": "ACCESS_TOKEN", + "ResultTo": { + "SerializeProperty": "ACCESS_TOKEN" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -207,46 +247,16 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=是否存在hook" + "SerializeProperty": "=code" } }, - "value": "%Null%" + "value": "0" }, "CommandList": [ { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "请求令牌", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户名" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "强制刷新", - "Value": "0" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "最新令牌", - "ResultTo": { - "SerializeProperty": "TOKEN" - } - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "查找钩子", + "ID": "6eff079d11144740b4fd5e2b0587ba6a" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -258,10 +268,50 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=code" + "SerializeProperty": "=钩子列表.Count" } }, - "value": "0" + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayQuery, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子列表" + }, + "Operation": 1, + "OperationParamaterPairs": [ + { + "Name": "url", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.hook_url" + } + } + ], + "OutParamaterName": "查找钩子" + } + ], + "ID": "46121cc4-33f5-4116-bde3-b6b15878703a" + } + ] + }, + { + "$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": "%Null%" }, "CommandList": [ { @@ -269,204 +319,231 @@ "ParameterName": "url", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&Gitee.enterprise&\"/\"&仓库.仓库路径名&\"/hooks\"" + "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&仓库.空间路径名&\"/\"&仓库.仓库路径名&\"/hooks\"" }, - "ID": "67f11c1341634f158b457443feca21de" + "ID": "631a9d7da45544d598696dbdbc7e16e7" }, { "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", "TryCommandPart": { "CommandList": [ { - "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", - "PostData": { - "DataItemType": 1, - "Data": { - "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", - "Data": [ + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", + "PostData": { + "DataItemType": 1, + "Data": { + "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", + "Data": [ + { + "Name": "access_token", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ACCESS_TOKEN" + } + }, + { + "Name": "url", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(回调地址=\"\",Gitee配置.回调地址,回调地址)" + } + }, + { + "Name": "encryption_type", + "DataItemType": 0, + "Data": 0 + }, + { + "Name": "password", + "DataItemType": 0, + "Data": 6158891 + }, + { + "Name": "push_events", + "DataItemType": 0, + "Data": true + } + ] + } + }, + "JsonString": "", + "WebUrl": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=url" + }, + "Method": "POST", + "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", + "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", + "NewParameter": "result", + "Header": [], + "Timeout": 100.0 + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "Git仓库表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库ID", + "GUID": "421e0ce9-cf66-4deb-8fe6-f586f95a2d78" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } + }, + "UpdateBindingValues": [ { - "Name": "access_token", - "DataItemType": 0, - "Data": { + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "钩子ID", + "GUID": "7474b27e-471f-45d3-9169-70ee07eb90fa" + }, + "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TOKEN" + "SerializeProperty": "=result.id" } }, { - "Name": "url", - "DataItemType": 0, - "Data": "http://www.baidu.com" - }, - { - "Name": "encryption_type", - "DataItemType": 0, - "Data": 0 - }, - { - "Name": "password", - "DataItemType": 0, - "Data": 6158891 - }, - { - "Name": "push_events", - "DataItemType": 0, - "Data": true + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "订阅成功", + "GUID": "c25cba9f-2eae-4238-8259-a6e2015e3900" + }, + "Value": "1" } ] } - }, - "JsonString": "", - "WebUrl": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=url" - }, - "Method": "POST", - "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", - "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", - "NewParameter": "result", - "Header": [], - "Timeout": 100.0 - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "Git_WebHook", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "仓库ID", - "GUID": "73a25ccf-ba9a-4c0b-a999-5598caeab5dc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库ID" - } - }, - { - "BindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "hook_id", - "GUID": "8b359d8c-e7f0-45bc-8336-270f0e318259" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.id" - } - }, - { - "BindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "url", - "GUID": "e835645b-cdc8-4f0c-904c-8d126c038e01" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.url" - } - }, - { - "BindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "password", - "GUID": "d13c52b9-870b-43bd-b96f-6dd187ee44b1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.password" - } - } ] }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", - "Message": "获取成功", - "CustomReturns": [ - { - "ReturnPropertyName": "id", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.id" - } - }, - { - "ReturnPropertyName": "url", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.url" - } - }, - { - "ReturnPropertyName": "password", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.password" - } - } - ] + "Message": "获取成功" } ] }, "CatchCommandPart": { "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "Git仓库表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库ID", + "GUID": "421e0ce9-cf66-4deb-8fe6-f586f95a2d78" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "钩子ID", + "GUID": "acc607e0-06da-4c13-8831-596f16899736" + } + }, + { + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "订阅成功", + "GUID": "c9954ca5-54b8-42c3-ba77-0a135764ea4b" + }, + "Value": "0" + } + ] + }, + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "SampleJson": "{\"message\":\"\"}", + "ToParameter": "错误信息" + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.message" - }, - "CustomReturns": [ - { - "ReturnPropertyName": "id" - }, - { - "ReturnPropertyName": "url" - }, - { - "ReturnPropertyName": "password" - } - ] + "SerializeProperty": "=错误信息.message" + } } ] } } ], - "ID": "031b5ddf-ab69-4f5c-b019-04dffd44a385" + "ID": "63717820-b794-4564-b115-c085dbf33b17" }, { "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=code" + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "Git仓库表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库ID", + "GUID": "421e0ce9-cf66-4deb-8fe6-f586f95a2d78" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } }, - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=msg" - }, - "CustomReturns": [ + "UpdateBindingValues": [ { - "ReturnPropertyName": "id" + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "钩子ID", + "GUID": "71681bd0-e7cb-4ba2-be9d-d8c902f124ae" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.id" + } }, { - "ReturnPropertyName": "url" - }, - { - "ReturnPropertyName": "password" + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "订阅成功", + "GUID": "ec4e7230-0fb9-4452-bc19-f6ef21642efb" + }, + "Value": "1" } ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "钩子已存在" } ], - "ID": "77757baf-64c1-43e5-b44c-acabb396fb97" + "ID": "94b197b1-f2ea-400f-8cb3-b07705f1a8f9" } ] } ], - "ID": "5a9df93d-443d-4f18-95e4-beb69f5af6fb" + "ID": "7f5dbfdf-16c7-4407-aa60-e35ffec13ded" }, { "CommandList": [ @@ -475,99 +552,43 @@ "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.message" - }, - "CustomReturns": [ - { - "ReturnPropertyName": "id", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=是否存在hook.hook_id" - } - }, - { - "ReturnPropertyName": "url", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=是否存在hook.url" - } - }, - { - "ReturnPropertyName": "password", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=是否存在hook.password" - } - } - ] + "SerializeProperty": "=msg" + } } ], - "ID": "d571148c-ddcf-45ee-a42e-3becef8b19de" + "ID": "fe312141-6c75-4967-aaa6-83e5804aae3a" } ] } ], - "ID": "6f4b26b3-63d6-48cf-b7a7-5cc107627190" + "ID": "2ed5a7ee-177e-4784-9f96-36bbce804e9c" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", - "Message": "仓库不存在，请先同步仓库到系统中", - "CustomReturns": [ - { - "ReturnPropertyName": "id" - }, - { - "ReturnPropertyName": "url" - }, - { - "ReturnPropertyName": "password" - } - ] + "Message": "该仓库已绑定" } ], - "ID": "02c8bfbc-5390-4d4a-a763-978ff5dee27a" + "ID": "4ee789dc-4642-4d34-9a2e-bfcb3b6397b8" } ] } ], - "ID": "d190a6f3-a4b0-44e7-a1e5-977c67381fd8" + "ID": "35977f7a-cd68-4e5e-b448-a7faff3ce155" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "请先配置全局Gitee企业路径名", - "CustomReturns": [ - { - "ReturnPropertyName": "id" - }, - { - "ReturnPropertyName": "url" - }, - { - "ReturnPropertyName": "password" - } - ] + "Message": "仓库不存在，请先同步仓库到系统中" } ], - "ID": "dd54f4bf-7b36-4757-85e8-6260abdef1f8" + "ID": "43bcf490-993d-41b1-a794-513a3b128633" } ] } - ], - "ReturnProperties": [ - { - "Name": "id" - }, - { - "Name": "url" - }, - { - "Name": "password" - } ] } \ No newline at end of file diff --git a/ServerCommands/Gitee/删除一个仓库WebHook.json b/ServerCommands/Gitee/删除一个仓库WebHook.json index b87c7b58..e6bd2a24 100644 --- a/ServerCommands/Gitee/删除一个仓库WebHook.json +++ b/ServerCommands/Gitee/删除一个仓库WebHook.json @@ -6,21 +6,22 @@ "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", "Parameters": [ { - "Name": "WebHookId", + "Name": "仓库ID", "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "1400424" - }, - { - "Name": "仓库路径名", - "DataValidationInfo": {}, "TestData": "gyrnccc" }, { "Name": "用户名", - "DataValidationInfo": {}, + "DataValidationInfo": { + "IgnoreBlank": false + }, "TestData": "Administrator" + }, + { + "Name": "清空钩子", + "DataValidationInfo": {} } ], "InvokeTriggerTestData": { @@ -31,55 +32,55 @@ "Commands": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "当前用户", + "ParameterName": "仓库", "TableValue": { - "TableName": "用户信息视图", + "TableName": "Git仓库表", "TableValueType": 1, "BindingInfos": [ { - "GUID": "78cb510b-3b08-4fee-8df4-b581cd73fcee", + "GUID": "6984ed49-645c-4768-a88a-0edc4f34c65c", "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "GIT用户名", - "GUID": "b6e5b969-da71-4371-9a85-218e9a38c3ab" + "TableName": "Git仓库表", + "ColumnName": "空间路径名", + "GUID": "a01c203a-e4df-4196-b987-949bb9e2bdf9" }, - "ColumnName": "GIT用户名" + "ColumnName": "空间路径名" }, { - "GUID": "57b469ca-2dca-400b-9537-af32029ab64f", + "GUID": "27c330a3-65da-4a14-9f71-81aebbc73575", "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "GIT密码", - "GUID": "482c4996-4547-4c68-a398-80eb4563b998" + "TableName": "Git仓库表", + "ColumnName": "仓库路径名", + "GUID": "f0989a4d-ce36-4869-b70a-3d3a7ef5f711" }, - "ColumnName": "GIT密码" + "ColumnName": "仓库路径名" + }, + { + "GUID": "bd5c6119-0f98-41ae-a979-aa49b426d2bf", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "hook_url", + "GUID": "7593214d-3ac3-4f31-8e29-e4230cf2b96a" + }, + "ColumnName": "hook_url" } ], "SqlCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "8ed9cbb6-76b8-463e-aef4-7585445b3303" + "TableName": "Git仓库表", + "ColumnName": "仓库ID", + "GUID": "856ed04e-a1ca-466b-a6dd-7e36934e1b6a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户名" + "SerializeProperty": "=仓库ID" } }, "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "50f64a7ee8764989ba838ab9701f5ce3" - }, - { - "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", - "JsonString": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=全局_Gitee" - }, - "SampleJson": "{\r\n \"enterprise\": \"GridStudio\",\r\n \"client_id\": \"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\r\n \"client_secret\": \"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\"\r\n}", - "ToParameter": "Gitee" + "ID": "69431f6041fc4cd9b99b4d2e12383acf" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -91,7 +92,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Gitee.enterprise" + "SerializeProperty": "=仓库" } }, "value": "%Null%", @@ -100,8 +101,16 @@ "CommandList": [ { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "请求令牌", + "ServerCommandName": "列出仓库的WebHooks", "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } + }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "用户名", @@ -109,11 +118,6 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=用户名" } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "强制刷新", - "Value": "0" } ], "ResultErrorCodeTo": { @@ -124,9 +128,15 @@ }, "ReturnPropertiesTo": [ { - "ResultPropertyName": "最新令牌", + "ResultPropertyName": "钩子列表", "ResultTo": { - "SerializeProperty": "TOKEN" + "SerializeProperty": "钩子列表" + } + }, + { + "ResultPropertyName": "ACCESS_TOKEN", + "ResultTo": { + "SerializeProperty": "ACCESS_TOKEN" } } ], @@ -150,114 +160,161 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "url", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&Gitee.enterprise&\"/\"&仓库路径名&\"/hooks/\"&WebHookId" + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钩子列表" + }, + "LoopItemParamName": "Item" }, - "ID": "020374fd3ba147899767312a664c7c2e" - }, - { - "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", - "TryCommandPart": { - "CommandList": [ - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", - "PostData": { - "DataItemType": 1, - "Data": { - "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", - "Data": [ + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.url" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.hook_url" + } + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=清空钩子" + } + }, + "value": "1" + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "url", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://gitee.com/api/v5/repos/\"&仓库.空间路径名&\"/\"&仓库.仓库路径名&\"/hooks/\"&WebHookId" + }, + "ID": "0cc504bc6d7044118b6022cea324f20f" + }, + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ { - "Name": "access_token", - "DataItemType": 0, - "Data": { + "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", + "PostData": { + "DataItemType": 1, + "Data": { + "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", + "Data": [ + { + "Name": "access_token", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ACCESS_TOKEN" + } + } + ] + } + }, + "JsonString": "", + "WebUrl": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TOKEN" + "SerializeProperty": "=url" + }, + "Method": "DELETE", + "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", + "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", + "NewParameter": "result", + "Header": [], + "Timeout": 100.0 + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "删除成功" + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "SampleJson": "{\"message\":\"\"}", + "ToParameter": "错误信息" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=错误信息.message" } } ] } - }, - "JsonString": "", - "WebUrl": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=url" - }, - "Method": "DELETE", - "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", - "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", - "NewParameter": "result", - "Header": [], - "Timeout": 100.0 - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "Git_WebHook", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "hook_id", - "GUID": "ac7a5b01-c68a-4321-b177-a3e2a9347c46" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=WebHookId" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "Git_WebHook", - "ColumnName": "仓库ID", - "GUID": "63ba95bb-2258-4f7e-a0c3-fd2c9a82c989", - "RelationBinding": { - "RelatedTable": "Git仓库表", - "RelatedColumn": "仓库ID", - "DisplayColumn": "仓库路径名" - } - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库路径名" - } - } - ] } - } - ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "删除成功" - } - ] + ], + "ID": "7bf94930-152d-4ad0-b0ed-06d9cf242245" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "Git仓库表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "ID", + "GUID": "f371a6e5-d82e-455a-a0ab-49d2edaa505a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库ID" + } }, - "CatchCommandPart": { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "删除失败" - } - ] - } + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "订阅成功", + "GUID": "eac7cb09-049a-4f2f-89ec-a6676767f5a2" + }, + "Value": "0" + } + ] } ], - "ID": "452284ba-2452-4c0b-a055-d020ad61f420" + "ID": "bfa84f55-a5a7-4e19-8ef6-7bcbd8149d2b" }, { "CommandList": [ @@ -273,22 +330,22 @@ } } ], - "ID": "68f5ba75-4d15-4baf-9ee9-595e5c1815f0" + "ID": "49a69f53-dc13-4115-8f1e-fba2282b4880" } ] } ], - "ID": "0d3cb56e-14ec-420c-82f9-995d7b5a1a48" + "ID": "a9e37a05-1a06-4e28-be3c-79ac1f77bf06" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "请先配置全局Gitee企业路径名" + "Message": "仓库不存在！" } ], - "ID": "abca0571-92c2-428d-870c-f50a45319d21" + "ID": "f69ab340-65a3-43d5-95c6-64efefd84138" } ] } diff --git a/ServerCommands/Gitee/同步一个仓库到表.json b/ServerCommands/Gitee/同步一个仓库到表.json index 292ef0d2..2b15e366 100644 --- a/ServerCommands/Gitee/同步一个仓库到表.json +++ b/ServerCommands/Gitee/同步一个仓库到表.json @@ -67,55 +67,38 @@ } ], "Commands": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=全局_Gitee" + }, + "SampleJson": "{\"client_id\":\"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\"client_secret\":\"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\",\"回调地址\":\"https://develop.gridfriend.cn/pms/ServerCommand/GitCallback\"}", + "ToParameter": "Gitee配置" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", - "TableValue": { - "TableName": "用户信息视图", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "366500b8-6b5a-415b-b080-c1984c5c546d", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "GIT用户名", - "GUID": "56abe866-0cb9-4437-b844-3e8a8f30dfa5" - }, - "ColumnName": "GIT用户名" - }, - { - "GUID": "1483cbe9-393e-45d7-94c4-367742849f83", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "GIT密码", - "GUID": "d2ce4ffe-abcb-4b1b-8fbd-f8481b08df32" - }, - "ColumnName": "GIT密码" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "af5d8809-daac-453d-9874-3c1a16f44ecd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户名" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "1635e0bf7bdf4b56b986f7c95a2104ef" + "ParameterValue": "%CurrentUser%", + "ID": "54d3c5b327f8449babca7b5f296cea3a" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "查找仓库", "TableValue": { "TableName": "Git仓库表", - "TableValueType": 3, + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "4f669f8c-c38e-452c-9223-35f7a9a27572", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "订阅成功", + "GUID": "917e816f-695c-4b75-af4d-bb404ea81fb2" + }, + "ColumnName": "绑定成功" + } + ], "SqlCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { @@ -128,9 +111,10 @@ "SerializeProperty": "=仓库ID" } }, - "NullFormulaValueQueryPolicy": 0 + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - "ID": "2abb0425c40841df8b09b37ecbbf58cb" + "ID": "fc30c0772f5e4ae99affdaa5209494b1" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -148,7 +132,7 @@ "SerializeProperty": "=查找仓库" } }, - "value": "0" + "value": "%Null%" }, "CommandList": [ { @@ -161,7 +145,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库ID", - "GUID": "dbd47bc5-1fde-4182-8e78-1d3c76ea6223" + "GUID": "1082605c-1429-4edc-8b4c-434c60c43252" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -172,7 +156,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", - "GUID": "abca3f5e-e20c-455b-b775-67f048fa8c87" + "GUID": "a2efe75d-6164-4966-b690-801e3795d21a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -183,7 +167,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间名称", - "GUID": "87681325-0d60-4165-94da-7f3190953f10" + "GUID": "a2479990-5f1b-4983-acc4-20f68b94af90" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -194,7 +178,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", - "GUID": "5b0f1389-5fc4-4330-b890-9d20f57e44bc" + "GUID": "eaaa2b00-c63d-4394-a2fe-49c500e2faef" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -205,7 +189,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", - "GUID": "714bfac1-405b-4a5d-9a22-bcff5b3cd28f" + "GUID": "1b2b0532-572e-4331-ac85-988cbce958c1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -216,7 +200,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库地址", - "GUID": "7dce609f-eea9-4411-8037-4b6a3730449f" + "GUID": "5c424701-fce3-44cc-b626-7f14dc7f41c6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -227,7 +211,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库描述", - "GUID": "de30e5d1-4837-4ebc-8ad3-344b36eb75ed" + "GUID": "c9c4e52a-839e-4483-9c35-9118cf4ce34d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -238,7 +222,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库成员", - "GUID": "8ae4008a-c654-483d-ab3e-6ffe05ec8f68" + "GUID": "8e47036f-a48c-45a7-b205-b42e39cbf499" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -249,7 +233,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人", - "GUID": "15f8dcd3-e557-413c-9edb-b065a7496b0e" + "GUID": "1599bc4e-4103-48b1-a5b4-960d658cee14" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -260,17 +244,36 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人头像", - "GUID": "c26b8a11-866b-4c85-b69c-45501406eb3b" + "GUID": "abb4a6b9-7c75-4455-91c3-dd62370f62a5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=创建人头像" } + }, + { + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "hook_url", + "GUID": "a9d19b38-b4ab-49dc-8ec3-0544384e5c58" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Gitee配置.回调地址" + } + }, + { + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "订阅成功", + "GUID": "50edfabc-aecf-4851-af6f-0f8f09b6a4be" + }, + "Value": "0" } ] } ], - "ID": "aebd842f-5e38-4248-bc8a-4cd8b7f809e4" + "ID": "cce9653e-ed26-4971-bb60-868b659af738" }, { "CommandList": [ @@ -296,7 +299,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间路径名", - "GUID": "4cace823-2051-4a68-be59-823a2b1af654" + "GUID": "dd12a605-d5a6-4fdc-8d3e-cb2c5afc191e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -307,7 +310,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "空间名称", - "GUID": "1de7544c-bf71-4d40-8a9a-2007c833de53" + "GUID": "31dadfcb-2aef-4091-b467-3c1c15e30b76" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -318,7 +321,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库路径名", - "GUID": "00ae0991-9a9b-4f75-aac6-146b1421a1f3" + "GUID": "9dcbe99d-92b4-4cb1-aad2-ba5bbeb034b3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -329,7 +332,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库名称", - "GUID": "31ce0962-b44b-4c79-96b8-a4fe0d660f24" + "GUID": "a4ae2be3-852a-469f-b408-142d80f48e19" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -340,7 +343,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库地址", - "GUID": "af88bb26-fcc8-494a-ae5f-f39d2c549612" + "GUID": "2bdc2766-1b71-49a0-b2af-3ac04a956158" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -351,7 +354,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库描述", - "GUID": "589d9932-db4e-403d-9484-af3ec8564b39" + "GUID": "1cf9fc74-7684-44f9-b48c-fc5f7b15b2b2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -362,7 +365,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "仓库成员", - "GUID": "ffbef827-bb53-428e-a446-e6951cdd4efb" + "GUID": "91a2422b-e5db-4225-9ef3-2368813a02bb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -373,7 +376,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人", - "GUID": "6a03ba3f-11fb-4c27-a6a7-10cd85f29660" + "GUID": "88141a74-bb6d-415a-bc4e-dd6fe45111f1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -384,7 +387,7 @@ "BindingInfo": { "TableName": "Git仓库表", "ColumnName": "创建人头像", - "GUID": "339132cf-3720-424e-87ef-0a539efe8026" + "GUID": "1329af92-8a83-4cba-9294-a8e6349f5e73" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -394,95 +397,118 @@ ] } ], - "ID": "62a3c749-befb-4c70-8d39-5f5f5016f21e" + "ID": "8d7222c3-a0df-4084-a9e8-39635a46a376" } ] - }, + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "创建一个仓库WebHook", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "仓库ID", - "Value": { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库路径名" + "SerializeProperty": "=Gitee配置.回调地址" } }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" + "value": "%Null%", + "compareType": 1 }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ + "CommandList": [ { - "ResultPropertyName": "id", - "ResultTo": { - "SerializeProperty": "res_hookId" - } - }, - { - "ResultPropertyName": "url", - "ResultTo": { - "SerializeProperty": "res_URL" - } - }, - { - "ResultPropertyName": "password", - "ResultTo": { - "SerializeProperty": "res_密码" - } - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "创建一个仓库WebHook", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", + "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=code" + "SerializeProperty": "=仓库ID" } }, - "value": "0" - }, - "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "仓库创建并订阅成功！" + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "回调地址", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Gitee配置.回调地址" + } } ], - "ID": "c55bf80e-90d8-4d7f-9365-34f71cfb6567" + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true }, { - "CommandList": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "仓库创建成功，但未能订阅，请手动订阅" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "仓库创建并订阅成功！" + } + ], + "ID": "26633f60-fa35-46ed-8a51-214624ab8565" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"仓库创建成功，但未能订阅：\"&msg" + } + } + ], + "ID": "f154763b-8f00-458c-b886-edf25bd928a8" } - ], - "ID": "a8c36ae0-f75f-4215-a245-ac6038b5d58c" + ] } - ] + ], + "ID": "937774c3-9d6c-4e46-a752-2d3f181e52de" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "仓库创建成功!" + } + ], + "ID": "2eb0ad43-5996-4e32-8d39-1cd1f5e3cb0d" } ] } diff --git a/ServerCommands/Gitee/搜索仓库.json b/ServerCommands/Gitee/搜索仓库.json index 321bdb79..6108b574 100644 --- a/ServerCommands/Gitee/搜索仓库.json +++ b/ServerCommands/Gitee/搜索仓库.json @@ -30,8 +30,7 @@ }, { "Name": "关键字", - "DataValidationInfo": {}, - "TestData": "UI" + "DataValidationInfo": {} }, { "Name": "页码", @@ -42,11 +41,6 @@ "Name": "行数", "DataValidationInfo": {}, "TestData": "20" - }, - { - "Name": "类型", - "DataValidationInfo": {}, - "TestData": "企业" } ], "InvokeTriggerTestData": { @@ -63,7 +57,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "632e0994-2a36-41ec-9804-50a50c5a7a9c", + "GUID": "bd58b78a-c6da-4660-a206-3882182af407", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -72,7 +66,7 @@ "ColumnName": "GIT用户名" }, { - "GUID": "51efeb90-0f7f-48e1-8b17-2da73b571818", + "GUID": "1187803a-6219-4476-baad-d2de55dc7cbe", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT密码", @@ -96,16 +90,46 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "739a7b1fc47d4c43ab0f9926980780a3" + "ID": "86ff7d43aa9e4b9fbdb615e033c310f9" }, { - "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", - "JsonString": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=全局_Gitee" + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "OutParamaterName": "仓库列表" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "请求令牌", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "强制刷新", + "Value": "1" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" }, - "SampleJson": "{\"enterprise\":\"GridStudio\",\"client_id\":\"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\"client_secret\":\"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\"}", - "ToParameter": "Gitee" + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "最新令牌", + "ResultTo": { + "SerializeProperty": "TOKEN" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -117,585 +141,279 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Gitee.enterprise" + "SerializeProperty": "=code" } }, - "value": "%Null%", - "compareType": 1 + "value": "0" }, "CommandList": [ { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "请求令牌", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户名" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "强制刷新", - "Value": "1" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "最新令牌", - "ResultTo": { - "SerializeProperty": "TOKEN" - } - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "url", + "ParameterValue": "https://gitee.com/api/v5/user/repos", + "ID": "0cc32b8ca0f9411c8519262b7971b1a1" }, { - "$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": "=code" - } - }, - "value": "0" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=类型" - } - }, - "value": "个人" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "url", - "ParameterValue": "https://gitee.com/api/v5/user/repos", - "ID": "e87eaebfa9f740ec9f36f69f062d99df" - }, - { - "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", - "PostData": { - "DataItemType": 1, - "Data": { - "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", - "Data": [ - { - "Name": "access_token", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TOKEN" - } - }, - { - "Name": "visibility", - "DataItemType": 0, - "Data": "all" - }, - { - "Name": "affiliation", - "DataItemType": 0, - "Data": "admin" - }, - { - "Name": "q", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=关键字" - } - }, - { - "Name": "page", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页码" - } - }, - { - "Name": "per_page", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=行数" - } - } - ] - } - }, - "JsonString": "", - "WebUrl": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=url" - }, - "Method": "GET", - "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", - "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", - "NewParameter": "result", - "Header": [], - "Timeout": 100.0 - } - ], - "ID": "6ad852dc-f0f9-406b-876f-184f83524090" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=类型" - } - }, - "value": "企业" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "url", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"https://gitee.com/api/v5/enterprises/\"&Gitee.enterprise&\"/repos\"" - }, - "ID": "47758608776342c69eba4ef82575a94e" - }, - { - "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", - "PostData": { - "DataItemType": 1, - "Data": { - "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", - "Data": [ - { - "Name": "access_token", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TOKEN" - } - }, - { - "Name": "search", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=关键字" - } - }, - { - "Name": "type", - "DataItemType": 0, - "Data": "all" - }, - { - "Name": "direct", - "DataItemType": 0, - "Data": true - }, - { - "Name": "page", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页码" - } - }, - { - "Name": "per_page", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=行数" - } - } - ] - } - }, - "JsonString": "", - "WebUrl": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=url" - }, - "Method": "GET", - "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", - "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", - "NewParameter": "result", - "Header": [], - "Timeout": 100.0 - } - ], - "ID": "3a7dfa5c-2fbc-42e8-a9db-52c76a347a24" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=关键字" - } - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "url", - "ParameterValue": "https://gitee.com/api/v5/search/repositories", - "ID": "f6c4537f166f41d2ac4c7da839a2daa6" - }, - { - "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", - "PostData": { - "DataItemType": 1, - "Data": { - "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", - "Data": [ - { - "Name": "access_token", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TOKEN" - } - }, - { - "Name": "q", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=关键字" - } - }, - { - "Name": "fork", - "DataItemType": 0, - "Data": false - }, - { - "Name": "page", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页码" - } - }, - { - "Name": "per_page", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=行数" - } - } - ] - } - }, - "JsonString": "", - "WebUrl": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=url" - }, - "Method": "GET", - "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", - "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", - "NewParameter": "result", - "Header": [], - "Timeout": 100.0 - } - ], - "ID": "28684180-7bc4-4ceb-a40d-4089961cc44e" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "搜索所有仓库时，必须填写关键字", - "CustomReturns": [ - { - "ReturnPropertyName": "仓库列表" - } - ] - } - ], - "ID": "08c2c1e8-fe59-4503-ba27-303f58aa602f" - } - ] - } - ], - "ID": "601681b2-eb33-4b89-af31-b9528b9ff14e" - } - ] - }, - { - "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", - "TryCommandPart": { - "CommandList": [ + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", + "PostData": { + "DataItemType": 1, + "Data": { + "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", + "Data": [ { - "$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": "=result.Count" - } - }, - "value": "0", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "OutParamaterName": "仓库列表" - }, - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result" - }, - "LoopItemParamName": "Item" - }, - "CommandList": [ - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.members" - }, - "Operation": 16, - "OperationParamaterAName": ",", - "OutParamaterName": "仓库成员名称" - }, - { - "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", - "OperationParamaterPairs": [ - { - "Name": "ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.id" - } - }, - { - "Name": "空间路径名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.namespace.path" - } - }, - { - "Name": "空间名称", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.namespace.name" - } - }, - { - "Name": "仓库路径名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.path" - } - }, - { - "Name": "仓库名称", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.name" - } - }, - { - "Name": "仓库地址", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.html_url" - } - }, - { - "Name": "仓库描述", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.description" - } - }, - { - "Name": "仓库成员", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库成员名称" - } - }, - { - "Name": "创建人", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.owner.name" - } - }, - { - "Name": "创建人头像", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.owner.avatar_url" - } - } - ], - "OutParamaterName": "仓库信息" - }, - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库列表" - }, - "Operation": 4, - "OperationParamaterAName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库信息" - }, - "OutParamaterName": "仓库列表" - } - ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "获取成功", - "CustomReturns": [ - { - "ReturnPropertyName": "仓库列表", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库列表" - } - } - ] - } - ], - "ID": "5be73592-8762-4dc7-9792-95dd0a25da67" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "无仓库信息", - "CustomReturns": [ - { - "ReturnPropertyName": "仓库列表" - } - ] - } - ], - "ID": "d76def9f-10ce-46da-8ea2-437362839574" - } - ] - } - ] - }, - "CatchCommandPart": { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { + "Name": "access_token", + "DataItemType": 0, + "Data": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.message" - }, - "CustomReturns": [ - { - "ReturnPropertyName": "仓库列表" - } - ] + "SerializeProperty": "=TOKEN" + } + }, + { + "Name": "visibility", + "DataItemType": 0, + "Data": "all" + }, + { + "Name": "affiliation", + "DataItemType": 0, + "Data": "admin" + }, + { + "Name": "q", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=关键字" + } + }, + { + "Name": "sort", + "DataItemType": 0, + "Data": "updated" + }, + { + "Name": "direction", + "DataItemType": 0, + "Data": "desc" + }, + { + "Name": "page", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=页码" + } + }, + { + "Name": "per_page", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=行数" + } } ] } - } - ], - "ID": "abcdda2d-3ea1-4638-a366-68531218353e" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": { + }, + "JsonString": "", + "WebUrl": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=url" + }, + "Method": "GET", + "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", + "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", + "NewParameter": "result", + "Header": [], + "Timeout": 100.0 + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=code" + "SerializeProperty": "=result" }, - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=msg" + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.members" + }, + "Operation": 16, + "OperationParamaterAName": ",", + "OutParamaterName": "仓库成员名称" }, - "CustomReturns": [ - { - "ReturnPropertyName": "仓库列表" + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.id" + } + }, + { + "Name": "空间路径名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.namespace.path" + } + }, + { + "Name": "空间名称", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.namespace.name" + } + }, + { + "Name": "仓库路径名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.path" + } + }, + { + "Name": "仓库名称", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.name" + } + }, + { + "Name": "仓库地址", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.html_url" + } + }, + { + "Name": "仓库描述", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.description" + } + }, + { + "Name": "仓库成员", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库成员名称" + } + }, + { + "Name": "创建人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.owner.name" + } + }, + { + "Name": "创建人头像", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.owner.avatar_url" + } + } + ], + "OutParamaterName": "仓库信息" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库列表" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库信息" + }, + "OutParamaterName": "仓库列表" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "获取成功", + "CustomReturns": [ + { + "ReturnPropertyName": "仓库列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库列表" } - ] - } - ], - "ID": "62914a42-8123-4e6c-9e67-54744d913100" - } - ] + }, + { + "ReturnPropertyName": "总行数", + "Value": "100" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.message" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "仓库列表" + }, + { + "ReturnPropertyName": "总行数" + } + ] + } + ] + } } ], - "ID": "c6a43e25-6dde-4fb7-8f24-cbd2c728e192" + "ID": "8a7c97c0-4535-4e2a-852c-70792a53e6ff" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "请先配置全局Gitee企业路径名", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + }, "CustomReturns": [ { - "ReturnPropertyName": "仓库列表" + "ReturnPropertyName": "仓库列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库列表" + } + }, + { + "ReturnPropertyName": "总行数" } ] } ], - "ID": "a0f96d73-acf3-410a-904d-3774cc75fca2" + "ID": "d1bd854a-0f1a-4896-8546-efd00f9b14cd" } ] } @@ -703,6 +421,9 @@ "ReturnProperties": [ { "Name": "仓库列表" + }, + { + "Name": "总行数" } ] } \ No newline at end of file diff --git a/ServerCommands/Gitee/请求令牌.json b/ServerCommands/Gitee/请求令牌.json index b11c36f1..2b70e2a2 100644 --- a/ServerCommands/Gitee/请求令牌.json +++ b/ServerCommands/Gitee/请求令牌.json @@ -40,7 +40,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "b4222772-c3d0-4440-8639-27288df25dba", + "GUID": "74dd4d3e-636e-4f65-acce-33a26d73a725", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -49,7 +49,7 @@ "ColumnName": "GIT用户名" }, { - "GUID": "f179a166-ffdc-420b-b7ea-6fa8555406f6", + "GUID": "109cbeb8-ba05-40af-b2a2-020b88398ce7", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT密码", @@ -72,7 +72,7 @@ }, "TopCount": "1" }, - "ID": "cff69cd7a24c45f994ffa93787bc4eaf" + "ID": "261743f5d31b4b9bb40716e2ec8b01b8" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -146,7 +146,7 @@ "$type": "CacheOperationCommand.CacheGetCommand, CacheOperationCommand", "CacheKeyStr": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户.GIT用户名+\"_Gitee_access_token\"" + "SerializeProperty": "=当前用户.GIT用户名&\"_\"&\"_Gitee_access_token\"" }, "ParamName": "获取缓存TOKEN" }, @@ -199,159 +199,192 @@ ] } ], - "ID": "fbb8609c-5624-404e-a16c-14e9e8550b15" + "ID": "7865b2e7-8ccf-486d-ba5a-68e7d760c331" }, { "CommandList": [ { - "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", - "PostData": { - "DataItemType": 1, - "Data": { - "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", - "Data": [ - { - "Name": "grant_type", - "DataItemType": 0, - "Data": "password" - }, - { - "Name": "username", - "DataItemType": 0, + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "PostDataToWebApi.PostDataCommand, PostDataToWebApi", + "PostData": { + "DataItemType": 1, "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户.GIT用户名" - } - }, - { - "Name": "password", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户.GIT密码" - } - }, - { - "Name": "client_id", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Gitee配置.client_id" - } - }, - { - "Name": "client_secret", - "DataItemType": 0, - "Data": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Gitee配置.client_secret" - } - }, - { - "Name": "scope", - "DataItemType": 0, - "Data": "user_info projects pull_requests issues notes keys hook groups gists enterprises" - } - ] - } - }, - "JsonString": "", - "WebUrl": "https://gitee.com/oauth/token", - "Method": "POST", - "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", - "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", - "NewParameter": "result", - "Header": [], - "Timeout": 100.0 - }, - { - "$type": "SaveFormData.fillInJSONProperties, SaveFormData", - "FullJsonString": "{\r\n \"error\": \"invalid_grant\",\r\n \"error_description\": \"授权方式无效，或者登录回调地址无效、过期或已被撤销\",\r\n \"access_token\": \"5c7c5fe2b1f0fc025c1a38006b6e95f3\",\r\n \"token_type\": \"bearer\",\r\n \"expires_in\": 86400,\r\n \"refresh_token\": \"03be42668ee199713604ff75491eeb0904a665d069de178c6c8f73c0a50a6ab6\",\r\n \"scope\": \"user_info projects pull_requests issues notes keys hook groups gists enterprises\",\r\n \"created_at\": 1718241807\r\n}", - "SourceJson": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result" - }, - "ResultTo": "RES" - }, - { - "$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": "=RES.error" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "CacheOperationCommand.CacheAddCommand, CacheOperationCommand", - "CacheKeyStr": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户.GIT用户名+\"_Gitee_access_token\"" - }, - "CacheValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=RES.access_token" - }, - "CacheSeconds": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=RES.expires_in" - }, - "ParamName": "缓存结果" - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "获取最新TOKEN成功", - "CustomReturns": [ - { - "ReturnPropertyName": "最新令牌", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=RES.access_token" + "$type": "PostDataToWebApi.ObjectData, PostDataToWebApi", + "Data": [ + { + "Name": "grant_type", + "DataItemType": 0, + "Data": "password" + }, + { + "Name": "username", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户.GIT用户名" + } + }, + { + "Name": "password", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户.GIT密码" + } + }, + { + "Name": "client_id", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Gitee配置.client_id" + } + }, + { + "Name": "client_secret", + "DataItemType": 0, + "Data": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Gitee配置.client_secret" + } + }, + { + "Name": "scope", + "DataItemType": 0, + "Data": "user_info projects pull_requests issues notes keys hook groups gists enterprises" } - } - ] - } - ], - "ID": "6aa74ad7-c578-4fef-af9c-fb96a6631550" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.error" + ] + } + }, + "JsonString": "", + "WebUrl": "https://gitee.com/oauth/token", + "Method": "POST", + "SuccessCallback": "// 请求成功返回的数据存储在“result”变量中\r\n// 请使用“result”变量来完成请求成功的回调 \r\n//console.log(result);", + "ErrorCallback": "// 请求中发生的错误存储在“error”变量中\r\n// 请使用“error”变量来处理异常情况 \r\nconsole.error(error);", + "NewParameter": "result", + "Header": [], + "Timeout": 100.0 + }, + { + "$type": "SaveFormData.fillInJSONProperties, SaveFormData", + "FullJsonString": "{\r\n \"error\": \"invalid_grant\",\r\n \"error_description\": \"授权方式无效，或者登录回调地址无效、过期或已被撤销\",\r\n \"access_token\": \"5c7c5fe2b1f0fc025c1a38006b6e95f3\",\r\n \"token_type\": \"bearer\",\r\n \"expires_in\": 86400,\r\n \"refresh_token\": \"03be42668ee199713604ff75491eeb0904a665d069de178c6c8f73c0a50a6ab6\",\r\n \"scope\": \"user_info projects pull_requests issues notes keys hook groups gists enterprises\",\r\n \"created_at\": 1718241807\r\n}", + "SourceJson": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result" + }, + "ResultTo": "RES" + }, + { + "$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": "=RES.error" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "CacheOperationCommand.CacheAddCommand, CacheOperationCommand", + "CacheKeyStr": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户.GIT用户名&\"_\"&\"_Gitee_access_token\"" + }, + "CacheValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=RES.access_token" + }, + "CacheSeconds": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=RES.expires_in" + }, + "ParamName": "缓存结果" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "获取最新TOKEN成功", + "CustomReturns": [ + { + "ReturnPropertyName": "最新令牌", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=RES.access_token" + } + } + ] + } + ], + "ID": "ae11d952-819c-4a9c-8ea5-3d1fa00c2a5b" }, - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.error_description" - }, - "CustomReturns": [ - { - "ReturnPropertyName": "最新令牌" - } - ] - } - ], - "ID": "cb2dbe62-dd22-4eaa-a70c-8be8feeb74c5" - } - ] + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.error" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.error_description" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "最新令牌" + } + ] + } + ], + "ID": "49d139cd-c0d1-4bf4-99ef-1904c6842a84" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "SampleJson": "{\"message\":\"\"}", + "ToParameter": "错误信息" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=错误信息.message" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "最新令牌" + } + ] + } + ] + } } ], - "ID": "8d208ae4-19ac-49ba-92d2-d3f1133ef4dc" + "ID": "8ddfb90f-3fb6-4561-950d-b1b6cee04bb9" } ] } ], - "ID": "ebf144b0-dd6f-4c75-b889-9ada8b6db780" + "ID": "ad68ffe5-0b5c-4467-b56f-f066062c4361" }, { "CommandList": [ @@ -366,12 +399,12 @@ ] } ], - "ID": "3036ecd5-8001-4122-82b6-31e54d15c529" + "ID": "e250f7a9-8b5e-4dd9-90a5-d4ec0248c612" } ] } ], - "ID": "e8e2fdd1-88f6-481e-86f1-5d189154b0a7" + "ID": "76875b4b-7d4c-4c17-bd15-bd3a3051819e" }, { "CommandList": [ @@ -386,7 +419,7 @@ ] } ], - "ID": "403fa8e4-ab3a-4db8-ae32-e95b4c4a3d26" + "ID": "841634f8-211a-4eef-a3a5-6365048ecdaa" } ] } diff --git a/ServerCommands/汇报/AI报工数据转日报.json b/ServerCommands/汇报/AI报工数据转日报.json index 07617a95..e392685c 100644 --- a/ServerCommands/汇报/AI报工数据转日报.json +++ b/ServerCommands/汇报/AI报工数据转日报.json @@ -85,10 +85,10 @@ "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", "JsonString": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=全局配置" + "SerializeProperty": "=全局_AI配置" }, "SampleJson": "{\"AI提示词1\":\"我将发给你一个记录着某人一天工作内容的数据，为JSON字符串，请你尝试解读它，内容中的[汇报类型]分为`日报`和`计划`。\\n- 日报指的是昨日工作内容的总结；\\n- 计划指的是今日计划工作安排；\\n请你使用为我编写一篇简要的工作日报，对于日报结构和要求如下：\\n标题为固定格式：YYYY年MM年DD月-某某工作日报\\n内容包含两个主题：昨日工作总结、今日工作计划\\n每个主题下的内容从JSON中总结，可以适当润色，但不可过度偏离源数据中的工作内容；\"}", - "ToParameter": "全局配置JSON" + "ToParameter": "AI配置JSON" }, { "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", @@ -163,7 +163,6 @@ "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", "URL": "https://openai.api2d.net", "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", - "ORGANIZATION": "", "IsDataSource": "json", "MessageJSON": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -176,7 +175,7 @@ "MaxTokens": 3000, "SystemContent": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=全局配置JSON.AI提示词1" + "SerializeProperty": "=AI配置JSON.AI提示词1" }, "Response_format": "text" }, @@ -191,7 +190,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=result.content" }, - "ID": "4b21c6860da34da3bfcc81eda17c4c76" + "ID": "8ab144aa1cbc41579b64c8f3755bb4ea" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -231,7 +230,7 @@ } } ], - "ID": "5a66cb4e-3cd9-4701-afa5-a1fd33b7e87f" + "ID": "1ce672b4-5cb7-4617-b49d-b008a1c33358" }, { "CommandList": [ @@ -246,7 +245,7 @@ ] } ], - "ID": "10f38766-4f2a-4bc6-88bd-7eba3f9cfc5e" + "ID": "2f7cf118-ce26-4d20-a909-e3f8c8c44637" } ] } diff --git a/ServerCommands/系统/获取版本号.json b/ServerCommands/系统/获取版本号.json new file mode 100644 index 00000000..adbdd2ef --- /dev/null +++ b/ServerCommands/系统/获取版本号.json @@ -0,0 +1,55 @@ +{ + "Name": "获取版本号", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + } + } + ], + "Commands": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=全局_业务配置" + }, + "SampleJson": "{\"版本号\":\"\"}", + "ToParameter": "业务配置" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "获取成功", + "CustomReturns": [ + { + "ReturnPropertyName": "版本号", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=业务配置.版本号" + } + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "版本号" + } + ] +} \ No newline at end of file diff --git a/Tables/Git/Git_事件记录.json b/Tables/Git/Git_事件记录.json index 9811be96..1ed0d173 100644 --- a/Tables/Git/Git_事件记录.json +++ b/Tables/Git/Git_事件记录.json @@ -28,12 +28,14 @@ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", + "MaxLength": -1, "Name": "提交人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", + "MaxLength": -1, "Name": "事件内容", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, diff --git a/Tables/Git/Git仓库表.json b/Tables/Git/Git仓库表.json index cb848bb8..fa41aaac 100644 --- a/Tables/Git/Git仓库表.json +++ b/Tables/Git/Git仓库表.json @@ -87,6 +87,27 @@ "Name": "仓库标题", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "hook_url", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "钩子ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "订阅成功", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { diff --git a/Tables/用户/用户信息视图.json b/Tables/用户/用户信息视图.json index e8b24114..4aca9e61 100644 --- a/Tables/用户/用户信息视图.json +++ b/Tables/用户/用户信息视图.json @@ -57,6 +57,20 @@ "Name": "默认时薪", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "System.String", + "MaxLength": -1, + "Name": "GIT用户名", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "System.String", + "MaxLength": -1, + "Name": "GIT密码", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "System.String", @@ -82,7 +96,7 @@ "BuiltInViewInfo": { "ViewName": "用户信息视图", "SourceTableName": "FGC_UserInfoTable", - "CreateViewSql": "SELECT [FGC_UserName] AS [用户名], [FGC_FullName] AS [全名], [FGC_Email] AS [邮件], [FGC_IsEnabled] AS [有效], [FGC_Role] AS [角色], [FGC_OrganizationSuperior] AS [组织上级], [负荷] AS [负荷], [默认时薪] AS [默认时薪], [公司] AS [公司], [部门] AS [部门], [小组] AS [小组] FROM [FGC_UserInfoTable]", + "CreateViewSql": "SELECT [FGC_UserName] AS [用户名], [FGC_FullName] AS [全名], [FGC_Email] AS [邮件], [FGC_IsEnabled] AS [有效], [FGC_Role] AS [角色], [FGC_OrganizationSuperior] AS [组织上级], [负荷] AS [负荷], [默认时薪] AS [默认时薪], [GIT用户名] AS [GIT用户名], [GIT密码] AS [GIT密码], [公司] AS [公司], [部门] AS [部门], [小组] AS [小组] FROM [FGC_UserInfoTable]", "ViewType": 1 }, "PrimaryKey": [ diff --git a/Tables/项目/项目动态.json b/Tables/项目/项目动态.json index d6d6fb63..bb6ba6d1 100644 --- a/Tables/项目/项目动态.json +++ b/Tables/项目/项目动态.json @@ -32,6 +32,13 @@ "Name": "执行人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "类型", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", diff --git a/Tables/项目/项目版本.json b/Tables/项目/项目版本.json index a1eb70ce..088bc726 100644 --- a/Tables/项目/项目版本.json +++ b/Tables/项目/项目版本.json @@ -32,6 +32,13 @@ "Name": "仓库ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "Git订阅", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index a93c15a6..9ef4f32f 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -177,4 +177,9 @@ .repeater-item .hover-btn { opacity: 0; +} + +/* 隐藏未注册提示条 */ +a[href="https://www.grapecity.com.cn/solutions/huozige?utm_source=exe&utm_medium=huozige"] { + display: none; } \ No newline at end of file