{"Message":"1. 增加模板对应关系设置;\r\n2. 优化汇报组件显示;\r\n3. 增加日报提交提醒通知;","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/汇报记录表"},{"State":1,"Type":1,"Name":"PCPage/汇报管理"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":9,"Name":"Theme"},{"State":1,"Type":12,"Name":"CustomLibrary"},{"State":1,"Type":7,"Name":"Table/汇报模板"},{"State":1,"Type":1,"Name":"PCPage/模板列表"},{"State":1,"Type":1,"Name":"PCPage/模板详情"},{"State":1,"Type":15,"Name":"ServerCommand/根据汇报模板生成内容"},{"State":1,"Type":1,"Name":"PCPage/日报详情"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/单日自动生成工作日报"},{"State":1,"Type":1,"Name":"PCPage/个人日报列表"},{"State":2,"Type":31,"Name":"UserControlPage/折叠卡片"},{"State":1,"Type":15,"Name":"ServerCommand/检查未提交汇报"},{"State":3,"Type":38,"Name":"Image/日报.svg"},{"State":3,"Type":38,"Name":"Image/工作报告.svg"},{"State":3,"Type":38,"Name":"Image/周报.svg"},{"State":3,"Type":38,"Name":"Image/月报.svg"},{"State":3,"Type":38,"Name":"Image/研发平台.svg"},{"State":3,"Type":38,"Name":"Image/报告管理.svg"},{"State":3,"Type":38,"Name":"Image/删除.svg"},{"State":3,"Type":38,"Name":"Image/搜索.svg"},{"State":3,"Type":31,"Name":"UserControlPage/汇报卡片"},{"State":3,"Type":7,"Name":"Table/汇报模板对应表"},{"State":3,"Type":1,"Name":"PCPage/平台设置"},{"State":3,"Type":6,"Name":"Pages/系统/平台设置"},{"State":3,"Type":1,"Name":"PCPage/汇报模板设置"},{"State":3,"Type":1,"Name":"PCPage/汇报对应关系设置"}],"Version":"v1"}

This commit is contained in:
超哥
2024-06-16 15:41:04 +08:00
parent e03698d1c1
commit 531e7eed27
40 changed files with 5232 additions and 1703 deletions

View File

@@ -34,14 +34,6 @@
"$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
"ServerCommandName": "根据汇报模板生成内容",
"Parameters": [
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "汇报人",
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=汇报人"
}
},
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "生成日期",
@@ -49,6 +41,26 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=汇报日期"
}
},
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "汇报类型"
},
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "汇报对象"
},
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "对象ID"
},
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "汇报人",
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=汇报人"
}
}
],
"ResultErrorCodeTo": {
@@ -243,7 +255,7 @@
]
}
],
"ID": "43908d25-436d-4c69-a6e9-3601f546c215"
"ID": "1b08af32-4016-4e6e-9175-8c5432816aa2"
},
{
"CommandList": [
@@ -312,17 +324,17 @@
]
}
],
"ID": "53490be1-b27a-48ea-bf58-086ed310c298"
"ID": "bd945f6a-3075-4c0b-b406-d37e89c56e59"
}
]
}
],
"ID": "9a57d033-7e24-4b02-a1a6-09dda167ada6"
"ID": "5cdca584-f29c-4f1f-826b-52b1ff34bc25"
}
]
}
],
"ID": "f483d112-b146-42be-b614-f5d3951b360f"
"ID": "f4c28c28-f2be-46c3-947c-b0fc575ea4d0"
}
]
}

View File

