diff --git a/.collaboration b/.collaboration index e9a1384a..af8f8a6d 100644 --- a/.collaboration +++ b/.collaboration @@ -322,16 +322,7 @@ }, { "ModuleName": "Table/项目发布记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-02T21:33:50.5339465+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目发布记录.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目表", @@ -647,33 +638,11 @@ }, { "ModuleName": "PCPage/版本发布详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-02T21:38:05.6003682+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目发布历史", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-02T21:33:50.5348053+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\项目发布历史.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\项目发布历史.rd", - "Pages\\86a6b47fab804262a2be25140e7ff23.json", - "Pages\\86a6b47fab804262a2be25140e7ff23.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目发布历史_列头", @@ -701,19 +670,7 @@ }, { "ModuleName": "PCPage/项目版本管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-02T21:38:05.6006596+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本\\项目版本管理.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本\\项目版本管理.rd", - "Pages\\97bdc47834844e0d8f3a5aef747785e.json", - "Pages\\97bdc47834844e0d8f3a5aef747785e.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本详情", @@ -1629,16 +1586,7 @@ }, { "ModuleName": "ServerCommand/新增项目发布记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-02T21:33:50.5367737+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\新增项目发布记录.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/新增或修改项目", diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json index 659d0c21..fee68dc5 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json @@ -31,25 +31,9 @@ "DesignLengthInPixel": 35.0 } }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 139.0 - } - }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 1 + "DesignLengthInPixel": 24.0 } }, "10": { @@ -59,7 +43,7 @@ }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 454.0 } }, "12": { @@ -68,16 +52,41 @@ } }, "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } } }, "InLogicalVisibleIndexes": [ - 13 + 15 ], - "Count": 14, + "Count": 16, "DefaultSize": 32.0 }, "Cols": { @@ -117,26 +126,6 @@ "DesignLengthInPixel": 32.0 } }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -167,16 +156,6 @@ "DesignLengthInPixel": 32.0 } }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -187,26 +166,62 @@ "DesignLengthInPixel": 32.0 } }, - "21": { + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 22, + "Count": 30, "DefaultSize": 32.0 }, "Values": { "1,1": "所属项目", - "1,12": "所属版本", - "4,1": "发布版本号", - "4,12": "发布人", - "5,12": "%CurrentUser.UserName%", - "7,1": "发布内容", - "7,17": "从反馈中导入", - "11,1": "删除", - "11,13": "取消", - "11,18": "保存" + "1,16": "所属版本", + "4,1": "发布人", + "4,16": "评审人", + "5,16": "%CurrentUser.UserName%", + "7,1": "发布版本号", + "10,1": "发布内容", + "10,25": "从反馈中导入", + "13,1": "删除", + "13,19": "取消", + "13,26": "保存" + }, + "Formulas": { + "5,16": "IFERROR(ODATA(\"项目表?$select=项目经理&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"\")", + "15,4": "IFERROR(ODATA(\"项目发布记录?$select=发布版本号&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\" and 版本ID eq \"&IF(ISBLANK(版本ID),\"null\",版本ID)&\"&$top=1&$orderby=发布时间 desc\"),\"\")", + "7,16": "最近版本号" }, "AttachInfos": { "2,1": { @@ -293,7 +308,7 @@ "IgnoreBlank": false } }, - "2,12": { + "2,16": { "BindingInfo": { "TableName": "项目发布记录", "ColumnName": "版本ID", @@ -395,43 +410,7 @@ "5,1": { "BindingInfo": { "TableName": "项目发布记录", - "ColumnName": "发布版本号", - "GUID": "77ffa55d-94ee-417f-8391-be2c2f6a2711" - }, - "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "text", - "resize": "none" - }, - "DataValidationInfo": { - "IgnoreBlank": false - } - }, - "5,12": { - "BindingInfo": { - "TableName": "项目发布记录", - "ColumnName": "负责人", + "ColumnName": "发布人", "GUID": "14c027b5-9686-49af-96cd-d4ee0c2f270d" }, "CellType": { @@ -451,7 +430,6 @@ ] } ], - "DefaultValue": "%CurrentUser.UserName%", "useBinding": true, "options": [ { @@ -509,19 +487,92 @@ "noMatchText": "无匹配数据" } }, - "7,17": { + "5,16": { + "BindingInfo": { + "TableName": "项目发布记录", + "ColumnName": "评审人", + "GUID": "7b05c1c6-b521-4d83-a958-ed95c02994d0" + }, "CellType": { - "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", - "Text": "从反馈中导入", - "ClickMode": 1, - "TemplateKey": "_RS_Main" + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "%CurrentUser.UserName%", + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "d5c3610a-4033-4139-aa2c-40821722616d", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "47ed5952-1dd0-4b2d-aec0-514cbf9a684e" + }, + "ColumnName": "value" + }, + { + "GUID": "4d5d0ef9-8c0f-4f9e-81de-c135db49fd2b", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "83f36148-858d-4d2a-aed5-9194268c46d3" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" } }, "8,1": { "BindingInfo": { "TableName": "项目发布记录", - "ColumnName": "发布内容", - "GUID": "6883d052-1eb0-42d1-8c75-e05e986c1070" + "ColumnName": "发布版本号", + "GUID": "77ffa55d-94ee-417f-8391-be2c2f6a2711" }, "CellType": { "$type": "ElementUI.InputCellType, ElementUI", @@ -546,15 +597,33 @@ ] } ], - "type": "textarea", - "placeholder": "请输入", - "resize": "vertical" + "type": "text", + "resize": "none" }, "DataValidationInfo": { "IgnoreBlank": false } }, + "10,25": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "Text": "从反馈中导入", + "ClickMode": 1, + "IsInvisible": true, + "TemplateKey": "_RS_Main" + } + }, "11,1": { + "BindingInfo": { + "TableName": "项目发布记录", + "ColumnName": "发布内容", + "GUID": "6883d052-1eb0-42d1-8c75-e05e986c1070" + }, + "CellType": { + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor" + } + }, + "13,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -588,7 +657,7 @@ "ReloadData": true } ], - "ID": "a31eea70-52b0-4f97-b536-0dd56e594446" + "ID": "8ac7727b-4513-44bc-878d-25b32b658abb" } ] } @@ -600,7 +669,7 @@ "835c1bc8-b4b6-4dbf-a330-eae59d90ed4a" ] }, - "11,13": { + "13,19": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -614,7 +683,7 @@ "IconSize": 14.0 } }, - "11,18": { + "13,26": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -660,7 +729,7 @@ "ParamName": "版本号", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=版本发布详情!B6" + "SerializeProperty": "=版本发布详情!B9" } }, { @@ -668,7 +737,7 @@ "ParamName": "发布人", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=版本发布详情!M6" + "SerializeProperty": "=版本发布详情!B6" } }, { @@ -676,7 +745,7 @@ "ParamName": "发布内容", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=版本发布详情!B9" + "SerializeProperty": "=版本发布详情!B12" } }, { @@ -726,7 +795,7 @@ "ReloadData": true } ], - "ID": "b97e0112-dad3-4b88-860e-b90b4a889148" + "ID": "45dd608c-94e8-44f2-878b-e28592a98d68" }, { "CommandList": [ @@ -741,12 +810,12 @@ "BtnText": "知道了" } ], - "ID": "d58d545f-8581-4a63-b82b-110c6fa61826" + "ID": "113315b1-318b-4d47-8bdb-c569570d4cda" } ] } ], - "ID": "e8c10b9b-11d2-4324-8d5a-c2915f4830e7" + "ID": "64e9ed00-b48c-4e80-97b5-9495cac019b1" }, { "CommandList": [ @@ -764,7 +833,7 @@ "ReloadData": true } ], - "ID": "2e746e81-7a93-4c27-b4af-ba6830a43b43" + "ID": "58ebd1d3-9349-436f-b45e-9a7f96d41c04" } ] } @@ -780,7 +849,7 @@ "IconSize": 14.0 } }, - "13,1": { + "15,1": { "BindingInfo": { "TableName": "项目发布记录", "ColumnName": "ID", @@ -803,8 +872,18 @@ "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 2, - "HorizontalAlignment": 3, + "Formatter": 3, + "HorizontalAlignment": 4 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 2, + "HorizontalAlignment": 4, "Underline": false + }, + { + "FontSize": 13.333333333333332 } ], "Types": { @@ -812,28 +891,33 @@ "Body", "[AUTO]General", "Accent 1 0", + "\"当前版本号:\"@", "Right" ] }, "CellStyles": { - "1,12": 0, - "1,13": 1, - "1,14": 1, - "1,15": 1, - "1,16": 1, - "1,17": 1, - "1,18": 1, + "1,16": 0, + "1,17": 0, + "1,18": 0, "1,19": 1, "1,20": 1, - "2,12": 1, - "2,13": 1, - "2,14": 1, - "2,15": 1, + "1,21": 1, + "1,22": 1, + "1,23": 1, + "1,24": 1, + "1,25": 1, + "1,26": 1, + "1,27": 1, + "1,28": 1, "2,16": 1, - "2,17": 1, - "2,18": 1, "2,19": 1, "2,20": 1, + "2,23": 1, + "2,24": 1, + "2,25": 1, + "2,26": 1, + "2,27": 1, + "2,28": 1, "4,0": 1, "4,1": 0, "4,2": 1, @@ -846,16 +930,24 @@ "4,9": 1, "4,10": 1, "4,11": 1, - "4,12": 0, + "4,12": 1, "4,13": 1, "4,14": 1, "4,15": 1, - "4,16": 1, - "4,17": 1, - "4,18": 1, + "4,16": 0, + "4,17": 0, + "4,18": 0, "4,19": 1, "4,20": 1, "4,21": 1, + "4,22": 1, + "4,23": 1, + "4,24": 1, + "4,25": 1, + "4,26": 1, + "4,27": 1, + "4,28": 1, + "4,29": 1, "5,0": 1, "5,1": 1, "5,2": 1, @@ -863,27 +955,83 @@ "5,4": 1, "5,5": 1, "5,6": 1, - "5,7": 1, - "5,8": 1, - "5,9": 1, - "5,10": 1, "5,11": 1, "5,12": 1, - "5,21": 1, + "5,13": 1, + "5,14": 1, + "5,15": 1, + "5,16": 1, + "5,29": 1, + "6,0": 1, + "6,1": 1, + "6,2": 1, + "6,3": 1, + "6,4": 1, + "6,5": 1, + "6,6": 1, + "6,7": 1, + "6,8": 1, + "6,9": 1, + "6,10": 1, + "6,11": 1, + "6,12": 1, + "6,13": 1, + "6,14": 1, + "6,15": 1, + "6,16": 1, + "6,17": 1, + "6,18": 1, + "6,19": 1, + "6,20": 1, + "6,21": 1, + "6,22": 1, + "6,23": 1, + "6,24": 1, + "6,25": 1, + "6,26": 1, + "6,27": 1, + "6,28": 1, + "6,29": 1, "7,0": 1, "7,1": 0, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, "7,10": 1, "7,11": 1, "7,12": 1, "7,13": 1, "7,14": 1, "7,15": 1, - "7,16": 1, - "7,17": 2, - "7,21": 1, - "11,13": 0, - "11,14": 1, - "11,15": 1 + "7,16": 2, + "7,29": 1, + "8,0": 1, + "8,1": 1, + "8,29": 1, + "10,0": 1, + "10,1": 0, + "10,14": 1, + "10,15": 1, + "10,16": 1, + "10,17": 1, + "10,18": 1, + "10,19": 1, + "10,20": 1, + "10,21": 1, + "10,22": 1, + "10,23": 1, + "10,24": 1, + "10,25": 3, + "10,29": 1, + "13,19": 0, + "13,20": 1, + "13,23": 1, + "15,4": 4 }, "SheetStyle": { "FontFamily": 0, @@ -891,16 +1039,19 @@ } }, "Spans": [ - "2,1,1,9", - "2,12,1,9", - "5,1,1,9", - "5,12,1,9", - "7,17,1,4", - "11,18,1,3", - "11,13,1,3", - "11,1,1,3", + "2,1,1,13", + "2,16,1,13", + "10,25,1,4", + "13,26,1,3", + "13,19,1,5", "13,1,1,3", - "8,1,2,20" + "15,1,1,3", + "5,1,1,13", + "5,16,1,13", + "8,1,1,28", + "15,4,1,8", + "7,16,1,13", + "11,1,1,28" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -920,6 +1071,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], + "RelatedDataTableName": "项目表", "ConditionFormatRulesCollection": { "Rules": [ { @@ -967,11 +1119,15 @@ }, { "Name": "版本ID", - "Formula": "版本发布详情!$M$3" + "Formula": "版本发布详情!$Q$3" }, { "Name": "ID", - "Formula": "版本发布详情!$B$14" + "Formula": "版本发布详情!$B$16" + }, + { + "Name": "最近版本号", + "Formula": "版本发布详情!$E$16" } ] -}//8+f7OmMuXDkwnw1RjMkmCFhVXGnvhc+2uzze3RQNR+jEVkHHhls2/GiBoi1tkZvxGCFIN+jWDyVT9Rq2he0tVTMYmmEW5qDp3KCZW0W9o6kX5GAoOm7P5ppaYNQj+CuIRizfXZqBJB5vAho33uVUZLmdaj2goEsQhW+5/sTOVEzY7YtRjELmPeD6HXqJ/kaY35koJo36b4mBg/vUKRDEm6PgfChCss/fY5B8Q3gVYLdSTsHIl0JndkziEPRmJSLWs99rmMqj+7h+RmfYWZHKZGCH0phwHuauUq2cSsLTw3XhAm9P9TIKw855/K69ZBlkI/wZ87II6vGPB8kXGaNtNQrxRXJeO9itehxSu58CBsb8hb9KQE9N+YHvD0Vt8+d3ATAHxn5CJZK0mcjDpB+iGX40dtbanjSZcIDb6FVdFEhiMyV9J7qnI8LNEN73xDKh+yYY0E9t1KrqA1ZenCDxgjwKWzdOgL8fhujKuyIUQpYRST0HXyn+j6S2s2FaffFFZk87Zex2r/yfHShcgCuu93zQzhbtZdahKWFwwV+yJPRjcXguHw8NCfEjQh/ukW9auPdR6mqjEW3Lc0InCwsZTErW9TOh7a2JGgF01hEVxyTVtxVRwaDZ37+H9+/IY9rlHjZAMzXaOA00FsVqHxRVTdmSMNdXkVF83KHsTCNoLIpE3oeyJChcBXK6Wbl9ZeMZPUVJSsAb6KiGnzGYiuTiqvl4ijsoqJjfPSstoPtLXNB/QrKV/fpxeNZ14UmqUYxF6D0WBJST7sBFjDc7doP2dLQfd5P80BIQ3wcLoCYTjTTxEl1xvEjO593zTibqK14/20DEsv0RvLqIlm2gQUlFspNk1JKcvDYKMReN6BaU48h4aYg++U86Ol/iHT35EO3rDcti8qEUpsjSNx5AajbBIQ==|920 \ No newline at end of file +}//Opumf94yo5nmPf4BIMk/Tuqp+lkHaA7ugJfIwoLGCsBojWzAPxQjp2Byszo5iKPXUyZIIeUCaIVYGzMkPIR6EJ6DRKUNdZNIpDoP780y0tcQGOPe7vPXV3E/3Xm9OZ+4Nnm8O0M88zDWMIVXryrJaZM1fgdFWnX2Y772aLCA1+c57BgVYtFZQVrL29Pp7cD+SC1vCF6zjek7bFGjCNZQZbMVs+PjDE8ukfjunctGNVfh65bh0eI0S+FuvvY9dSU/h5hOyPPNkgX3kbU2Ikk3rAca+5YFb/wFnwkcFLV41YD8CUX3TIkQG1I7BkoNcJAEcELfTmHMfmSsX8xqsvW0p26tBPTW8ygnTPRMKfpNHgZz9r8yoKoxmOulQlIlSzKGmP66yx754vNaDiK4hog3RIflkV0Wuochs48RDC38piBgVGhizv47+GEbqF+sGIPZUfxlkGr396qd07n3654JRxeZaEN/ZF8LczpGS9gMVJwORxvDughlM53923yau1d2ukkk1sqdkSZXucqDzstDVKV6Gmk3FYR9l7FV1JBG3BUMMXgB8s/ATIC9+2MRzSWhwuCnhcXznxX+iGOLRZTH7ICxyk1uoFkySqrmQuT4VAE6+FKSL7UGMy1i+Q2Y2EX488yrAwdm47xQ+lDh0palR0p3DtdZv577ZUJYZAG9vs+vB5jIA7IIyxm2GOmaGpKyI26thtyahhWwzEVOv9nONBH/dpMfvPLZY4l1B8XKPCOXAj6sMnJF1CZ0ZMzsuuQ6f7mlE/g5aiouYHXPog+L445G39I3gr6Ur50W5h5AyFD3BLjBRwA7QmsxqZxIW35sYfSmOaiAHmZNglkzRRV9dSt8/qVQLAvhxy4j73FXy/k80XjqZQgci9kAqE6F+w2D+4qky1rjuNV+nazfaewGKA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.rd b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.rd index 59c38ab0..3a213d32 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.rd @@ -1,7 +1,12 @@ { "PageType": 0, - "ColumnCount": 22, - "RowCount": 14, + "ColumnCount": 30, + "RowCount": 16, + "Formulas": { + "5,16": "IFERROR(ODATA(\"项目表?$select=项目经理&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"\")", + "15,4": "IFERROR(ODATA(\"项目发布记录?$select=发布版本号&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\" and 版本ID eq \"&IF(ISBLANK(版本ID),\"null\",版本ID)&\"&$top=1&$orderby=发布时间 desc\"),\"\")", + "7,16": "最近版本号" + }, "CustomNames": [ { "Name": "项目ID", @@ -9,11 +14,15 @@ }, { "Name": "版本ID", - "Formula": "版本发布详情!$M$3" + "Formula": "版本发布详情!$Q$3" }, { "Name": "ID", - "Formula": "版本发布详情!$B$14" + "Formula": "版本发布详情!$B$16" + }, + { + "Name": "最近版本号", + "Formula": "版本发布详情!$E$16" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/项目发布历史.json b/Pages/项目/项目首页/项目首页-容器页面/项目发布/项目发布历史.json index 19de94bf..482ad6fc 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/项目发布历史.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/项目发布历史.json @@ -647,7 +647,7 @@ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { "TableName": "项目发布记录", - "ColumnName": "负责人", + "ColumnName": "发布人", "GUID": "584b03e8-0b52-4b98-8040-427eb7643f60" }, "Value": { @@ -758,7 +758,7 @@ "GUID": "675acd48-c14a-4ee4-8ef6-2acf6a2dabec", "BindingInfo": { "TableName": "项目发布记录", - "ColumnName": "负责人", + "ColumnName": "发布人", "GUID": "9e1eeb84-3b35-40fd-b444-d141508fb9dd", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", @@ -1152,4 +1152,4 @@ "PaperSize": {}, "Margin": {} } -}//nvoFHy19nxmQPbB3UcpWZR6aNCRUV58zn3v9yQ9cOjIKgIAhhhmOMh96RldV+pwU+9iHngedbJU8fQ+GLupqccUPiIN3jdUGnncAtblbqyqOO6lUIZwY28+rjJWSnSxyRUlTAo+0sc0D8KkAfvUirDmQKAU4umBb/Bce7tmMFQGWJ96+RIQNf3aaxYg7Wyq7d4XDoRiw1FNwGsehoToSf1ugNL73nyrehMmRFz3/i+Ir58i1o1d+AxbFHPJ6p0Xn9gpnwUywdrU3Ex/FDRB5ctRbK/aRZ44WI5lwQy9KCOuQuZB0G+9L7uHL+UUQKsfydpxhGz7Nk0q62M/KVo+oUgleGtslOgOnXWn+4ViuitAYPch//bXz90F/Anp3+dCvSNGsg+D8V+VBWY1e9Far0TwH4U5fr6+rGQN/FN7ERIvljHe69KYz3NOdOdHNnL7+V7qbspKACZVTyoyskw+ParpSduXl/SSAgf9iQBsOqiHY5t9kpBJ0uichdmhV+8WB2LwqWuiRj211QfQ0EIK+a7Wdukp93xLcl00h9vNGnZ3ygvFf1VcpTnjyaFtG8/398YV7pBw8Ma+AIpxWSLDql8RfjmWHPjgIh/TSU0Os/v2xLULjZ4dQ3cUCW19t3KqXEDQlP7QlSJQkpFwb0UYBKGZH0Rswxlau86GTcXVzO0N71a12Y39Q5v1BiEhySusFLuFdXaOblzyHZ/3fMR468bsbABA4zLzOBzkMv9EeOwDSFcGzP2YqwjcGabGBXW7fRCClxgCkeGfLm4OI/I+sjjp2OQYC7CoO2dyNt4F1HUPirNe+Etg0Lw/et5WMP4iDhCZig0tbrYFMZK5ruOOlCi7XcZOkuc9FV/LdlTl+hesWGNLoOrEo82OqgO/70qOxxxDnlJGXcnXbzERVN1PwxQ==|920 \ No newline at end of file +}//CyOcsXcOsmRKrqoKZ7LePZeXHlYlKtKfwOvDXhWtZdHvSB2ZG9EMHLY3XiVE4qyVKxpbLcxYahmMBuWclFedGFafYJE4JmMOMrJv7cgaJU91o0kK1IJJzpMHbNzC/rEPHPMEyHyr3VwDDvQKAT0S7TtQfc84U8eXTmkFNe6CIKduO3W0oIYIoZFdu2ak9yw6Evy7p0ZdAzzcjjPCbOH8CbELrC9LEGODpO+IsYOgGdt1f2Wrr+EkAVRMb+G7Aqppvj3oh0HTTKfprdC6ExLeOeQYtfPnBLSidZgWiOQPrK1t38ZdRHfR4do79x6DvdmHpKYHcTBmOUgz0QCljxK+WeBMQkCl7jV6Gd0oo1uqZJtKIVkDVfib/1b7Ymg6/ZDPeWafFda9v2L9ZNmCuQFG+KXz7hohUMngsbhRlbcWIfp2EpMbKDAs3WQC5/YWbp9D4moYPNvH8etsKrDHZfipGYLI8WFgLcxrfTRg323w/V8m4zXic3qH9ktAcyrq0HqYWdqUqig/GtbMlZKYl7WKPoiO0ErgUh5De2TT3dVMAHFdDI4MzYTkyMFiIthJ5a871dgkEYjYWTHCySntlJ0VP68twBQvtOZwV/9zqEIW/EHKLf1+RepAuMbBwVUlwASX//eeMwwdTkmQOV54vKmgXWZDphuPdU1XCmZaowVZLMgCmbiLeOAkFLgg0VRY2fQ9I4ZfRBa15FKmqPy6a6XSaqdt4pQXYwtfc6PLuSm54EV6Y45lXgd1SRqUsBSkGzN67FW5MeQtZqM7CmJzC985V3SfucsWwhakAD4IFCQdWeknh1hrC35CZp6KFuhliY36/fCkdYSCXdOjJQKwacT7s99ddHPCtpJ99xDcJn/xNAnLnJul/uRBq1571A6GmhABN1HoVtQBJ7t9FuIwQO1brA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json b/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json index 02d8f432..9cc7baa3 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json @@ -911,7 +911,7 @@ } } ], - "ID": "76094b13-d03a-45c9-a903-28c34e7681ed" + "ID": "74d587e1-95f6-428f-8365-3fe79d0af97c" } ] } @@ -1187,4 +1187,4 @@ "Formula": "项目版本管理!$G$9" } ] -}//ywq3f+quqoU9jC9iK0X+VYbowQHzOlkE99RA4B0cDSMSUc/dbuIgijV64YEgP8z17tfY/PZW4D7wvTSwumf7tBesTqsd1nyzz9fEjv1PaYOnzNY+S8bY4bNC95ZwWBXF4dmSXAdADjCPUCkZ1alblML7ACieTIaMe4B6WOmnaZbOcIaWDTj1OpSa3tlzRKHX47rA/EZ6e+H5gI/130HlC6o+dvtWZsIlWc6ja13XSmalRQvVwkfCLRbSe2pHkLjZ5PyTmEFJVXz5rifoDjPy2wHnOMoaGE4rWMjaSOKCJKwxvh1/XYDchO637RSnDuf5LLfTUAB1Tz6eeUmOa+6n3UndIbJ8XMaRu30tckpihVtGLkCMeeSWI9YmRhVDr4St5GQgtXI0mbSzD2VEraqco98Yb0D+yg9Td2bxcyEd9UuzoqT6NdW2jO8GYsf6VWMbIZJp6+ukF84WsT037Z8PacuR+3RO9L5oGUtz4r/8b63lN95Z4x+iBGYvZqITw2Po8PLL4K8Nhxdk05EvEvx+Uouzq2jWysphf/DiXQex6WkoXjMnjhoWDNCx1DSnye6SdfDkD1o4LpvMUcSXxSt6OPfrgTxb6d2OjkWtnWik4QNxwG6BwUG7sSJ7dDpgWTPTXtBgzFu5v5g90BQSpHn0JCqJepwHtT/cvNvsbjw5GEfKWGsSAo5cUAO3BY4uN8GCnoRpgFw2GH5RM4r8v10CR/ja7rzoEQG68rr63+hXeAvrpsThSrYAXcKXNakpY3mgMkvHHGFLpeKagTghbQ+4o8LLjiCUDmkN+CDNY1ZDc0XilV0HnrU7BTtr8+ic7D2zRjWTHQPd0pRfGTvJK+/E3+PioSoA9HN9vfihY6a5Y92A7nsHlX86lMxcuB+eSh45T63C/rs90A2uplceXV2O2Q==|920 \ No newline at end of file +}//qUHtLK20xgiaX8nDUybHV8FgaW/C1lbtEplH3aPJT2MX41FLXGzrB3KB5TD/NATFfb/0aZ7CNSn9IClqKx0CJM8Zl/Gnj0sPSpcbTUqnqndKlucpOZbp6DbtyqdZqN6xmYIDm6Gg3op4PYdGVsN6qKDQimhpZAfIxM2/+wVFL82TKzhp3z49WZxyrZWNs3RQqWDwqSSE6OjzJEuD5zcyWKx230RjDhYIORugRk5glHebxWXCIOsz26Ija8xVbX/CpaW93N450i6LllTJqzWxor/o0qMlVzbOmLklLxsZ48kJedyYqLiuQyIK7HWZLj+UuQO5N25MoIkDrZVW92umqqnPd/6qoZcX9x3tcQisPUPD9L8XZFqQWBxI24jeFwBGKjOyJMua/HQiauFCyJEPG90HkjqfE00737frUkZEsDK+ugNkJsmhzjWHG266a4Q8ZAxG0xXsIRxiWME2oQFVcaDIDQQmZncS0FUGk4kOJ4k6gFzzgJ7qjURS4muk4gl5GT/ZvStBHduIWhhLZkYVnUtLuziD+NOSjkz33JGnL4+SppkQYGad2JRpvWwCJlcjgTUsNhtMHyPYrvpEVoFoBw41TyeES9Tlf4OT9gYxE8IrFZEHw0WcHfRVF0L0PYRJJwizNRJrUdjOW67Qncmzur27XOIA/pc7WGjx3z1uHlbm5fV6EJaduF6t/ylkFKmmIxUfTOjno/ek5J/Z9bETcFIKUV0tjTrfslK0F+PcjO1qRSzXKxaXi0BW8zjw9iOkdRDkwB9OsF6KJ2N5mtAnhL7GGE65cc+9Vhi3nYeT6x/BY6gnfO4y1PL8oABYCKthQ1cjLLmgxvKGCxX7ubyo98wiu6wfuzm06NvDitL8KYWdHquyzqMPHnAYlEGoti+S0EoNENVSu1ml3t5B8c82kg==|920 \ No newline at end of file diff --git a/ServerCommands/项目/新增项目发布记录.json b/ServerCommands/项目/新增项目发布记录.json index 9cdd76f0..19c9032a 100644 --- a/ServerCommands/项目/新增项目发布记录.json +++ b/ServerCommands/项目/新增项目发布记录.json @@ -260,7 +260,7 @@ { "BindingInfo": { "TableName": "项目发布记录", - "ColumnName": "负责人", + "ColumnName": "发布人", "GUID": "e39edd23-20eb-429f-8f92-2b7b43b376d7" }, "Value": { @@ -349,7 +349,7 @@ "Message": "新增成功" } ], - "ID": "6866e99d-9565-484e-8900-e143193f83ac" + "ID": "a4965cba-bfd7-4023-8a5e-696246049a94" }, { "CommandList": [ @@ -359,12 +359,12 @@ "Message": "该版本号已被使用,请更换版本号后重试!" } ], - "ID": "1dd27a6a-2cb6-4632-a9db-02717fbb800b" + "ID": "e7005405-7ed9-41a5-843b-398b275f9209" } ] } ], - "ID": "c638c2e2-d9c8-44f0-aba3-eebca7f37918" + "ID": "97b656f3-4efe-4afb-9788-81acf103c291" }, { "CommandList": [ @@ -374,12 +374,12 @@ "Message": "版本不存在,请重新指定要发布的版本" } ], - "ID": "82d6da66-c2ec-4676-a564-266cc65f98e9" + "ID": "278ef0e1-1a2e-43f5-bc69-17e5c05f2adc" } ] } ], - "ID": "a2b7da92-ce1c-439f-a06a-d7bec028ba30" + "ID": "316c6629-a273-45c4-8422-e7e079dff1a7" }, { "CommandList": [ @@ -389,7 +389,7 @@ "Message": "项目不存在" } ], - "ID": "7f78a225-11e2-402b-99ea-8df9ba58ce56" + "ID": "442dba59-a808-4e51-8f4c-37dde4d9a58f" } ] } diff --git a/Tables/项目/项目发布记录.json b/Tables/项目/项目发布记录.json index 67dac102..9754fc00 100644 --- a/Tables/项目/项目发布记录.json +++ b/Tables/项目/项目发布记录.json @@ -36,7 +36,14 @@ "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "负责人", + "Name": "发布人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "评审人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, {