diff --git a/.collaboration b/.collaboration index 3fe280f7..508058c8 100644 --- a/.collaboration +++ b/.collaboration @@ -9,47 +9,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1907914+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-21T09:05:08.1907949+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-21T09:05:08.1907973+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -58,16 +28,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:02:11.7094345+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目成员表", @@ -139,16 +100,7 @@ }, { "ModuleName": "TableView/子任务视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1908019+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\子任务视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/任务评论表", @@ -236,137 +188,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1908079+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1908096+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1908112+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.190813+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1908153+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.190817+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1908185+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1908202+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1908247+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-21T09:05:08.1908276+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -666,21 +518,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T08:59:44.943679+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目列表.json", - "Pages\\项目\\项目列表.rd", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员详情", @@ -824,17 +662,7 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T07:52:01.4961766+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/任务", @@ -1685,25 +1513,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:08.1913553+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", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.medium.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.small.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -1711,47 +1521,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T09:05:44.1136403+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_6_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_2_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\裁剪并上传图片-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2083,17 +1853,7 @@ }, { "ModuleName": "PCPage/平台设置", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T07:54:29.1501287+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\平台设置\\平台设置.json", - "Pages\\系统\\平台设置\\平台设置.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/系统/平台设置", @@ -2159,32 +1919,9 @@ "ModuleName": "ServerCommand/发起任务流程", "ModuleType": 15 }, - { - "ModuleName": "Pages/邮件模板", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T08:44:06.7585509+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\邮件模板" - ] - }, { "ModuleName": "PCPage/模板编辑器", - "State": 4, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T08:44:06.7578995+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\邮件模板\\模板编辑器.json", - "Pages\\邮件模板\\模板编辑器.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Table/邮件模板表", @@ -2428,12 +2165,6 @@ }, { "ModuleName": "Pages/系统/平台设置/邮件模板", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T08:44:06.7585559+08:00", "ModuleType": 6 } ] \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index a63cf5b3..b60457be 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json index 6ba73d7e..f5edea2b 100644 --- a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json +++ b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json @@ -160,7 +160,7 @@ ] } ], - "ID": "c6cad4c6-f5cc-422d-a18e-40580cb647c9" + "ID": "dc3f7e54-9ae9-4be7-b44b-4003a0aae3b2" } ] } @@ -235,7 +235,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "92000342-36ce-4efe-a4f5-e1997e1e40d6" + "ID": "2a7517bd-6da4-4953-a878-c478fff86cb4" }, { "Condition": { @@ -265,7 +265,7 @@ "Message": "复制成功" } ], - "ID": "bc798263-d00b-4866-935a-06d520e312f9" + "ID": "5fecdaa2-03ce-49ee-867e-e144f1cc7370" }, { "Condition": { @@ -342,7 +342,7 @@ "Message": "操作成功" } ], - "ID": "8befa681-950e-4640-916e-a640eed6b419" + "ID": "ced55eda-db07-4526-9461-36e347b3a38c" }, { "CommandList": [ @@ -357,17 +357,17 @@ "BtnText": "知道了" } ], - "ID": "8e06cd0d-0682-42b3-af57-1a130671fb52" + "ID": "1398fcdb-5cc8-4305-b771-0f3d8e3cb625" } ] } ], - "ID": "a26b3264-3e12-4962-92a9-1dfa98d54e72" + "ID": "61e7a2eb-d620-493e-a79f-555348b4f73b" } ] } ], - "ID": "2e39df4f-90ec-46a1-9eb5-95bf08f6e41e" + "ID": "39f3457f-28e0-4b2d-9b60-cbf64dc160d2" } ] } @@ -439,4 +439,4 @@ "PaperSize": {}, "Margin": {} } -}//Q0nwxyqGdjIt0/0IPmgpnqywYuGyhSf0SrgQq1FdtZW9psmeb1FLrF8CV1ArCaXzAlpncZFU9rmQFU0nH9Qynrow12VZfHvs76Ufud89/ojCM1HEeQsQERrVtzKy4r+a7Uft7ytEa3wgrk1NNMUfgB81wheZfeQ7h5sDFJEqGc1LflSqbGKepU2VFaU6aEFeBPjXct9MBKvX68/UJP9+gmzvMR3e37SNpSWxXLgxoZdacr1G1U/Cd9nbiMgTNeIj4YCKtK05JcpmEDetvQd2JpV5KnXZfaFs1iDhR91bPEnp+99+EP1IW9OmZmmcmh2W18wsGb+FFvrR6U37HGK83woPvYwPSI8696mZ1ilKtyFRgvaf/lZAM9kLpl6jvbNHlnYJK8nRopxYahiu8Nts9XDflihQzji8xa+ELCIa8ZwBgcBAvTeSUSdaUZ2YwKXKYFbQz+akWViXRa0ZY7Rr8U4u28avsP0NqKKC0PLKm+Cz0VgsYzETCnYiSYqb5TWCFg+/U3J49iPorKDr3TdhMTKXJXu3l1t4K2H7v5gGZgdnVnTRqwlMnHlK/lcEyIYbouwIlaYL7dk7rA3/trqafNM7KW9RpjpSncSiLRyWmSODKPgacJSw/5d/GNCTE0xTaH3YPVSe81SjVzgKg/UN1lfsPHK49vNSP0CV7sAwaZnIahIuGYHCSZTtVWFvrolx93dC7TlTd/Rn56M8zvoAFUB8mf3c+P7ToCETeNZ0P6mZ0xjMPlxp9gYhlZPFJOswihzpndptb/UubbycUbtMv/hFbYwkHO++AvsGMxYukjQ2wGxqYA4ddzzDTqOzkGcr7xng3S0nmaTVgN1Flo91hkBmGJjMX8m9MHtiQxH5we/qrdHcVncf+rPrKfGa1Uk3ZSOV9bJqrj+CmlKio/H5dw==|920 \ No newline at end of file +}//LNYHlNfZTaXbYB+UOAxMMlqOvEKSa9PAOZ35P+AtFbqopkzA9Ybo5YWuFAym4JGHIP037Ou+foYFw9oexHniivOalZO3zTcZFcGdItg70d6skHy7ba/9ZOoVfYe58+et/sNIrccxE5enXn19C08kkaDwH7LnMzCtkKoIyNcZVpLs5Zhv+Nd/Ez8iX6kui6zyMhG3vkuGRsY6eJmN54Hq/fnhbAqNalZtTXomYnxYZAxvcRFFyrKsFe7/Mf24jmU3fI5TP/O5Lda6jUm8mPDAKI21kZJfoxrJPGfKJvjaxItDWaFYEK4GWawya4j2vyJD8q1VKAUgaES30jQ9X6u/XyK/gOW8AIzdr+MvU1bLjNHxD0bJVgMNTsi3CcFwRipgVjLXrGpEsNZkKqKPETUlQUaRbozXgfebhyx5dDf3RpPJ7DlUdiW1AMVykHV756R6VRwDnS4FRTW/gOmV5Ab3weiFTkBwe3IKOgGS35UPmXRSFrGAGUvkoLjOFXRGWNE1FRhtXdlCnxU6euDOuTTAUJMb8NBZqFqI0Go+9UA7JdqYeaBSxR4wpqLqHIGtE2JZ5CmyrvV9DCdDiVNFQ/IRRFPO6j5ZXwY8yt+esTigXlLIAhGPodY3L6582dq5Perq2FVhmK4JU1aamLYQlyc2rM1ohqz3Bp4kVp+GSqI3l5Umuy51jnxgbo6b6hf1/+GYxhUwdtoCsiECk0DHC+D4InhgwiXfqkLXSZPcLlj4XBDpWetytdiO7OJYbmjFHW+KQcKGKmoMsDV/vv0hqCeWJgcSm7crpEN2tM8rqUv0/eMk5kKF7sddZ0VqUsC4brSCWtQ+Ug6k/ILZ90HSPK6sXPUSChZGQnoFq2DT+9G9ZfVkh7sO19fH7SV/JqSmHfxWbcncFTsmiypRdCXMGctqDw==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index d082b6ce..ae9dc0e7 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -178,7 +178,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "aa1dcc76-05db-448b-8b3e-9237a3f70bde" + "ID": "aeb821a0-122c-46cb-855c-61a107c84173" }, { "Condition": { @@ -234,34 +234,60 @@ "Answer": "我已确认", "OklButton": "确认", "CancelButton": "取消", - "Result": "按钮结果", - "OkButtonCommand": { - "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", - "Commands": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { + "Result": "按钮结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=按钮结果" + } + ] + }, + "value": "确认" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { "TableName": "项目表", - "ColumnName": "删除", - "GUID": "aace6039-c9b7-4203-b106-44d7074056ef" + "ColumnName": "ID", + "GUID": "0bb92d3a-19c9-4b77-8ace-d062ea87d58e" }, - "Value": "1" - } - ] - } - ], - "ParamProperties": { - "context": "上下文", - "inputContent": "用户输入内容" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!B5" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "删除", + "GUID": "380955af-175b-4f1c-94e8-af5938992053" + }, + "Value": "1" + } + ] + } + ], + "ID": "a0d56297-b221-4025-8331-c24739e91bd6" } - } + ] } ], - "ID": "7ad94a37-45a9-4b7a-966c-a596c1cc8db9" + "ID": "2b71a885-f0ee-4bd2-a129-3e3e8f7b4ce7" }, { "CommandList": [ @@ -271,17 +297,17 @@ "Message": "无删除该项目权限" } ], - "ID": "5608a04e-0eb6-4d27-b7f0-5a54964e2157" + "ID": "b12013ba-ae30-4160-9a0c-5dc09f5d6b4f" } ] } ], - "ID": "74d25589-b3ad-4be2-aaa5-1259d535ecd6" + "ID": "7b1f68cd-57f6-4b8a-b0fa-366adeed2bbf" } ] } ], - "ID": "8d85b6f0-54c7-458b-8c6b-583ca0b59b47" + "ID": "e57d33b0-1da7-4296-924b-1de80e679d22" } ] } @@ -298,4 +324,4 @@ "Size": "20,20" } ] -}//QtdYkppUoKaTdY5U4MpWQMKVukV9hcHTZimoAEi24uteqY7AATApcs8Gok3kpqwVcVQ4aoAG5gR0JmvdVozaWUUZPQH47aYEPNOReH2mbCZL8R2HXOhyArL78Lrz/gblfsHjPByP/p3YGIKw/NVwarEaerHOFEIHJk7ZnGbxrJf6SOJp9Qx1sMjMNG9K5cIst7Q4zQ2eqOH100+/fPRYmGyfyHQEWjA4poAw3orfjM+jNtZq8YKzwK47pmBJnefi7d9MvOuEUU6WIPnSttBb77cFprxsPZg9zT51UyB2jYlD1xGi9h3Gj1Bao3Ztkgx9EzCrUGDKOrZLekGDOjLSv9KlnvHR6kSJikYV7+iCotKi/puX9sZ/aD1HUb5cbOTkztzj6t1Iwi8wkQ4xm1Iks2Kg43x+DuyPHZHfnOjtB6Xjgb5ajBjYumdNVf73zA4WP9BJPCtsXXH0/ahtIVo5RZ1dzZWm8cJDF4jMXxHdcxdSUwK5lntm86Dkyd1u4tbMKUkrPvn6LiDHWzxAp8h4/hzbCYb7PC1BTTM+arXZQOGpZEhmLM4xNNvH3ZRjLF2Y7ufzVE6c/gXeB4rnqqvC+59SC1yR1LVxZ6308JmQhFVHA58IqcuSdjZYnsnnim5f9Z/GH/1xjCV5S+LxX0bSM8dQ2MSR1BRYlyhyXecc5cNjTHf+TxTNwJ58FGLzrLJFkEEDzy9AC+ZTudFFMeYxfvf2I2v4OZWl5o68YqfVd8Rapp3iALmLAARY5R7yDmKLR4HuNd8lb2LLfoypUuDlo40vp6eibqxwle05o7Oue61UXs32njU21y8zL1skhQWvKHYiTJkn1Nw2vJGJasqxYlvXP5yd3/msJ9Aq0KGElucqF0JqV9Z7itfOYKXAqjbCKIeG7hjurn/t9I2RXuI41w==|920 \ No newline at end of file +}//l/Z5o2V5E5yUcs6e67wmcDIKLsBjPPD48ljpURUPiWaM4VMapk5ANwlsLnyu2gKqdnLwIdp3wkw0J9lXMPl1xqucSzvp+5MGamcmnD7cwHrSiabGA/bof6gUtNYvUnOcayU5ejQQg85e2EiBkIE3Y2Y3CjtEqZ3zbGkz+aaE6yFqpr6Wk5Si5ui4oiHtEY6aZ1HDoPiKlsj7fs6WNm0yFbNX/9pNB2sZWYuDd2ivWG67N+i6+4itNCf+HwHesof0HpNS9n6HCygrRTGQ7uvCX7YAVeAM0NYKNiSRz8fRnBWvgUbxBhcbn5FXjph6BUAiiknD/zhfBUGe57z19gRT7c2U0EQ4/69iaMcQVh0NzVuuC0gyUSA0tv0vR7GFmA3U0kgqtEApRjvif+k1iYGG/ouFvsIkX+xOdU3t9GpXDKfTAnR0qNx5XDc8epInu63ZPLs3HY3/hkLtkHPJ5jVkXFO9AmL6nrpXsI77TJrYqT1PohVHoCcepTZ8AR0+8ruscVhM4HQZJLmdSomv10o9vJO7LmjgAmke14aXj+mtOP+bD56DEFmkLyLwrh04jgGibVJqEYVp/zFXQKA+7Gx20NBzvlPvbVSDZ2ZzUfccWrNzuKF6C3OTsqkkcgip5pbiELEsjO0OqQkwKVfup/BAjb1xfAsGfoaClqBCtCYIA1AZhUnMgAK26pGyAmN/hGFmvK/waT5zQ3JlrKxrVRIXPD9pH4KT1VphaUvXGf/b0a8EiBWDPnBO7Any5vUzx9Vyvuq5PPKs9e5akwc7Yvh/1OneCncHoPipbg9braSOZLjSWBq30/boe0j03ZgG7Qlmv0gaywYxu8kjWBMVS0pbJFvTSfVGqUUl57OB3NjpkItZprSZ1Wv5WOhopY9O3Dg7EtTJn+FMdEzLxOeC7JCdig==|920 \ No newline at end of file diff --git a/Pages/系统/平台设置/平台设置.json b/Pages/系统/平台设置/平台设置.json index f2ccbb45..e8ba7864 100644 --- a/Pages/系统/平台设置/平台设置.json +++ b/Pages/系统/平台设置/平台设置.json @@ -33,22 +33,55 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 263.0, + "DesignLengthInPixel": 255.0, "Mode": 1 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 34.0, + "Mode": 1 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 255.0, + "Mode": 1 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 34.0, + "Mode": 1 + } + }, + "16": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 10, + "Count": 17, "DefaultSize": 32.0 }, "Cols": { @@ -247,10 +280,10 @@ "Values": { "2,2": "%PageTitle%", "5,2": "汇报模板对应设置", - "7,1": "汇报模板设置" + "11,2": "邮件模板" }, "AttachInfos": { - "5,19": { + "5,27": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", @@ -312,9 +345,789 @@ }, "7,1": { "CellType": { - "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", - "PageName": "汇报模板设置", - "OverflowMode": 0 + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "模板对应设置表格", + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "汇报模板对应表", + "BindingInfos": [ + { + "GUID": "7b1f0fca-6a0d-41c0-92c3-af4278a982ed", + "BindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "ID", + "GUID": "529594e0-5366-48d8-a3d9-7d3e8b81d972" + }, + "ColumnName": "ID" + }, + { + "GUID": "27a188cc-2746-4fc1-a80c-79fc3818ca92", + "BindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "汇报对象", + "GUID": "c70c70e5-813c-4e32-adb1-f97e0e0548b5" + }, + "ColumnName": "汇报对象" + }, + { + "GUID": "20072f90-1feb-48da-9302-49163366da31", + "BindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "汇报类型", + "GUID": "22c478fe-b28e-4e77-aea8-a416d5a88ae7" + }, + "ColumnName": "汇报类型" + }, + { + "GUID": "5e4be0db-7efd-4d6c-b642-7f2c1a7ffa0e", + "BindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "模板ID", + "GUID": "414c31ce-1e3f-459c-b0b1-38b66499c734", + "RelationBinding": { + "RelatedTable": "汇报模板", + "RelatedColumn": "ID", + "DisplayColumn": "模板名称" + } + }, + "ColumnName": "模板名称" + } + ], + "CustomColumns": [] + }, + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "ID", + "label": "ID", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, + "hide": true, + "key": "64a57e88-f61f-46c6-bbdc-701c3d21726f", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "汇报对象", + "label": "汇报对象", + "width": 150, + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "95087f2d-e95e-480c-84ce-6c76a7a6fa7f", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "汇报类型", + "label": "汇报类型", + "width": 150, + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "f7422bb6-ba11-4406-bc12-d6faad0f5d57", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "模板名称", + "label": "模板名称", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "9003df54-b49e-4803-81a5-6de77c40e02d", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + } + ], + "showActionButtons": true, + "actionButtons": [ + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "编辑", + "styleType": "Accent 1 0", + "shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "ID", + "GUID": "8c8d94ef-95fb-4a42-b56b-62e739d381f3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!行数据.ID" + } + } + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!B8" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "PageName": "汇报对应关系设置", + "LoadBindingDataOption": 1 + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } + }, + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "删除", + "styleType": "Accent 5 0", + "shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "ID", + "GUID": "8c8d94ef-95fb-4a42-b56b-62e739d381f3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!行数据.ID" + } + } + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报模板对应表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "ID", + "GUID": "bf11229b-16c6-4346-8b9d-7ff1683d4812" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!行数据.ID" + } + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!B8" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } + } + ], + "sumText": "合计", + "size": "default" + } + }, + "9,1": { + "CellType": { + "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", + "AttachElementTable": true, + "ElementTableName": "模板对应设置表格", + "pagerCount": 7, + "layout": [ + { + "layoutItem": "prev" + }, + { + "layoutItem": "next" + }, + { + "layoutItem": "total" + }, + { + "layoutItem": "->" + } + ], + "pageSizes": [ + {}, + { + "value": 20 + }, + { + "value": 30 + }, + { + "value": 40 + }, + { + "value": 50 + }, + { + "value": 100 + } + ], + "prevText": "上一页", + "nextText": "下一页", + "hideOnSinglePage": true + } + }, + "11,27": { + "CssName": "toolbar toolbar-right ", + "CellType": { + "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", + "TemplateKey": "横向迷你菜单", + "Items": [ + { + "Value": "添加一条", + "Text": "添加一条", + "IconPath": "增加.svg", + "IsBuiltInIconPath": false, + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1", + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 4, + "ShowDrawerHeader": true, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!B14" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "PageName": "模板编辑器", + "LoadBindingDataOption": 2 + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + } + ], + "Orientation": 0, + "MenuLevelsStyle": [ + { + "FontSize": 13.333333333333332, + "Bold": false, + "Height": 32.0, + "IconHeight": 14.0, + "IconWidth": 14.0 + } + ] + } + }, + "13,1": { + "CellType": { + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "邮件模板表格", + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "邮件模板表", + "BindingInfos": [ + { + "GUID": "c0754f93-cbad-43da-969f-a0c1bc42adde", + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "ID", + "GUID": "6644a102-174b-4553-9584-c72dd68dd0fe" + }, + "ColumnName": "ID" + }, + { + "GUID": "24c5a431-8049-4103-b97f-2f77c4671a01", + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "模板名称", + "GUID": "590f74cf-f119-4da8-b863-79a486495958" + }, + "ColumnName": "模板名称" + }, + { + "GUID": "84fad4e3-e9ca-4f27-aab1-a33e8fe5c6a5", + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "FGC_Creator", + "GUID": "3eb48bab-c552-446a-a7c3-0279dddf2b89" + }, + "ColumnName": "创建者" + }, + { + "GUID": "8618baac-26c8-41e4-92bf-ecb9df7deea2", + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "FGC_CreateDate", + "GUID": "10675071-469b-4cbd-ac08-2b9cfcc3ad00" + }, + "ColumnName": "创建日期" + }, + { + "GUID": "2abca3ae-26ee-4e61-b083-0ad6aee2c205", + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "FGC_LastModifier", + "GUID": "8393dfab-c82c-4b4d-8b31-2704a6df5864" + }, + "ColumnName": "最后更新者" + }, + { + "GUID": "bf54073d-d704-4083-87dd-0b619da5464d", + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "FGC_LastModifyDate", + "GUID": "e00d531d-2ab8-4d21-bad6-6e19b6924a43" + }, + "ColumnName": "最后更新日期" + } + ], + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "FGC_LastModifyDate", + "GUID": "085cccc7-090c-4cb6-927b-494391e8a923" + }, + "Order": 1 + } + ] + }, + "CustomColumns": [] + }, + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "ID", + "label": "ID", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, + "hide": true, + "key": "6816c91f-54e6-4398-8499-b86325a44af5", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "模板名称", + "label": "模板名称", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "23bde9b8-6048-4c23-af22-ca4d77a01544", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "创建者", + "label": "创建者", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "3ae86310-10de-489d-b321-3bfadd3c8163", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "创建日期", + "label": "创建日期", + "formatStr": "yyyy年MM月dd日", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "729a8603-24d9-44e3-8bea-b1e097daa3ed", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "最后更新者", + "label": "最后更新者", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "c133969b-b2a2-4da5-8a07-23d941a13b9b", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "最后更新日期", + "label": "最后更新日期", + "formatStr": "yyyy年MM月dd日", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "8a800b2c-be62-48bd-9ff7-7fffef45bb36", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + } + ], + "showActionButtons": true, + "actionButtons": [ + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "编辑", + "styleType": "Accent 1 0", + "shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "ID", + "GUID": "4b93c0ff-015b-4330-8c4c-3269e80baf05" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!行数据.ID" + } + } + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 4, + "ShowDrawerHeader": true, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!B14" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "PageName": "模板编辑器", + "LoadBindingDataOption": 1 + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } + }, + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "删除", + "styleType": "Accent 5", + "shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "邮件模板表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "ID", + "GUID": "35ed1fb6-eca4-4ceb-9484-59e4e5a98574" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!行数据.ID" + } + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=平台设置!B14" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } + } + ], + "sumText": "合计", + "size": "default" + } + }, + "15,1": { + "CellType": { + "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", + "AttachElementTable": true, + "ElementTableName": "邮件模板表格", + "pagerCount": 7, + "layout": [ + { + "layoutItem": "prev" + }, + { + "layoutItem": "next" + }, + { + "layoutItem": "total" + }, + { + "layoutItem": "->" + } + ], + "pageSizes": [ + {}, + { + "value": 20 + }, + { + "value": 30 + }, + { + "value": 40 + }, + { + "value": 50 + }, + { + "value": 100 + } + ], + "prevText": "上一页", + "nextText": "下一页", + "hideOnSinglePage": true } } }, @@ -350,23 +1163,193 @@ "2,2": 0, "3,1": 1, "5,2": 2, - "5,19": 3, - "5,20": 4, - "5,21": 4, - "5,22": 4, - "5,23": 4, - "5,24": 4, - "5,25": 4, - "5,26": 4, - "5,35": 3 + "5,27": 3, + "5,28": 4, + "5,29": 4, + "5,30": 4, + "5,31": 4, + "5,32": 4, + "5,33": 4, + "5,34": 4, + "5,35": 3, + "7,1": 4, + "8,1": 4, + "8,2": 4, + "8,3": 4, + "8,4": 4, + "8,5": 4, + "8,6": 4, + "8,7": 4, + "8,8": 4, + "8,9": 4, + "8,10": 4, + "8,11": 4, + "8,12": 4, + "8,13": 4, + "8,14": 4, + "8,15": 4, + "8,16": 4, + "8,17": 4, + "8,18": 4, + "8,19": 4, + "8,20": 4, + "8,21": 4, + "8,22": 4, + "8,23": 4, + "8,24": 4, + "8,25": 4, + "9,1": 3, + "11,0": 4, + "11,1": 4, + "11,2": 2, + "11,3": 4, + "11,4": 4, + "11,5": 4, + "11,6": 4, + "11,7": 4, + "11,8": 4, + "11,9": 4, + "11,10": 4, + "11,11": 4, + "11,12": 4, + "11,13": 4, + "11,14": 4, + "11,15": 4, + "11,16": 4, + "11,17": 4, + "11,18": 4, + "11,27": 3, + "11,28": 4, + "11,29": 4, + "11,30": 4, + "11,31": 4, + "11,32": 4, + "11,33": 4, + "11,34": 4, + "11,35": 3, + "12,0": 4, + "12,1": 4, + "12,2": 4, + "12,3": 4, + "12,4": 4, + "12,5": 4, + "12,6": 4, + "12,7": 4, + "12,8": 4, + "12,9": 4, + "12,10": 4, + "12,11": 4, + "12,12": 4, + "12,13": 4, + "12,14": 4, + "12,15": 4, + "12,16": 4, + "12,17": 4, + "12,18": 4, + "12,19": 4, + "12,20": 4, + "12,21": 4, + "12,22": 4, + "12,23": 4, + "12,24": 4, + "12,25": 4, + "12,26": 4, + "12,27": 4, + "12,28": 4, + "12,29": 4, + "12,30": 4, + "12,31": 4, + "12,32": 4, + "12,33": 4, + "12,34": 4, + "12,35": 4, + "13,0": 4, + "13,1": 4, + "13,35": 4, + "14,0": 4, + "14,1": 4, + "14,2": 4, + "14,3": 4, + "14,4": 4, + "14,5": 4, + "14,6": 4, + "14,7": 4, + "14,8": 4, + "14,9": 4, + "14,10": 4, + "14,11": 4, + "14,12": 4, + "14,13": 4, + "14,14": 4, + "14,15": 4, + "14,16": 4, + "14,17": 4, + "14,18": 4, + "14,19": 4, + "14,20": 4, + "14,21": 4, + "14,22": 4, + "14,23": 4, + "14,24": 4, + "14,25": 4, + "14,26": 4, + "14,27": 4, + "14,28": 4, + "14,29": 4, + "14,30": 4, + "14,31": 4, + "14,32": 4, + "14,33": 4, + "14,34": 4, + "14,35": 4, + "15,0": 4, + "15,1": 3, + "15,2": 4, + "15,3": 4, + "15,4": 4, + "15,5": 4, + "15,6": 4, + "15,7": 4, + "15,8": 4, + "15,9": 4, + "15,10": 4, + "15,11": 4, + "15,12": 4, + "15,13": 4, + "15,14": 4, + "15,15": 4, + "15,16": 4, + "15,17": 4, + "15,18": 4, + "15,19": 4, + "15,20": 4, + "15,21": 4, + "15,22": 4, + "15,23": 4, + "15,24": 4, + "15,25": 4, + "15,26": 4, + "15,27": 4, + "15,28": 4, + "15,29": 4, + "15,30": 4, + "15,31": 4, + "15,32": 4, + "15,33": 4, + "15,34": 4, + "15,35": 4 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ + "13,1,1,34", "7,1,1,34", - "5,19,1,8" + "9,1,1,34", + "15,1,1,34", + "5,27,1,8", + "11,27,1,8" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -417,6 +1400,26 @@ "IsAutomaticFill": false, "Location": "39,118", "Size": "2,18" + }, + { + "Name": "BackgroundPicture3", + "DisplayName": "背景图4", + "StyleInfo": { + "Fill": "Accent 1 0" + }, + "IsAutomaticFill": false, + "Location": "39,491", + "Size": "2,18" + }, + { + "Name": "BackgroundPicture4", + "DisplayName": "背景图5", + "StyleInfo": { + "Fill": "Accent 1 0" + }, + "IsAutomaticFill": false, + "Location": "39,491", + "Size": "2,18" } ] -}//Ns4fs8Dy4E2jzGjH8yXKNEAro58LPsyq6zd6fBbAapB75V4gp9gwbT6A2MFclwyHSGtdt6bVQEaiShdDtCcpusHKFenpMEILoZdR1niFeZDjj29+PXUEydRMXfn6VlSbUmBLtoX3ij0+cn9QK/0r7CeeN7EFEVVgnbvZXo3Y1goKSN4Sl9tnEQTMSdcXy5r9gbJh/u6R1S62CVmIMuYfOjWZ0/pognXG24JD24m1gzWYlG0VMBtiY0OI4myp2kuXTTB/y3AZdWDpwp5nSkY5beYtxe4okd8+OfnF3mLSPD7F+SwyJNoO8rqqovtCqk8a4F/urHBBQYVdYXtc7qO320KzpcP72T0WbM0/MV2OwL5rW7GnaoD0OHXU1ZLgKIQ7mvh79wjo6cTddsiDdEQve7FU6qGidc8eRVaxeqs51un+iA5k0L9Pht4Y14sZkowoB7DN6N0PXrQSf2mGRQTAveEchokPlYmehFcuLixKvSPCUqCC4JbRDd7txyqI6toPT/MuSZRmH6kMXE/o7DEIVhRqrvkwsny7w2JUwATo1rRvtcAeFxWdUqcJJgrtb3Moh5ZZ47wjDBKWRFRuZHKwAx6qgiVJP0qCQNjLLOwlU43KygPo3ezZPjLI3gm+NVwnJ1u9Vi8C4inHO+jLhD5feMok4/jbMLh2/ujfxPT75OeaWJHMUEmuqcA9ZKrnEBOt7ZqD7co0oBaWH9gfvPl/ksfQcyULgfbHPDwz04ccR9LbE/Yw1msFumKKFeimSf0NYhsm2fvQ+jl9WTVu7L81EQENw5UHjtZR74VbzjwpvGxj2Vk9J8F1bFQu6J5N3LmCI7/ZYQjFXpvNJUtCg01WFz5b+CoWcyC4WQnKCNdeKSCp6BB9kNiyQ3HSSVkDkEnH4Bm/Wc3ZsM+Uma5mSYDYGA==|920 \ No newline at end of file +}//9u8RIpeVLVONUehCcTy+8kBcml4gyNY4lAgT5duIMa6HPMLeU/u+pi1usW4xY6qxFc02rfxR9acZq/MFWbcCcin3WnIDYL6Lo4u+n0hd6gAWzi0CmaySOZ37umE0YSmbBK6+iRrtEFhBAj3yPxV423ER51VoPX7Go/h0wswx35c8Qs/vTYfa/R7Lltc/W7ek4FLpqcSNa2w/myAlq/9VQDt0XkAB1oEs2lWJHBOVOmwE5n7HgjJysg49Jse/SX7IDuG+iGrPkRR7TX9OSCSqnT++s3vijAaHn4IJ1JQnUyILPqJvLK5IEdK1tt+SBqLB9L2Bw25FcS6HH+ZUcMN8ueKFfg8xZdLiN8FUkNaBY2R01y565d6cJwiODZcfHP65ugQ5hollZmAQ/b80DeVB5Fd0Cg/WpEASuvYDxhY0yX4vZLhgWiKSGeG0fucXOwlR0zHb0kPmfXmz1IGhdh2HD7SHaQWwE9PGamxXAAJAPYRNvySch6h5Kk3Zg3ROU5hpmou9I43mdjBEBwha2qrf+0DTnmGnwfQhbj+JgG2fNEEqrhP9PC1xpVfOQC0F72iOCVhwp/vTWQuDBJqvmeSMwY6Bp+Racdhie96NSdC78qjPNjm7XKigV93k5XAFMN3PaSIIb0/upHoAMIOVSEx+WHe6O0OvxDDqZxvuQcYTjnMuKF+HB96TsC0Lwb4VHJtaatkdhOgu1jtuM3lsvefRdqXhdDWV4I3b2+PT0+NFankQ8PbT6ZUGi/yMccLWspaGRu42xUdArQQph8GuNYZVon0ys0a1H8ruGe0jdXEg19XPZdiqGw6GR+FP0+x008dQU/PUP6d/YHwJuIbLlazjLnxIqJQufKE4iQ/Thvsoi+3ccHo4oOhfYhFebPdMjY0n0fKC30xZUPAH3Bo6TSGKEQ==|920 \ No newline at end of file diff --git a/Pages/系统/平台设置/平台设置.rd b/Pages/系统/平台设置/平台设置.rd index 3f058af0..22d54d93 100644 --- a/Pages/系统/平台设置/平台设置.rd +++ b/Pages/系统/平台设置/平台设置.rd @@ -1,5 +1,5 @@ { "PageType": 0, "ColumnCount": 36, - "RowCount": 10 + "RowCount": 17 } \ No newline at end of file diff --git a/Pages/系统/平台设置/邮件模板/模板编辑器.json b/Pages/系统/平台设置/邮件模板/模板编辑器.json new file mode 100644 index 00000000..0319f24b --- /dev/null +++ b/Pages/系统/平台设置/邮件模板/模板编辑器.json @@ -0,0 +1,533 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 580.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 33.0 + } + } + }, + "Count": 6 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + } + }, + "Count": 35, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "%PageTitle%", + "1,31": "保存" + }, + "AttachInfos": { + "1,1": { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "模板名称", + "GUID": "9c6c2309-3ae0-40f3-8d06-263f2750c977" + }, + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "CellDefaultValue": "%PageTitle%", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "Gost", + "WaterMark": "请输入模板名称" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "1,31": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!B4" + }, + "TargetType": "UnlayerEditorPlugin.EmailEditorCelltype, UnlayerEditorPlugin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", + "MethodName": "Save" + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!B4" + }, + "TargetType": "UnlayerEditorPlugin.EmailEditorCelltype, UnlayerEditorPlugin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", + "MethodName": "ExportMergeTags", + "RetrunParamNames": { + "MergeTagsJsonString": { + "SerializeProperty": "导出标签" + } + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!B4" + }, + "TargetType": "UnlayerEditorPlugin.EmailEditorCelltype, UnlayerEditorPlugin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", + "MethodName": "ExportHtml", + "RetrunParamNames": { + "Countent": { + "SerializeProperty": "导出内容" + }, + "DesignData": { + "SerializeProperty": "设计模板" + } + } + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "邮件模板表", + "ColumnName": "ID", + "GUID": "67ca2509-7875-4542-aa32-e62dd922b146" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "邮件模板表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "模板名称", + "GUID": "af0ecded-eb93-4a89-af9b-577819b1a8d9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!B2" + } + }, + { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "设计模板", + "GUID": "59905ea1-a5d6-418e-9cb8-81ffd4d1e79e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!设计模板" + } + }, + { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "HTML模板", + "GUID": "6171634f-4f3f-4ff3-98c0-42374405013e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!导出内容" + } + }, + { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "模板标签", + "GUID": "73d50364-cfb8-4b30-8dac-bf8d35af9ff5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!导出标签" + } + } + ] + } + ], + "ID": "deca53d9-b551-4b90-9fa2-af2c4c688a53" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "邮件模板表", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "模板名称", + "GUID": "c8972e9c-74f1-4c19-8981-b2d122865120" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!B2" + } + }, + { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "设计模板", + "GUID": "cffc6aac-a4f2-45b4-a17d-e6be4afd2fc6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!设计模板" + } + }, + { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "HTML模板", + "GUID": "243f7a37-f4d5-4563-b6e4-8ea1b26e707f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!导出内容" + } + }, + { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "模板标签", + "GUID": "b85477c4-9008-4f24-819d-c694e4532cd8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!导出标签" + } + } + ] + } + ], + "ID": "8ac3f5d9-d437-4416-a30a-937c7cd6f7d3" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存成功" + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/067_save_4.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "3,1": { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "设计模板", + "GUID": "e02f2707-0d79-4e73-af2f-070688b06565" + }, + "CellType": { + "$type": "UnlayerEditorPlugin.EmailEditorCelltype, UnlayerEditorPlugin", + "Mode": "email", + "Theme": "modern_light", + "DockAlign": "right", + "ImgSaveMode": "BASE64", + "accept": ".xbm,.tif,.jfif,.ico,.tiff,.gif,.svg,.jpeg,.svgz,.jpg,.webp,.png,.bmp,.pip,.apng,.pjpeg,.avif", + "CustomsTags": true, + "MergeTageJson": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!B4" + } + } + }, + "5,1": { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "模板标签", + "GUID": "0a9a16cd-1705-4d73-9b5c-9a3e7632cfef" + } + }, + "5,6": { + "BindingInfo": { + "TableName": "邮件模板表", + "ColumnName": "ID", + "GUID": "27cfa53b-ea8c-45b6-b2c8-84accb7b2ba1" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 18.666666666666664, + "Formatter": 0 + } + ], + "Types": { + "Strs": [ + "@", + "Body" + ] + }, + "CellStyles": { + "1,1": 0 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "1,31,1,3", + "5,1,1,5", + "3,1,1,33", + "1,1,1,28", + "5,6,1,4" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "ShouldCheckDirty": true, + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//ETTHKSZliZfe5MW/1Qm2G/oDU+qQUDmjruk0Yn2T9JFfNgPFDkEusZuV/Qtz5k/PmQ4tkIQNgGfP9Gn9wnW44FbSJblyXTU6bJhwheY+PqoXVMSfWiEluqKPFaA2LKVBVz2Uxzdkbeiz5jKZOlh+3ZRqP+fVJccuMklSNDhFr82ToB4KUQZWb89oz/hmOM3HM+oETOU1rNQAs26sVRwHNhlSywq5KWC/7+sW1xXxNsPPw46x2rBj/fZMhyDRLgOWSWBuoS2nwL3aMoy00DxqRk2U2yGtJqh3s5z3+J7ndNeGnw+pHX89PtpHFFJahVQAZjTg8jkYPy46rcOJMMzpujPhplTSudVVEBLun/+O9o9V9zlUOEhk4sYV5ytMa5kM1+KlTnWLFTl3kevWtYveNkvJl4Bqn3YDqNUzHc7K6ReLfr55UUtG3NgAjy2pBaTX8BybuKNIhxN1sXVCvBWIHcpZEczn9lJeJhwb0VwZH3zsVcMWQ6NEMZ7BJohbM0bDEByHs5gFf+P0AmdxoGm9mC6LWCvFXgAJaBGvwPPtkdAKHgfR2o3XUeWfg/r5t8BnKAW6RKB+LrWGaKTEX4oOp5cl/GF1Z1EfsWCUyqfoiZRzHxuiCwcewsj9rD219/Hl1jCBfY7Z6ntlw/mT/Fv30c1WNgdDBDziFJYUqbtBHd+ST+hpYiuTuGYS7ku2UVAf8H/Uvq1Ewo8fyOiwKTUHmIjWAaOXZ0hSizJseWb9fjqkNRB2C6DJgiDETMC6SWVR7Cq4Cer3tVWkQLLEreK0hRHGmcTM2R0r+M8jWK8nwsisV31AYjxdO4xc5+1r8c+h+OBobM9+o+PfsE2mQA3vYhHVUzk9JbEWrwV4jAw73xVSXGrytycYCWKdjgxjEjCnd/GLXbaFERopfq3FhAMJag==|920 \ No newline at end of file diff --git a/Pages/邮件模板/模板编辑器.rd b/Pages/系统/平台设置/邮件模板/模板编辑器.rd similarity index 71% rename from Pages/邮件模板/模板编辑器.rd rename to Pages/系统/平台设置/邮件模板/模板编辑器.rd index c0899235..ba622f8a 100644 --- a/Pages/邮件模板/模板编辑器.rd +++ b/Pages/系统/平台设置/邮件模板/模板编辑器.rd @@ -1,5 +1,5 @@ { "PageType": 0, "ColumnCount": 35, - "RowCount": 5 + "RowCount": 6 } \ No newline at end of file diff --git a/Pages/邮件模板/模板编辑器.json b/Pages/邮件模板/模板编辑器.json deleted file mode 100644 index 215442b9..00000000 --- a/Pages/邮件模板/模板编辑器.json +++ /dev/null @@ -1,293 +0,0 @@ -{ - "Rows": { - "RowColumnAttachedInfos": { - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 580.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 - } - } - }, - "Count": 5 - }, - "Cols": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "30": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "31": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "32": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "33": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "34": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 - } - } - }, - "Count": 35, - "DefaultSize": 32.0 - }, - "Values": { - "1,1": "%PageTitle%", - "1,31": "保存" - }, - "AttachInfos": { - "1,31": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "保存", - "TemplateKey": "_RS_Main1", - "Icon": { - "Name": "Application/067_save_4.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "3,1": { - "CellType": { - "$type": "UnlayerEditorPlugin.EmailEditorCelltype, UnlayerEditorPlugin", - "Mode": "email", - "Theme": "classic_light", - "DockAlign": "right", - "ImgSaveMode": "BASE64", - "accept": ".xbm,.tif,.jfif,.ico,.tiff,.gif,.svg,.jpeg,.svgz,.jpg,.webp,.png,.bmp,.pip,.apng,.pjpeg,.avif" - } - } - }, - "StyleDatas": { - "Styles": [ - { - "FontSize": 18.666666666666664 - } - ], - "Types": { - "Strs": [ - "Body" - ] - }, - "CellStyles": { - "1,1": 0 - }, - "SheetStyle": { - "FontFamily": 0 - } - }, - "Spans": [ - "3,1,1,33", - "1,31,1,3" - ], - "PageInfo": { - "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "ShouldCheckDirty": true, - "PermissionData": { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", - "permissionResource": { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" - }, - "permissionBindings": [ - { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", - "roleNames": [ - "FGC_LoginUser" - ] - } - ] - }, - "RowBreakLines": [], - "RepeatRangeSettings": [] - }, - "PrintInfo": { - "PaperSize": {}, - "Margin": {} - } -}//QkcZqp+Whvwuip5kwkIbfRUqKMa6En+Quo3k6VBGqyHjNcBxIIrMBhMlQLkjcBO+cYycy8W5awYpSEqDUB1sXJCp5aX1TTtcXip2QUFb090t7q7JMdcDo76dUnIMC/lFmvYSMqty6RTZwlzviIRaP/BO/cWJS/fQOPE/iSBlgrF+GdhTP7XOG3/lOQoETrRwiZOhC8eBJBtRo9B+cH5+vGTzZ+5EMSFlrAlT71h7Q9DpOYjeuS+mfQhzPoqUnuvARRI7HOdDIZJfIp4LC/r8PrV2u9CR77Dsrr+W+MRzZ7h7OvLDD4EVTslJeCxzsq6e0jvkqaZj6Q86qn6TFAhToZTMTY3zrR1KOL5yQomEbYLnV18/u0EIZsnKwH4MNHdi5q3HTrO4JkCMavukfFPJYa2UVbqzpniQmdL3ozi6LquXuCLErVzcl3iVN2bWkNvqnuXOUkFSMy4+1utEoo/8JWp5hQKFBRt5AFc6zlHXbFuWVrC+aewZGA+JIfz/Z8ihuWXeR/UK8Cp0sCvBGNsG/qh88b9CGio+GMP1PQwstw7q1LE110aR3ajWG2c3UK7yfxlUlgh4ITNTEgTt+k6WnBDIqhhNu8d6VAEzc8Cfbq7eGdZb/ZEMn1WVJVNMUv1CGb4q+j6ywOgp/L45DRmP5b7O/Ds8109Oe9tjx5f9tPa8NTahLGGsLetAe72TJZkHWPa1WrZYHHgSFq+yDO/I3cRUHV4h3SIsxkAjNdhteo7OOBVJvnK07C4akZQZ7dDNeEmLh5fzfjmV6nOzYvKyPvUmRn9f3BclnuDDyI1f2o+7UD6isIM6rZpzuqGoKW9Gvt6WTnHfg8e9tvfALTMXytMs5FtWQVLbIhKmOVSdv4mKnD9Z6PQpWG8mICrgAvrr+dX6sjJJZlxCZ9vkn2kOHA==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index 25e07772..a97754fd 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -488,12 +488,12 @@ } } ], - "ID": "d0b6ca5f-452b-49fa-b1cb-3b6334c8ca09" + "ID": "1a8a1e5b-c875-4d40-af83-42eb8cd436de" } ] } ], - "ID": "4c6276f6-d101-4950-b717-1d566e42c564" + "ID": "0211428b-d79c-4e9c-bfc9-9b39ac07957d" } ] } @@ -827,10 +827,11 @@ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "是否删除", - "ID": "e40717925d4c4984a620af2a90c8fd5a" + "ParameterValue": "0", + "ID": "f80245fe95e54190b6fd428917237293" } ], - "ID": "948a0021-d423-4995-9172-7c836f647bf7" + "ID": "d02a29f5-782e-4158-a5ca-6e897f173c0d" }, { "CommandList": [ @@ -838,10 +839,10 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "是否删除", "ParameterValue": "1", - "ID": "464a194e712840acbf20ae688bc8ba74" + "ID": "f1f46d09366c4d40878ac41cc03c7045" } ], - "ID": "34b1efe7-edd5-4370-b819-fdc9f6b14006" + "ID": "21a58d73-f379-44c3-a4ff-4d8e7c61d20c" } ] }, @@ -914,7 +915,7 @@ } ] }, - "ID": "0d9e12966dc447fb99159e951a298799" + "ID": "4d6f24be6ed34d05a6d27c0b190d8b5a" } ], "Text": "查询", @@ -1132,7 +1133,7 @@ ] } ], - "ID": "5a5db4ed-67bd-4428-8244-d2129572d014" + "ID": "c1b8ae4c-8a34-4314-9dc9-d93be38b7fc0" }, { "CommandList": [ @@ -1145,7 +1146,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "7ce0c6a1-a744-41cf-ab94-72133575cadd" + "ID": "d3cd4464-b952-45e1-931c-e39406eabd34" } ] } @@ -1210,6 +1211,18 @@ "ColumnName": "项目经理" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "删除", + "GUID": "2f82a680-59e8-47a2-82b0-82ee34c24815" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!E4" + } + }, "NullFormulaValueQueryPolicy": 1, "OrderBySqlCondition": { "OrderByColumns": [ @@ -1740,4 +1753,4 @@ "Formula": "项目列表!$B$19" } ] -}//fiwgzLITFWxChB+zpirj+Xtx/04R1c+3mRhugTCm8DmkdHnnKuGno7cywHMdcq4l0P9Oh+4j/u9cfKJ0B0FgC3RKd9+LcEBNu2BbD7hcpetx7CPNkgkKZ1yVTL8SN3gj3ZRnlMpFd3QhyU5nCNarx16rm3wgVe1zvf/qnBIY1+6xk7jQcCl/77lSSvVvO4lh93r6nsjY7i0rWV33a0Y6O4h1MV91gmExS1RnFlcmTWC5BcsGVQkpnqhkYv2W85lqnCGxDLX/VEFhS+6H4cCQYvjfCSuZ011NyR7X17NvgOgyOZxonq0S0a2Q3S9aoRbmVZ7qduPLk5f4B5a8MFoRFc7aTOHwX5Aeagxh4EAVgREqH3NpVv3pTK4YAUHjPPDxMQqf7gF7qXSVhIv6hdSVLBXI93kQxRLmVnehklPs1l+LbT70/HxCmMrvEGUnfcCYQxknXqAjbuVF6EM67faSQl43UEdULuvVK/rnG5pOSvUgw+5LNUP1n3L81fkVzEsF19cvMCPjc3MBl2Eom9Vwbt0hsfBtqT/5+OlE/7rrF1tb5kArP6HakQrAy7GymOyKfeyE7d8Gg8awgUngT2hIfb7ZezvZr7ath8M0FzSgomGaAQZ10kXjWh5apv5CoVERXbtv4w6fTqYCbFLWzjQ815f3IftjrN5SziN51XdrFUmDf7VqohIf+6imO0yxOrI3Wzy1UFP6DAclmyqHEL0W8wd9HmsMDWEuT8avUVye208rdjvaGh5sUkPP8VkHBVxftzHKoS7E6YBll458QU7kwQHaPY/R22BPM1BahvxTQnUXqhnKc5FJp7//5ApnZO3xKXk9nE3p7YOecrOXZhOfsEri9fC3e0dux77QyWFMZwaUiFQA0mh9QnYuGV2+BfYYoULlEg+jdHUgqFRg3PkBwQ==|920 \ No newline at end of file +}//Qi3tab9/nIYvpMTWEcbP/NLjIum4SZ0jRqYvEFYg4VfIw/uaLWgCvl+i0HiqRJ8bxPKqfH8tQTKHIMh6DkyQlQDJ+a0NYcuNHs053m6xge+5q9ksGx4MPDJw0KvH7fiHu3LOzyBle9YIeYDcHOEtVmyx+x9LHM839/T4JwPUhizOp5qNpXhmS5hvFEJYAgCM3MA3Y9SXV4eS42E0lmz+DPyQCjACJoaERdUQj+wU0lNvhmX2i5V5sZBR0tp3ILu1sAN9KmZ4tVz38yqfqUIoRWpHgDaJqmpkl1O8XvLcdW5Iufh/43wXBSiZN6nqtjV2T14Hl+A+GKwX0DEo8Av3HoHvtTShSWh7nvOHFwuLWZ91xaanknnv27PMjjEHCuXpI+s/Zf9Km+AhJ5rdiWlaNrddPCdJdumISIkAU1CQ4PwgQ0ltJ2fJ6T8lboCf+Wi2HepRNXCVLtcjwClAEEI4C+K/aqiolmmKZO+NwM0WKmjgDc5w69kyUEbDHO018HoIafk1XkHrtyHVSoCWj+ckzqfA2qWpbn7RjaMnugxAsE/cMNV5fHov/2g/SEHWuhezbFakTg6cdYpnnnBzh0k8sJs3HylrGSPYduYm5wCLPw0yHj07/Mls+Xz6o1DEAbjwsGKXmLHeAY5nQvbIOdFe2hd0PZcBHrYRX5BEXv3bMniIFfi2bGj1URRpx2I5yqDC0x3wZDb2SgIc/d296jxzVrh4R2MQY927xeIfbDFjMWzqW/6A1TvCBzuIspCL4eJKwdIDL9JORsyE9NiIWFkcfanh4A74073k9MP30tmuHTr1nq5R0W/2NFIcp0NpuPXnhkNiT1GqOG12wuJPjtDqaXwOSp8itpJhCzxrH15W3snrwchJ4rSF2kao/sdYf486CXxG6gKjWPtxuY4wzNX1dQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index e9a01e7c..62736e84 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -203,6 +203,10 @@ } } }, + "InLogicalVisibleIndexes": [ + 32, + 33 + ], "Count": 35, "DefaultSize": 32.0 }, @@ -221,6 +225,9 @@ "9,17": "关联任务", "9,25": "下一节点处理人" }, + "Formulas": { + "1,31": "IF(G15,F15,E15)" + }, "AttachInfos": { "0,33": { "CellType": { @@ -276,6 +283,31 @@ ] } }, + "1,31": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!G15" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT(处理反馈工单!G15)" + } + } + ] + } + ], + "Size": 14, + "ImagePath": "展开1.svg", + "UseCellForeColor": true + } + }, "4,1": { "BindingInfo": { "TableName": "需求反馈登记表", @@ -709,6 +741,46 @@ "ColumnName": "项目ID", "GUID": "9d96b455-1882-41f9-8734-b5b453f27abd" } + }, + "14,4": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "Size": 14, + "ImagePath": "展开1.svg", + "UseCellForeColor": true + } + }, + "14,5": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "Size": 14, + "ImagePath": "收起.svg", + "UseCellForeColor": true + } + }, + "14,6": { + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": "展开审批历史", + "Style": 1, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!AG:AH" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!G15" + } + } + ] + } + ] + } } }, "StyleDatas": { @@ -724,16 +796,19 @@ "FontFamily": 0, "FontSize": 13.333333333333332 }, + { + "Foreground": 1 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Formatter": 1 + "Formatter": 2 }, { "FontFamily": 0, "FontSize": 14.666666666666666, - "Foreground": 2, - "HorizontalAlignment": 3 + "Foreground": 3, + "HorizontalAlignment": 4 }, { "FontFamily": 0, @@ -745,7 +820,7 @@ { "FontFamily": 0, "FontSize": 14.666666666666666, - "Formatter": 4 + "Formatter": 5 }, { "FontSize": 13.333333333333332 @@ -754,6 +829,7 @@ "Types": { "Strs": [ "Body", + "Text 1 50", "[AUTO]General", "black", "Left", @@ -778,22 +854,23 @@ "1,14": 2, "1,15": 2, "1,16": 2, - "3,1": 3, - "3,9": 3, + "1,31": 3, + "3,1": 4, + "3,9": 4, "3,10": 2, "3,11": 2, "3,12": 2, "3,13": 2, "3,14": 2, "3,15": 2, - "3,17": 3, + "3,17": 4, "3,18": 0, "3,19": 0, "3,20": 0, "3,21": 0, "3,22": 0, "3,23": 0, - "3,25": 3, + "3,25": 4, "3,26": 0, "3,27": 0, "3,28": 0, @@ -801,8 +878,8 @@ "3,30": 0, "3,31": 0, "3,32": 0, - "4,1": 4, - "4,9": 5, + "4,1": 5, + "4,9": 6, "4,10": 2, "4,11": 2, "4,13": 2, @@ -816,14 +893,14 @@ "4,22": 0, "4,23": 0, "4,24": 2, - "4,25": 4, + "4,25": 5, "4,26": 0, "4,27": 0, "4,29": 0, "4,30": 0, "4,31": 0, - "4,32": 4, - "6,9": 3, + "4,32": 5, + "6,9": 4, "6,10": 2, "6,11": 2, "6,12": 2, @@ -831,7 +908,7 @@ "6,14": 2, "6,15": 2, "6,16": 2, - "6,17": 3, + "6,17": 4, "6,18": 2, "6,19": 2, "6,20": 2, @@ -839,7 +916,7 @@ "6,22": 2, "6,23": 2, "6,24": 2, - "6,25": 3, + "6,25": 4, "6,26": 2, "6,27": 2, "6,28": 2, @@ -847,23 +924,23 @@ "6,30": 2, "6,31": 2, "6,32": 2, - "7,1": 6, - "7,9": 5, + "7,1": 7, + "7,9": 6, "7,10": 2, "7,11": 2, "7,13": 2, "7,14": 2, "7,15": 2, "7,16": 2, - "7,17": 5, + "7,17": 6, "7,18": 2, "7,19": 2, "7,21": 2, "7,22": 2, "7,23": 2, - "7,24": 5, - "7,25": 7, - "7,32": 7, + "7,24": 6, + "7,25": 8, + "7,32": 8, "8,0": 2, "8,1": 2, "8,2": 2, @@ -899,14 +976,14 @@ "8,32": 2, "8,34": 2, "9,0": 2, - "9,1": 3, + "9,1": 4, "9,2": 2, "9,3": 2, "9,4": 2, "9,5": 2, "9,6": 2, "9,7": 2, - "9,9": 3, + "9,9": 4, "9,10": 2, "9,11": 2, "9,12": 2, @@ -914,7 +991,7 @@ "9,14": 2, "9,15": 2, "9,16": 2, - "9,17": 3, + "9,17": 4, "9,18": 2, "9,19": 2, "9,20": 2, @@ -922,7 +999,7 @@ "9,22": 2, "9,23": 2, "9,24": 2, - "9,25": 3, + "9,25": 4, "9,26": 2, "9,27": 2, "9,28": 2, @@ -932,41 +1009,43 @@ "9,32": 2, "9,34": 2, "10,0": 2, - "10,1": 5, + "10,1": 6, "10,2": 2, "10,3": 2, "10,5": 2, "10,6": 2, "10,7": 2, - "10,9": 5, + "10,9": 6, "10,10": 2, "10,11": 2, "10,13": 2, "10,14": 2, "10,15": 2, "10,16": 2, - "10,17": 5, + "10,17": 6, "10,18": 2, "10,19": 2, "10,21": 2, "10,22": 2, "10,23": 2, - "10,24": 5, - "10,25": 5, - "10,32": 5, - "10,34": 2 + "10,24": 6, + "10,25": 6, + "10,32": 6, + "10,34": 2, + "14,4": 0, + "14,5": 0 }, "RowStyles": { - "5": 8, - "6": 8, - "7": 8, - "8": 8, - "9": 8, - "10": 8, - "11": 8, - "12": 8, - "13": 8, - "14": 8 + "5": 9, + "6": 9, + "7": 9, + "8": 9, + "9": 9, + "10": 9, + "11": 9, + "12": 9, + "13": 9, + "14": 9 }, "SheetStyle": { "FontFamily": 0 @@ -988,7 +1067,8 @@ "7,1,1,7", "7,25,1,7", "1,1,1,16", - "0,33,14,1" + "0,33,14,1", + "14,6,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1020,4 +1100,4 @@ "Formula": "处理反馈工单!$B$15" } ] -}//UJmiS4D+qfNdaxERagZkBsg/rh2CkNwPKGNVMGj/Z4g3uV8q4CMp3FMlmZKbPOFjNySglgcVzB8dk+zFiHyqeeAktyFDLHwWmePbODFcuQe6SiIKyJuYhxoPVnewYH2COUvSENEHUjkB9rmLpczhtE0cpDN+rfjbdOEjvSUK0Dfhb6MPORQQJrMwQiCF53/wf8DA3AdK9I2GLidESMb0+h2QXT6gajJNdkbh/4vBRZ6pEpVscZ3xxKqi/Gt6xnqWYor2fzbGO77aGcmeH3RRaotCkSvxlLrouyxTBLXSs/XNlD3o6eRQIulLXTuGVgVlP2BcEvd8ragOET1vKpeyqr/bJeAKYiFGUJFFM6RMVPEhYIvV2Ajf1KT2KTsZ+rT3PvO7OXUIXr7pry8z0s6UPS0d2KNIJNSimge6xv1W82yMP1nTF12R8b+La2rNJXCgBXArzoJl5i2efPZ0oxpNVyih8oxhzEyvnUEcd4PSs4dEMOOnXFR5IholuHzicvwtW4dBFfHmhqMVzPK09x41In/QYqOshiLEoELN21EElecQRAOwoL1IPcy+o5Gdrjt04DRBhrzIfjt3oZrH8msSGsl+3H4Y2xTAPZy+zA09vRK9kFbxuUcdyYA9bFkp94K3YDJQyvWLEOtW4NOiWDSADA9RRUqI1URy+XjHigvCBdczwBXcl7H1DCtxJaO8Trh+RM+J17lBRVd4oDlHVYDriU30VggFMRJ71zUYUQ2G4/gYHqE1Vn3ofZjfH2nCLqIgJD1yXcxdFaJb/jVX+jnEQZhasNtrHBMrpUneoI2S9UH+Pi7dImWdg+dc2WqHsw1fKMZhXS1k/gA042t3rJ0hdrkZWapyxbX44IB5CseOL+vB4y4tdqaoaGl9s8njixsKf9d0gbEP5t0Ye4fVTWeE5w==|920 \ No newline at end of file +}//P+1IwdnEHe6ZXXP0br1PjgGvrZJ7LZMor652b6CeG8jSEq6TaCdaomTDDd9tNjIoYHvPPn40cCH2prhwur3CU0FcHAfxblQZ2Bo3fK4ubuDGz3+EDFAsLMRNncuKZp+cfZ4oZtQC+tnFNsptpjoF+kYG0HtLjUPsPd+eozrtZpAzs1bZ9B1bXWZXu05GpWQMxYvWHN57tL/SNgnStJwda7UTCbXfqwynmb3AGbPuh6nwY8VLskMTuFF6FGDm06VlrMK0oHU69ZHSV5GPPuwfnh0UxW8h4G/JVldU3g2mW7ExssGp9rjTkMCXsFL40gxIYCqRReCbtKnC/xbjP5U2XKryqglyede+lyb9Tv8DrwygvE2xDWh2+znrUQXAtHqGSYPhxX6rQkNQalEED8OT+OoNOcWxcyCOom152gntFP2+CyPN10yVa5kkM5iF7mFj4jc6++hrE1mEUKlYJGOz1NdnqV4jv3SIhggpRuBWN9xjbFsJtutQNK40TjNNRLEUgOrVasO5yM//RVvL37mGr6YxsnL31Z+Td5inttfR+XzWzNrnxUmEI3BmJTeXo7Ty+nM3Ppbc2o4Ojd3pj4NmTx2e71YqLwzK73xINn5Hun+JRFOPlQvqxRc8yugnBj7RVUW7YvE90nxe7kBkfonnhYQobdrFGrzpbn2tksP7HxjSjKyyJkovNMbQcUCZwdhMo43JfEmE0W3WP6jmOeWGRp26qFEKmk3Nb+WHkQ0qub5w81voiTlpz0fA5DqhQGaNn+X8B+aPbK1BgPe2zm5tSoQlB+TybqglNXMtePl5dnVtr8xE68WFeWOBuynLzhZuLQ65OT/B8pBnOSUE1zxsv87R/zT96Ss++SbCXGcV4lZf4XDEkV6EZwId0whNnBOwBAjYZROuvMujeQUafpok2w==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.rd b/Pages/项目/项目反馈/处理反馈工单.rd index 0a315a34..b91826b3 100644 --- a/Pages/项目/项目反馈/处理反馈工单.rd +++ b/Pages/项目/项目反馈/处理反馈工单.rd @@ -2,6 +2,9 @@ "PageType": 0, "ColumnCount": 35, "RowCount": 15, + "Formulas": { + "1,31": "IF(G15,F15,E15)" + }, "CustomNames": [ { "Name": "项目ID", diff --git a/Plugin/Unlayer-9_0_103_0(1).zip b/Plugin/Unlayer-9_0_103_0(1).zip deleted file mode 100644 index fcc29ef4..00000000 Binary files a/Plugin/Unlayer-9_0_103_0(1).zip and /dev/null differ diff --git a/Plugin/Unlayer-9_0_103_0.zip b/Plugin/Unlayer-9_0_103_0.zip new file mode 100644 index 00000000..445336da Binary files /dev/null and b/Plugin/Unlayer-9_0_103_0.zip differ diff --git a/Tables/任务/子任务视图.json b/Tables/任务/子任务视图.json index b708e07c..fe3f9cd9 100644 --- a/Tables/任务/子任务视图.json +++ b/Tables/任务/子任务视图.json @@ -192,14 +192,14 @@ "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "功能名称", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "收集反馈", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", diff --git a/Upload/443d5833-c737-4769-9a2e-104182d6e821_新生成的图片.png b/Upload/443d5833-c737-4769-9a2e-104182d6e821_新生成的图片.png new file mode 100644 index 00000000..9246ba24 Binary files /dev/null and b/Upload/443d5833-c737-4769-9a2e-104182d6e821_新生成的图片.png differ diff --git a/Upload/6f34b1f7-5fa5-40fd-8cd1-103a63ff37b9_新生成的图片.png b/Upload/6f34b1f7-5fa5-40fd-8cd1-103a63ff37b9_新生成的图片.png new file mode 100644 index 00000000..9246ba24 Binary files /dev/null and b/Upload/6f34b1f7-5fa5-40fd-8cd1-103a63ff37b9_新生成的图片.png differ diff --git a/Upload/8131abcf-935a-4aa7-b774-45523e96717c_新生成的图片.png b/Upload/8131abcf-935a-4aa7-b774-45523e96717c_新生成的图片.png new file mode 100644 index 00000000..98f0c1a8 Binary files /dev/null and b/Upload/8131abcf-935a-4aa7-b774-45523e96717c_新生成的图片.png differ diff --git a/Upload/88aea4ae-f850-4b94-b2ca-4fb74595161c_新生成的图片.png b/Upload/88aea4ae-f850-4b94-b2ca-4fb74595161c_新生成的图片.png new file mode 100644 index 00000000..dd798ad1 Binary files /dev/null and b/Upload/88aea4ae-f850-4b94-b2ca-4fb74595161c_新生成的图片.png differ diff --git a/Upload/897e9d75-6bb0-4d81-937d-af672e7c9c49_新生成的图片.png b/Upload/897e9d75-6bb0-4d81-937d-af672e7c9c49_新生成的图片.png new file mode 100644 index 00000000..d3139fd4 Binary files /dev/null and b/Upload/897e9d75-6bb0-4d81-937d-af672e7c9c49_新生成的图片.png differ diff --git a/Upload/d5185fbc-ff70-4662-9ab0-6dd3c736ff39_新生成的图片.png b/Upload/d5185fbc-ff70-4662-9ab0-6dd3c736ff39_新生成的图片.png new file mode 100644 index 00000000..dd798ad1 Binary files /dev/null and b/Upload/d5185fbc-ff70-4662-9ab0-6dd3c736ff39_新生成的图片.png differ diff --git a/Upload/e8bc81ba-c90b-4bf3-82dd-1ca73c73d426_新生成的图片.png b/Upload/e8bc81ba-c90b-4bf3-82dd-1ca73c73d426_新生成的图片.png new file mode 100644 index 00000000..d3139fd4 Binary files /dev/null and b/Upload/e8bc81ba-c90b-4bf3-82dd-1ca73c73d426_新生成的图片.png differ diff --git a/Upload/ec25d4da-d567-435d-ae65-6c2c5b062c1d_新生成的图片.png b/Upload/ec25d4da-d567-435d-ae65-6c2c5b062c1d_新生成的图片.png new file mode 100644 index 00000000..98f0c1a8 Binary files /dev/null and b/Upload/ec25d4da-d567-435d-ae65-6c2c5b062c1d_新生成的图片.png differ