diff --git a/.collaboration b/.collaboration index 778e3228..b99c2267 100644 --- a/.collaboration +++ b/.collaboration @@ -5,137 +5,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8058638+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8058796+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8058823+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8058833+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8058849+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.805887+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8058879+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.805886+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8058891+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -392,47 +302,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8059488+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8059519+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8059543+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -613,17 +493,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:24:00.8059608+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -732,21 +602,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-23T15:17:35.5072913+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd", - "Pages\\eaf92441634a4701b4a255ccc7601ac.json", - "Pages\\eaf92441634a4701b4a255ccc7601ac.rd", - "Pages\\f9ec059d9c5d440eabbb7db442b15c9.json", - "Pages\\f9ec059d9c5d440eabbb7db442b15c9.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷", diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index e256633d..33e0350b 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/Pages/f9ec059d9c5d440eabbb7db442b15c9.json b/Pages/f9ec059d9c5d440eabbb7db442b15c9.json index 7da32635..03433463 100644 --- a/Pages/f9ec059d9c5d440eabbb7db442b15c9.json +++ b/Pages/f9ec059d9c5d440eabbb7db442b15c9.json @@ -13,26 +13,33 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 35.0, + "Mode": 1 } }, "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } } }, "InLogicalVisibleIndexes": [ - 3 + 4 ], - "Count": 4, + "Count": 5, "DefaultSize": 10.0 }, "Cols": { "RowColumnAttachedInfos": { "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 104.0 + "DesignLengthInPixel": 104.0, + "Mode": 1 } }, "3": { @@ -101,7 +108,7 @@ } ], "separator": ",", - "size": "large", + "size": "default", "effect": "light", "allowAdd": false, "addButtonSettings": { @@ -119,17 +126,19 @@ "1,5": { "TemplateCellSource": "创建日期" }, - "3,1": { + "4,1": { "TemplateCellSource": "ID" } }, "StyleDatas": { "Styles": [ { + "FontSize": 13.333333333333332, "Foreground": 0, "HorizontalAlignment": 1 }, { + "FontSize": 13.333333333333332, "Foreground": 0, "WordWrap": true }, @@ -153,12 +162,17 @@ "CellStyles": { "1,1": 0, "1,3": 1, - "1,5": 2 + "1,5": 2, + "2,1": 0, + "2,5": 2 }, "SheetStyle": { "FontFamily": 5 } }, + "Spans": [ + "1,3,2,1" + ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", "ParentPageName": "项目概况" @@ -167,4 +181,4 @@ "PaperSize": {}, "Margin": {} } -}//lZH/H4H+4IqD9mtQPTsUW+zpgNYPpBnAeujuIIwzY8Kj4tcXWirjdgiytLRN91K5JYSE1CEmP0hjCla9pToG2gw29njPU9XArERpdvpyoHqsgO5uwqxFFdFOo87t9Div+7TXC60NsDY6GwK/yqDT80M61yLIMZKriYZ8C/i/SKCtgqbs7+iYYXa2aFEYvSg3e6pSk/4qjIcaW0oQNzgH0w2Az09Qx9fF+ZcM989iKLv/IR1/N/dl2087ZPt6aaTtG/T6AuXSq156gjaCRAT4GWErfjQhUYnRGKqIjULNoJkj2DVYeRUZTXM1RBOBicRTGoDUiD46fEBPABe+AgwivV04mvEl4LXejqVq426PkEGXT7isz4BKiB5+GGagEqSKrdnApSy6ePyBr/DUjBVIAnUnUbwbsSurrkKFJcGhi7MljAmt+wRDxuNrYd63QphIb6sKWcLP/KjhdanSelfpastvN1NK0P09/NrSLuGqEQv+tlfGJeNhokxayxTrHjtZYUSd88oqCkP02mLJm4qNdwpdwKyR5lFo9iL7H51SEeYIVbuWcxKAZMxLcTjCnrXcqDEJOmdBEWYvCBjRHFIgmMJtN8dfWiufqdP34b6LyCNwhcMVDuRDEsIjDM65Zt9HQnlLEeCy4zs7aCphZ89zOxQm/3oJQ90sgd+bJcMSAXb29IP58PnCqa5Zplpb5jw3qVRHt0FNR/T34mE2k1P2F2qerGy4rWy3ZwuPcNLuXUdsh/oUVQ1emR/Ed+Tt7wngn0hAK/s9dTHFfCbMZ1My6AdkX0K6WTqP/P+5ww1q0qV9U5D41TdtolsEgs6zQUle1uKXPWTr0NHl9VvcHtVjUYy/PUwuZ2JjDLFYE2Ou4/hcJwWTaiYekdLlgQkWR9EznxwofzLEmYQe4Eu6l4rGCA==|920 \ No newline at end of file +}//ez9NBI/rlKaOJ+a8bjOrjuqpV9GsC6ObXocYjGR2ddNOhXDINRhOefxKIH427+3bdnLexi4ol1PV5GxteqEXVA6PLhq0OfgQMPrAOPBj5CWfiepghW4OP/8OPRkCW5iFZwA+Ae1Zxd7hSGfVLpe/PYhArRA9Sk0qgHtoD2dWNucO7DWhYuDNyb0lUNbXISAhB1qa6Znyt99JVQsLglxS8CQN6ObJuH0xG0H+FyX+zTbf/B7HzgIgsUWRuXRnStDbM/qDkIwbkM2vGYpcxVLL5Qs3886ChC76FlYGtQIoGA9EF2WDCHUdEgZM/kK2op71tVBfiBPHnrgG0SB9mvql7tmgldhYQ6YWPnMtrJr52gdUpVwy+LrJPAd+FgbuQ4DQWeZbM0+txAX6lVzqnT0aBgHcfcq8y2zMQAdwRX0QT9N5XofVIZtFpnwp1dINB+zVrmCaT204WiC6Ct64CQ6um9QVizb7DaHGmsfIIhhfXbs65C37Ys56mEkluNp2boaHealrHvOB6JNhBtCwOr52GhVnp7V6J5lyi/E+XT52HaMQ9xPIvkb2f6yCZkfQIU5d7MvYJfeXXLMM2CcmXNNBRuj5J6tx2ZgrhqVSEIPoSE75qq586WH/tP/d/dI3MSEJ2fWQ+uSQAD1hzLPPIDhhdWrlW7Il56X9Tt5N8xqS8b97OfNlNmgpjFbp5eACColssiB/o5RBuafLN55Ubjt2SUoXT0rVj6wKymKd4pSNUA51s1L5u4TLQROaXV+1QBMNCQ+1kF4+QhNULvzAnS0tsNakQPMZW8duIh01v4porXvtrc8CaLHmch4jRSb+hbdZ2F2ppc7hbKUAAHfx2z1QhLVb+2WlWRYl0Wsn0MP8aNEM6HKgRc+yRS4cA+0MVZAaeOjtY7CIjtk3N4qfFvHgHg==|920 \ No newline at end of file diff --git a/Pages/f9ec059d9c5d440eabbb7db442b15c9.rd b/Pages/f9ec059d9c5d440eabbb7db442b15c9.rd index d8c8d52d..ae86158b 100644 --- a/Pages/f9ec059d9c5d440eabbb7db442b15c9.rd +++ b/Pages/f9ec059d9c5d440eabbb7db442b15c9.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 7, - "RowCount": 4 + "RowCount": 5 } \ No newline at end of file