{"Message":"更新到102","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/工作台首页"},{"State":1,"Type":18,"Name":"RdlReport/人员工时报表"},{"State":2,"Type":18,"Name":"RdlReport/人员汇报报表"},{"State":1,"Type":40,"Name":"Plugin"}],"Version":"v1"}

2024-11-08 22:28:51 +08:00
parent c3d59b7c7f
commit 58ae1facc2
25 changed files with 1295 additions and 247 deletions
--- a/.collaboration
+++ b/.collaboration
@@ -1246,19 +1246,7 @@
  },
  {
    "ModuleName": "PCPage/工作台首页",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-11-08T22:28:15.0484855+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工作台\\工作台首页.json",
-      "Pages\\工作台\\工作台首页.rd",
-      "Pages\\3868fc7f40b841649f14b5adba61954.json",
-      "Pages\\3868fc7f40b841649f14b5adba61954.rd"
-    ]
+    "ModuleType": 1
  },
  {
    "ModuleName": "PCPage/工作台_关键信息",
@@ -1898,17 +1886,7 @@
  },
  {
    "ModuleName": "RdlReport/人员工时报表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-11-08T22:23:23.9409937+08:00",
-    "ModuleType": 18,
-    "ToRemoveFiles": [
-      "Reports\\人员工时报表.json",
-      "Reports\\人员工时报表.rdlx"
-    ]
+    "ModuleType": 18
  },
  {
    "ModuleName": "RdlReport/项目工时报表",
@@ -1918,20 +1896,6 @@
    "ModuleName": "RdlReport/客户部门工时报表",
    "ModuleType": 18
  },
