cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 收敛旧控件资源与后台线程生命周期

Browse Source
This commit is contained in:
SugarChes
2026-08-11 14:12:18 +08:00
parent f1ce6ff658
commit a9c986f9d5
20 changed files with 1145 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/ModuleEx.Designer.cs
Generated
+1 -189
View File
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.scc_container = new DevExpress.XtraEditors.SplitContainerControl();
this.pl_left = new DevExpress.XtraEditors.PanelControl();
this.pl_left_main = new System.Windows.Forms.Panel();
@@ -38,25 +39,8 @@
this.pl_left_top = new DevExpress.XtraEditors.PanelControl();
this.pl_right = new DevExpress.XtraEditors.PanelControl();
this.moduleGridDetailEx1 = new Lskj.Control.ModuleGridDetailEx();
this.excelControlEx1 = new Lskj.Control.ExcelControlEx();
this.repModelDetailEx = new Lskj.Control.ReplacementDetailEx();
this.MainBodyTab = new DevExpress.XtraTab.XtraTabControl();
this.barManager1 = new DevExpress.XtraBars.BarManager();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
this.commonBar1 = new DevExpress.XtraSpreadsheet.UI.CommonBar();
this.spreadsheetCommandBarButtonItem1 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem();
this.spreadsheetCommandBarButtonItem2 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem();
this.spreadsheetCommandBarButtonItem3 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem();
this.spreadsheetCommandBarButtonItem4 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem();
this.spreadsheetCommandBarButtonItem5 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem();
this.spreadsheetCommandBarButtonItem6 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem();
this.spreadsheetCommandBarButtonItem7 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem();
this.spreadsheetCommandBarButtonItem8 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem();
this.spreadsheetCommandBarButtonItem9 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem();
this.spreadsheetBarController1 = new DevExpress.XtraSpreadsheet.UI.SpreadsheetBarController();
((System.ComponentModel.ISupportInitialize)(this.scc_container)).BeginInit();
this.scc_container.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pl_left)).BeginInit();
@@ -68,8 +52,6 @@
((System.ComponentModel.ISupportInitialize)(this.pl_right)).BeginInit();
this.pl_right.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.MainBodyTab)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.spreadsheetBarController1)).BeginInit();
this.SuspendLayout();
//
// scc_container
@@ -172,7 +154,6 @@
//
this.pl_right.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.pl_right.Controls.Add(this.moduleGridDetailEx1);
this.pl_right.Controls.Add(this.excelControlEx1);
this.pl_right.Controls.Add(this.repModelDetailEx);
this.pl_right.Controls.Add(this.MainBodyTab);
this.pl_right.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -190,20 +171,6 @@
this.moduleGridDetailEx1.TabIndex = 0;
this.moduleGridDetailEx1.VisibleDetailPanel = true;
//
// excelControlEx1
//
this.excelControlEx1.AddEnabled = true;
this.excelControlEx1.DeleteEnabled = true;
this.excelControlEx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.excelControlEx1.Location = new System.Drawing.Point(0, 0);
this.excelControlEx1.Margin = new System.Windows.Forms.Padding(6);
this.excelControlEx1.Name = "excelControlEx1";
this.excelControlEx1.PrintEnabled = true;
this.excelControlEx1.SaveEnabled = true;
this.excelControlEx1.Size = new System.Drawing.Size(712, 610);
this.excelControlEx1.TabIndex = 1;
this.excelControlEx1.Visible = false;
//
// repModelDetailEx
//
this.repModelDetailEx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -224,147 +191,11 @@
this.MainBodyTab.TabIndex = 6;
this.MainBodyTab.Visible = false;
//
// barManager1
//
this.barManager1.DockControls.Add(this.barDockControlTop);
this.barManager1.DockControls.Add(this.barDockControlBottom);
this.barManager1.DockControls.Add(this.barDockControlLeft);
this.barManager1.DockControls.Add(this.barDockControlRight);
this.barManager1.Form = this;
this.barManager1.MaxItemId = 9;
//
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Size = new System.Drawing.Size(915, 0);
//
// barDockControlBottom
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
this.barDockControlBottom.Location = new System.Drawing.Point(0, 610);
this.barDockControlBottom.Size = new System.Drawing.Size(915, 0);
//
// barDockControlLeft
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
this.barDockControlLeft.Location = new System.Drawing.Point(0, 0);
this.barDockControlLeft.Size = new System.Drawing.Size(0, 610);
//
// barDockControlRight
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControlRight.Location = new System.Drawing.Point(915, 0);
this.barDockControlRight.Size = new System.Drawing.Size(0, 610);
//
// commonBar1
//
this.commonBar1.BarName = "";
this.commonBar1.Control = null;
this.commonBar1.DockCol = 0;
this.commonBar1.DockRow = 0;
this.commonBar1.FloatLocation = new System.Drawing.Point(339, 195);
this.commonBar1.FloatSize = new System.Drawing.Size(244, 31);
this.commonBar1.Offset = 44;
this.commonBar1.Text = "";
//
// spreadsheetCommandBarButtonItem1
//
this.spreadsheetCommandBarButtonItem1.Caption = "New";
this.spreadsheetCommandBarButtonItem1.CommandName = "FileNew";
this.spreadsheetCommandBarButtonItem1.Enabled = false;
this.spreadsheetCommandBarButtonItem1.Id = 8;
this.spreadsheetCommandBarButtonItem1.Name = "spreadsheetCommandBarButtonItem1";
//
// spreadsheetCommandBarButtonItem2
//
this.spreadsheetCommandBarButtonItem2.Caption = "Open";
this.spreadsheetCommandBarButtonItem2.CommandName = "FileOpen";
this.spreadsheetCommandBarButtonItem2.Enabled = false;
this.spreadsheetCommandBarButtonItem2.Id = 7;
this.spreadsheetCommandBarButtonItem2.Name = "spreadsheetCommandBarButtonItem2";
//
// spreadsheetCommandBarButtonItem3
//
this.spreadsheetCommandBarButtonItem3.Caption = "Save";
this.spreadsheetCommandBarButtonItem3.CommandName = "FileSave";
this.spreadsheetCommandBarButtonItem3.Enabled = false;
this.spreadsheetCommandBarButtonItem3.Id = 6;
this.spreadsheetCommandBarButtonItem3.Name = "spreadsheetCommandBarButtonItem3";
//
// spreadsheetCommandBarButtonItem4
//
this.spreadsheetCommandBarButtonItem4.Caption = "Save As";
this.spreadsheetCommandBarButtonItem4.CommandName = "FileSaveAs";
this.spreadsheetCommandBarButtonItem4.Enabled = false;
this.spreadsheetCommandBarButtonItem4.Id = 5;
this.spreadsheetCommandBarButtonItem4.Name = "spreadsheetCommandBarButtonItem4";
//
// spreadsheetCommandBarButtonItem5
//
this.spreadsheetCommandBarButtonItem5.Caption = "&Quick Print";
this.spreadsheetCommandBarButtonItem5.CommandName = "FileQuickPrint";
this.spreadsheetCommandBarButtonItem5.Enabled = false;
this.spreadsheetCommandBarButtonItem5.Id = 4;
this.spreadsheetCommandBarButtonItem5.Name = "spreadsheetCommandBarButtonItem5";
//
// spreadsheetCommandBarButtonItem6
//
this.spreadsheetCommandBarButtonItem6.Caption = "&Print";
this.spreadsheetCommandBarButtonItem6.CommandName = "FilePrint";
this.spreadsheetCommandBarButtonItem6.Enabled = false;
this.spreadsheetCommandBarButtonItem6.Id = 3;
this.spreadsheetCommandBarButtonItem6.Name = "spreadsheetCommandBarButtonItem6";
//
// spreadsheetCommandBarButtonItem7
//
this.spreadsheetCommandBarButtonItem7.Caption = "Print Pre&view";
this.spreadsheetCommandBarButtonItem7.CommandName = "FilePrintPreview";
this.spreadsheetCommandBarButtonItem7.Enabled = false;
this.spreadsheetCommandBarButtonItem7.Id = 2;
this.spreadsheetCommandBarButtonItem7.Name = "spreadsheetCommandBarButtonItem7";
//
// spreadsheetCommandBarButtonItem8
//
this.spreadsheetCommandBarButtonItem8.Caption = "Undo";
this.spreadsheetCommandBarButtonItem8.CommandName = "FileUndo";
this.spreadsheetCommandBarButtonItem8.Enabled = false;
this.spreadsheetCommandBarButtonItem8.Id = 1;
this.spreadsheetCommandBarButtonItem8.Name = "spreadsheetCommandBarButtonItem8";
//
// spreadsheetCommandBarButtonItem9
//
this.spreadsheetCommandBarButtonItem9.Caption = "Redo";
this.spreadsheetCommandBarButtonItem9.CommandName = "FileRedo";
this.spreadsheetCommandBarButtonItem9.Enabled = false;
this.spreadsheetCommandBarButtonItem9.Id = 0;
this.spreadsheetCommandBarButtonItem9.Name = "spreadsheetCommandBarButtonItem9";
//
// spreadsheetBarController1
//
this.spreadsheetBarController1.BarItems.Add(this.spreadsheetCommandBarButtonItem1);
this.spreadsheetBarController1.BarItems.Add(this.spreadsheetCommandBarButtonItem2);
this.spreadsheetBarController1.BarItems.Add(this.spreadsheetCommandBarButtonItem3);
this.spreadsheetBarController1.BarItems.Add(this.spreadsheetCommandBarButtonItem4);
this.spreadsheetBarController1.BarItems.Add(this.spreadsheetCommandBarButtonItem5);
this.spreadsheetBarController1.BarItems.Add(this.spreadsheetCommandBarButtonItem6);
this.spreadsheetBarController1.BarItems.Add(this.spreadsheetCommandBarButtonItem7);
this.spreadsheetBarController1.BarItems.Add(this.spreadsheetCommandBarButtonItem8);
this.spreadsheetBarController1.BarItems.Add(this.spreadsheetCommandBarButtonItem9);
//
// ModuleEx
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.SystemColors.Control;
this.Controls.Add(this.scc_container);
this.Controls.Add(this.barDockControlLeft);
this.Controls.Add(this.barDockControlRight);
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "ModuleEx";
this.Size = new System.Drawing.Size(915, 610);
((System.ComponentModel.ISupportInitialize)(this.scc_container)).EndInit();
@@ -378,10 +209,7 @@
((System.ComponentModel.ISupportInitialize)(this.pl_right)).EndInit();
this.pl_right.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.MainBodyTab)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.spreadsheetBarController1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
@@ -389,22 +217,6 @@
private DevExpress.XtraEditors.SplitContainerControl scc_container;
private DevExpress.XtraEditors.PanelControl pl_right;
private DevExpress.XtraBars.BarManager barManager1;
private DevExpress.XtraBars.BarDockControl barDockControlTop;
private DevExpress.XtraBars.BarDockControl barDockControlBottom;
private DevExpress.XtraBars.BarDockControl barDockControlLeft;
private DevExpress.XtraBars.BarDockControl barDockControlRight;
private DevExpress.XtraSpreadsheet.UI.CommonBar commonBar1;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem spreadsheetCommandBarButtonItem1;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem spreadsheetCommandBarButtonItem2;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem spreadsheetCommandBarButtonItem3;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem spreadsheetCommandBarButtonItem4;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem spreadsheetCommandBarButtonItem5;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem spreadsheetCommandBarButtonItem6;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem spreadsheetCommandBarButtonItem7;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem spreadsheetCommandBarButtonItem8;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetCommandBarButtonItem spreadsheetCommandBarButtonItem9;
private DevExpress.XtraSpreadsheet.UI.SpreadsheetBarController spreadsheetBarController1;
private DevExpress.XtraEditors.PanelControl pl_left;
private System.Windows.Forms.Panel pl_left_main;
private DevExpress.XtraEditors.PanelControl pl_gridandtree_container;