duheng
2024-08-12 61b78d9f6ba10420ee932976b8d9ee9f9c4a273b
修改报错
已修改2个文件
90 ■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs 88 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
@@ -48,12 +48,9 @@
            colExtendTypeDisPlayName = new DevExpress.XtraGrid.Columns.GridColumn();
            colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            svgImage32 = new DevExpress.Utils.SvgImageCollection(components);
            sidePanel1 = new DevExpress.XtraEditors.SidePanel();
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            dockPanel1.SuspendLayout();
@@ -61,22 +58,17 @@
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)typeViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)svgImage32).BeginInit();
            sidePanel1.SuspendLayout();
            SuspendLayout();
            // 
            // ribbonControl1
            // 
            ribbonControl1.Dock = DockStyle.None;
            ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.True;
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete });
            ribbonControl1.Location = new Point(2, 2);
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 17;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
@@ -84,7 +76,7 @@
            ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
            ribbonControl1.Size = new Size(929, 101);
            ribbonControl1.Size = new Size(933, 101);
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
            // barBtnEditPumpCurve
@@ -163,11 +155,12 @@
            // gridControl1
            // 
            gridControl1.DataSource = typeViewModelBindingSource;
            gridControl1.Location = new Point(2, 128);
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.Location = new Point(0, 101);
            gridControl1.MainView = gridView1;
            gridControl1.MenuManager = ribbonControl1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(929, 417);
            gridControl1.Size = new Size(933, 446);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -234,46 +227,6 @@
            colDescription.Visible = true;
            colDescription.VisibleIndex = 4;
            // 
            // layoutControl1
            //
            layoutControl1.Controls.Add(ribbonControl1);
            layoutControl1.Controls.Add(gridControl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(200, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(933, 547);
            layoutControl1.TabIndex = 6;
            layoutControl1.Text = "layoutControl1";
            //
            // Root
            //
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem1 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(933, 547);
            Root.TextVisible = false;
            //
            // layoutControlItem2
            //
            layoutControlItem2.Control = ribbonControl1;
            layoutControlItem2.Location = new Point(0, 0);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(933, 126);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            //
            // layoutControlItem1
            //
            layoutControlItem1.Control = gridControl1;
            layoutControlItem1.Location = new Point(0, 126);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(933, 421);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            //
            // barButtonItem1
            // 
            barButtonItem1.Caption = "barButtonItem1";
@@ -286,13 +239,25 @@
            svgImage32.Add("bletter", "image://svgimages/outlook inspired/bletter.svg");
            svgImage32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
            // 
            // sidePanel1
            //
            sidePanel1.BorderThickness = 0;
            sidePanel1.Controls.Add(gridControl1);
            sidePanel1.Controls.Add(ribbonControl1);
            sidePanel1.Dock = DockStyle.Fill;
            sidePanel1.Location = new Point(200, 0);
            sidePanel1.Name = "sidePanel1";
            sidePanel1.Size = new Size(933, 547);
            sidePanel1.TabIndex = 8;
            sidePanel1.Text = "sidePanel1";
            //
            // SysTypeManageMainPanel
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Controls.Add(sidePanel1);
            Controls.Add(dockPanel1);
            Name = "SysTypeManageMainPanel";
            Size = new Size(1133, 547);
@@ -303,13 +268,9 @@
            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)typeViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            layoutControl1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
            sidePanel1.ResumeLayout(false);
            sidePanel1.PerformLayout();
            ResumeLayout(false);
        }
@@ -323,9 +284,6 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
        private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraBars.BarButtonItem barBtnEditPumpCurve;
        private DevExpress.XtraBars.BarButtonItem BtnAdd;
        private DevExpress.XtraBars.BarButtonItem BtnDelete;
@@ -338,6 +296,6 @@
        private SysModuleTreeListCtrl moduleTreeListCtrl1;
        private DevExpress.XtraGrid.Columns.GridColumn colExtendTypeDisPlayName;
        private DevExpress.Utils.SvgImageCollection svgImage32;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraEditors.SidePanel sidePanel1;
    }
}
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs
@@ -18,13 +18,13 @@
        public override void InitialDataSource()
        {
            this.typeTreeListCtrl2.SetBindingData();
            _bll = new Yw.BLL.SysCatalog();
        }
        //聚焦切换
        private async void TypeTreeListCtrl2_FocusedChangedEvent(long typeID)
        {
            _allBindingList = new List<SysCatalogViewModel>();
            _bll = new Yw.BLL.SysCatalog();
            var alllist = await _bll.GetByTypeID(typeID);
            _allBindingList.Clear();
            foreach (var item in alllist)