@@ -21,19 +21,31 @@
}
},
"Parameters": [
{
"Name": "汇报人",
"DataValidationInfo": {
"IgnoreBlank": false
},
"TestData": "shamus"
},
{
"Name": "生成日期",
"DataValidationInfo": {
"IgnoreBlank": false
},
"TestData": "2024/6/13"
},
{
"Name": "汇报类型",
"DataValidationInfo": {}
},
{
"Name": "汇报对象",
"DataValidationInfo": {}
},
{
"Name": "对象ID",
"DataValidationInfo": {}
},
{
"Name": "汇报人",
"DataValidationInfo": {
"IgnoreBlank": false
},
"TestData": "shamus"
}
],
"InvokeTriggerTestData": {
@@ -57,7 +69,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=TEXT(生成日期,\"yyyy-MM-dd\")"
},
"ID": "4491daaaae9c488a8c74361f2560c355"
"ID": "4418574915d448e8a3a0ff87bb3805e0"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -67,7 +79,7 @@
"TableValueType": 1,
"BindingInfos": [
{
"GUID": "d69c1753-9acf-4ed7-9c80-f0b8d8f2bbba",
"GUID": "373b5db3-9019-4c86-8b5d-b749601675b1",
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "总工时",
@@ -116,7 +128,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
"ID": "4c938ea260b94a89b2d72dcdaaf0d4bc"
"ID": "46450718969a4aeea8c451b6a387a2bd"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -125,7 +137,7 @@
"TableName": "任务工时表",
"BindingInfos": [
{
"GUID": "bdbcdbfc-8edb-445f-9dc7-e17615d51d0d",
"GUID": "f53e666c-6927-4991-a7d0-035e05e98a09",
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "项目ID",
@@ -134,7 +146,7 @@
"ColumnName": "项目ID"
},
{
"GUID": "e95ff5a5-080d-4f9b-9802-de0279b46123",
"GUID": "302831ef-9cf8-4e69-a894-384b2ccbc7bd",
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "项目ID",
@@ -148,7 +160,7 @@
"ColumnName": "项目名称"
},
{
"GUID": "29c34886-ce79-49b0-97a6-937c88bfd643",
"GUID": "482ba89c-88c1-4834-a01d-dc6e61793310",
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "总工时",
@@ -197,7 +209,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
"ID": "93129abf523d4f1382f20ff674ba15f6"
"ID": "f172e7641ed8478d9abbae743aa187ed"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -234,7 +246,7 @@
"TableName": "任务工时表",
"BindingInfos": [
{
"GUID": "7a86d110-fe10-4b4f-a3fd-b205bca84757",
"GUID": "109c944c-b561-471c-98d7-a013cb305188",
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行内容",
@@ -296,7 +308,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
"ID": "d5039106a33d401890c287c3e151e8ef"
"ID": "1724b9cb79214e1e8af86bfb49938e9d"
},
{
"$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
@@ -383,17 +395,22 @@
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "日报模板",
"ParameterName": "查找模板",
"TableValue": {
"TableName": "汇报模板",
"TableName": "汇报模板对应表",
"TableValueType": 1,
"BindingInfos": [
{
"GUID": "32b5f782-2d35-428e-afe4-66d120029d89",
"GUID": "d65d3c11-ebb1-4b7e-b8eb-ac58fbd7d5e2",
"BindingInfo": {
"TableName": "汇报模板",
"ColumnName": "模板内容",
"GUID": "1d9bbe66-ae19-4d86-95cf-dfa2e7e4e2a8"
"TableName": "汇报模板对应表",
"ColumnName": "模板ID",
"GUID": "c7ff5824-2d67-4b0f-9b8f-e01ec06a8511",
"RelationBinding": {
"RelatedTable": "汇报模板",
"RelatedColumn": "ID",
"DisplayColumn": "模板内容"
}
},
"ColumnName": "模板内容"
}
@@ -404,28 +421,33 @@
{
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
"TableName": "汇报模板",
"ColumnName": "ID",
"GUID": "722f4877-7cb8-44dc-8b27-c9faa8948228"
"TableName": "汇报模板对应表",
"ColumnName": "汇报对象",
"GUID": "86547761-1198-4fa9-90b9-ad99af9b3dc9"
},
"Value": "1"
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=汇报对象"
}
},
{
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"CompareType": 1,
"ColumnBindingInfo": {
"TableName": "汇报模板",
"ColumnName": "是否禁用",
"GUID": "b81cdddf-c5f0-441f-8380-ba980377bd40"
"TableName": "汇报模板对应表",
"ColumnName": "汇报类型",
"GUID": "d831036f-9c97-4988-b548-4c7b25b5fc29"
},
"Value": "1"
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=汇报类型"
}
}
]
},
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
"ID": "bcfe9971a6bd4462b60e9dcebf77bdf7"
"ID": "bf0cea8b763e46aeb807c216aeda31eb"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -437,7 +459,7 @@
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=日报模板"
"SerializeProperty": "=查找模板"
}
},
"value": "%Null%",
@@ -448,7 +470,7 @@
"$type": "MustachePlugin.Render, MustachePlugin",
"DataSrouce": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=日报模板.模板内容"
"SerializeProperty": "=查找模板.模板内容"
},
"UseCustomsDataHash": true,
"CustomsDataHash": {
@@ -480,7 +502,7 @@
]
}
],
"ID": "95494b7b-a921-46ca-a739-e58f33c777fa"
"ID": "f4b879c7-4e10-46c2-9ab5-7033aaf5ba1e"
},
{
"CommandList": [
@@ -498,19 +520,19 @@
]
}
],
"ID": "ee8e3a59-924d-4d05-a811-8265fe8ee8e4"
"ID": "d98deac5-2088-40ca-b376-488bf807a3c7"
}
]
}
],
"ID": "5253f66b-c75b-49f8-8760-161595c7e89a"
"ID": "e2405c9c-b846-40a0-b356-13315a59b6ad"
},
{
"CommandList": [
{
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
"ErrorCode": "400",
"Message": "昨日无工作内容。",
"Message": "无工作内容。",
"CustomReturns": [
{
"ReturnPropertyName": "生成文本"
@@ -521,7 +543,7 @@
]
}
],
"ID": "6fc57d6e-38d9-407e-b896-151dedf7d9a8"
"ID": "86265d6f-9c96-4add-82fe-0a81ee1876e5"
}
]
}