-  {
-    "ModuleName": "RdlReport/人员汇报报表",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-11-08T22:26:57.2286108+08:00",
-    "ModuleType": 18,
-    "ToRemoveFiles": [
-      "Reports\\人员汇报报表.json",
-      "Reports\\人员汇报报表.rdlx"
-    ]
-  },
  {
    "ModuleName": "RdlReport/客户工时报表",
    "ModuleType": 18
@@ -2522,51 +2486,7 @@
  },
  {
    "ModuleName": "Plugin",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-11-08T22:28:35.9665519+08:00",
-    "ModuleType": 40,
-    "ToRemoveFiles": [
-      "Plugin\\Echarts图表-10_0_3_0.zip",
-      "Plugin\\Editormd-6_0_102_0.zip",
-      "Plugin\\Forguncy.CustomMenu.zip",
-      "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip",
-      "Plugin\\JSON数据源-10_0_2_0.zip",
-      "Plugin\\Lottie动画插图-10_0_2_0.zip",
-      "Plugin\\Notiflix-9_0_103_0.zip",
-      "Plugin\\OPENAI套件-10_0_5_0.zip",
-      "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip",
-      "Plugin\\SqlServerWrapper.zip",
-      "Plugin\\Tiny富文本编辑器-10_0_2_0.zip",
-      "Plugin\\UI操作工具箱-9_0_103_0.zip",
-      "Plugin\\Unlayer-9_0_103_0.zip",
-      "Plugin\\xTools快速开发工具包-9_0_4_0.zip",
-      "Plugin\\内容编辑器-9_0_103_0.zip",
-      "Plugin\\加载动画-10_0_2_0.zip",
-      "Plugin\\发送HTTP请求命令-10_0_2_0.zip",
-      "Plugin\\取消当前行-9_0_103_0.zip",
-      "Plugin\\增强关闭页面-9_0_6.zip",
-      "Plugin\\复制到剪贴板-7_0_3_0.zip",
-      "Plugin\\客户端缓存操作工具库-8_0_0_0.zip",
-      "Plugin\\富文本编辑器-10_0_2_0.zip",
-      "Plugin\\对象与集合操作工具-8_0_0_0.zip",
-      "Plugin\\应用服务器操作工具集合-8_0_3_0.zip",
-      "Plugin\\异步运行命令-9_0_103_0.zip",
-      "Plugin\\支持预览的附件上传-10_0_2_0.zip",
-      "Plugin\\服务端缓存操作工具库-8_0_3_0.zip",
-      "Plugin\\标签页和打开标签命令-10_0_2_0.zip",
-      "Plugin\\模板引擎操作库-9_0_103_0.zip",
-      "Plugin\\用户管理命令 V2-10_0_5_0.zip",
-      "Plugin\\网络操作库-9_0_102_0.zip",
-      "Plugin\\设置当前行命令-10_0_2_0.zip",
-      "Plugin\\设置焦点命令-10_0_2_0.zip",
-      "Plugin\\读取管理控制台日志-10_0_5_0.zip",
-      "Plugin\\豪~豪插件合集-7_0_102_0.zip",
-      "Plugin\\钉钉SDK2.0-10_0_5_0.zip"
-    ]
+    "ModuleType": 40
  },
  {
    "ModuleName": "PublishSetting",
--- a/Pages/工作台/工作台首页.json
+++ b/Pages/工作台/工作台首页.json
--- a/Plugin/Echarts图表-10_0_102_0.zip
+++ b/Plugin/Echarts图表-10_0_102_0.zip
--- a/序列化和反序列化-10_0_102_0.zip
+++ b/序列化和反序列化-10_0_102_0.zip
--- a/序列化和反序列化-10_0_2_0.zip
+++ b/序列化和反序列化-10_0_2_0.zip
--- a/Plugin/JSON数据源-10_0_102_0.zip
+++ b/Plugin/JSON数据源-10_0_102_0.zip
--- a/Plugin/JSON数据源-10_0_2_0.zip
+++ b/Plugin/JSON数据源-10_0_2_0.zip
--- a/Plugin/Tiny富文本编辑器-10_0_102_0.zip
+++ b/Plugin/Tiny富文本编辑器-10_0_102_0.zip
--- a/Plugin/加载动画-10_0_102_0.zip
+++ b/Plugin/加载动画-10_0_102_0.zip
--- a/Plugin/加载动画-10_0_2_0.zip
+++ b/Plugin/加载动画-10_0_2_0.zip
--- a/Plugin/发送HTTP请求命令-10_0_102_0.zip
+++ b/Plugin/发送HTTP请求命令-10_0_102_0.zip
--- a/Plugin/发送HTTP请求命令-10_0_2_0.zip
+++ b/Plugin/发送HTTP请求命令-10_0_2_0.zip
--- a/Plugin/富文本编辑器-10_0_102_0.zip
+++ b/Plugin/富文本编辑器-10_0_102_0.zip
--- a/Plugin/支持预览的附件上传-10_0_102_0.zip
+++ b/Plugin/支持预览的附件上传-10_0_102_0.zip
--- a/Plugin/标签页和打开标签命令-10_0_102_0.zip
+++ b/Plugin/标签页和打开标签命令-10_0_102_0.zip
--- a/Plugin/标签页和打开标签命令-10_0_2_0.zip
+++ b/Plugin/标签页和打开标签命令-10_0_2_0.zip
--- a/Plugin/用户管理命令
+++ b/Plugin/用户管理命令
--- a/Plugin/用户管理命令
+++ b/Plugin/用户管理命令
--- a/Plugin/设置当前行命令-10_0_102_0.zip
+++ b/Plugin/设置当前行命令-10_0_102_0.zip
--- a/Plugin/设置当前行命令-10_0_2_0.zip
+++ b/Plugin/设置当前行命令-10_0_2_0.zip
--- a/Plugin/设置焦点命令-10_0_102_0.zip
+++ b/Plugin/设置焦点命令-10_0_102_0.zip
--- a/Plugin/设置焦点命令-10_0_2_0.zip
+++ b/Plugin/设置焦点命令-10_0_2_0.zip
--- a/Reports/人员工时报表.rdlx
+++ b/Reports/人员工时报表.rdlx
--- a/Reports/人员汇报报表.json
+++ b/Reports/人员汇报报表.json
@@ -1,155 +0,0 @@
-{
-  "Name": "人员汇报报表",
-  "DataSources": [
-    {
-      "Name": "汇报记录",
-      "GUID": "177f804b-d611-4ba0-aff8-f565fa456aaf",
-      "DataSourceSetting": {
-        "TableName": "汇报记录表",
-        "BindingInfos": [
-          {
-            "GUID": "d60e5214-97c0-434a-aa93-7bc5d5d54d2d",
-            "BindingInfo": {
-              "TableName": "汇报记录表",
-              "ColumnName": "ID",
-              "GUID": "f8dc67cd-ed28-4d39-b37e-c72e84e0b532"
-            },
-            "ColumnName": "ID"
-          },
-          {
-            "GUID": "393c6a7e-45c6-4d6e-9cd5-84694b497fc7",
-            "BindingInfo": {
-              "TableName": "汇报记录表",
-              "ColumnName": "开始日期",
-              "GUID": "aa3098b3-58ea-4631-aeb9-be0f9a59ad65"
-            },
-            "ColumnName": "开始日期"
-          },
-          {
-            "GUID": "6d6bbfcf-0cd1-4849-91cd-a650b5108537",
-            "BindingInfo": {
-              "TableName": "汇报记录表",
-              "ColumnName": "汇报对象",
-              "GUID": "a31f02b1-7689-4b1e-9965-f613dfc3206c"
-            },
-            "ColumnName": "汇报对象"
-          },
-          {
-            "GUID": "dd16a79e-6d77-4474-91e0-ce759f4305d9",
-            "BindingInfo": {
-              "TableName": "汇报记录表",
-              "ColumnName": "汇报类型",
-              "GUID": "51cd3441-70e0-48d7-ac75-56b80c152ed2"
-            },
-            "ColumnName": "汇报类型"
-          },
-          {
-            "GUID": "7580ec71-f337-403a-a874-71da6358be98",
-            "BindingInfo": {
-              "TableName": "汇报记录表",
-              "ColumnName": "汇报人",
-              "GUID": "0257336a-360a-4352-a438-8a2a1e393341",
-              "AttachType": {
-                "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
-                "UserColumnAttachType": 1
-              }
-            },
-            "ColumnName": "汇报人_全名"
-          },
-          {
-            "GUID": "d2f1a602-19e5-4830-a397-2ccdb4f60afa",
-            "BindingInfo": {
-              "TableName": "汇报记录表",
-              "ColumnName": "内容",
-              "GUID": "64655edd-393d-48b6-9c0f-e23b73ce0532"
-            },
-            "ColumnName": "内容"
-          },
-          {
-            "GUID": "5d21595a-53d4-4770-a986-fb2df813bd83",
-            "BindingInfo": {
-              "TableName": "汇报记录表",
-              "ColumnName": "纯文本内容",
-              "GUID": "3727a5b2-d0a4-47ec-bef8-8be1ec213a15"
-            },
-            "ColumnName": "纯文本内容"
-          },
-          {
-            "GUID": "1c0a810f-9982-49ee-864a-14a7b62bbcff",
-            "BindingInfo": {
-              "TableName": "汇报记录表",
-              "ColumnName": "总工时",
-              "GUID": "8eb01738-867a-4d9a-9cc6-f0ab3ec2ed94"
-            },
-            "ColumnName": "总工时"
-          }
-        ]
-      },
-      "ColumnsType": [
-        "integer",
-        "date-time",
-        "string",
-        "string",
-        "string",
-        "string",
-        "string",
-        "number"
-      ]
-    },
-    {
-      "Name": "人员表",
-      "GUID": "037a95ad-b4f5-455f-9810-f458b6f0cc69",
-      "DataSourceSetting": {
-        "TableName": "用户信息视图",
-        "BindingInfos": [
-          {
-            "GUID": "1bf5ad93-dacc-4e92-9d56-3524beb36163",
-            "BindingInfo": {
-              "TableName": "用户信息视图",
-              "ColumnName": "用户名",
-              "GUID": "dc3bded8-ef8e-4c22-9a2c-6e5bc2bf9e26"
-            },
-            "ColumnName": "用户名"
-          },
-          {
-            "GUID": "bfb9e097-3a8d-4549-b207-b7bbbecbdd5e",
-            "BindingInfo": {
-              "TableName": "用户信息视图",
-              "ColumnName": "全名",
-              "GUID": "fade5b3d-28a5-4329-bca9-a585f35fdc75"
-            },
-            "ColumnName": "全名"
-          }
-        ]
-      },
-      "ColumnsType": [
-        "string",
-        "string"
-      ]
-    }
-  ],
-  "PermissionData": {
-    "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionData, Forguncy.RbacPermission.Core",
-    "permissionResource": {
-      "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionResource, Forguncy.RbacPermission.Core",
-      "activeReportType": 1
-    },
-    "permissionBindings": [
-      {
-        "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core",
-        "activeReportPermissionType": 1,
-        "roleNames": [
-          "FGC_LoginUser"
-        ]
-      },
-      {
-        "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core",
-        "activeReportPermissionType": 2,
-        "roleNames": [
-          "FGC_LoginUser"
-        ]
-      }
-    ]
-  },
-  "ReportType": 1
-}
--- a/Reports/人员汇报报表.rdlx
+++ b/Reports/人员汇报报表.rdlx
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2005/01/reportdefinition"><dd:Name xmlns:dd="http://schemas.datadynamics.com/reporting/2005/02/reportdefinition">人员汇报报表.rdlx</dd:Name><Body><Height>2pt</Height></Body><BottomMargin>1cm</BottomMargin><LeftMargin>1cm</LeftMargin><PageHeight>29.7cm</PageHeight><PageWidth>21cm</PageWidth><RightMargin>1cm</RightMargin><TopMargin>1cm</TopMargin><Width>2pt</Width><ReportParameters><ReportParameter Name="报表参数1"><DataType>String</DataType><Prompt>报表参数1</Prompt><UsedInQuery>True</UsedInQuery></ReportParameter></ReportParameters><DataSources><DataSource Name="汇报记录"><ConnectionProperties><ConnectString>jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/177f804b-d611-4ba0-aff8-f565fa456aaf;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"开始日期":{"type":"date-time"},"汇报对象":{"type":"string"},"汇报类型":{"type":"string"},"汇报人_全名":{"type":"string"},"内容":{"type":"string"},"纯文本内容":{"type":"string"},"总工时":{"type":"number"}}}}</ConnectString><DataProvider>JSON</DataProvider></ConnectionProperties></DataSource><DataSource Name="人员表"><ConnectionProperties><ConnectString>jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/037a95ad-b4f5-455f-9810-f458b6f0cc69;schemadata={"type":"array","items":{"type":"object","properties":{"用户名":{"type":"string"},"全名":{"type":"string"}}}}</ConnectString><DataProvider>JSON</DataProvider></ConnectionProperties></DataSource></DataSources><DataSets><DataSet Name="汇报记录_DataSet"><Fields><Field Name="ID"><DataField>ID</DataField></Field><Field Name="开始日期"><DataField>开始日期</DataField></Field><Field Name="汇报对象"><DataField>汇报对象</DataField></Field><Field Name="汇报类型"><DataField>汇报类型</DataField></Field><Field Name="汇报人_全名"><DataField>汇报人_全名</DataField></Field><Field Name="内容"><DataField>内容</DataField></Field><Field Name="纯文本内容"><DataField>纯文本内容</DataField></Field><Field Name="总工时"><DataField>总工时</DataField></Field></Fields><Query><CommandText>$.[*]</CommandText><DataSourceName>汇报记录</DataSourceName></Query></DataSet><DataSet Name="人员表_DataSet"><Fields><Field Name="用户名"><DataField>用户名</DataField></Field><Field Name="全名"><DataField>全名</DataField></Field></Fields><Query><CommandText>$.[*]</CommandText><DataSourceName>人员表</DataSourceName></Query></DataSet></DataSets><CustomProperties><CustomProperty><Name>DisplayType</Name><Value>Page</Value></CustomProperty><CustomProperty><Name>SizeType</Name><Value>Default</Value></CustomProperty><CustomProperty><Name>PaperOrientation</Name><Value>Portrait</Value></CustomProperty></CustomProperties><dd:ReportThemes xmlns:dd="http://schemas.datadynamics.com/reporting/2005/02/reportdefinition"><ThemeUri>DefaultTheme.rdlx-theme</ThemeUri></dd:ReportThemes></Report>
				`@@ -1 +0,0 @@`
				<?xml version="1.0" encoding="utf-8"?><Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2005/01/reportdefinition"><dd:Name xmlns:dd="http://schemas.datadynamics.com/reporting/2005/02/reportdefinition">人员汇报报表.rdlx</dd:Name><Body><Height>2pt</Height></Body><BottomMargin>1cm</BottomMargin><LeftMargin>1cm</LeftMargin><PageHeight>29.7cm</PageHeight><PageWidth>21cm</PageWidth><RightMargin>1cm</RightMargin><TopMargin>1cm</TopMargin><Width>2pt</Width><ReportParameters><ReportParameter Name="报表参数1"><DataType>String</DataType><Prompt>报表参数1</Prompt><UsedInQuery>True</UsedInQuery></ReportParameter></ReportParameters><DataSources><DataSource Name="汇报记录"><ConnectionProperties><ConnectString>jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/177f804b-d611-4ba0-aff8-f565fa456aaf;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"开始日期":{"type":"date-time"},"汇报对象":{"type":"string"},"汇报类型":{"type":"string"},"汇报人_全名":{"type":"string"},"内容":{"type":"string"},"纯文本内容":{"type":"string"},"总工时":{"type":"number"}}}}</ConnectString><DataProvider>JSON</DataProvider></ConnectionProperties></DataSource><DataSource Name="人员表"><ConnectionProperties><ConnectString>jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/037a95ad-b4f5-455f-9810-f458b6f0cc69;schemadata={"type":"array","items":{"type":"object","properties":{"用户名":{"type":"string"},"全名":{"type":"string"}}}}</ConnectString><DataProvider>JSON</DataProvider></ConnectionProperties></DataSource></DataSources><DataSets><DataSet Name="汇报记录_DataSet"><Fields><Field Name="ID"><DataField>ID</DataField></Field><Field Name="开始日期"><DataField>开始日期</DataField></Field><Field Name="汇报对象"><DataField>汇报对象</DataField></Field><Field Name="汇报类型"><DataField>汇报类型</DataField></Field><Field Name="汇报人_全名"><DataField>汇报人_全名</DataField></Field><Field Name="内容"><DataField>内容</DataField></Field><Field Name="纯文本内容"><DataField>纯文本内容</DataField></Field><Field Name="总工时"><DataField>总工时</DataField></Field></Fields><Query><CommandText>$.[]</CommandText><DataSourceName>汇报记录</DataSourceName></Query></DataSet><DataSet Name="人员表_DataSet"><Fields><Field Name="用户名"><DataField>用户名</DataField></Field><Field Name="全名"><DataField>全名</DataField></Field></Fields><Query><CommandText>$.[]</CommandText><DataSourceName>人员表</DataSourceName></Query></DataSet></DataSets><CustomProperties><CustomProperty><Name>DisplayType</Name><Value>Page</Value></CustomProperty><CustomProperty><Name>SizeType</Name><Value>Default</Value></CustomProperty><CustomProperty><Name>PaperOrientation</Name><Value>Portrait</Value></CustomProperty></CustomProperties><dd:ReportThemes xmlns:dd="http://schemas.datadynamics.com/reporting/2005/02/reportdefinition"><ThemeUri>DefaultTheme.rdlx-theme</ThemeUri></dd:ReportThemes></Report>