WIP: 将最新版本合并至Master #1

Draft
admin wants to merge 3623 commits from 版本10 into master
4 changed files with 239 additions and 35 deletions
Showing only changes of commit 19861eb020 - Show all commits

View File

@@ -242,16 +242,7 @@
},
{
"ModuleName": "Table/任务成员表",
"State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-05T13:40:10.8820724+08:00",
"ModuleType": 7,
"ToRemoveFiles": [
"Tables\\任务\\任务成员表.json"
]
"ModuleType": 7
},
{
"ModuleName": "Table/任务表",
@@ -2279,19 +2270,7 @@
},
{
"ModuleName": "PCPage/工作台首页",
"State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-05T13:09:56.7361296+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\工作台\\工作台首页.json",
"Pages\\工作台\\工作台首页.rd",
"Pages\\3868fc7f40b841649f14b5adba61954.json",
"Pages\\3868fc7f40b841649f14b5adba61954.rd"
]
"ModuleType": 1
},
{
"ModuleName": "PCPage/项目负荷 (2)",

File diff suppressed because one or more lines are too long

View File

@@ -1,5 +1,5 @@
{
"PageType": 0,
"ColumnCount": 42,
"RowCount": 17
"RowCount": 19
}

View File

@@ -35,6 +35,18 @@
"Name": "任务成员",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
"BindingInfo": {
"TableName": "任务成员表",
"ColumnName": "ID",
"GUID": "5a6c9445-622e-416c-9c76-8e34957ebec4"
},
"AggregateFunction": 1,
"DataColumnName": "ID",
"Name": "数量",
"ColumnType": "System.Int32, 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",