View File

@@ -33,29 +33,10 @@
"Commands": [
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "汇报分类",
"ParameterName": "汇报数量",
"TableValue": {
"TableName": "汇报记录表",
"BindingInfos": [
{
"GUID": "8c7fefdd-89ba-4046-9610-2eb651f01924",
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "汇报类型",
"GUID": "3af46d9c-128e-4759-ac26-7b44ff526d26"
},
"ColumnName": "汇报类型"
},
{
"GUID": "b3ce8f5a-ec2f-48df-a581-0b8b0a70d931",
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "行数",
"GUID": "93ad164e-0580-4c69-8080-a20159915eb2"
},
"ColumnName": "行数"
}
],
"TableValueType": 3,
"SqlCondition": {
"$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
"SubConditions": [
@@ -84,7 +65,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
"ID": "504ba365e40345e58ed4330479f11fc7"
"ID": "d90d23e183f241a48bc0e424d9f4fbd9"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -96,7 +77,7 @@
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=汇报分类.Count"
"SerializeProperty": "=汇报数量"
}
},
"value": "0",
@@ -111,7 +92,7 @@
"TableValueType": 1,
"BindingInfos": [
{
"GUID": "6ef63570-9dbd-4eed-b248-27314bd25091",
"GUID": "9ddb957d-47ed-4323-9ccb-28e0aca8104d",
"BindingInfo": {
"TableName": "汇报模板",
"ColumnName": "模板内容",
@@ -132,7 +113,8 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
"ID": "25ee65bc622248a18bc56bce614dd21a"
"ID": "0c415a6101b74f079857656997280c17",
"Disabled": true
},
{
"$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
@@ -141,11 +123,12 @@
"Name": "汇报列表",
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=汇报分类"
"SerializeProperty": "=汇报数量"
}
}
],
"OutParamaterName": "数据源"
"OutParamaterName": "数据源",
"Disabled": true
},
{
"$type": "MustachePlugin.Render, MustachePlugin",
@@ -159,7 +142,8 @@
"SerializeProperty": "=数据源"
},
"SetMaxRecursionDepth": 512,
"ResultTo": "输出结果"
"ResultTo": "输出结果",
"Disabled": true
},
{
"$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon",
@@ -172,20 +156,20 @@
"Params": [
{
"Name": "标题",
"Value": "汇报等待提交"
"Value": "汇报提醒"
},
{
"Name": "内容",
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=输出结果"
"SerializeProperty": "=\"你有\"&汇报数量&\"份汇报等待提交,赶紧来看看吧~\""
}
}
],
"ID": "da6f51a2bf2c4ae3a857efb985c30fb7"
"ID": "1063eb84a28b4d2b93edbced4f6a07f8"
}
],
"ID": "990de595-2c5e-4431-9e9d-6a5bec691b53"
"ID": "8a1bb6b7-fc52-48a2-b181-34c2ab99a6c0"
}
]
},