From eb69973ed3c7f1f6af1395865cc6402cbc967056 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 11 八月 2025 17:22:37 +0800
Subject: [PATCH] 1、合并按钮优化
---
DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json | 123 ++++++++++++++++++++++++-----------------
1 files changed, 72 insertions(+), 51 deletions(-)
diff --git a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
index ab8023f..442636d 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
@@ -3,7 +3,19 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Web\\DevApp\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\wom\\frm_mesprocgx.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\wom\\frm_mesprocgx.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\wom\\frm_mesprocgx.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\wom\\frm_mesprocgx.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\devfrm\\wom\\frm_mesprocgx.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\wom\\frm_mesprocgx.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
"RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
},
{
@@ -13,14 +25,6 @@
{
"AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\devfrm\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
"RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
- },
- {
- "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\usercontrol\\ucbtnprint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\ucbtnprint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\devfrm\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -30,69 +34,82 @@
"DocumentGroups": [
{
"DockedWidth": 248,
- "SelectedChildIndex": 1,
+ "SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 3,
- "Title": "UcBtnPrint.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\UcBtnPrint.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\UcBtnPrint.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\UcBtnPrint.cs",
- "RelativeToolTip": "Gs.DevApp\\UserControl\\UcBtnPrint.cs",
- "ViewState": "AgIAAGEAAAAAAAAAAAAUwJMAAAAiAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-15T07:55:29.367Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
"DocumentIndex": 0,
- "Title": "App.config",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
- "RelativeDocumentMoniker": "Gs.DevApp\\App.config",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
- "RelativeToolTip": "Gs.DevApp\\App.config",
- "ViewState": "AgIAABgAAAAAAAAAAADwvygAAAA9AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
- "WhenOpened": "2025-07-14T09:15:36.127Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "RptPreview.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
- "ViewState": "AgIAAAkAAAAAAAAAAAAAAA8AAAAIAAAAAAAAAA==",
+ "Title": "Frm_MesProcGx.Designer.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.Designer.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.Designer.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.Designer.cs*",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.Designer.cs*",
+ "ViewState": "AgIAAKQFAAAAAAAAAAASwLEFAAB5AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-14T07:55:39.67Z"
+ "WhenOpened": "2025-07-26T09:26:13.162Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 1,
- "Title": "Frm_MesDepot.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
- "ViewState": "AgIAAD0AAAAAAAAAAAAcwFIAAAAAAAAAAAAAAA==",
+ "Title": "Frm_MesProcGx.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "ViewState": "AgIAAAkCAAAAAAAAAAAvwBQCAAA6AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-14T07:13:06.781Z",
+ "WhenOpened": "2025-07-26T08:19:11.392Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
+ "Title": "Frm_MesProcGx.cs [\u8BBE\u8BA1]",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs [\u8BBE\u8BA1]",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs [\u8BBE\u8BA1]",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-26T08:19:05.275Z",
+ "EditorCaption": " [\u8BBE\u8BA1]"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "App.config",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
+ "RelativeDocumentMoniker": "Gs.DevApp\\App.config",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
+ "RelativeToolTip": "Gs.DevApp\\App.config",
+ "ViewState": "AgIAAB4AAAAAAAAAAADwvygAAABBAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
+ "WhenOpened": "2025-07-24T10:31:00.761Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "Title": "Frm_MesDepot.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "ViewState": "AgIAAG4BAAAAAAAAAAAQwIYBAAA5AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-24T07:19:16.496Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
"Title": "Frm_MesDepot.cs [\u8BBE\u8BA1]",
"DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs [\u8BBE\u8BA1]",
"RelativeToolTip": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs [\u8BBE\u8BA1]",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-11T09:39:04.708Z",
+ "WhenOpened": "2025-07-24T06:45:15.578Z",
"EditorCaption": " [\u8BBE\u8BA1]"
}
]
@@ -104,6 +121,10 @@
{
"$type": "Bookmark",
"Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
}
]
},
--
Gitblit v1.9.3