diff --git a/.collaboration b/.collaboration index d8e209c3..135813ba 100644 --- a/.collaboration +++ b/.collaboration @@ -542,17 +542,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-21T11:13:09.3348258+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -812,19 +802,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-21T11:06:29.8608415+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报\\汇报详情.json", - "Pages\\汇报\\日报\\汇报详情.rd", - "Pages\\484d3ed119274a60bf32f15d178cf60.json", - "Pages\\484d3ed119274a60bf32f15d178cf60.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", @@ -1528,41 +1506,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-21T11:42:49.6109169+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_2_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动画插图-9_0_103_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-ElementPlus-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\加载动画-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\\甘特图-10_0_2_0.zip", - "Plugin\\用户管理命令 V2-10_0_2_0.zip", - "Plugin\\表格报表-10_0_2_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1590,16 +1534,7 @@ }, { "ModuleName": "ServerCommand/AI对话", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-21T11:01:57.0973439+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\AI\\AI对话.json" - ] + "ModuleType": 15 }, { "ModuleName": "Notification/AI流消息", @@ -1615,19 +1550,7 @@ }, { "ModuleName": "PCPage/项目周报首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-21T11:38:01.08511+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\项目周报\\项目周报首页.json", - "Pages\\汇报\\项目周报\\项目周报首页.rd", - "Pages\\50f88f59718b4ba78fa3fc76286d95b.json", - "Pages\\50f88f59718b4ba78fa3fc76286d95b.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/汇报/日报", @@ -1639,17 +1562,7 @@ }, { "ModuleName": "PCPage/项目周报详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-21T11:02:18.2732284+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\项目周报\\项目周报详情.json", - "Pages\\汇报\\项目周报\\项目周报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", @@ -1657,12 +1570,6 @@ }, { "ModuleName": "ServerCommand/AI生成周报", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-21T10:46:59.0629014+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json index 28979acf..15b7bd15 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.json +++ b/Pages/484d3ed119274a60bf32f15d178cf60.json @@ -227,7 +227,7 @@ "ShowConfirm": false } ], - "ID": "8efb05a9-8ea5-4eac-8e3e-2fdeb61920c3" + "ID": "79c6e498-98d6-4e98-ba86-b7dcc021ea0a" } ] } @@ -762,7 +762,7 @@ "ShowConfirm": false } ], - "ID": "4a038bea-a4cf-4eeb-a41e-259ac57329f6" + "ID": "1f6a250a-190f-434e-baa4-823432def1a6" } ] } @@ -849,7 +849,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "dfb9a093-a3cc-4d57-b432-1cc08cef7321" + "ID": "66019a34-705a-41df-b4e8-49c8e945037e" }, { "CommandList": [ @@ -863,7 +863,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "e2b2f578-b540-4524-a570-cdb282e8418b" + "ID": "098b7b11-3f0c-4b9d-a1ab-87e9dffca1c7" } ] } @@ -1114,4 +1114,4 @@ "PaperSize": {}, "Margin": {} } -}//f6WkF+tElvJqCqfRf7fjVhMJmOe2DJTGtNFG7adQRTVXEsnYsdq9yEhQXQddEpIyazd2A5eiPoxBY2ZaWi54kV4h0nt628TDrYrzqZRhe+nJv0j0PoRoQyjITC1CRkrWtnlZqQ6EhkTJvGsW+c4kVP9mqMUoE5KSsCK7JZCo8g3GdMNxyLvzM8Ht3ZMGtA51F8b/5DwtmwVOjxK/yx63FB8iPCpBETwvV4tsDD9Us/nE7TpqAYe6Dq1bmJar8sbf2AZ0I6K0x5ylF7bp6W/mp71FerE7gOvKNX9XwrrMZKZc1pfDJgmvSw7fwK1pKHC0eBdpot+caUZPPKlOuA7Eo7rYtQiO5x9Kul4zZEQj00oOaKOj+hIZK737pELIPa/nUEqWl8K/ePDRY+ZFUUtI1mkZMqZVlkN603eGLnQDFNw2CAswlXG3Ioqva0/dmK+UeTYl5DoigGZmxzsiBjFLpOoqBALmR7T2+i2O6cJl7Vjzo0JpadZO0iUC1kiWptMxT5DBFoyMh8F/dqA5fkZKvzgcxQCg/WRhp0YYN+K98UwDdJA8dg8uPwOjHw/gTgUxddKhkSwEcbAcqqQMMKU+mQnw2myvJPUZWt/KPYGuBmiRBwg8NY+ZGPdq0PKtLUy1t5VS3KxgmE4vXaqLNClgU6UHGO+rxFXKSYWRX24f+DYofzVtdK9qrBCokFFOO9MCGpYZqyefuNYI4ye3G8ZWCvhaTq+fysoPNjJb4f4UwaXllsVySPQ1HwsotgMj6gGjSc33GDYrcRT0JvCR5tiAyYmoRFGHwXewxCw4i7wUzgvGlu8HLwfxZiaM0etCDY2PXACBt/CGU+ecNo5/TPAFGr2Nt2yG6N7V90BMBamZdRPD/hi2korHqjLdXfG4DeCRlMHdvAOHOJt+GNWnyyICOQ==|920 \ No newline at end of file +}//Hz+Bu+b/1InvH1hy2tjDmWnteDJxXeO1ohccr+4+EFzWXbbXiRqEw1o35yAShgKqoxeARfTzCybWH3NzyF13Y33Lx+vUAou1sxa8iQNvpHkb1Y+a3r/AkCJRkyNeoEbm2DsiznKPeJdRqKLk6djqFpCT7/TqUEhfjF6UIkG/vH8gz5S1wNa7vbgupaLbsCaOSgx6JZsmJfO9/ECzQ5zJg6HwqC1nfLvZubAcFc2yDibJEYf51xtazPyLfakz2LIU1xpa6YiBeOPqAUfG7E1lJQ7BlPF2tcRHx/th6wZ9NfdHA0Nw1p/+L4RMk+wkWgshAVQ8xtxUfkaYUmfYYNm2UcSFZTLqQXHzKAd1M2W2ACmBCjrFTr9VrjSgO2JcUtWde13WNDLQ8uTZOkehbCmPZIWZhXedC7dGt5t9vDcxwKyg1dW186SXNsn0WyhTOfU68ePlWM8V1Vz8Q7RoOkP4SFKmqvEnOkrRSyBPKzkO6wkUD7YL9y/UYqyHY2nAZyrB8/ZLgzzFr6ytIa0mVl2+B2xeg+Lcyu9LDx5SJbIRGR1vqYxAZSX2LPde4wzDzrv8/3xjDEEdlDCVKwa7c/wWrLKPq6bAewBVZehlhq/P11/A7AUUZO1MRkkUC7ogF0EnxnxBBBS0Dq0qujFqeO+CJ1c02X1I5vIX0m4K2iWikGb9+T4fc1stsel2+wxfC7/p4o6gWo3Ke+WRmqhFA02khtNGzSAJAXPom3sQk/Oj2VZFb6Uis1IH4jXzFBRCrsyz3tQMNpW7Ns0R3l4cick6c4H5KGoCxJNdg2C2gA68dYJ6bDxb0pDkCUnWLaq8eoCXCtJII5WBOhbBmRa4LS6FBz+rSeSxn1efOrJA4tjlFLTYLY3QGEEy0cewXdjFGpMJsy4X4taRwLvieqVgplV+3Q==|920 \ No newline at end of file diff --git a/Pages/50f88f59718b4ba78fa3fc76286d95b.json b/Pages/50f88f59718b4ba78fa3fc76286d95b.json index 7d306cd5..0d3abfac 100644 --- a/Pages/50f88f59718b4ba78fa3fc76286d95b.json +++ b/Pages/50f88f59718b4ba78fa3fc76286d95b.json @@ -6,6 +6,11 @@ "DesignLengthInPixel": 15.0 } }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 21.0 + } + }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 @@ -58,19 +63,16 @@ "DesignLengthInPixel": 15.0 } }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 21.0 - } - }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 21.0 + "DesignLengthInPixel": 21.0, + "IsHidden": true } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 20.0, + "IsHidden": true } } }, @@ -120,7 +122,7 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 665.0, + "DesignLengthInPixel": 544.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -130,18 +132,23 @@ } } }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 131.0 + } + }, + "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 46.0 - } } }, - "Count": 9, + "Count": 10, "DefaultSize": 50.0 }, "Values": { @@ -191,10 +198,23 @@ "1,1": { "TemplateCellSource": "标题" }, + "1,8": { + "TemplateCellSource": "汇报人" + }, "4,1": { + "CellType": { + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", + "ShowToolBars": false, + "ReadOnly": true + }, "TemplateCellSource": "上周工作" }, "7,1": { + "CellType": { + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", + "ShowToolBars": false, + "ReadOnly": true + }, "TemplateCellSource": "本周计划" }, "9,1": { @@ -354,10 +374,9 @@ "HorizontalAlignment": 5 }, { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Formatter": 6, - "HorizontalAlignment": 5 + "FontSize": 12.0, + "Foreground": 1, + "HorizontalAlignment": 2 }, { "Foreground": 1 @@ -374,7 +393,7 @@ "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 1, - "Formatter": 7 + "Formatter": 6 }, { "FontFamily": 0, @@ -401,14 +420,14 @@ "black", "yyyy/m/d", "Left", - "\"第\"0\"周\"", "[AUTO]General" ] }, "CellStyles": { "1,0": 0, "1,1": 1, - "1,6": 2, + "1,7": 1, + "1,8": 2, "3,1": 3, "3,2": 3, "3,3": 3, @@ -416,6 +435,7 @@ "3,5": 3, "3,6": 3, "3,7": 3, + "3,8": 3, "4,1": 4, "5,1": 3, "5,2": 3, @@ -424,6 +444,7 @@ "5,5": 3, "5,6": 3, "5,7": 3, + "5,8": 3, "6,0": 5, "6,1": 6, "6,2": 6, @@ -432,10 +453,11 @@ "6,5": 7, "6,6": 7, "6,7": 7, - "6,8": 5, + "6,8": 7, + "6,9": 5, "7,0": 5, "7,1": 8, - "7,8": 5, + "7,9": 5, "8,0": 5, "8,1": 9, "8,2": 9, @@ -444,14 +466,15 @@ "8,5": 9, "8,6": 9, "8,7": 9, - "8,8": 5, + "8,8": 9, + "8,9": 5, "9,0": 5, "9,1": 9, "9,2": 9, "9,3": 9, "9,4": 9, "9,5": 9, - "9,8": 5 + "9,9": 5 }, "SheetStyle": { "FontFamily": 0, @@ -459,11 +482,11 @@ } }, "Spans": [ - "4,1,1,7", - "7,1,1,7", - "1,1,1,5", "3,1,1,2", - "6,1,1,2" + "6,1,1,2", + "4,1,1,8", + "7,1,1,8", + "1,1,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -473,4 +496,4 @@ "PaperSize": {}, "Margin": {} } -}//ie3AKVraTDOO2xviAfPvIjDD6vDsqRGvtMQUT+0FCnwD19Msec1OY9HwLrA1w65wsEO06wwbvq61I0Po0EAqWmW+jgU3CfnEN/b70nUFTm/8vM+x0v7/4p5rTZ+LjujlZyNLoeHA2ObUBur+A35C5tuWjbc6+w2XiZ9tG3Fy8UbyFlhxocPQySLt4M/GiYS/ns0rnLgr3JQ+574NnfmbiThIKcHKcTCiwRlnQMW7eHDZcjfHj5TlumKXwjMVXNJhX4kJH9ZBeIzchZL47Wmy8JmdnJTNnXzf1WFSC10hcQkYUT1BYd4tv4vyRyTymcN6KZUhMlK6Bnnl7VfmhIB6Ipn3jC4q01fIpL5WnLceHiPz5Mzre97vuI0rBJixTiXJqaoqmPwg38usPXkgWCCMCIVvF1f4LMKX2vafVmqeu0Jm9jcjqoB9h3O86T7YNwGMneEu08wXRKcqUn6zepS97himVr+2y6Gb3GW4aX0Zdt7mwnZUXprQGJPavixDv1Txx9NRrT2PgI7pU7XLy2Sdyw4DvgQAw22ufwVXkr/16XIUYFsJSaRui/SR5KuwwezI55U5L7mvBWFZVO6LvR5K3dLXByAkpkT8WT8lhj3p1WgzHtvtJYyjW4Fm+zqK+8CFIIrEIMbndZVmmXQU6ClHOs01hwNiVv4kNA5n4Njr4/hIWtnESFWdYbJvlWZIPXoAD8FUSR6UcrRQ0YDw422K2jvIgsuBfM8IoJAMCqxeUlx7mgGfHhN4Cn3ClqUUv3+QVaku5Gzs1H4ESwYIXIE5YEdeAhVd+lglVnoz38CQ8SJW2NSv/bMjcg5HZ/UZmbgSkiw/lf0kZT47ZbJJ7U/i4UcJUEi6sS1qgoKswSm+9y8oBQOL6SRy00wzLJopo6z2h6wOSho1xcsFYINhv1+F5g==|920 \ No newline at end of file +}//Jx0H3MkKGV08r1kENpl+T2+8zjpomTy5cL3UhV81hI2NFHJMcbADAd/JtTwI5lsYT5A/4xLRWDekz4usr2m2lCCLIfQty+ThR7lGyF1OOZtD6/fdIeFAVuCTSaqYAURyHGM79dBblsSQ84T7fZ6oTuhYPWhBm7BJSs/375NKumsTTHkBWoL8hjgw6GkX++/poz7XuJXOeTQvgegkrMK9QLSZA2ggkWd1uQbL9CIplwJEisdiWsioHCv00H2gSvgMqy6xhX6E7cnabodmsfDsIJF2wByHnp90ZWGVlnWZeJH7d2TcarFp8F8NyL/uQs8SZd+tDI9Ow2DJB4KjJKga3hD3u5w1RlJ4fGB14SBe0qqqA0blRgtwh5ciWVApeGNZHv/lFY4drWjiBh57YTA6AD3anT9SNQPDpMXdkwo//QfF98swiQ1Mmxc/xpDyQG1YC6hU9zvFl+uflp3irFKcUkC8vjQmZ45Wij9AwjvjQ6qqMyrGfPf9ZThk/T3rQQTY5OCh/hpqw9sLEvjtD9+h0iyVXpeYbXBVNwsLZzPbziYyU+eSJweaTE7htWf7ees1GgAY9QxD0wzdVJvxGgQg3dZdQH0uWWhAhm5AxzKJeUaPEPagq9W64IiUFBMsNmh39pf4/foNbEY70YJ4NFOxm1Hz0g92H8GIwlk8qFpWOf0Gq6Z0uuYmIizB/bJtvaug6kpU8Rg0ab3Q4sfWXrDKXt//uNf3vHKJ02Fo+eA7g8T8XTV5ltaCYbrpCnEGBBlsY1H+kLss26CNDC1eJlJurT5IbVfkAPFOfXdZWy36Au/0wuVgANR/BiMhbX68H3mjYJX6PbIqKweD4QaZ13k47NX0+yknMdv4GskbSYOlklheHMTc6Hl9cDgzhmJdjzcJ6yH/7z+SJFABQY0YMvTVZA==|920 \ No newline at end of file diff --git a/Pages/50f88f59718b4ba78fa3fc76286d95b.rd b/Pages/50f88f59718b4ba78fa3fc76286d95b.rd index 408ed732..d8494ab6 100644 --- a/Pages/50f88f59718b4ba78fa3fc76286d95b.rd +++ b/Pages/50f88f59718b4ba78fa3fc76286d95b.rd @@ -1,5 +1,5 @@ { "PageType": 2, - "ColumnCount": 9, + "ColumnCount": 10, "RowCount": 13 } \ No newline at end of file diff --git a/Pages/汇报/日报/汇报详情.json b/Pages/汇报/日报/汇报详情.json index 3e385062..ac3f6879 100644 --- a/Pages/汇报/日报/汇报详情.json +++ b/Pages/汇报/日报/汇报详情.json @@ -535,7 +535,7 @@ } } ], - "ID": "57449ba1-df17-433e-8439-0c2abd9e4f8a" + "ID": "634827c7-d3af-4070-a1fb-afa02199cbfd" }, { "CommandList": [ @@ -550,7 +550,7 @@ "BtnText": "知道了" } ], - "ID": "ca300f1f-0fb6-4980-83f7-56cfaff14672" + "ID": "8b65bed0-bbec-496e-9f7b-abd28b396e06" } ] }, @@ -564,7 +564,7 @@ "Title": "生成中" } ], - "ID": "496de6a0-6495-42a1-afd0-a45324b77655" + "ID": "0f06528f-0525-4a6d-aa4f-df259f98c0e1" }, { "CommandList": [ @@ -574,7 +574,7 @@ "Message": "请在下方编写你的工作内容,让AI帮你完成左边的日报!" } ], - "ID": "968dfb58-8938-423b-87a4-8db0f4e2803e" + "ID": "0702ffc6-aba0-49da-b07d-86538d841dc6" } ] } @@ -744,7 +744,7 @@ ] } ], - "ID": "7c772a80-0fe6-468a-a9e1-20ff5df5fdc2" + "ID": "686d90a7-2f65-4e62-bb73-29fc43a08712" }, { "CommandList": [ @@ -759,12 +759,12 @@ "BtnText": "知道了" } ], - "ID": "5fa9f7f4-949b-49c7-9ada-d6379d7d941f" + "ID": "525c6dac-d802-44c3-8a91-d3ed3a069fa2" } ] } ], - "ID": "a85f9fac-e3b6-4456-a0ae-2cf7907c6e3a" + "ID": "9fdf86e3-4000-4666-94dc-f3bda0422ad5" }, { "CommandList": [ @@ -774,7 +774,7 @@ "Message": "请选择汇报日期" } ], - "ID": "80a9e3f2-b4a9-420f-a19a-7a295a7dd0d7" + "ID": "d039d251-bcef-41c8-af6c-8b3d1c4fd640" } ] } @@ -1063,7 +1063,7 @@ "ParamName": "汇报人", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!用户全名" + "SerializeProperty": "=汇报详情!用户名" } }, { @@ -1141,7 +1141,7 @@ "ReloadData": true } ], - "ID": "d03b5910-058b-4a32-9f7c-fb91c37e62e1" + "ID": "0a838575-16ca-42a0-901c-433c7f5272ae" }, { "CommandList": [ @@ -1156,7 +1156,7 @@ "BtnText": "知道了" } ], - "ID": "0deed8e5-0cd0-44a1-abc8-02b1ecb9ef2f" + "ID": "c9f0beed-2bf9-4e48-8a81-05d7dc2982c6" } ] } @@ -1559,4 +1559,4 @@ "Formula": "汇报详情!$B$8" } ] -}//5IV/D/qar7DOw0GoWHDsqrqF7rLyN4tQeLjxtEhMzxcvxR6vg9Es53zXGP2ykY2Y/x+KFAATzeSC6rF59vRZe9qN+au6a4YvhPDmyqLSjegKeK8XpXA2Zzt6CISj66777M8O8vL8G9VQYxX/3RZHRYpCJL2fv5rf4/XP8E3UpMaoqpbGWPQeFxkH9CyRKawi71SCn9YsrTa7A5i0F8Dzc5Ul1YQJdmUiXftTtCINjA+K39qUGULawBkVmvopfdxN8U4MR6dzqJJNqUGs9qEW5z/D21dcA5S1OgSeWYu1AKi44DikJWy3sKehbnG1RnxyLCzp9Mmw1cZ35PPZ1/j0cX5Ktxz4e1s2mUk/7dqKRETFznjsE4dUQxRqU15T4Hv2u/gKwobEYZrOxmFoFX0BcqdTa4hCmlWtVG2atQlrgVbu5rJirm9YUYZqi8nzfSB2mOqLILPpbrIPak4VAtW5S8GaRbcb4lcvJrWqAaLEz71WkW6Xd67FCTnQrnT1J6d6o5orja+1VXjmlysvIBeEU2JOACLiXlROPkbePQpsjetmExRCWLM9DigyLbyUt13WrvowBQaIJN/4zvV4/z2f4hYZHBXrroS00unR+qGn3RoiGfqScsRTTyv7ZwHzcx2n9vKbhf+53D/hQBX65DxBqwWyaIudftQjLWBnuSfuyXJqS7jYKV8viaIAL6DLT3xepamCPNBPJnOC7IChwy73rXIxqUr81HfGqrNCGYMqINRsZcFCNWomnnCyVL44lTuqh7N28tm0gaLJoGU6bw4M+wMujjez7ClcjsEptjljFSvX9lpoJ4lg1zxKuxt+E1l+15pYA8EyO2HHTzMkqWLrkMXK/LTFsICJzTszydbaKWwjYxf7LqDbDC1ax+sht9c0QyEywgh4iUV7pxFmJzU97A==|920 \ No newline at end of file +}//XfJpsIBwL2DUvMsLj7bAMyi0hSEPwNFpAohNCHyHEJgTWBTl3SC0DtlX/tNZneJRKozk3Ej0KcSUQ+c2eENrrAbo6Ou2D9zVpfszwgLAiaYkEoXKGGi04cSZrAlBDHe7mWvnn8Ci5RQPms5VtQK//3WVfM7n/6420AW5bcS1lb9CUVAZ6TmTS6lqxVM7uqw6lCh/wpOuHlPie584fxmtfls9Rr3xRMChDwGDDzeFK1hLmx5XiyqVAOxaQpavwNRXatDCbfFi6jKP7ON9sv2a0vzFE0l+54P8h4rH3DseQFYoagVf5Of/L7sPsAOfX7xdKBhuoh0zegPE5932m7IglkuFGmZlvt8eOkf1i3vma4R/fbtHRZeUg4XsHOWhvJ3RIh7VO0QuF9zAEWdp5z/VMoybFAh7HDzqe2bKyrWo/ODoHetYPoccDbj3ANfR2bIDqjJex9IMZOc2b4ZZw24C2QNItfVKRbAGjll7ou/4ywy0V30q3mtr0TACYD7XuNoJcDGBe0ZH0QAiV9vc558RRw/ew9dE0482g5HeXSOkyQG94wsxt3fm7qcE8meXeFmTqG2SlJZFk/P2NyGLvAp6ShG6V80QsQombhYqmhUGjXQezt6LxA8KLS2JDW/LpaDtOx1sQ/jg6Nu6hypYRER6pkszCzo4ccvKBnNHyDeg42rF2Qlv79s6TPFQjmf2lg3Riwd7JhPmFUfeCGE3sATCw5p5b3z4k89uVSgfAJr+WIuAaIDmK+mJaCqSQFGG2+695q/Df5G8PThzGDRiXhfUYekgBzy9oTBJ18XI2fu8sortqIBRNRsP+IkTc82bkC8l+kJDVrcrlwV/sC41kUkcgC6vPXJ/MdawzArlHpSMBPEDZLjNJIg6yaTkcIO3kjjG9P058/boyqgpA1qNw2C/9Q==|920 \ No newline at end of file diff --git a/Pages/汇报/项目周报/项目周报详情.json b/Pages/汇报/项目周报/项目周报详情.json index 5428b528..dbcb8a15 100644 --- a/Pages/汇报/项目周报/项目周报详情.json +++ b/Pages/汇报/项目周报/项目周报详情.json @@ -53,8 +53,14 @@ }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 69.0, - "Mode": 1 + "DesignLengthInPixel": 238.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "12": { @@ -74,8 +80,14 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 69.0, - "Mode": 1 + "DesignLengthInPixel": 238.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "16": { @@ -148,46 +160,48 @@ "DesignLengthInPixel": 32.0 } }, - "13": { + "26": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "14": { + "27": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "15": { + "28": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "16": { + "29": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "17": { + "30": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "18": { + "31": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 19, + "Count": 32, "DefaultSize": 32.0 }, "Values": { "1,1": "项目", "5,1": "汇报日期", "9,1": "上周工作", + "9,28": "AI生成", "13,1": "本周计划", - "18,15": "保存" + "18,28": "保存", + "20,1": "%CurrentUser.UserName%" }, "AttachInfos": { "3,1": { @@ -319,6 +333,195 @@ "IgnoreBlank": false } }, + "9,28": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$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": "=项目周报详情!项目ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目周报详情!B8" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报详情!B12" + }, + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "AI生成周报", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "成员", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报详情!B21" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报详情!项目ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "生成日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(项目周报详情!B8,\"yyyy-mm-dd\")" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "上周工作", + "ResultTo": { + "SerializeProperty": "上周工作" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=上周工作" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报详情!B12" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报详情!上周工作" + } + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报详情!msg&\",请完善所属项目和任务\"" + } + } + ], + "ID": "3245f3dc-91db-4894-90d9-1e4d7d25b08f" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "info", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报详情!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "83d91d47-1b24-414e-aa38-68feeb4cbc67" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报详情!B12" + }, + "Title": "加载中" + } + ], + "ID": "0c8cbeea-aa99-447f-a8bc-419beca863e0" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "请选择日期和项目" + } + ], + "ID": "79eaf3e9-b75d-41f3-8c3a-9133d3d61d81" + } + ] + } + ], + "Text": "AI生成", + "TemplateKey": "_RS_Success3", + "Icon": { + "Name": "gpt.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, "11,1": { "BindingInfo": { "TableName": "项目周报", @@ -326,34 +529,7 @@ "GUID": "c3c718bc-c5bb-4469-8c61-62ec732abe09" }, "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "textarea", - "placeholder": "请选择", - "resize": "vertical" - }, - "DataValidationInfo": { - "IgnoreBlank": false + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor" } }, "15,1": { @@ -363,37 +539,10 @@ "GUID": "3157fe2f-4949-4b24-8e6e-33b7f8009bf4" }, "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "textarea", - "placeholder": "请选择", - "resize": "vertical" - }, - "DataValidationInfo": { - "IgnoreBlank": false + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor" } }, - "18,15": { + "18,28": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -450,7 +599,7 @@ "ReloadData": true } ], - "ID": "1c8529da-8a08-4bcf-af46-b8c3c8ac3aaf" + "ID": "61d2f04d-6281-464a-891f-ffb9852923bf" }, { "CommandList": [ @@ -477,7 +626,7 @@ "Message": "保存成功" } ], - "ID": "133b0fba-7daa-42a9-a36a-e5a5d794da61" + "ID": "b1cd88ff-e0a6-4c8a-84ba-5e433834e521" } ] } @@ -503,6 +652,11 @@ "FontFamily": 0, "Formatter": 1 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, { "BorderBottom": 0 } @@ -539,6 +693,19 @@ "1,16": 0, "1,17": 0, "1,18": 0, + "1,19": 0, + "1,20": 0, + "1,21": 0, + "1,22": 0, + "1,23": 0, + "1,24": 0, + "1,25": 0, + "1,26": 0, + "1,27": 0, + "1,28": 0, + "1,29": 0, + "1,30": 0, + "1,31": 0, "2,0": 0, "2,1": 0, "2,2": 0, @@ -558,9 +725,22 @@ "2,16": 0, "2,17": 0, "2,18": 0, + "2,19": 0, + "2,20": 0, + "2,21": 0, + "2,22": 0, + "2,23": 0, + "2,24": 0, + "2,25": 0, + "2,26": 0, + "2,27": 0, + "2,28": 0, + "2,29": 0, + "2,30": 0, + "2,31": 0, "3,0": 0, "3,1": 0, - "3,18": 0, + "3,31": 0, "9,0": 0, "9,1": 1, "9,2": 0, @@ -580,6 +760,17 @@ "9,16": 0, "9,17": 0, "9,18": 0, + "9,19": 0, + "9,20": 0, + "9,21": 0, + "9,22": 0, + "9,23": 0, + "9,24": 0, + "9,25": 0, + "9,28": 2, + "9,29": 0, + "9,30": 0, + "9,31": 0, "10,0": 0, "10,1": 0, "10,2": 0, @@ -599,9 +790,22 @@ "10,16": 0, "10,17": 0, "10,18": 0, + "10,19": 0, + "10,20": 0, + "10,21": 0, + "10,22": 0, + "10,23": 0, + "10,24": 0, + "10,25": 0, + "10,26": 0, + "10,27": 0, + "10,28": 0, + "10,29": 0, + "10,30": 0, + "10,31": 0, "11,0": 0, "11,1": 0, - "11,18": 0, + "11,31": 0, "12,0": 0, "12,1": 0, "12,2": 0, @@ -621,6 +825,19 @@ "12,16": 0, "12,17": 0, "12,18": 0, + "12,19": 0, + "12,20": 0, + "12,21": 0, + "12,22": 0, + "12,23": 0, + "12,24": 0, + "12,25": 0, + "12,26": 0, + "12,27": 0, + "12,28": 0, + "12,29": 0, + "12,30": 0, + "12,31": 0, "13,0": 0, "13,1": 1, "13,2": 0, @@ -640,6 +857,19 @@ "13,16": 0, "13,17": 0, "13,18": 0, + "13,19": 0, + "13,20": 0, + "13,21": 0, + "13,22": 0, + "13,23": 0, + "13,24": 0, + "13,25": 0, + "13,26": 0, + "13,27": 0, + "13,28": 0, + "13,29": 0, + "13,30": 0, + "13,31": 0, "14,0": 0, "14,1": 0, "14,2": 0, @@ -659,37 +889,64 @@ "14,16": 0, "14,17": 0, "14,18": 0, + "14,19": 0, + "14,20": 0, + "14,21": 0, + "14,22": 0, + "14,23": 0, + "14,24": 0, + "14,25": 0, + "14,26": 0, + "14,27": 0, + "14,28": 0, + "14,29": 0, + "14,30": 0, + "14,31": 0, "15,0": 0, "15,1": 0, - "15,18": 0, - "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 + "15,31": 0, + "16,1": 3, + "16,2": 3, + "16,3": 3, + "16,4": 3, + "16,5": 3, + "16,6": 3, + "16,7": 3, + "16,8": 3, + "16,9": 3, + "16,10": 3, + "16,11": 3, + "16,12": 3, + "16,13": 3, + "16,14": 3, + "16,15": 3, + "16,16": 3, + "16,17": 3, + "16,18": 3, + "16,19": 3, + "16,20": 3, + "16,21": 3, + "16,22": 3, + "16,23": 3, + "16,24": 3, + "16,25": 3, + "16,26": 3, + "16,27": 3, + "16,28": 3, + "16,29": 3, + "16,30": 3 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "3,1,1,17", - "7,1,1,17", - "11,1,1,17", - "15,1,1,17", - "18,15,1,3" + "3,1,1,30", + "7,1,1,30", + "18,28,1,3", + "9,28,1,3", + "11,1,1,30", + "15,1,1,30" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -720,4 +977,4 @@ "Formula": "项目周报详情!$B$4" } ] -}//S7tIi549JrgxIMddVLa0rrPg9c3wijgEFv8Qen/fvhdOlJXuucqgatZa9cIuULNBVKpJ8IAbjEF6+XXuGwy5mebGrnRtQm9uzmR7nAsru+EDhxqdseWhP9WwENWm64wPKLFYGQj+4gIVTdz8IAtmlHS5ROs7yApCqK/F6jVcfm2ykC0hBZg52yIQ+eOXA0ahK/xbR+7jXXnCIZi3B39rnlUZVJRegZLA4maWDx3h3/3kHrocoHoXtrFd7IdJ6xiUzhZ9Af66f6UtHZJ4xTMYx+g14MGM3IwRl0kIxsWI3Lu75HiWlZ+YH08/h/O283V5Yx/r6E+6tGaP10GtmMDpUEPh6GUZZrTwva1fA99b32A0vsKCX9Auw6OfbzyYQWlp/FV9q0qmSoTxg9J0F4eGY8GDoOVKLyjFxhZBHeh8MFLjN2ll2GfhC/Z0eDHr89CzL13XG5KlILiFXAQIybzRNYffNpRMOQAGvBSryCxoYoHc77X+BUBr6X18nnft0abT31CToeRH3VocHrNQFaAj8uBBR3dt6+2SXnw+UQpYEgd2ht7rOmWkjlawavfs80xZoC4l0mEhYV+RmjLGMTRucVx07jEafrI1+mqwMfsvYclEGw5Y6HFwF6o1vujGfSNqE7S9o+aWyF9UQL0WtzUfzxlFFK8VAa0uQzWHmA8vnjzrhP/OOCwGw+3qWkNkeX/I7+if0ZB9Smo7zOj0VEsoEyEYg1yU9Inx7KhrsjGI/0+UmmHnW3JyXDmNOQmbqHlNmWNLCzx3zlhRWI4zGs/1EFdfhRxj6ADzProqmHoX4rOtX7Oa3u/iByckQ8W3f64fLY1jm8QoveagvQe2gYM16ELJX6Mjl9CwNpdImnpluXsIitj2sgStKVmvOj9m7mJScM9fWYCcYpMPEsOLDaH4Vg==|920 \ No newline at end of file +}//UNaYeIife+ebVzn8qIRyYyuHHqT57fDpDlOFAhETJIGbey9pT2h/FpV2812jdIHVvMWTcr88verRLkW84oOiqjnhAK/SPH6TGOVG+ZK/PaoxDwImgtqMEityinP+wjd5bjjIRbWolh93s0ed+NOL91Dts2G2S+GrpAgJrWyfoUaNk+RrHIU3I+FQeoZqkReZHPXO1k6AQhFHVE9mAQ1WCm5LnQmN+JwTXln2gsLI6U5Fm6q14aRmD4PQUscDCVC6/wSRxExAs3hOL20iijUOoLiepXFwTPY5QRYgDGNfBgHS1SDPkYmFXy9gQYaYE+kJ39QUcat31LvUYLjNwYIxUzJY/DKbYqVOfG3KO8bSsXKylMCCSZiWv13wa9m5d0JRY+gmcbEYfMvmzSOMucFO1pl1rw5HZj3GFu1U81csEX5p1beLZGbnfa4oRJ3bNk/ezT87e9O4kn409e3bm93U/mPEe6sta0zZZtCpDosL7j2n2TrGJfeR7+QH0QJSX0dQhhudQsJeAdVke5tiEinBAm2AU6Z7fozAjSd7hU8WLVLwnKG46+jLZDDZhbgkUNmh1R41d9wLIXIXsWxMc3J+CkJn1fuHe1iywTNiu29Oe5udGg2BIQcwC+oeAN2CV9RzHW4x/DIp+mvuph1cRgl1Tu2yS1x29NUwaEtmyi9dWWmSi0Cx3UQdLuyVgnEmhrHiftXWhjzo3c2zABUL72QRyMDvAn6w0o3MCYF3g2YHdlPe+q+tcc/XLPhEl50/+xIXleRCBIMijthnFkUacBSIW3WADYYngEXsohwbu3rswOmWTFbsOz7zOaslPUu+OPnXD3HVasf5jEKKC9UtMIaPUkspmOCVCioNotOTaXjy4XX2H/XJ3FEvcb6cKVA5OPRqMCDRY8L4V7JjT3csFmpuCg==|920 \ No newline at end of file diff --git a/Pages/汇报/项目周报/项目周报详情.rd b/Pages/汇报/项目周报/项目周报详情.rd index f9b5f4a8..71373eb3 100644 --- a/Pages/汇报/项目周报/项目周报详情.rd +++ b/Pages/汇报/项目周报/项目周报详情.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 19, + "ColumnCount": 32, "RowCount": 21, "CustomNames": [ { diff --git a/Pages/汇报/项目周报/项目周报首页.json b/Pages/汇报/项目周报/项目周报首页.json index 81344e06..72317e1c 100644 --- a/Pages/汇报/项目周报/项目周报首页.json +++ b/Pages/汇报/项目周报/项目周报首页.json @@ -6,18 +6,39 @@ "DesignLengthInPixel": 15.0 } }, - "2": { + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 342.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } }, - "1": { + "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 342.0 + "DesignLengthInPixel": 28.0, + "IsHidden": true } } }, - "Count": 3, + "InLogicalVisibleIndexes": [ + 5 + ], + "Count": 6, "DefaultSize": 15.0 }, "Cols": { @@ -39,7 +60,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "4": { @@ -99,14 +120,7 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "16": { @@ -180,16 +194,157 @@ } }, "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "31": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } } }, - "Count": 31, + "Count": 32, "DefaultSize": 32.0 }, + "Values": { + "1,1": "日期", + "1,17": "汇报人" + }, "AttachInfos": { - "1,1": { + "1,3": { + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报首页!D2" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "=项目周报首页!开始日期" + }, + "EndValue": { + "SerializeProperty": "=项目周报首页!结束日期" + } + } + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "daterange", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "1,19": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "33d9473c-b870-4743-9509-1e1fa510f511", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "50662434-4e82-41a9-b80a-c61507d07bd4" + }, + "ColumnName": "value" + }, + { + "GUID": "f12d9785-923a-4271-8702-d52981904176", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "f1b8b3cf-6b9c-4093-b483-e43335d0ced5" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "3,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "50f88f59718b4ba78fa3fc76286d95b", @@ -265,6 +420,50 @@ "ColumnName": "标题" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目周报", + "ColumnName": "汇报人", + "GUID": "bd64783f-627c-4181-8d9f-a564e3d22ced" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报首页!T2" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "项目周报", + "ColumnName": "汇报日期", + "GUID": "1ef2ecd2-c84b-4fbf-8590-01c255734d56" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报首页!开始日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "项目周报", + "ColumnName": "汇报日期", + "GUID": "2ef2e45d-ee96-4c3e-a926-91d297ae69bb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报首页!结束日期" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 1, "OrderBySqlCondition": { "OrderByColumns": [ { @@ -290,57 +489,101 @@ "StyleDatas": { "Styles": [ { - "HorizontalAlignment": 0 + "FontSize": 13.333333333333332 }, { + "FontFamily": 0, "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0 + }, + { + "HorizontalAlignment": 1 } ], "Types": { "Strs": [ - "Center", - "Body" + "Body", + "Center" ] }, "CellStyles": { "1,1": 0, - "2,1": 1, - "2,2": 1, - "2,3": 1, - "2,4": 1, - "2,5": 1, - "2,6": 1, - "2,7": 1, - "2,8": 1, - "2,9": 1, - "2,10": 1, - "2,11": 1, - "2,12": 1, - "2,13": 1, - "2,14": 1, - "2,15": 1, - "2,16": 1, - "2,17": 1, - "2,18": 1, - "2,19": 1, - "2,20": 1, - "2,21": 1, - "2,22": 1, - "2,23": 1, - "2,24": 1, - "2,25": 1, - "2,26": 1, - "2,27": 1, - "2,28": 1, - "2,29": 1, - "2,30": 1 + "1,3": 0, + "1,17": 1, + "1,18": 2, + "1,19": 0, + "1,30": 0, + "3,1": 3, + "4,1": 3, + "4,2": 3, + "4,3": 3, + "4,4": 3, + "4,5": 3, + "4,6": 3, + "4,7": 3, + "4,8": 3, + "4,9": 3, + "4,10": 3, + "4,11": 3, + "4,12": 3, + "4,13": 3, + "4,14": 3, + "4,15": 3, + "4,16": 3, + "4,17": 3, + "4,18": 3, + "4,19": 3, + "4,20": 3, + "4,21": 3, + "4,22": 3, + "4,23": 3, + "4,24": 3, + "4,25": 3, + "4,26": 3, + "4,27": 3, + "4,28": 3, + "4,29": 3, + "4,30": 3, + "5,1": 0, + "5,5": 0, + "5,9": 0, + "5,10": 0, + "5,11": 0, + "5,12": 0, + "5,13": 0, + "5,14": 0, + "5,15": 0, + "5,16": 0, + "5,17": 0, + "5,18": 0, + "5,19": 0, + "5,20": 0, + "5,21": 0, + "5,22": 0, + "5,23": 0, + "5,24": 0, + "5,25": 0, + "5,26": 0, + "5,27": 0, + "5,28": 0, + "5,29": 0, + "5,30": 0, + "5,31": 0 }, "SheetStyle": { - "FontFamily": 1 + "FontFamily": 0 } }, "Spans": [ - "1,1,1,29" + "1,1,1,2", + "1,3,1,13", + "1,17,1,2", + "1,19,1,11", + "5,1,1,4", + "5,5,1,4", + "3,1,1,30" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -372,5 +615,15 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//H+87XtiW+dc+VvPZpOM8I8T3iwXy1UA4DHNkpFSLCI9sd1OVru8WeTTODOaHajNxfNRKJPaXxYk98DXPVtb4EWmbf8CL+RMy9tbsy8jI9HOugIdpEqszmb9vWTIVRxhkGROxuPvp2nbRiZURtfYjgGZUbQTvPMeGaHHBUL5ixyI00mOCjLRw+riVKR0PZKE8jFyliaXgp+OXh6Kfrscs2T3ujle8MOPlD6KxRYXZXecbFPtuz9cdY8/SGo+r3oCKqyRn37YvwqoadRw4Ek6uu2p8ReFZWSmwgXO2Ur3c88+DD5eBJnSLSL7F0VaYlYeF0OFaby6UXtN3s86Gj8oLvrAkDacJrwEZ0vgvTbjgKxLkYMAbRYjkn7GiB0rlG8OsVx6WA2wM56kwjYAFt7sT5RJANC2W4Hsz4BwBubpEUETVpzSUhaALku65FzMWIOBfQR0tjysIDTOH7MIbxYZIs2pllCKGCa+DQThHifxNRbhaMaOIlgwqgJw0X80Qy34gMVC4dPQS8I95/2lRQ46y9Lz3IrjnNQQWExmDeUkCZlDGrsof1hvvXeBFsv3jK5/D747t8BBn7UHmCUOs24FKKMuTs10TE8u7GWfXLqCWjBYmLM/G6F4dIlijAWPbJImaVhBsI78BHKOho1CX9KTUi79OD5BT6m6TeZ+c81QMKzRXfbibKFl/J0GY9Qr041P2p6MZe5lS5ZTjd9KWK36hhf9d3vy2l0waigifDSAtrAFjT+yGE1ye7PsoH5iLm/r2PsAHnxcgtNr0exSr/WCk4J/f5ftuLGBGsApDYXSffg5IYFupZ7w76U2TkExA2v67MVYqhgKrlEo7dJB9drzjFSk4pRLWfDZPVWLzK3LosgRtgLKSrcNAus1PUgWbeMekTeBg4lwKVaG0XLv7WjKZ8Q==|920 \ No newline at end of file + }, + "CustomNames": [ + { + "Name": "开始日期", + "Formula": "项目周报首页!$B$6" + }, + { + "Name": "结束日期", + "Formula": "项目周报首页!$F$6" + } + ] +}//bSecEgXcYtYOfa/bpCiRjsEc73vGyVnZQcRJUkq4vxQS4EHophktUfjSa7V+MY7RP9a/sjDIBCWM0XDSzbznPHkWPAwlexGJn83nAvqYGWj01r/t1DUNqxzkQQSgeV9seSJu1e4PvMpeDcW7RMvAo6lzXaMYPI+xFvj79lTYZ5ffNjOZXeH8VxNi9FPpc2NcSaGN3rXyrOl0Ml4ZtV/gxJNm+jUwkCgQhgreQqPQPUgZrCvJUnkbk/79Ej8dE+8Z+KNk8OwkD+HWwchvC4MgiyIxR7S2/lEImWseum36tLvZ0yHbVUYhGliQeup3BdW8F0XjDiUCiR8ZZaKL7u0Cr8z2wuHU2PxCwDXXonXCBAS+Zjf/EUX70Uj6iQJz/WtSEtxij2MkzZrk9nXOOBNC2alzz+DRw1V6t6AFquLhI3xoW0oZwrxDP6sxGzbirRNfH5Iz5gCr+eqGj27Tp38OJz//J2bhgBx28OOtdC2eOKiagmZZ11NRErvkjFTsFldkm25Y+IB0JlPMNjwfge44vo5foAoG63FxECXRNeLEL5k8v0esMi/JdrbpgFAML6Rq7uY32aagNlI/rQBJMgtNTXCMWJF9x5IJ2PQGFYzX2/44PN6I3G7rjb3ZUWJP2TmN36EmBaDg1i3YpSAuBtnoXN2hILjX1a+1xfwqWK0puXn0kl4yrEkhJjTmVEHmkvwB7LPKJlez4xj1Z5WaVLZ0ay6WmbTiZP+BFtwF3yB1P23FAEwfKDyVT46FQfTvg5bGUr2oxmjiaShn2j+A/DzWfdsWZApoH7sOOqxc2zuUboTqobGwHD/kzeHr1FFloX42z2azWNL2jhAg3xqaI4A1PFZeCFuDhkBBGl2o4AqptVM81i5ShX3XTtNPo0LH7FjcfOqysj5bvVvsMwonYRWvHQ==|920 \ No newline at end of file diff --git a/Pages/汇报/项目周报/项目周报首页.rd b/Pages/汇报/项目周报/项目周报首页.rd index aa8fcec9..71465fac 100644 --- a/Pages/汇报/项目周报/项目周报首页.rd +++ b/Pages/汇报/项目周报/项目周报首页.rd @@ -1,5 +1,15 @@ { "PageType": 0, - "ColumnCount": 31, - "RowCount": 3 + "ColumnCount": 32, + "RowCount": 6, + "CustomNames": [ + { + "Name": "开始日期", + "Formula": "项目周报首页!$B$6" + }, + { + "Name": "结束日期", + "Formula": "项目周报首页!$F$6" + } + ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index 4e895552..52e32caf 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -252,7 +252,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "28e311fb-dc5f-4da3-9b1b-eefff15b3d07" + "ID": "3380f3fc-77a8-4c63-8cd1-5a05cf6736ab" } ] } @@ -370,7 +370,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "d76d336f-ff5a-425a-be6f-685d55094255" + "ID": "bd7a4074-8f35-4c65-8692-ed9ce720975c" }, { "Condition": { @@ -393,7 +393,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "ab9750e4-bfe7-47e2-bbc0-5fc8629b6e5d" + "ID": "b076472b-9f85-4e0a-bfbd-3d23fb612525" }, { "Condition": { @@ -443,7 +443,7 @@ "Disabled": true } ], - "ID": "c825a1c1-fa46-40a8-9f37-e290c76d3c1b" + "ID": "4ed70055-2490-4286-9a35-de48e3f7cd49" }, { "Condition": { @@ -479,7 +479,7 @@ "Message": "操作完成" } ], - "ID": "76e79e9a-98a6-4603-80a5-d297e024977f" + "ID": "d8ac2061-1ffa-48cf-bf93-dd387cf2d4ca" }, { "Condition": { @@ -515,19 +515,20 @@ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "生成网址", - "ID": "405a0f5293814b5892913383e11482ee" + "ID": "1b04b412c0ca4a5b9eec18de2539f086" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目ID", + "ParameterName": "projectId", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目ID" + "SerializeProperty": "=项目首页!项目ID" }, - "ID": "fee4a179089844ba8d954a5d10c4522e" + "ID": "ab688a491cf947a9afded6b018776775" }, { "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "var baseurl = location.origin;\r\nvar appname = Forguncy.Helper.SpecialPath.getBaseUrl();\r\nvar pagename = '%E5%8F%8D%E9%A6%88%E4%B8%8E%E5%BB%BA%E8%AE%AE';\r\nvar id = Forguncy.CommandHelper.getVariableValue('projectId');\r\nvar url = baseurl+appname+pagename+'?ID='+ id\r\nForguncy.CommandHelper.setVariableValue('生成网址', url)\r\n", "ID": "6e457e0fa93b4192aefdd829a02cc754" }, { @@ -574,12 +575,12 @@ "IsOpenInNewTab": true } ], - "ID": "e171a5de-823d-49ee-9810-4121cd045163" + "ID": "aebe6821-3fff-41dc-96a8-257fe05a6672" } ] } ], - "ID": "77cfa373-8a33-40a0-95e2-b8fc8a645f98" + "ID": "a887d29f-e132-4f73-8086-0ffd8b37d046" }, { "CommandList": [ @@ -589,12 +590,12 @@ "Message": "当前项目未开启收集需求功能,请开启后分享!" } ], - "ID": "30f59718-eb39-48e3-ab19-bd334ee64fdc" + "ID": "cc704070-6785-4bf5-b97e-4b798c828778" } ] } ], - "ID": "f26dca12-35ad-4099-93a6-a5a582f3d5b0" + "ID": "4c088b8d-3357-4c8f-9aa7-c702755be26d" }, { "Condition": { @@ -617,22 +618,22 @@ { "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目ID" + "SerializeProperty": "=项目标题!projectId" }, "TargetCell": { - "SerializeProperty": "=项目任务分组详情!项目ID" + "SerializeProperty": "=项目任务分组详情!projectId" } } ], "LoadBindingDataOption": 2 } ], - "ID": "19e3f63b-44d5-4066-9f6f-dcbc32559668" + "ID": "fb50741a-03fc-4718-b08d-43db2136807e" } ] } ], - "ID": "f681629b-a6a6-49f8-9597-525ee6a159f9" + "ID": "911497df-be3c-4143-8de6-735e5bc6e996" } ] } @@ -706,7 +707,7 @@ ] } ], - "ID": "f1d700f8-8ffd-4e03-a8c5-764b31f49155" + "ID": "95dc42f6-1536-4ccb-beae-49071a71d8cc" } ] } @@ -945,4 +946,4 @@ "Formula": "项目标题!$F$3" } ] -}//lpzmV3ygeV+2nLabEuvxTmiSG+cFwR2ieuKAT+MwfNdwIjTsd6NNLiCty0ARrMuepHE80XDDHmGEmxR9Rt9243jIpmZzBNCyEBLfMrkag8qPVwAVwz+W+yzHk/frUfbisZGE/tvbYRMq3/GaAsYjCcVVc2A6TmuEEsXoVU1HjIGheI8nSGYmUCinlbrvSB1VTOf+mUZxCrTXDsQi76Wv1ga/ea/md6Hvjgjy4U3I6o5Q9aKbMeKY3wjFy8LzU7rQ9/4cCqF35VH4AMU72u6I+h0qPfU5ISr348HHNyquA+0BT/fYC7d+up+/UL0f4eo7oUlwDkQfjUtF6PQh4hnxegvVs7akuxGhlbCxNjrrb+0QJWzguL2wV7thff3IqNE+MndGSIQPPpxPEQNssGirT2hL4wQwN1GC6VHhlYGpu82Y5kUNo3o8zU1glHaLQ0Qre5PfDoaIIeVR8ZhviQIfuNZoGFCoC/7Zm+rMElrZTmSWENvXJO9dxlwKBUy+RbVaOrfobiN3dfInXhDP/tYhpxNVKFeSyfsL68g3WcPySU1I6IVPzN1+24AyUTbpqRBTN+i/D04j5+FHdn6h7eBgTHfWa2vdqfieftYs/fqLKQZRQyE8MF+TbLJhIv8dNoEpvQJbalrHcPj0KHlGtX5HnpW6x0zrme3HzBQwKCG+pFbgDI22/aM6gufCamulogu/dl4hXDPepyHy+LpOObqhscXIrf8Id1s0+YjqSiqkZLC/XF2QCmMP39cnrbwLn9rFK8867CEV03nz8XBvpmTkzpltgUloQY7cG2XUQERhdKfIDb3umSZoGbbkdB8KhGZwVxFKpRSzDIPtlg1gFvfcpYEbAna3yhguk06trs9EGjbZ32FXFAQwqq1p8v58YUQOAFQcDC43vpqBD+h5yNt2VQ==|920 \ No newline at end of file +}//3k17yFZdfeO737N2HmrdwxWx2toAARemxMTu6fCg1qV57yGPt2fo79LgKYPgFdZXHRjd4EHG5Tm1LkBEePoZvKRKBiK3RFRu1WmDaqAuCxFksbT624R+Js+Gm7DAts8fdpZQ4hKOZiE/sJikH9KOiPTN5DMDIUrnByNlPdNnqGM6hN4J43x4F/E6s900E/GEYJeE+J6GPOZyYq9GJrdpfpYsl+8kqWZ1faqoT2WzO1ACbDiZda5A0/jrgsN6YWVWA1DDqZ1X5/OXsqBdhBYjfwmNZDms8gMElKHKLKTXmHi0KZRS4u+OLCJWWBOOpvzkIh/fsIlZg0PjuagsLlyLaRt9o9nfSMkihs1nuMaa7WD99KIwR+q5+EiJCRphDAbjELw7zkTzhjvRIlzghkJz3jVzddZUKkKnyuMpi4DSzLz3Fi5tu3qI867sz1mjSKfJTb7kdOQQwb/9gkKenjwINIuSxfOIMuKA9k1ExsVqTfLcDikZKQyfpMC5uATq9t0ZO/A11qaqvslMS/kQ58j7hyPcnLdnUxTE5mrJOLadhzpLy8ghtJWtNWEdRDKm1MPxU/E+KfiZCLI1P/4sBcB2nAx3Pnao99hnXhbYgk/a/7b4II6wTNK30zyM6SqIIoPRniybXBzAGrO+bL3IqszTGbe+bmfWhkOeUh5IYTcPCCHbm1yZCKLDv+jnUj6l2Aq9RiHWRg6v+RHLlkpZI5OZS4NN6dYopIrpnRKJkUOjbtE7nEPMELEGCk1rlYGdTECo/qOkbhSeGuTKK+nh/5uZbJYzGM9MhY+/XjDyzfHih4/buu3q5P+qDxUzqbIzIdppDdSof+DCxcIIJprArwzOB6H38Q2W+LCcCH8TfBPePFlh0xvgvwOUZfMOYZVU0TF4Y9QBEKOYsiuGFpc80tS7wQ==|920 \ No newline at end of file diff --git a/Plugin/PC组件包-ElementPlus-10_0_2_0.zip b/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip similarity index 56% rename from Plugin/PC组件包-ElementPlus-10_0_2_0.zip rename to Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip index 3171dcf5..85864837 100644 Binary files a/Plugin/PC组件包-ElementPlus-10_0_2_0.zip and b/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip differ diff --git a/ServerCommands/AI/AI对话.json b/ServerCommands/AI/AI对话.json index d236ba3c..32b50976 100644 --- a/ServerCommands/AI/AI对话.json +++ b/ServerCommands/AI/AI对话.json @@ -119,7 +119,7 @@ "ParamNameToSaveNewRowValue": "主题信息" } ], - "ID": "66d7f2f4-0e2e-44c9-a46c-c097992c6f1b" + "ID": "07e1cedb-3594-4d7c-8e44-53f0e6fe56e6" } ] }, @@ -343,7 +343,7 @@ ] } ], - "ID": "b1044b48-b07e-4928-9336-dddae2a15a77" + "ID": "2e59df14-2e47-4fb6-99c5-bdac5c129c54" } ] }, @@ -353,7 +353,7 @@ "Message": "回答完毕" } ], - "ID": "e49cb0ba-058a-4665-ac8f-e2eb32dd63ee" + "ID": "9d048bad-049e-4f51-ace2-226ab89f0147" }, { "CommandList": [ @@ -363,7 +363,7 @@ "Message": "请输入消息" } ], - "ID": "44e554ab-28b6-4c3f-8dea-6ef3a4820c6c" + "ID": "61baa18c-594f-421f-af87-648ebac28894" } ] } diff --git a/ServerCommands/汇报/AI生成周报.json b/ServerCommands/汇报/AI生成周报.json new file mode 100644 index 00000000..18a0b9bd --- /dev/null +++ b/ServerCommands/汇报/AI生成周报.json @@ -0,0 +1,484 @@ +{ + "Name": "AI生成周报", + "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" + }, + { + "Name": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "生成日期", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "2024-05-21" + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目", + "TableValue": { + "TableName": "项目表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "918e9258-8319-428c-9b9e-21465d7c4c21", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "e3ae3770-3818-4a35-8783-8a1cd506c188" + }, + "ColumnName": "项目名称" + }, + { + "GUID": "f60f492d-e013-4447-985b-a7400086e1f2", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "7785e73f-e24d-45e4-ae0d-841ad6d99329", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "项目经理_全名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "de34a6be-921b-46f5-abb6-4bfe6ef9b946" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + "TopCount": "1" + }, + "ID": "7ce3f27f33cc4c438d7d7268f0c11182" + }, + { + "$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": "JsonUtilityCommand.JsonSerializeCommand, JsonUtilityCommand", + "SourceObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目" + }, + "ToParameter": "项目信息字符串" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "上周起始日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期-WEEKDAY(生成日期,3)-7" + }, + "ID": "4115a274972f45bba55e6fb5e8fbfd0c" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "上周结束日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期-WEEKDAY(生成日期,3)-1" + }, + "ID": "b9fc3400e48043f8bf5ad1b06c5c0864" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "本周开始日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期-WEEKDAY(生成日期,3)" + }, + "ID": "9c4578b6e5024eb1904bd2332289058e" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "本周结束日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期-WEEKDAY(生成日期,3)+6" + }, + "ID": "88d0d170d12e4993af02e464ce3c7bcf" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "上周工作日报", + "TableValue": { + "TableName": "汇报子表", + "BindingInfos": [ + { + "GUID": "5a86d5e9-81a5-4702-9802-ee8703242820", + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "03bafd85-46b6-491f-8d80-cfaa6f064ea3", + "RelationBinding": { + "RelatedTable": "汇报记录表", + "RelatedColumn": "ID", + "DisplayColumn": "汇报日期" + } + }, + "ColumnName": "汇报日期" + }, + { + "GUID": "983acae3-afea-4289-97da-4e7e6a1b4115", + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "关联任务", + "GUID": "f0ea9e3a-3809-4c20-88e4-d9b559823675", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务名称" + }, + { + "GUID": "4ef1c2f9-819e-44b6-838e-ee59bd614947", + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报类型", + "GUID": "afd89dec-976c-4ea3-a7ca-9ee6a18f049c" + }, + "ColumnName": "汇报类型" + }, + { + "GUID": "75f5117f-96ea-401b-ac1c-f656d00274fe", + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报内容", + "GUID": "83dc859a-42d2-459b-9264-83540e1ef87c" + }, + "ColumnName": "汇报内容" + }, + { + "GUID": "b375e278-c5bc-4ba1-b97d-c8d1fefd61a3", + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "工时", + "GUID": "c85b16eb-fc2a-4c39-ad41-8cfb9b2921c8" + }, + "ColumnName": "工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "e83bc92a-a9b1-459f-900a-51ee910af6d9", + "RelationBinding": { + "RelatedTable": "汇报记录表", + "RelatedColumn": "ID", + "DisplayColumn": "汇报人" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "0f825103-4fca-4ad4-819d-7ed1d8cb5200", + "RelationBinding": { + "RelatedTable": "汇报记录表", + "RelatedColumn": "ID", + "DisplayColumn": "汇报日期" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=上周起始日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "976797f8-83c0-46ea-b4a1-3df852eaeb86", + "RelationBinding": { + "RelatedTable": "汇报记录表", + "RelatedColumn": "ID", + "DisplayColumn": "汇报日期" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=上周结束日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报类型", + "GUID": "b17ef968-65b8-4709-bcc8-d3517e583bb6" + }, + "Value": "日报" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "关联项目", + "GUID": "7104cc4b-18cc-4562-8aed-449ac3319774" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + } + ] + } + }, + "ID": "40a01e57ab3444eb9575e658664bbad5" + }, + { + "$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": "=上周工作日报.Count" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "JsonUtilityCommand.JsonSerializeCommand, JsonUtilityCommand", + "SourceObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=上周工作日报" + }, + "ToParameter": "上周工作日报字符串" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "OutParamaterName": "消息记录" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "role", + "Value": "user" + }, + { + "Name": "content", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息字符串" + } + } + ], + "OutParamaterName": "项目信息消息对象" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=消息记录" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息消息对象" + }, + "OutParamaterName": "消息记录" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "role", + "Value": "user" + }, + { + "Name": "content", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=上周工作日报字符串" + } + } + ], + "OutParamaterName": "日报消息对象" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=消息记录" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报消息对象" + }, + "OutParamaterName": "消息记录" + }, + { + "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", + "URL": "https://openai.api2d.net", + "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", + "IsDataSource": "json", + "MessageJSON": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=消息记录" + }, + "Parameter": { + "Model": 43, + "Temperature": 1.0, + "TopP": 1.0, + "MaxTokens": 500, + "SystemContent": "我将会发送两个JSON数据,第一个为项目的信息,第二个为该项目上周的工作日报列表,请根据内容为我编写该项目的上周工作总结,按照任务进行分类,用简短语言描述上周的工作,生成内容要求:1、请保证返回结果中仅包含报告内容;2、不要给周报整体添加标题、说明描述等;3、请使用HTML编辑器对段落进行排版;4、字数不要超过500字;", + "Response_format": "text" + }, + "Tools": [], + "ResultTo": "result", + "CommandList": [] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "生成完毕", + "CustomReturns": [ + { + "ReturnPropertyName": "上周工作", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.content" + } + } + ] + } + ], + "ID": "8335e543-f850-4648-982c-2b4a4b847747" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "您上周没有日报,无法为您总结!", + "CustomReturns": [ + { + "ReturnPropertyName": "上周工作" + } + ] + } + ], + "ID": "f78ac38a-7949-452e-a73c-171a2af3be44" + } + ] + } + ], + "ID": "51703d1d-086c-41db-969c-8149ff8ff24e" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "上周工作" + } + ] + } + ] + } + } + ], + "ReturnProperties": [ + { + "Name": "上周工作" + } + ] +} \ No newline at end of file