diff --git a/.collaboration b/.collaboration index b06b893d..2cdf8455 100644 --- a/.collaboration +++ b/.collaboration @@ -778,17 +778,7 @@ }, { "ModuleName": "PCPage/汇报管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-18T12:56:53.1769471+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报管理.json", - "Pages\\汇报\\汇报管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", @@ -1424,46 +1414,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-18T13:06:52.4703304+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.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", @@ -1511,16 +1462,7 @@ }, { "ModuleName": "ServerCommand/根据汇报模板生成内容", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-18T13:01:09.6081602+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\根据汇报模板生成内容.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/Gitee", @@ -2100,17 +2042,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-18T13:01:09.6087295+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\个人日报\\汇报详情.json", - "Pages\\汇报\\个人日报\\汇报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报列表", @@ -2354,16 +2286,7 @@ }, { "ModuleName": "ServerCommandPrivate/自动生成昨日日报", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-18T13:01:09.6087615+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\自动生成昨日日报.json" - ] + "ModuleType": 27 }, { "ModuleName": "SchedulerTasks/定时任务", diff --git a/Pages/汇报/个人日报/汇报详情.json b/Pages/汇报/个人日报/汇报详情.json index 31ef7bf3..79a4249c 100644 --- a/Pages/汇报/个人日报/汇报详情.json +++ b/Pages/汇报/个人日报/汇报详情.json @@ -266,7 +266,7 @@ ] } ], - "ID": "1dc210f0-daa9-4b9e-85c5-98dacda59220" + "ID": "c749473a-78b0-45c8-9b91-147313d64a86" }, { "Condition": { @@ -302,7 +302,7 @@ ] } ], - "ID": "f766275d-012e-4196-b178-1480060a529b" + "ID": "0b80c532-879b-4380-9656-13cdf6d0c442" }, { "Condition": { @@ -338,7 +338,7 @@ ] } ], - "ID": "d57340ae-308f-48d0-a957-97e10052ea1e" + "ID": "abc2eeb7-80af-4fc0-b55b-1ac5cc1dea55" } ] } @@ -637,7 +637,7 @@ "ErrorCode": "0" } ], - "ID": "536acc1c-ea2d-4842-b4f8-9747b6867069" + "ID": "251ce236-01be-4adb-b6d0-234d6f25e8b2" }, { "CommandList": [ @@ -647,7 +647,7 @@ "Message": "必须指定成员" } ], - "ID": "cffeb1a3-3b0e-41a0-b0c1-94a035230e14" + "ID": "8d247f8b-f412-4ae5-8c67-771d1c1b103e" } ] } @@ -1032,7 +1032,7 @@ "ErrorCode": "0" } ], - "ID": "fbea1ea1-c537-4d60-bc62-b7b9a372f0ac" + "ID": "dafac257-fc16-4508-9c52-767ad340e4ab" }, { "CommandList": [ @@ -1042,7 +1042,7 @@ "Message": "必须指定团队" } ], - "ID": "33a6dd0f-cdec-4f38-b7e6-2b19a2a2ce9d" + "ID": "83b6a311-56da-4b50-8f36-267e9fb71250" } ] } @@ -1173,7 +1173,7 @@ "ErrorCode": "0" } ], - "ID": "8ad50c9c-a1d7-4edb-b257-ad47914c90a9" + "ID": "eefe30bc-dbb4-4c08-ad56-6df99fad4890" }, { "CommandList": [ @@ -1183,7 +1183,7 @@ "Message": "必须指定项目" } ], - "ID": "f29b3d98-5b76-4b8a-ac47-a9c2ce12aba9" + "ID": "1f53977c-d0ea-4912-99af-7167a2567f6b" } ] } @@ -1322,12 +1322,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "0a3ccbe0-91bb-40bc-a85d-91df17d322de" + "ID": "66d7573c-87fd-4287-8f46-23d5951d2833" } ] } ], - "ID": "54b5ea51-43be-47aa-97bc-910013150369" + "ID": "15e3f011-4e2b-4730-aecc-220cd1a8bb62" } ] }, @@ -1408,11 +1408,14 @@ }, "ReturnPropertiesTo": [ { - "ResultPropertyName": "生成文本", + "ResultPropertyName": "日报内容", "ResultTo": { "SerializeProperty": "生成内容" } }, + { + "ResultPropertyName": "日报文本" + }, { "ResultPropertyName": "返回总工时", "ResultTo": { @@ -1474,7 +1477,7 @@ ] } ], - "ID": "8acfa307-5a16-4fa3-932a-2650dcd3abad" + "ID": "7c937952-38b0-4883-9b5f-24b3adfeb5de" }, { "CommandList": [ @@ -1488,12 +1491,12 @@ "Duration": 3000 } ], - "ID": "c84f0a7f-706d-4930-ba15-3c4cfc438972" + "ID": "9689d302-2257-4a7c-b774-668f096cbe9a" } ] } ], - "ID": "58abaa2a-ccfd-4ed4-abc4-b103a08357f1" + "ID": "72d19a5d-c603-4bac-8a34-12b222b26e87" }, { "CommandList": [ @@ -1511,7 +1514,7 @@ "AdvancedSettings": {} } ], - "ID": "a10ea15a-94ce-4323-9964-869492ecd7c7" + "ID": "d113b9ba-f6cb-4a9b-8394-2aadab2bb303" } ] } @@ -1714,7 +1717,7 @@ ] } ], - "ID": "15aa4217-459b-4943-9e86-0eef710c76e6" + "ID": "6e98e005-9fe5-467f-8e8e-a921a439dfc5" }, { "CommandList": [ @@ -1856,7 +1859,7 @@ ] } ], - "ID": "a359a620-dac1-4614-8781-259f8149e9e9" + "ID": "dc75bd28-1ea5-46e4-ab03-4460a928af17" }, { "CommandList": [ @@ -1864,12 +1867,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "1f81deaa-a935-47d8-9d97-07b303fa6c78" + "ID": "a5f92d18-8504-4d1b-a6b3-cf7688caeb7e" } ] } ], - "ID": "9f5ca34d-6316-4552-a08d-204f0b13a1f1" + "ID": "c042640e-5fa3-4321-9772-b4d24dc28128" } ] }, @@ -1886,7 +1889,7 @@ "ReloadData": true } ], - "ID": "a7d8f9e8-06cb-439f-b0c5-6527ded11d30" + "ID": "38bde51a-4725-4d7f-956a-a4c52f1c25eb" }, { "CommandList": [ @@ -1901,12 +1904,12 @@ "AdvancedSettings": {} } ], - "ID": "28127771-bd7f-46bf-890b-e2a876d0f130" + "ID": "80b47436-f332-4066-8458-661a1e445114" } ] } ], - "ID": "c239b2be-1eb1-4db3-b0ab-a118ae66cf1c" + "ID": "2f5a6069-4952-4654-8ca2-3a6bb035b345" }, { "CommandList": [ @@ -1921,7 +1924,7 @@ "AdvancedSettings": {} } ], - "ID": "3f2c2146-1bbb-418e-8272-ff236e319b7a" + "ID": "2b09af44-ff12-4178-8888-9b941ee45f58" } ] } @@ -2412,4 +2415,4 @@ "Formula": "汇报详情!$B$11" } ] -}//SkK5DQKw0oLQaq6IfbCyKKe3DGT7IVLKzrNJH4L1ZKZ7af+9ArM87jJK4+DqL0E8hRMdbZ8LgU1K0fYgl7GJd5w/6AROjaS7LiECr0dEccR+jzmx9Y7OE9BZES4fwwaSuBgx2zdanDVYjy1LLqC7CjnKi+n3OUkxLKRIl+hpOtC4G2mTeXO6F7o9UFNfG7pkv1E17r/0sCzR1I/xe//WXo8rVeTT1j1r01pqYFvF3qoMH8dFEsYlU4YvdADGnLOogKR5+sDNh+NJOzgLXXTDKw0/wQVKTYBPIOv0moyiV3vss70insI+DsurzhooxWhb/ZVC7NWzSW7J87eu5DdZxSz8nycgDmfbTmbUUMXRrddf39vVC6RG6l496c2CTLuU0EVFFouJ4XjOP3iYTQqhZhGHqW9QSQ9KN6+DPscKxmc4Q9izPERwFVAdzrqu9vKhROSF+6bIEsOEuuTUvueYChjVes8bX1YZpHXkr/++EB/7BVEEld9Kif1yIrvY1nV6lPyXtdiUjOelCRODcW83wdfvgchrZLvWX9fIGE2qTKuNQ/6DySfyhouzt9i8/0Kl2Oa4+UbEX2B96SFQ7B2af8zSRxk/rqjlPgKIuVyPgUuQB1I5yc6RZhnXE8SlIdRBwiXplwBWG2ZUWaSuyda07iTwrF1kqM2vwJdZQEFcCBr9gdqO8jTKCwSrt0+Sv4uAXTeRuaLYlcbYJ3arn6JXaF+9w28jgTR7htWR1vqDfYtf38geDiJ3B8+TAQKz7SrPnnHgMDANCcvh6tS5QfOu726JuHbd2xdstacLT0Pkbk/BwD6Eh59qOI4C1HfRBFGGY9iK5/oFF5LtyC9NL4xC1XBXZHTXBluia4K9y2reFONA9/hhh7CJmlwSgYGgJb+qMTpcUtIM693FlctXttuYww==|920 \ No newline at end of file +}//1QFD1XrRWZxtIieIhBRvkaPyO1DLXCbZo4wUe6o6/QGQQQuwgJDUfA9FnfH1hpESt2vbjTrcKFxXYQAm0vtaoKVHYwE92einlcQSBKuuzhZ0gL6s0s1EXZ0UmhNIo0N5ev3rDvcxJWCMr+Sd9lZW5EbuUrNipCQNJOQNAeOYcD6BaeB2urLe/HCrszLkZFQgmLev1yJS2mra3fRKYdyvwbdiSe9PP4j+wl9AG7BFCllWHxZjvGXc6Rw3dSNcWia9m3hibRn4pRMoglwCZSWt8KDBqxfQuuaVgqY4KanlKRBrOm5mRUAiNqCP9xkpDby626JByFbVmf2eqoBEPOhnEuBpAWN0fiGsv4UFkJs6XdoI/Wbu7dvkG63FLgF0kC/e24VHFSxgRuPw/XS1p2Ed9WOXIAHPcB8Wt89QBFrW9Nk7bCnQfGb0l+ppajn0tkXnLveniQVzT76szekaOvDF1elWucLKy0GAq0dtoyhzs1ZSdT6AU2mKmrTRe9mALTy3qfhGfgTzCPfvT7l+XgjIjAWGmCeIe0M1CZJ76QRVyT9kxjiEiLcUTiNfVKDxi/Ed72Yql9CAWisutGCRk1/pG/aDnyrBJ7G2DF6+n3kMfqzabAYqruzvpPdhvY3vHsPlveas6217IOqKF0CaBuAZEfX4/uR9ZJyTz2DuYg6FxbSPUKyIfBmPqC0qNFCQlfDGMffUqvuTb65dN4X+V3S7+2mVl4Mq7FxBlisVe098QzO1ThgTiSFsJ0BPfPT1j/WN3gWYyaVg4C3fRqWMeBFOvCRAygU6393W1T1/UMDzizj5vtqQjnorqDopgxpcuSocxVTa0KNmrETRVJkogtj4wAamlKblQNRdwkcZ5OQTKm3OAbhCKam2QwWD1q3YOW2zqwopacE1DDKDzDS4q7vbng==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json index 9b735b43..47ca6376 100644 --- a/Pages/汇报/汇报管理.json +++ b/Pages/汇报/汇报管理.json @@ -1111,7 +1111,8 @@ "matchMethod": "contains", "loadingText": "加载中" }, - "noMatchText": "无匹配数据" + "noMatchText": "无匹配数据", + "clearable": true } }, "5,17": { @@ -1144,6 +1145,7 @@ "rangeSeparator": "至", "endPlaceholder": "结束日期", "firstDayOfWeek": 1, + "clearable": true, "DefautWeekFormat": "yyyy 第 WW 周" } }, @@ -1774,4 +1776,4 @@ "Formula": "汇报管理!$R$8" } ] -}//dBEjGeVQA/yiDxyWjSEPZWtOgnGUurwr9CD6Ssf4WnxAYmhXYkv+C5CtwizSnexKSCyXli/tDCzp31SypVQenfmDZSwCp5dVVDkiYj3qrvUpIvfpsLU3WLbpnBOvTdinnDaZxt8iL1r0W+J9aSyH7zolQnf5qz60nWTwIiGPkgVcnwdqdavW8gLNc7MGnYTgtNNyH3eE0ALaRAtT+ucR/Erd5t3iSSlrcsxe3UdJuX/yOJmqXKqROHUw0zYLkyWSJV2R7ihzq6UbdWLtpEWnckpX0yO4ELLU10yDFpa8d3/AYVEkPsS/0rbA+SMnigp3lrEffKLnoLZVFhQgIGVqKRYz15BPuuoVLGz5tqf//glVGqJnrgGk3xsmvu51YJA9Dx8Bl0bwXYX3WgqgXHjiEt53dUjJwktdmoh+wpydbfEKrxStY3CfGY+e54ZuKCxG+pVwVNIXpGQyGNGEqRnaSOAKP0o3Yu+2+GVqEVtYervsTzxOIMNvuZ5g+iQ/grsyQY89LY/qAw7eZI0GS9l7af+FwUXOM7uf3k4NVUllz3i4USSqnMQD8Mbk0PiR0HHzZ1WimgF5z3Tje2zn4vJNF+SOmJ2NQOtnIn0XuQTH4Whfp+o/zF5qETMtKNpnxSwEQ1ze5niZP65wYKI6JxoirOwAk4iG4d0g87jZe0exuUzsrfx0sC2feOvn6fdM+DS55gXfOGfeaRxACWebI8NJoij8RqwJlyfKMCJsJvIMvuVGFfySmkbaJZxpGZVgOHyI593q24yXouEp8yIb4VeQz9sOf1B6wLtZgmEXgIR4zFL3a4uDcu2gn8Ez32AkfvVdyfDWxRkMt4BtoYYzYTw5A3ZoqG/u6izINcnqT7dSHl/k4+E1rAOtLeXd2FS/VgFtiAz5bqNon6W0VVp+/CxU7Q==|920 \ No newline at end of file +}//72JdrOCdPELNs0bYAAg+ulBst6RwAYI3FDkkR+MzrPg6X3BnIRERd+gVoScXYdvsFMfi/+KuUkW+3LgsACkcPhv45R4v4X9TJQUKMyBpQ7DE2JPdgyz2DtV6WRKPeIn47/tErhmWlxbVyt21N2EWm/rMCDky4tp2jF+VVUtJT3rxBmKyxWI2EntBfRWYdHxHZTAkdp134Yry2yk6p0FlYCDlaWivPcz8vqb77pnTHR74gBLqGtvg3Kpywg0x+vDdHXnvEJ4bZOhmRrwnBHBWx7GBatlg8XG6zaRZPUtsYTSSaclD7pbd8L6Gqweqb1L50pl3VP1UU5pNsisInf5x3XyI7Nv+iKpkM3KRIfKrx4pNUPyPx9sxLu181aKvn1N3WkoknJdL/yvaW9187TKam0jOvoxs3vBQYox7ij5uuuWJoxauRdXz9ptIgF86VhG1PsDi2ZtscoVwq5JI+4SJfXVX8dDnwyMDJgItelKd+uOa617Jl4CbjEswzMwiFAZHevtCBk2cABI4jOMJggGC45ZFnqrG2ebejgHYthn1nYTzj1LMu6Z6XUdx1+Xo+KPHb4tYWGWNfx5HxrQic676gOtYYJ5n0WVSj3+j3R323QOHdRHzhAFR8H4yBzkbzcoJ+/hglzAZ1muXMQMT2F42O0pbQfyZtSpoJ+Ni9TqefFVPljZaTiC6NA7/bRI7cDjJVErP9OCAlBw1XIhoKRGY3y2fV6MEc4Vy040cFxNJd/HEFGHJ/P86bpCTj2Gh4GIo/Gz8/3wfBwpFy+09IGLAuOvCmvepJpC+QZ6ISsBHb+3eo/hko2XKHkuhSDiHRHzYdN9NNsghmKEsvqDRvgm1EMstFIQoFRlAlGFXnwAz0EPGHafpVNLHp56+k3x+BZjE/dDdBxY6akpHEzxVKNK2Xw==|920 \ No newline at end of file diff --git a/Plugin/超哥富文本增强工具包-9_0_103_0.zip b/Plugin/超哥富文本增强工具包-9_0_103_0.zip new file mode 100644 index 00000000..3f95a984 Binary files /dev/null and b/Plugin/超哥富文本增强工具包-9_0_103_0.zip differ diff --git a/ServerCommands/汇报/根据汇报模板生成内容.json b/ServerCommands/汇报/根据汇报模板生成内容.json index f51ea028..66f941b0 100644 --- a/ServerCommands/汇报/根据汇报模板生成内容.json +++ b/ServerCommands/汇报/根据汇报模板生成内容.json @@ -30,7 +30,8 @@ }, { "Name": "汇报类型", - "DataValidationInfo": {} + "DataValidationInfo": {}, + "TestData": "日报" }, { "Name": "汇报对象", @@ -480,18 +481,38 @@ "SetMaxRecursionDepth": 11, "ResultTo": "输出结果" }, + { + "$type": "Summernotetools.ReplaceTemplateParameters, Summernotetools", + "HtmlContent": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=输出结果" + }, + "ReplaceRules": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"\"" + }, + "ReturnText": true, + "ResultTo": "纯文本" + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", "Message": "成功", "CustomReturns": [ { - "ReturnPropertyName": "生成文本", + "ReturnPropertyName": "日报内容", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=输出结果" } }, + { + "ReturnPropertyName": "日报文本", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=纯文本" + } + }, { "ReturnPropertyName": "返回总工时", "Value": { @@ -502,7 +523,7 @@ ] } ], - "ID": "1f1540dc-8209-49f1-b3fd-34af5a8fe74f" + "ID": "ca6bc49e-fbbe-4774-9df7-8625295a5df0" }, { "CommandList": [ @@ -512,7 +533,10 @@ "Message": "未找到模板", "CustomReturns": [ { - "ReturnPropertyName": "生成文本" + "ReturnPropertyName": "日报内容" + }, + { + "ReturnPropertyName": "日报文本" }, { "ReturnPropertyName": "返回总工时" @@ -520,12 +544,12 @@ ] } ], - "ID": "67ff462c-b818-4291-a1b9-846118486c78" + "ID": "eaaa632e-f920-4121-89b6-0aecb420355e" } ] } ], - "ID": "77814082-307f-4522-9a24-e09ccb8a63a9" + "ID": "bc3a0131-51bd-404a-bed0-d7ffbc0eeff3" }, { "CommandList": [ @@ -538,7 +562,10 @@ }, "CustomReturns": [ { - "ReturnPropertyName": "生成文本" + "ReturnPropertyName": "日报内容" + }, + { + "ReturnPropertyName": "日报文本" }, { "ReturnPropertyName": "返回总工时" @@ -546,7 +573,7 @@ ] } ], - "ID": "3739afbb-7599-4f01-843e-19d6cd35ff01" + "ID": "73a29f21-14a6-4bad-b77e-5448ddafe1df" } ] } @@ -566,7 +593,10 @@ }, "CustomReturns": [ { - "ReturnPropertyName": "生成文本" + "ReturnPropertyName": "日报内容" + }, + { + "ReturnPropertyName": "日报文本" }, { "ReturnPropertyName": "返回总工时" @@ -579,7 +609,10 @@ ], "ReturnProperties": [ { - "Name": "生成文本" + "Name": "日报内容" + }, + { + "Name": "日报文本" }, { "Name": "返回总工时" diff --git a/ServerCommands/汇报/自动生成昨日日报.json b/ServerCommands/汇报/自动生成昨日日报.json index 6d49998e..c7e406db 100644 --- a/ServerCommands/汇报/自动生成昨日日报.json +++ b/ServerCommands/汇报/自动生成昨日日报.json @@ -10,7 +10,8 @@ "Name": "汇报日期", "DataValidationInfo": { "IgnoreBlank": false - } + }, + "TestData": "2024-06-26" } ], "InvokeTriggerTestData": { @@ -141,11 +142,17 @@ }, "ReturnPropertiesTo": [ { - "ResultPropertyName": "生成文本", + "ResultPropertyName": "日报内容", "ResultTo": { "SerializeProperty": "生成汇报内容" } }, + { + "ResultPropertyName": "日报文本", + "ResultTo": { + "SerializeProperty": "纯文本" + } + }, { "ResultPropertyName": "返回总工时", "ResultTo": { @@ -197,7 +204,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "e815c9f8-4647-4b16-9a7c-a9856abcec31", + "GUID": "ecd908a8-4578-4820-9bae-ea8defe1af66", "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "ID", @@ -255,7 +262,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "8d7816ef29014ca88d0b56228efea014" + "ID": "4d65dca15f4d4a059b0c73989c40bfa0" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -283,7 +290,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报类型", - "GUID": "59d8febc-fd0e-44c0-ab91-4e8bee3be57f" + "GUID": "c46d99e0-0924-4aab-b261-4dd849497956" }, "Value": "日报" }, @@ -291,7 +298,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "开始日期", - "GUID": "599ea8c4-cd37-486c-908b-b76153f8fa6f" + "GUID": "1636542f-6299-4a68-8514-059b747cfa6a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -302,7 +309,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", - "GUID": "2b44c825-d1e2-4ea7-b02b-bd0e7b5a0930" + "GUID": "2c8584ba-2879-4586-8cfd-25a62e08d620" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -313,18 +320,29 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "内容", - "GUID": "e1fd5fef-55bd-4bad-bef7-a1e8587eb1fe" + "GUID": "de382c90-6c84-4ef8-b1c8-6995e3f6b64d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=生成汇报内容" } }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "纯文本内容", + "GUID": "b0ef91c2-b2c5-4c17-9eaa-d162888866af" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=纯文本" + } + }, { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "总工时", - "GUID": "f63f3278-817d-4d3b-85e1-ad3e572f68b6" + "GUID": "37876972-0203-482a-ae55-27c560124b30" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -335,7 +353,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报对象", - "GUID": "52130e76-6317-4a2d-a3f3-78aa660dc017" + "GUID": "c9a7431f-66c5-429f-a124-d4f109e79da0" }, "Value": "个人" }, @@ -343,14 +361,14 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "状态", - "GUID": "540643f7-47e6-4398-a81c-cb07864014e9" + "GUID": "9babf69c-3573-4934-8ae3-30c0525e12fb" }, "Value": "1" } ] } ], - "ID": "f2958030-4bf0-4ebe-9fb9-1ce8192e5a1f" + "ID": "d5d6a3b3-4379-4ddc-9b40-93b803084e87" }, { "CommandList": [ @@ -376,7 +394,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "开始日期", - "GUID": "a57546f4-0f7a-4029-b472-193e72b0da1b" + "GUID": "044c716f-8c30-4ee2-aa5b-e457a36b63e6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -387,7 +405,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", - "GUID": "584ee468-b463-4253-aa90-7e46fa5153c2" + "GUID": "aded0655-e6fb-4bb6-801c-68a840cea09e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -398,7 +416,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "内容", - "GUID": "92ddb7cd-2e5a-4508-9fe7-d35f54b98eeb" + "GUID": "7e81a511-6614-4787-9bb0-bd7fc16242c5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -409,27 +427,28 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "总工时", - "GUID": "a82384cf-a65e-41e4-90d8-ce2bb3334a2c" + "GUID": "cc271653-e5e9-45f1-a45d-27d6d1f6f1fd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=返回总工时" } } - ] + ], + "Disabled": true } ], - "ID": "b2986861-58e8-486d-a128-ad51d4e8b21b" + "ID": "60899e04-e025-4e85-9e36-018001d2cd90" } ] } ], - "ID": "f6695547-dd52-4271-bfaa-09f4e1f12d85" + "ID": "c4510c86-ac15-4e72-99fd-0ae01fcd964e" } ] } ], - "ID": "78de713c-52e7-48e9-ae6d-b82d70339128" + "ID": "efc6eb81-99e1-4423-88ec-999e994e5ac9" } ] }