diff --git a/.collaboration b/.collaboration index e92786c9..731c692b 100644 --- a/.collaboration +++ b/.collaboration @@ -245,16 +245,7 @@ }, { "ModuleName": "Table/汇报记录表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-09T21:59:09.7401601+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\汇报记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/汇报子表", @@ -750,33 +741,11 @@ }, { "ModuleName": "PCPage/汇报管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-09T22:56:55.8108189+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报管理.json", - "Pages\\汇报\\汇报管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-09T21:19:22.9657504+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报详情.json", - "Pages\\汇报\\汇报详情.rd", - "Pages\\484d3ed119274a60bf32f15d178cf60.json", - "Pages\\484d3ed119274a60bf32f15d178cf60.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", @@ -784,17 +753,7 @@ }, { "ModuleName": "PCPage/导入汇报数据", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-09T21:37:09.4216094+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\导入汇报数据.json", - "Pages\\汇报\\导入汇报数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/工时", @@ -1422,36 +1381,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-09T23:14:27.9724499+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_1_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON数据源-10_0_1_0.zip", - "Plugin\\Notiflix-9_0_103_0(1).zip", - "Plugin\\PC组件包-ElementPlus-10_0_1_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_1_0.zip", - "Plugin\\加载动画-10_0_1_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_1_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_1_0.zip", - "Plugin\\甘特图-10_0_1_0.zip", - "Plugin\\用户管理命令 V2-10_0_1_0.zip", - "Plugin\\表格报表-10_0_1_0.zip", - "Plugin\\设置当前行命令-10_0_1_0.zip", - "Plugin\\设置焦点命令-10_0_1_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1491,32 +1421,14 @@ }, { "ModuleName": "TableView/成员计划内容合并视图", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-09T21:36:23.1364565+08:00", "ModuleType": 23 }, { "ModuleName": "ServerCommands/汇报", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-09T21:58:37.645639+08:00", "ModuleType": 20 }, { "ModuleName": "ServerCommand/AI自动编写汇报", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-09T21:59:02.1621533+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json index 35d63812..b6ca862c 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.json +++ b/Pages/484d3ed119274a60bf32f15d178cf60.json @@ -140,11 +140,6 @@ } }, "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -156,9 +151,19 @@ } } }, - "14": { + "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } }, "17": { @@ -166,35 +171,20 @@ "DesignLengthInPixel": 32.0 } }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "22": { + "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } } }, - "Count": 23, + "Count": 19, "DefaultSize": 32.0 }, "Values": { "2,1": "类型", "2,2": "*", "2,5": "日报", - "2,10": "*日报指的是昨日的工作总结，计划为今日工作安排", + "2,9": "*日报指的是昨日的工作总结，计划为今日工作安排", "4,1": "内容", "4,2": "*", "7,1": "工时", @@ -203,17 +193,17 @@ "9,1": "关联项目", "11,1": "关联任务", "13,1": "删除此行", - "13,19": "添加一行" + "13,15": "添加一行" }, "AttachInfos": { "1,1": { "CssName": "ec-label", - "TemplateCellSource": "类型加内容" + "TemplateCellSource": "内容概要" }, - "1,16": { + "1,12": { "TemplateCellSource": "工时" }, - "1,20": { + "1,16": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -229,7 +219,7 @@ "UseCellForeColor": true } }, - "1,21": { + "1,17": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -280,7 +270,7 @@ }, "TemplateCellSource": "汇报类型" }, - "2,21": { + "2,17": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -335,7 +325,10 @@ } ], "type": "textarea", - "placeholder": "请输入", + "placeholder": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF('484d3ed119274a60bf32f15d178cf60'!F3=\"日报\",\"填写你昨日的工作汇报\",\"填写你今日的工作计划\")" + }, "resize": "vertical" }, "DataValidationInfo": { @@ -455,7 +448,6 @@ }, "placeholder": "请选择", "noDataText": "无数据", - "multiple": true, "collapseTags": true, "filterable": true, "filterInServerOptions": { @@ -838,7 +830,7 @@ "IconSize": 14.0 } }, - "13,19": { + "13,15": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -846,7 +838,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!V3" + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!R3" }, "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "ExecuteCommand" @@ -903,13 +895,13 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!V2" + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!R2" }, "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "ExecuteCommand" } ], - "ID": "37a85aea-a0ea-4ece-9d38-8ccb96daf33b" + "ID": "1f28aeca-32e5-4478-a7c6-d5d891d56c9e" }, { "CommandList": [ @@ -917,13 +909,13 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!V3" + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!R3" }, "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "ExecuteCommand" } ], - "ID": "d6189e5d-dbf8-4c89-ace0-2100441e9c61" + "ID": "66ccc7c6-a796-4e11-9622-09d7999b48b6" } ] } @@ -1019,24 +1011,20 @@ }, "CellStyles": { "1,1": 0, - "1,14": 0, - "1,16": 1, - "1,20": 2, - "1,21": 3, + "1,12": 1, + "1,16": 2, + "1,17": 3, "2,1": 4, "2,2": 5, "2,5": 6, - "2,10": 7, + "2,9": 7, + "2,10": 8, "2,11": 8, "2,12": 8, "2,13": 8, "2,14": 8, "2,15": 8, - "2,16": 8, - "2,17": 8, - "2,18": 8, - "2,19": 8, - "2,21": 3, + "2,17": 3, "4,1": 9, "4,2": 5, "4,3": 8, @@ -1051,14 +1039,14 @@ "9,3": 8, "9,4": 8, "9,5": 6, - "9,22": 8, + "9,18": 8, "11,0": 8, "11,1": 9, "11,2": 8, "11,3": 8, "11,4": 8, "11,5": 6, - "11,22": 8, + "11,18": 8, "12,0": 8, "12,1": 9, "12,2": 9, @@ -1077,28 +1065,24 @@ "12,15": 6, "12,16": 6, "12,17": 6, - "12,18": 6, - "12,19": 6, - "12,20": 6, - "12,21": 6, - "12,22": 8, + "12,18": 8, "13,0": 8, "13,1": 10, "13,2": 8, "13,3": 8, - "13,18": 10, - "13,19": 11, - "13,20": 8, - "13,21": 8, - "13,22": 8, + "13,14": 10, + "13,15": 11, + "13,16": 8, + "13,17": 8, + "13,18": 8, "14,0": 8, "14,1": 10, "14,2": 10, "14,3": 10, - "14,19": 11, - "14,20": 11, - "14,21": 11, - "14,22": 8, + "14,15": 11, + "14,16": 11, + "14,17": 11, + "14,18": 8, "15,1": 12 }, "SheetStyle": { @@ -1106,19 +1090,19 @@ } }, "Spans": [ - "4,5,2,17", - "7,5,1,17", + "4,5,2,13", + "7,5,1,13", "11,1,1,3", - "11,5,1,17", + "11,5,1,13", "9,1,1,3", - "9,5,1,17", + "9,5,1,13", "13,1,1,3", - "13,19,1,3", - "1,1,1,13", + "13,15,1,3", + "1,1,1,10", "15,1,1,3", - "1,16,1,3", - "2,10,1,10", - "2,5,1,5" + "1,12,1,3", + "2,9,1,7", + "2,5,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -1147,4 +1131,4 @@ "PaperSize": {}, "Margin": {} } -}//g5+rMf48jaNZ9qislVLIBEgOYfJ0/92FwE9DJqx+jbMdhtGvl9r+cj5/FoyjNfTxySAmXrTHEI+pIpzQrDSQdK5THRY1+/buPOUvhQfA05JxKPxb/TScdMQJa6Dw7EcpehVd33wfklpekKSFUgO1rLoxreQnLzARQ6R/uOowOqVeYLX3KVVtkGImOQdmPjb8medoPB51jyeMzOMJHFFt93KIQKDdY2wa0PHHFhK/NWX0O+hP7579FpnfZOXEdSOTdshZQ9qfL96uB4VTC1Q7dYLO0MfpX7rG65JD8JqXlsYuqoNRYu1OY0UL6AhWj+zCS5StbDJGYeVrEQBX5fHDx3RN8Uxo8NuTSQ6mHehbwCn1laNdjR6mjGutsQVdrlfD0WWSDCw3nqaRvHkq7+g3KuWACb8IggqAUkyJ943gSKgAY5cUR64a+TpKu/o8b2pXVWN28cMEsig5K+qz0Uxu/Nd1/Ji2AMUag2JoeUK5iOW00gWaehNxDW9e6zlbmbhN72UiGxlXsu92jCmlN22nqLismW7xS3oD94WihjYQ6eaaXCglZVS9UiKygUgLp9o5I4trUQMf4d7q3OTwrdLVsCpspkibRAlO4pYjpeiK6bP/aQMztWw1D9YM47FOb7j+7SC5lm7jaulVIQRweIMpGeG6VxVf/YFfj7gPeisBxp47stxu9PCCkk6IiM5QwRfKe7/FaxCEeHSx+vazsl7g1Hgv2IC+caC8hTza+tti+1CHXRhx/auEvpoRpugGcTrK3UXblQzDsqiMYvvG8lk1lBedR/6RaoVrxNjB7ItJos9RQTgWjZwpyvcuPWbQG7SKWde3jqxphQWiY6Gb+95ckOor27IsNbG4X1coDBld7t+jaSON1ulCQiaZuPzv0ht1Dev628uIEO0phY6yXdJpPA==|920 \ No newline at end of file +}//1lEia5lolcy+VcNYy66VXxXUTHPxZIGGV6mrVZ1pOfBihvJ1AUrwD5YF5tHJx/SB+y2cfiECla0MQpLbSpUZ2S8+bphXTDifAbgxtoUCheMJo9IEAhXRmECvoeQ1iRbo8k03lcxpc3yqsDos1zHELcqTbgHjFpWAH4eKis35v2yqe5XMVJLT0y3f43DcOnW0KeJCWZEqqHPKsdWzrFlf42R+Q8U7t7+3cKyf5SZ2ypwqG5gL1SHsnP+8nfSQVA9e5fT54XkwcWHp5j8S+IzcnDEcB7KiKgkSFmkocAm56Pj0kVKrDK6zw/fEhPRKysF6cWyEy5fzobRmFs7RbjGKnetQqi6GTuntIxAc+P/Dcmjb0nB/og/EaPyvDWbx6vps1di1HcSH06Cdd7dj2q1S9pDJnDEaM6opPC8SB1Y9kzYY2slcbNxqEiktlZK/CnykDZy0uu6vvRATygFViPdwnUwLbes4qoLi05QkISN3gICGPo5VGAnL4PYJfVvZhxjCZtHOLM9JBje/jooBZFWHhimbafKog7b/bFx9ZFJRHJje0YR3QCBH9H+T55Pj7hEfp2XaqGZYtAeyAt9Qt5m3+MydeS88K+jHG6ex7QYG+ayrHTyZz6iKeoZCkAek+Djuyd1w6L3SIlhKLgMKD1SmrZx2+0bxUiVhcmDdSmPN8nAzZ0SPpDdOtB4DtOgSzb5dSOX3RUVL4XP7UO9TLXcGmWOgIywZWVb9jWQ3fkMVGaGPGOcbczV81rw0w+Rlof2ialZ+IFTZmqG9SMP7uu7OGplwCJoA1ShS7Lk0mgMdmPTKW/LUzubGZvWarPk/5B+Brq69YgyGvT5YpdXkEZjEMJY/yH1t9FVobockwSUoOrb11hKvvPG45wAji82jqCWnELzAwWoZoJMYm9Wkhcf4oQ==|920 \ No newline at end of file diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.rd b/Pages/484d3ed119274a60bf32f15d178cf60.rd index 0d7aef61..7d2c407a 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.rd +++ b/Pages/484d3ed119274a60bf32f15d178cf60.rd @@ -1,5 +1,5 @@ { "PageType": 2, - "ColumnCount": 23, + "ColumnCount": 19, "RowCount": 16 } \ No newline at end of file diff --git a/Pages/汇报/导入汇报数据.json b/Pages/汇报/导入汇报数据.json index 47cef8b5..af472bdd 100644 --- a/Pages/汇报/导入汇报数据.json +++ b/Pages/汇报/导入汇报数据.json @@ -227,8 +227,12 @@ }, "Values": { "1,1": "筛选日期", - "1,22": "筛选类型", - "1,31": "批量导入" + "1,31": "批量导入", + "3,5": "汇报日期", + "3,11": "汇报内容", + "3,21": "工时", + "3,25": "关联项目", + "3,29": "关联任务" }, "AttachInfos": { "1,3": { @@ -283,75 +287,108 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "1,24": { - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 1, - "Items": [ - { - "DisplayValue": "全部" - }, - { - "Value": "日报", - "DisplayValue": "日报" - }, - { - "Value": "计划", - "DisplayValue": "计划" - } - ] - } - }, "1,31": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "PassListviewDataCommand.PassListviewDataCommand, PassListviewDataCommand", - "PassRowMode": 1, - "PassValueItems": [ - { - "SourceCell": "汇报类型", - "TargetCell": "汇报类型" - }, - { - "SourceCell": "汇报内容", - "TargetCell": "汇报内容" - }, - { - "SourceCell": "工时", - "TargetCell": "工时" - }, - { - "SourceCell": "关联项目", - "TargetCell": "关联任务" - }, - { - "SourceCell": "关联任务", - "TargetCell": "关联项目" + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "表格1", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "GetSelectedRows", + "RetrunParamNames": { + "SelectedRows": { + "SerializeProperty": "选择行索引列表" + }, + "SelectedRowCount": { + "SerializeProperty": "选择行个数" + } } - ], - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=导入汇报数据!F5" - }, - "Target": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!B7" } }, { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择行个数" + } + ] + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "PassListviewDataCommand.PassListviewDataCommand, PassListviewDataCommand", + "PassRowMode": 1, + "PassValueItems": [ + { + "SourceCell": "汇报内容", + "TargetCell": "汇报内容" + }, + { + "SourceCell": "工时", + "TargetCell": "工时" + }, + { + "SourceCell": "关联项目", + "TargetCell": "关联项目" + }, + { + "SourceCell": "关联任务", + "TargetCell": "关联任务" + } + ], + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入汇报数据!C5" + }, + "Target": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!B8" + } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "ID": "7111282a-4981-4ccb-91e6-86c77ca0d67c" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "请至少选择一行进行导入" + } + ], + "ID": "bf270bba-a245-439a-8932-70ff1ac61bd8" + } + ] } ], "Text": "批量导入", - "TemplateKey": "_RS_Main1" + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/008_add_file_3.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } }, "3,1": { "ListViewInfo": { "Name": "表格1", - "TableName": "汇报子表", + "TableName": "成员计划内容合并视图", "RowIndex": 3, "ColumnIndex": 1, "RowCount": 3, @@ -362,29 +399,19 @@ { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报ID", - "GUID": "ef723b89-121b-41df-ade2-e9ccd0be9d11", - "RelationBinding": { - "RelatedTable": "汇报记录表", - "RelatedColumn": "ID", - "DisplayColumn": "汇报人" - } + "TableName": "成员计划内容合并视图", + "ColumnName": "成员", + "GUID": "05c3f342-6a56-48e7-b868-79ad191dc20b" }, - "Value": "%CurrentUser.UserName%" + "Value": "%CurrentUser%" }, { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "CompareType": 3, "ColumnBindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报ID", - "GUID": "b6afd836-cb27-47fa-ab22-71b19bebb00a", - "RelationBinding": { - "RelatedTable": "汇报记录表", - "RelatedColumn": "ID", - "DisplayColumn": "汇报日期" - } + "TableName": "成员计划内容合并视图", + "ColumnName": "日期", + "GUID": "62a3b4ca-c216-4b99-b034-c3ba199bdb26" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -395,31 +422,14 @@ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "CompareType": 5, "ColumnBindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报ID", - "GUID": "f588f4b6-85f9-4268-b774-eea07d70d21e", - "RelationBinding": { - "RelatedTable": "汇报记录表", - "RelatedColumn": "ID", - "DisplayColumn": "汇报日期" - } + "TableName": "成员计划内容合并视图", + "ColumnName": "日期", + "GUID": "626d13f2-4113-4304-ae66-706479681882" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=导入汇报数据!E10" } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报类型", - "GUID": "8bcd11e4-15f4-42f8-9d5f-70ac918c546c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=导入汇报数据!Y2" - } } ] }, @@ -427,9 +437,9 @@ "OrderByColumns": [ { "ColumnBindingInfo": { - "TableName": "汇报子表", - "ColumnName": "FGC_CreateDate", - "GUID": "ae216968-08ae-4fb6-add2-d847625cba5c" + "TableName": "成员计划内容合并视图", + "ColumnName": "日期", + "GUID": "ac69fc3e-ce21-48bc-8d12-25ed918b3796" }, "Order": 1 } @@ -441,52 +451,48 @@ "IsRowHeaderCheckBoxVisible": true, "ShowEditStatusIcon": true, "UseSimpleBar": true, - "ColumnOperation": 2 + "ColumnOperation": 2, + "CommitType": 1 } }, "4,2": { - "NameUsedInJavaScript": "汇报类型", + "NameUsedInJavaScript": "来源", "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报类型", - "GUID": "842bc940-52d2-4625-b1a7-db48841db9eb" + "TableName": "成员计划内容合并视图", + "ColumnName": "来源", + "GUID": "d0ff641d-b068-45ec-8722-146f6fabd6e9" } }, "4,5": { "NameUsedInJavaScript": "汇报日期", "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报ID", - "GUID": "d01a1882-ec19-415a-842a-43e437a0f831", - "RelationBinding": { - "RelatedTable": "汇报记录表", - "RelatedColumn": "ID", - "DisplayColumn": "汇报日期" - } + "TableName": "成员计划内容合并视图", + "ColumnName": "日期", + "GUID": "4507c944-22a9-47d9-8d2b-f9d3a25675d8" } }, - "4,10": { + "4,11": { "NameUsedInJavaScript": "汇报内容", "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报内容", - "GUID": "83696111-138e-466c-8944-7144a3972c56" + "TableName": "成员计划内容合并视图", + "ColumnName": "内容", + "GUID": "ff2fa53b-14cb-4d90-a416-4cac27e76c16" } }, - "4,19": { + "4,21": { "NameUsedInJavaScript": "工时", "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "工时", - "GUID": "1693aee4-0703-4217-8119-3da803f9d90d" + "TableName": "成员计划内容合并视图", + "ColumnName": "总工时", + "GUID": "4bb8e717-58f7-4c8f-aa4c-b7ad5909e920" } }, - "4,23": { + "4,25": { "NameUsedInJavaScript": "关联项目", "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "关联项目", - "GUID": "156bcb7d-57e8-41f7-9b49-0daa3bb9c838" + "TableName": "成员计划内容合并视图", + "ColumnName": "项目ID", + "GUID": "d0955b40-c1b2-4696-93cd-a4aece3f44cc" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -496,22 +502,22 @@ "ValueColumnBindingInfo": { "TableName": "项目表", "ColumnName": "ID", - "GUID": "ce5d5354-6c8e-48bf-afdb-c847a21d8d8f" + "GUID": "573668ee-bc6b-44e9-97f0-dae3d73a66e2" }, "DisplayColumnBindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", - "GUID": "9cdd8900-86e7-4627-a055-76c6a530b9cb" + "GUID": "8bc5331c-d1ca-424b-bc46-2ecbfb6ed887" }, "ReadOnly": true } }, - "4,28": { + "4,29": { "NameUsedInJavaScript": "关联任务", "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "关联任务", - "GUID": "1d4061a2-b160-4db3-8bb1-5804b8f4cb40" + "TableName": "成员计划内容合并视图", + "ColumnName": "任务ID", + "GUID": "af4c8ec1-3a42-4381-b33e-b23d8b049213" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -521,12 +527,12 @@ "ValueColumnBindingInfo": { "TableName": "任务表", "ColumnName": "ID", - "GUID": "da0c76c5-1e24-4894-a492-2bff2098dcf6" + "GUID": "ec67ee70-940f-4352-bf11-7365bd97cd94" }, "DisplayColumnBindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", - "GUID": "715802cb-f5c7-4dd4-a3da-018e80051d2b" + "GUID": "08615cd8-58e1-402d-8afd-2fb5cb675d13" }, "ReadOnly": true } @@ -535,6 +541,7 @@ "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "ListviewName": "表格1", + "pageSize": 15, "pagerCount": 7, "layout": [ { @@ -597,6 +604,13 @@ "Formatter": 2, "HorizontalAlignment": 1 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 2, + "HorizontalAlignment": 1, + "WordWrap": true + }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -628,22 +642,29 @@ "1,24": 0, "3,1": 1, "3,2": 1, - "3,10": 1, - "3,19": 2, - "3,23": 1, - "3,28": 1, + "3,5": 2, + "3,11": 0, + "3,21": 2, + "3,22": 0, + "3,23": 0, + "3,24": 0, + "3,25": 2, + "3,29": 2, "4,2": 1, "4,5": 3, - "4,10": 4, - "4,19": 2, - "4,23": 2, - "4,28": 2, - "9,1": 5, - "9,2": 5, - "9,3": 5, - "9,4": 5, - "9,5": 5, - "9,6": 5 + "4,11": 4, + "4,21": 5, + "4,22": 0, + "4,23": 0, + "4,24": 0, + "4,25": 2, + "4,29": 2, + "9,1": 6, + "9,2": 6, + "9,3": 6, + "9,4": 6, + "9,5": 6, + "9,6": 6 }, "SheetStyle": { "FontFamily": 0, @@ -651,27 +672,25 @@ } }, "Spans": [ - "4,19,1,4", - "4,10,1,9", "7,1,1,33", - "4,5,1,5", "1,31,1,3", - "1,3,1,18", - "4,2,1,3", - "1,24,1,6", "1,1,1,2", - "1,22,1,2", - "4,23,1,5", - "4,28,1,6", "5,1,1,33", "9,1,1,3", "9,4,1,3", + "1,3,1,16", + "4,2,1,3", + "4,5,1,6", + "4,25,1,4", + "4,29,1,5", + "4,21,1,4", "3,2,1,3", - "3,5,1,5", - "3,10,1,9", - "3,19,1,4", - "3,23,1,5", - "3,28,1,6" + "3,5,1,6", + "3,21,1,4", + "3,25,1,4", + "3,29,1,5", + "4,11,1,10", + "3,11,1,10" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -696,5 +715,11 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//r+V0YCQ79BzGyEWH3zUobb3z6jihFep7PSdVjrty+8zcZUpc+/kK6PmnjWkKmRDZIFiftbDsylcajXXa4nrkPZwr7E0FXt2j2pBYWWVJuvPVJDvgJ3uNPdpY70WenRVebK/PwbgKdzZS3GrGf7hTBuDvkn1dPcLdJxorDIoQIzcaAA9b1Mo0DwYNi2jlPWLvwydap2aAwtNm6Foh4MCOz1QtsrHgwQof8uZ/+SmW1MXCSQW2rMdtu+tJUwnhoCqSL5T641UDO8AF11JDH4Gq8yaS1qkYMucHeSpKIj/2arnH4h+Mgz8b/OCpht08j3u0+25GGRzM84JfCXEppf21mB1admMts8kjSuePrA0hQByJ5AZpsSluqOWwRa4yGAjFg59FjpSuLN2qApVVohvrbLGlfaaagQM1Ee5s4GNvPVBiDg9s1zExtNbMuJTUNAOz6rTx6wwkmVpoyVyzMWhtT2q5PU9J726A+EEAsybr8LQe19lOWKbDOadQ2+sTnXOdUNj/CfhnGOtH4tlJu6AXJunots9NUTKMj4rT7oCtU+Omoaw/RUlLu1fEA+KtGjGMet5lmC/DWdIeRN/G8xaD2MkPKjzo5EzU1i9QNWjn4XnFkgI+0KZKm8XBAr8MQFeqhFcAY1JmOB9kEKlLfYEL9lgnxpGEVTH52hLBcNKMi1ulv9e1Tn4SLIwUDOYGrJjPRsAihQjatgPIOgwPoMFKT5Av0r3OkqCkdo3meKJ71RSGV3EKV8Riid0zDl7wXNJlGHu4dmZ9MPvlfyYy1o+IKo6LjucZWuMBHlSU+FN4jOPiD2cy/yuUY6hw3IKEvnqTEcFg4bnU1pZo0kVfNoQ8l7Vbk/gOGK4CyocmslPFU5a3/UQt9eY+Bvbw3C7yDmlaa5h90XNQrPj1G3Z5G1fG5A==|920 \ No newline at end of file + }, + "CustomNames": [ + { + "Name": "日期范围", + "Formula": "导入汇报数据!$D$2" + } + ] +}//nId1m1TUK/fwuPAwh5+9kRE7vcRPumc4zCNKypHYDPLR80vn2yiA9aqDXU7WcciYOK0hFefWG4P2/a76DqlMvA3W0mFLA8981WvE87DqtEkyjMZg1gIHqLDlg1F2+jIfNB+hN+7Nrk+rJHjJLdRThe7JcJ5kXN+i0f2QvTHiSMVraY/6i5nLDsNmXj1A7+WMIzhqn2pnN3MI4A4RwX0PhU34FONdeX20nHsmOn/3OC5iZNlc8QM1alWD524xMHWYRZwnkUE+qauaVniaV4fh9B3V/+M33mD6WbcIY919OcB0H17uCDF6n8ke0erikRazKBD56A+nKCRJlHThoyycp9AYyZYje9f3s4XyhiUdDRb6mZxGkvJfawzucf3OYO+Bxs9zq801u/6rP9qazMKwqFrYSXcwy3mz+zgt8k40mGSQP9sA8yoAYKhqKUBx1Nls080eQTou2oxmQ2STnpPdGo8Kr5tjWdg4ASz4b3OSZVB5MgIyeWMeOhSLsPfGBS3d3YiJgx9sQY7Zv2C7Rhp6+M2cbCQizUScfQO+faLl+p7earQWUwWoVFP97J9iNRC3KspP2GgLnQfiTYOQagANc8guhcpE7Q2DvltDdlECplnsR9toPSwntBgmuS97kBsSR3MPimY5eEJoyErBvLN0awrj+sdy6uNGdsdXx3p++hfNaAPehkrsgvbOmUVj7ZLUszeyU7OijrlDWzbrrFXvSPQSqQ/ZtUfEMEaYbIUxJeFN7xZpAXZod+5hcqLPqBxpPTz/tMmKipDk+U+NT55D8VfUD5NF1IKoXs+Olbt2lTHApgGPwCBQF6Lb3fJyjSEqhE+7G9UMjoRMysmpBevsM7GPNoEcJqBHx3sEuTdFAzevxugt1xbSZpaVKRg3jRHfc39absm0jJ1cKAcxk9dfJA==|920 \ No newline at end of file diff --git a/Pages/汇报/导入汇报数据.rd b/Pages/汇报/导入汇报数据.rd index 52c1ff2d..354d759f 100644 --- a/Pages/汇报/导入汇报数据.rd +++ b/Pages/汇报/导入汇报数据.rd @@ -1,5 +1,11 @@ { "PageType": 0, "ColumnCount": 35, - "RowCount": 10 + "RowCount": 10, + "CustomNames": [ + { + "Name": "日期范围", + "Formula": "导入汇报数据!$D$2" + } + ] } \ No newline at end of file diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json index 0c4fb958..8687177b 100644 --- a/Pages/汇报/汇报管理.json +++ b/Pages/汇报/汇报管理.json @@ -473,7 +473,7 @@ } } ], - "ID": "68fb6065-cdbb-4835-ae9d-f41ae3a8718b" + "ID": "6f15124a-1ca0-4275-9f8a-ff76da7a1e84" } ] } @@ -781,7 +781,7 @@ } } ], - "ID": "5eca654c-49fc-45eb-98e3-7cc2a547d67c" + "ID": "bb3f401f-f50a-4e61-bcb9-a11081aff96b" } ] } @@ -906,6 +906,7 @@ }, { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ShowDrawerHeader": true, "ClosePopupCallbackCommand": { "Commands": [ { @@ -939,7 +940,7 @@ } } ], - "ID": "e54bb23a-f06c-49f4-909b-b21fc27b4229" + "ID": "6e26e223-d36b-46b5-9af4-e5f43c7a8398" } ] } @@ -1447,4 +1448,4 @@ "Formula": "汇报管理!$J$23" } ] -}//2R/9CwRNQuJeGGubrslwPEXvDJqFf3hUZJY94IaASkU8NMA4oFT4SeZHe+tV+a00CF+XSij07FJbanJXPaQSHDm6FUyWmtCiJgqwlqvF2JfSBonRP3J/9AdEXZUu4GgqKVxA0BxwVOY3N6/6pfsRpdQDGu224ZFZAGH07ZGdMHwr23V0+8ZE8W/FJZ/YF98Y43LXgxbvKineYubjeB6D2bVOwPry8IwYkUoSn5Smo53uueZqditfd7ucBbwLu2ALHQlAVDWnfkS+6p1WkQlwa4xnBewT1VUjLddL1Pveny1bxfFkTg9c5U86xi8HFU0eUzURYdjFKtWt3bgaD0glXRbeA7aaLLzspxxIIXlURVztGDN2xgIJf9Nh53zIQ6Yj254XOD4Y5bQVxD2ZUh4lNV9T2D7NJtXT5Vn3Ru3g6N+yLypku4vi95D6H18USwMcURHKkgjA3pvUfdeyoflffpgdM1fTdYkbFT8HG6zItI+IlWPi8+oyp0OBN3O04wWuYxc6poli5NvKDt7MB4AJ+VFkII90EW0AZkeFt4/KMXc99WdA7ggK9XV3hVjkyqaW9ttcjfdyySt+bilEMioYm4DTVPU3Hu3Z6aj+bLsCxgFUhhOsBH3ZnZdjjKBwLu9527LHC44NNs8eR8pt/p/Td3z60PcC68gSA4PNP3CyFvXtY4rW2MFlWycl7d0U53l1Or9JWcWPpwqn6WiBxtSCfz9L8yqrSbUx4JpcBJPtNofzUXiRyp5ROODygJ7yQGofQkPoUaIezeRycBMZiUR90TLgd+r/X92e4gZluAXqNA9hcdX0qw0t82q+jIDLZSJgrbYSPjtXwbFtU452PVfprdPSAeXy8QBzR+7r3dGJUEBPqDtZ7RcvdqE5Q55flTkb3FuWS7J4/BKJwCD/k1MHYQ==|920 \ No newline at end of file +}//5KIFxjUHi5nXHZETkLWBhQPAlUVGiVaRyn/RSNtKQnwPjls1HsdoDaOlJmfvnv4d7kE8bVIVZifi9Lr7gGDegccg9/uHQC7uKDskz9a4QZ2LzfY7QgWd2XDMuOayeNIZPhIx0C7LnN1sgPeJ/lvi39XDniQKdLaUEM/WygPrGTgP+Ai9534SuSa4+/aoke9yDGnWChkDq9UVqhFaOQ0zmRmwp7wtC9FJQ4qgecQod1lAF73RIvBcWB/s49RutLUkW82nKLuXuSHmX1bE/UzOYw1jHmmgBfJTivEUZv7LGgktyh0PPi9yowVmOu31KPmt+ymQFUIz+z1P1cGvRdICrMGAYMczcAn9EqWsmOex+zeafror+fEzRtyHXaYpAO0D0vPrqtryBjJkUR7EeC8mI/9RSc6Y2zV7cxIcpUUiZbZBQPptlByIelNVTsnEXWH9wS631tMkyvtsZ2ofVsio+bRLABOIFLI7SrKIHthi19MBEtfL6rdHep4JAy34bwOuWlvnoy7cjrBk5h8I6QthFBWojGQPbkUcxzgX65jr1YYwRqzniWET7xuNKyM4a71gGrtv0p/QD0jRRu7xUfqopHd+KGGg6b6NfTOxfoupZAm+qavROlCRtmbK5cvprfI8oZ7zN6SVOcsF3F18c/Nr5+T2doU5SItmC9GquJrL4UJMWdjzVYDcyJs8aG5JhOtSfhiWMriLnN41Xm6DbdA6WrLVq/nGjvE+rElfvUzoPG7yyQ3FH/05Js6KOnoyvdpo/B3+fdz2yT4AwE8ktEuuc4LlGUqK7Hl1+EtvVVBFY7MReFB02u/NcUuQKgiRgXg25ti/3jlGALRByRsr0RFXeKg6HFR3EyKMwkdncl21XCUIrwShiwYFNItGBPUu0wXmDh+wA/JYJ5C7RCVJ5NiGEQ==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报详情.json b/Pages/汇报/汇报详情.json index dd5b6ff0..7b4c9b60 100644 --- a/Pages/汇报/汇报详情.json +++ b/Pages/汇报/汇报详情.json @@ -13,32 +13,39 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 23.0 + "DesignLengthInPixel": 10.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 10.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 20.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 600.0 + "DesignLengthInPixel": 10.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 600.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "8": { @@ -52,6 +59,11 @@ } }, "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 39.0, "IsHidden": true @@ -59,9 +71,9 @@ } }, "InLogicalVisibleIndexes": [ - 10 + 11 ], - "Count": 11, + "Count": 12, "DefaultSize": 32.0 }, "Cols": { @@ -118,19 +130,13 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "12": { @@ -168,45 +174,65 @@ "DesignLengthInPixel": 32.0 } }, - "19": { + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 396.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "24": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 31.0 + } + }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 31.0 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 317.0 } }, - "22": { + "23": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 126.0 } } }, - "Count": 23, + "Count": 25, "DefaultSize": 32.0 }, "Values": { - "1,5": "上一天", - "1,16": "下一天", - "4,1": "今日工作", - "8,1": "*日报指的是昨日的工作总结，计划为今日工作安排", - "8,15": "关闭", - "8,19": "保存", - "10,8": "新增一行", - "10,11": "%CurrentUser.UserName%" + "1,4": "上一天", + "1,13": "下一天", + "1,21": "使用AI助手来编写日报", + "1,23": "AI生成", + "5,1": "今日工作", + "9,1": "*日报指的是昨日的工作总结，计划为今日工作安排", + "9,12": "关闭", + "9,16": "保存", + "11,7": "新增一行", + "11,10": "%CurrentUser.UserName%", + "11,13": "%CurrentUser.FullName%" }, "Formulas": { - "8,19": "IF(汇报ID>0,\"更新\",\"提交\")" + "9,16": "IF(汇报ID>0,\"更新\",\"提交\")" }, "AttachInfos": { - "1,5": { + "1,4": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -230,7 +256,7 @@ "TemplateKey": "Gost" } }, - "1,8": { + "1,7": { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报日期", @@ -245,7 +271,7 @@ "TemplateKey": "_RS_NewLittleRoundCorner" } }, - "1,16": { + "1,13": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -269,7 +295,253 @@ "TemplateKey": "Gost" } }, - "4,10": { + "1,23": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "xTools.Commands.xTableToJson, xTools", + "TableName": "图文列表表格1", + "ColArray": "汇报类型,汇报内容,工时,关联项目,关联任务", + "ToParameter": "json" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!json.length" + } + ] + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!V5" + }, + "Title": "生成中" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!X2,汇报详情!V4,汇报详情!V5" + }, + "PropertyType": 0, + "Value": false + } + ] + }, + { + "$type": "JsonUtilityCommand.JsonSerializeCommand, JsonUtilityCommand", + "SourceObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!json" + }, + "ToParameter": "表格内容" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "AI自动编写汇报", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "生成文本", + "ResultTo": { + "SerializeProperty": "data" + } + } + ], + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!V5" + }, + "Title": "生成中" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!X2,汇报详情!V4,汇报详情!V5" + }, + "PropertyType": 0, + "Value": true + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!V5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!data" + } + } + ] + } + ], + "ID": "f6c2e69f-0e32-4b28-9c5c-75bbff14ec59" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "5178db33-4bff-4869-9320-250ff24a7bbe" + } + ] + } + ], + "ID": "c7ea25c2-6aeb-47a4-9e53-04951eb76d02" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "请先填写工作内容" + } + ], + "ID": "69166410-98f9-401b-8c79-51e1f70facc0" + } + ] + } + ], + "ID": "08b19259-f368-4e1f-99d4-6c7bf07f22e8" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "请先保存后再试" + } + ], + "ID": "be63dc3d-abe0-469c-b41f-fc1f51e4dd0a" + } + ] + } + ], + "Text": "AI生成", + "TemplateKey": "_RS_Success3", + "Icon": { + "Name": "Application/123_send_3.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "4,21": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "概要", + "GUID": "010bf853-5439-4277-ab42-49232a158f40" + }, + "CellType": { + "$type": "TinyRichEditor.TinyRichEditorCellType, TinyRichEditor", + "UIPermissions": [ + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "ShowMenuBars": false, + "ShowToolBars": false + } + }, + "5,9": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", @@ -277,7 +549,7 @@ "Items": [ { "Value": "菜单1", - "Text": "快捷导入", + "Text": "从工时导入", "IconPath": "Arrow/318_import_2.svg", "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, @@ -286,7 +558,18 @@ "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "导入汇报数据" + "PageName": "导入汇报数据", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报日期-1&\",\"&汇报详情!汇报日期-1" + }, + "TargetCell": { + "SerializeProperty": "=导入汇报数据!日期范围" + } + } + ] } ], "CanVisitRoleList": [ @@ -341,7 +624,7 @@ ] } }, - "6,1": { + "7,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "484d3ed119274a60bf32f15d178cf60", @@ -403,7 +686,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=汇报详情!汇报类型&\"：\"&IF(汇报详情!汇报内容=\"\",\"尚未填写...\",汇报详情!汇报内容)" }, - "ColumnName": "类型加内容" + "ColumnName": "内容概要" } ], "IsListviewDataSource": true, @@ -414,7 +697,7 @@ "ImageForNoItem": { "Name": "暂无内容 (1).png" }, - "NoItemImageSize": 25.0, + "NoItemImageSize": 180.0, "TextForNoItem": "请点击\"新增一行\"开始填写", "Orientation": 1 }, @@ -429,7 +712,7 @@ "CommitDataWithCommand": true } }, - "8,15": { + "9,12": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -442,7 +725,7 @@ "TemplateKey": "_RS_Information3" } }, - "8,19": { + "9,16": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -480,19 +763,14 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!L11" + "SerializeProperty": "=汇报详情!K12" } } ] }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "9134bc0605204e5bbcc875a3b374cd2f" - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "提交中" + "ID": "b28a57e2ead74b69bcd4556b633f4c9a" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -534,6 +812,11 @@ "UpdateType": "add", "ShowConfirm": false }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "提交中" + }, { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "Message": "提交成功" @@ -543,7 +826,7 @@ "ReloadData": true } ], - "ID": "d81a1b64-cd22-4867-a2bc-c30466c80e9c" + "ID": "ea5f3b3a-fb10-461a-89b8-fcf78726b8ea" }, { "CommandList": [ @@ -553,12 +836,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "acf6340d-8e7d-4fdc-9d06-93e03e883c25" + "ID": "95169ad5-9461-468b-ba53-bafac6a88400" } ] } ], - "ID": "65264586-9380-4df8-b8b8-22e28469a182" + "ID": "a35acc10-313b-462a-829d-ffa45b4605c2" }, { "CommandList": [ @@ -612,7 +895,7 @@ }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!L11" + "SerializeProperty": "=汇报详情!K12" }, "RightBracket": 1 } @@ -627,6 +910,11 @@ "TableName": "汇报记录表", "ShowConfirm": false }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "提交中" + }, { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "Message": "保存成功" @@ -636,7 +924,7 @@ "ReloadData": true } ], - "ID": "78347f89-16b0-4ff7-8146-123cf19d7666" + "ID": "e70f3335-3c62-4405-96ee-430f32715675" }, { "CommandList": [ @@ -646,12 +934,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "4fd1f402-bd2e-4fe3-b1a6-753d3f65c773" + "ID": "1afb17fa-17ae-4c6a-9ee6-4d6a4446aaab" } ] } ], - "ID": "20745129-5ed0-4642-9db2-d309b6452791" + "ID": "49d64daf-8416-45aa-9bb0-05c5fa544367" } ] } @@ -660,14 +948,14 @@ "TemplateKey": "_RS_Main1" } }, - "10,4": { + "11,3": { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "ID", "GUID": "cdb43b1e-2041-4d56-ab6e-da5a26c7d5b0" } }, - "10,8": { + "11,7": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -704,7 +992,7 @@ "IconSize": 14.0 } }, - "10,11": { + "11,10": { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", @@ -801,18 +1089,34 @@ "FontSize": 16.0, "HorizontalAlignment": 2 }, + { + "BorderLeft": 0 + }, + { + "FontSize": 16.0, + "Foreground": 4 + }, { "BorderBottom": 0 }, { - "FontWeight": 4 + "FontWeight": 5 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "BorderLeft": 0 }, { "HorizontalAlignment": 2 }, + { + "HorizontalAlignment": 2, + "BorderLeft": 0 + }, { "FontSize": 12.0, - "Foreground": 5 + "Foreground": 6 } ], "Types": { @@ -821,6 +1125,7 @@ "[AUTO]General", "Center", "Background 2 0", + "Accent 1 0", "Bold", "Text 1 50" ], @@ -831,7 +1136,8 @@ ] }, "CellStyles": { - "0,12": 0, + "0,11": 0, + "0,12": 1, "0,13": 1, "0,14": 1, "0,15": 1, @@ -841,64 +1147,83 @@ "0,19": 1, "0,20": 1, "0,21": 1, - "1,5": 0, + "0,22": 1, + "0,23": 1, + "1,4": 0, + "1,5": 1, "1,6": 1, - "1,7": 1, - "1,8": 2, - "1,15": 1, - "1,16": 0, - "1,17": 1, - "2,1": 3, - "2,2": 3, - "2,3": 3, - "2,4": 3, - "2,5": 3, - "2,6": 3, - "2,7": 3, - "2,8": 3, - "2,9": 3, - "2,10": 3, - "2,11": 3, - "2,12": 3, - "2,13": 3, - "2,14": 3, - "2,15": 3, - "2,16": 3, - "2,17": 3, - "2,18": 3, - "2,19": 3, + "1,7": 2, + "1,12": 1, + "1,13": 0, + "1,14": 1, + "1,20": 3, + "1,21": 4, + "2,4": 0, + "2,5": 0, + "2,6": 1, + "2,7": 2, + "2,8": 2, + "2,9": 2, + "2,10": 2, + "2,11": 2, + "2,12": 1, + "2,13": 0, + "2,14": 0, "2,20": 3, - "2,21": 3, - "4,1": 4, - "4,10": 1, - "4,11": 1, - "4,12": 1, - "4,13": 1, - "4,14": 1, - "4,15": 1, - "4,16": 1, - "4,17": 1, - "4,18": 1, - "4,19": 1, - "4,20": 1, + "3,1": 5, + "3,2": 5, + "3,3": 5, + "3,4": 5, + "3,5": 5, + "3,6": 5, + "3,7": 5, + "3,8": 5, + "3,9": 5, + "3,10": 5, + "3,11": 5, + "3,12": 5, + "3,13": 5, + "3,14": 5, + "3,15": 5, + "3,16": 5, + "3,17": 5, + "3,18": 5, + "3,20": 3, + "4,20": 3, "4,21": 1, - "6,1": 5, - "8,1": 6, - "8,15": 0, - "8,16": 1, - "8,17": 1, - "10,4": 1, - "10,5": 1, - "10,6": 1, - "10,8": 0, - "10,9": 1, - "10,10": 1, - "10,11": 1, - "10,16": 1, - "10,17": 1, - "10,18": 1, - "10,19": 1, - "10,20": 1 + "5,1": 6, + "5,9": 1, + "5,10": 1, + "5,11": 1, + "5,12": 1, + "5,13": 1, + "5,14": 1, + "5,15": 1, + "5,16": 1, + "5,17": 1, + "5,18": 1, + "5,19": 1, + "5,20": 7, + "6,20": 3, + "7,1": 8, + "7,19": 8, + "7,20": 9, + "8,20": 3, + "9,1": 10, + "9,12": 0, + "9,13": 1, + "9,14": 1, + "9,20": 3, + "11,3": 1, + "11,4": 1, + "11,5": 1, + "11,7": 0, + "11,8": 1, + "11,9": 1, + "11,10": 1, + "11,13": 1, + "11,16": 1, + "11,17": 1 }, "SheetStyle": { "FontFamily": 0, @@ -906,16 +1231,19 @@ } }, "Spans": [ - "6,1,1,21", - "8,19,1,3", - "8,15,1,3", - "10,4,1,3", - "10,8,1,3", - "4,10,1,12", - "10,11,1,5", - "1,5,1,2", - "1,16,1,2", - "1,8,1,7" + "7,1,1,18", + "9,16,1,3", + "9,12,1,3", + "11,3,1,3", + "11,7,1,3", + "5,9,1,10", + "11,10,1,3", + "1,4,1,2", + "1,13,1,2", + "1,7,1,5", + "1,21,1,2", + "11,13,1,3", + "4,21,6,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -959,7 +1287,7 @@ ] } ], - "ID": "422ac7b4-76a2-4031-b004-d580a1f117ec" + "ID": "c533b891-a68d-40f6-aafe-fb21ecbe2a4f" } ] } @@ -988,15 +1316,15 @@ "CustomNames": [ { "Name": "增加一行按钮", - "Formula": "汇报详情!$I$11" + "Formula": "汇报详情!$H$12" }, { "Name": "汇报ID", - "Formula": "汇报详情!$E$11" + "Formula": "汇报详情!$D$12" }, { "Name": "汇报日期", - "Formula": "汇报详情!$I$2" + "Formula": "汇报详情!$H$2" } ] -}//R+XzGv2XC1SgtBnwLTwHOQPpJMmNgsfHlOzTpkW4rODc9ChFHKn+NlmztdVpSPSmG/W3zdCvqC5Po3BYOtSzsH/LvXE5Qyk5SbyTcWZOVPySVcGU7MY8FcovbqQLtGpKtuS5Xn15AKZmxTJ3AToErS/jhg/xVXrqsHcz8Mg+j6T7Y6ENOPZDwGZxMYBjkJzGo2Nz8rnl2fDbg6KNEERdVM0ljxxCyCx7WykA+t+8Yr+lDNDvl3oq9JVIRWJeo8vtVQ9ZUYVrpzSHQUvbmTuXZrTvU0IAMO4Mjz8dU34/4wzTuexMHUizkL95XglvzWNPQC37SNIPdJHCBNRJPXpRDDInIrNrcNhFS5d9/z0ohEoKViNLFbM6unsyrTUJSZXMawo6ejjfMM6WpPr8lHeYtJ/L3s4Kl/C9ec2m6VtFqLbXJIDyVcS1WEITXp7XMc/LejDvz0TK1ov18q0hpTk+G9F4IbfLyF0cdEJBIOZKYi77nSFgXnH1jQw8VPrOi8ssuJ9/Uf2SYi6izRdxHqVf0grC2XsJ7VQ7wuNvK8yow7XxX7j8mtb6QdHQXc2GPSE/4xgdETrG/Lr9cxbjNP7yeQjhL/4t+yS6QSTaMjNt52Zm6s6LYZ8CsWxFV2FE3kX53wCLM/Rx9y6KSePLMHdAhc83X+LYtVEP/mrFK2ELJKvq9ztc9j2pvcQVeCuV4eXJ4a/2+DWzbc91vMFrdcHvMrEQh1OmdygYk+dy2l1cYVIY+/d+J62ZFsEXtyULRJ4+LnHD4qGI0YVfGHqHZz4mGzQJir38brJBe8Gt9LQfkYoxvFrNUhQQ8x5B7SHfcdbENYVAySxpw+8NebcAZ/p+QdSe6mPA3O3JfZz1NaMdQVWRjaRFU1tfjXEa1LiBpC5Pau9/1KkLVzM1PvcAVBQ8PQ==|920 \ No newline at end of file +}//iQHxYNPkM2PUiuyly7qgxaIa+3ZeoUxw4n07XweF3mSy0pc+pz2Rfbuc2mC+k3XqZtK/Z7OHiaMsaC4GfQ5qnnB1M47uB7wecRqx6BrzeDtledMWDW658IYvvXenqw0TKXdSQ2OKNnfGzu3XIXiHENSePS2v2FvG4kqktgvrImKpmf6RDlrZWf26k/XbrBzq3QtPl0VzXkC+SlU074ACH8IrCDIhFyMg0l+CPzeZ9eJvBvL8v6QCecWwr0krwh8up6TkxVUREi9gs1ac5gEU6wkRKYqCarktQG5uqrBSYwsgg6Ar99e3zpTB6b10V+3J54mrAl0eiPnRLTKE2LlzXtLggKHYK5oN99FsyxZKeqsEHtO2tyQ40/QPiF17qzS89KykZ1a3DQX+KS4mUmAUgxmw6l/AaEsofaw0M03hmD7MyoxMu8amJak4BWQNA7Dfqwz1q+9V3EU5Wudo4KKCVFZt2Ta1tpsHLgTsP5slZ5OxPd53XAIU5pNIAyS8VgeGIvV9LUP64xi7fDI2cq9qkjvSSRkUB3nZ/QQ/I4b/seXZve95IK+V6DY7kzECjw1XY5ZNkAi/HRvZDpAJ24RbXS74AQCF3rBuxs2iDRP40b2tSAgQWh3Gka0ucmOl77E9NRZFj8yucjD05gJMSZtDQMkp4KvEVbevUYeM59BiCw/BjFdEX5mRMAPKA5klQMAqFYqPQsFvtAqI/bOItbzR+Aff9Qt9HVk8bXOj+MFd2nhla1clhxzMptH7QQdSlzJiGdf1KMbjlLskRO6FbR/klQoVLxwGO9bw4NLca2TnzQGcDszOy/Ov+rzQjKCqeOgVCi/Hp8EljUXBv8ak8+sy8rHfXLKnWtt5Dd8XJAHnVJwYgwmn9LIQMy3n0WK0bU/2LIMvxOKohrStBZ3c8Hpdsw==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报详情.rd b/Pages/汇报/汇报详情.rd index 61e05beb..3f327fe8 100644 --- a/Pages/汇报/汇报详情.rd +++ b/Pages/汇报/汇报详情.rd @@ -1,22 +1,22 @@ { "PageType": 0, - "ColumnCount": 23, - "RowCount": 11, + "ColumnCount": 25, + "RowCount": 12, "Formulas": { - "8,19": "IF(汇报ID>0,\"更新\",\"提交\")" + "9,16": "IF(汇报ID>0,\"更新\",\"提交\")" }, "CustomNames": [ { "Name": "增加一行按钮", - "Formula": "汇报详情!$I$11" + "Formula": "汇报详情!$H$12" }, { "Name": "汇报ID", - "Formula": "汇报详情!$E$11" + "Formula": "汇报详情!$D$12" }, { "Name": "汇报日期", - "Formula": "汇报详情!$I$2" + "Formula": "汇报详情!$H$2" } ] } \ No newline at end of file diff --git a/Plugin/JSON 序列化和反序列化-10_0_1_0.zip b/Plugin/JSON 序列化和反序列化-10_0_1_0.zip new file mode 100644 index 00000000..4bfb7da1 Binary files /dev/null and b/Plugin/JSON 序列化和反序列化-10_0_1_0.zip differ diff --git a/Plugin/xTools快速开发工具包-9_0_4_0.zip b/Plugin/xTools快速开发工具包-9_0_4_0.zip new file mode 100644 index 00000000..85590e1d Binary files /dev/null and b/Plugin/xTools快速开发工具包-9_0_4_0.zip differ diff --git a/Plugin/文心一言-10_0_1_0.zip b/Plugin/文心一言-10_0_1_0.zip new file mode 100644 index 00000000..01513395 Binary files /dev/null and b/Plugin/文心一言-10_0_1_0.zip differ diff --git a/ServerCommands/汇报/AI自动编写汇报.json b/ServerCommands/汇报/AI自动编写汇报.json new file mode 100644 index 00000000..e01d7115 --- /dev/null +++ b/ServerCommands/汇报/AI自动编写汇报.json @@ -0,0 +1,298 @@ +{ + "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": "汇报ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "汇报主表", + "TableValue": { + "TableName": "汇报记录表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "b4df1d1d-bad2-4169-8d6a-f58887c99582", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "汇报人" + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报日期文本", + "GUID": "657dec23-28df-476f-8709-36b38c0e7b96" + }, + "ColumnName": "汇报日期" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "813a1102-e2e5-41d7-8044-6a088af709f4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "d3bc485d654242868188179581a918c9" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "汇报子表", + "TableValue": { + "TableName": "汇报子表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报类型", + "GUID": "4f46c36a-25e6-4b82-a1ac-16109d071ab8" + }, + "ColumnName": "汇报类型" + }, + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报内容", + "GUID": "0d671561-a0b5-46f2-8012-da3267e15083" + }, + "ColumnName": "汇报内容" + }, + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "工时", + "GUID": "2c0c577e-37de-431f-a226-3adac1d33e53" + }, + "ColumnName": "工时" + }, + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "关联项目", + "GUID": "875dd053-4423-4c34-bb9d-d588a882d0a6", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目名称" + }, + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "关联任务", + "GUID": "0f17a3a1-f25c-418b-a9b2-c5d7456d5c29", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务名称" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "de513bc4-ed82-42fe-8d68-e673d86727d5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报ID" + } + } + }, + "ID": "e846b647f4a74a52b07bdb4e3878e485" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "汇报日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报主表.汇报日期" + } + }, + { + "Name": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报主表.汇报人" + } + }, + { + "Name": "工作内容明细", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报子表" + } + } + ], + "OutParamaterName": "汇报数据对象" + }, + { + "$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": "=\"我将发给你一个JSON字符串，它是某个人在某天的工作内容清单，内容中的[汇报类型]分为`日报`和`计划`，日报指的是昨日工作内容的总结，计划指的是今日计划工作安排。请你使用纯文本为我编写一篇简要的工作日报，禁止使用Markdown或其他语言格式来进行排版，内容如下：\"&CHAR(10)&汇报数据文本" + } + } + ], + "OutParamaterName": "我的消息" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=聊天记录" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=我的消息" + }, + "OutParamaterName": "聊天记录" + }, + { + "$type": "WenxinQianfanAI.WenxinQianfanAICommand, WenxinQianfanAI", + "ClientId": "wvAnHBgnYnvcXKt3S9xPeLZF", + "ClientSecret": "yw60qYsGrCzLmuZkLoatEcKdpMzJzFuT", + "ModelType": "completions_pro", + "Messages": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=聊天记录" + }, + "Functions": [], + "ReturnParam": "返回结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.result" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "生成完成", + "CustomReturns": [ + { + "ReturnPropertyName": "生成文本", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.result" + } + } + ] + } + ], + "ID": "741ab2fe-57bc-4085-8f85-0d0250746a3b" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.error_code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.error_msg" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "生成文本" + } + ] + } + ], + "ID": "4811907e-d3c9-4547-90f7-f6828453d5a9" + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "生成文本" + } + ] +} \ No newline at end of file diff --git a/Tables/汇报/成员计划内容合并视图.json b/Tables/汇报/成员计划内容合并视图.json new file mode 100644 index 00000000..272886d3 --- /dev/null +++ b/Tables/汇报/成员计划内容合并视图.json @@ -0,0 +1,77 @@ +{ + "Name": "成员计划内容合并视图", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "序号", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "varchar", + "MaxLength": -1, + "Name": "来源", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "date", + "MaxLength": -1, + "Name": "日期", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "项目ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "任务ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "成员", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "内容", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "总工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + } + ], + "ExternalDatabaseInfo": { + "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "ConnectionId": "业务表", + "SourceTableName": "成员计划内容合并视图", + "SourceTableSchema": "dbo", + "CreateViewSql": "WITH 记录 AS(\r\nSELECT\r\n[来源]='日报',\r\nCAST([汇报记录表].[汇报日期] AS date) AS [日期],\r\n[汇报记录表].[汇报人] AS [成员],\r\n[汇报内容] AS [内容],\r\n[工时] AS [工时],\r\n[关联项目] AS [项目ID],\r\n[关联任务] AS [任务ID]\r\nFROM [汇报子表]\r\nLEFT JOIN [汇报记录表] ON [汇报子表].[汇报ID] = [汇报记录表].ID\r\nWHERE [汇报子表].汇报类型='计划' AND [汇报内容] IS NOT NULL\r\nUNION ALL\r\nSELECT\r\n[来源]='报工',\r\nCAST([工时日期] AS date) AS 日期,\r\n[执行人] AS 成员,\r\n[执行内容] AS 内容,\r\n[工时] AS [工时],\r\n[项目ID] AS [项目ID],\r\n[任务ID] AS [任务ID]\r\nFROM [任务工时表]\r\nWHERE [执行内容] is not NULL AND [工时类型]='实际'\r\n)\r\n\r\nSELECT\r\n ROW_NUMBER() OVER (ORDER BY [来源]) AS [序号],\r\n[来源],\r\n[日期],\r\n[项目ID],\r\n[任务ID],\r\n[成员],\r\nSTRING_AGG([内容], CHAR(13)+CHAR(10)) WITHIN GROUP (ORDER BY [日期]) AS 内容,\r\nSUM(工时) AS 总工时\r\nFROM 记录\r\nGROUP BY\r\n[日期],\r\n[项目ID],\r\n[任务ID],\r\n[成员],\r\n[来源]", + "ViewInfo": { + "ViewName": "成员计划内容合并视图", + "IsUpdatable": true, + "QueryColumns": [ + "序号" + ] + } + }, + "Indexes": [] +} \ No newline at end of file diff --git a/Tables/汇报/汇报记录表.json b/Tables/汇报/汇报记录表.json index f371b06e..fd62209f 100644 --- a/Tables/汇报/汇报记录表.json +++ b/Tables/汇报/汇报记录表.json @@ -25,6 +25,13 @@ "Name": "汇报人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "概要", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { @@ -51,6 +58,12 @@ "Name": "汇报数量", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "YEAR([FGC_CreateDate])&\"-\"&MONTH([FGC_CreateDate])&\"-\"&DAY([FGC_CreateDate])", + "Name": "汇报日期文本", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",