Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2024-10-24 5fcc843704ca90c742b578aa5898acf0097f753b

 WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs

@@ -39,8 +39,10 @@
            barBtnEditPumpCurve = new DevExpress.XtraBars.BarButtonItem();
            BtnAdd = new DevExpress.XtraBars.BarButtonItem();
            BtnDelete = new DevExpress.XtraBars.BarButtonItem();
            barCheckSorter = new DevExpress.XtraBars.BarCheckItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
            dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
            dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
@@ -50,7 +52,6 @@
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            colDefaultValue = new DevExpress.XtraGrid.Columns.GridColumn();
            colFormat = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -61,6 +62,7 @@
            barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            svgImage32 = new DevExpress.Utils.SvgImageCollection(components);
            sidePanel1 = new DevExpress.XtraEditors.SidePanel();
            behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            dockPanel1.SuspendLayout();
@@ -71,15 +73,16 @@
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)svgImage32).BeginInit();
            sidePanel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)behaviorManager1).BeginInit();
            SuspendLayout();
            // 
            // ribbonControl1
            // 
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete, barCheckSorter });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 19;
            ribbonControl1.MaxItemId = 20;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -113,9 +116,17 @@
            BtnDelete.Name = "BtnDelete";
            BtnDelete.ItemClick += BtnDelete_ItemClick;
            // 
            // barCheckSorter
            // 
            barCheckSorter.Caption = "排序";
            barCheckSorter.Id = 19;
            barCheckSorter.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCheckSorter.ImageOptions.SvgImage");
            barCheckSorter.Name = "barCheckSorter";
            barCheckSorter.ItemClick += barCheckItemSorter_ItemClick;
            // 
            // ribbonPage1
            // 
            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 });
            ribbonPage1.Name = "ribbonPage1";
            ribbonPage1.Text = "ribbonPage1";
            // 
@@ -127,8 +138,16 @@
            ribbonPageGroup1.Name = "ribbonPageGroup1";
            ribbonPageGroup1.Text = "基础功能";
            // 
            // ribbonPageGroup2
            // 
            ribbonPageGroup2.ItemLinks.Add(barCheckSorter);
            ribbonPageGroup2.Name = "ribbonPageGroup2";
            ribbonPageGroup2.Text = "更多";
            // 
            // dockManager1
            // 
            dockManager1.DockingOptions.ShowAutoHideButton = false;
            dockManager1.DockingOptions.ShowCloseButton = false;
            dockManager1.Form = this;
            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
            dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
@@ -184,7 +203,8 @@
            // 
            gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colSortCode, colDescription, colDefaultValue, colFormat, colIsNull, colUnitName, ColPropEdit });
            gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colDescription, colDefaultValue, colFormat, colIsNull, colUnitName, ColPropEdit });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
@@ -210,16 +230,6 @@
            colCode.Visible = true;
            colCode.VisibleIndex = 1;
            // 
            // colSortCode
            // 
            colSortCode.AppearanceCell.Options.UseTextOptions = true;
            colSortCode.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colSortCode.Caption = "排序码";
            colSortCode.FieldName = "SortCode";
            colSortCode.Name = "colSortCode";
            colSortCode.Visible = true;
            colSortCode.VisibleIndex = 6;
            // 
            // colDescription
            // 
            colDescription.AppearanceCell.Options.UseTextOptions = true;
@@ -228,7 +238,7 @@
            colDescription.FieldName = "Description";
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 7;
            colDescription.VisibleIndex = 6;
            // 
            // colDefaultValue
            // 
@@ -269,7 +279,7 @@
            ColPropEdit.Name = "ColPropEdit";
            ColPropEdit.OptionsColumn.AllowEdit = false;
            ColPropEdit.Visible = true;
            ColPropEdit.VisibleIndex = 8;
            ColPropEdit.VisibleIndex = 7;
            // 
            // repositoryItemButtonEdit1
            // 
@@ -288,8 +298,7 @@
            // svgImage32
            // 
            svgImage32.ImageSize = new Size(32, 32);
            svgImage32.Add("bletter", "image://svgimages/outlook inspired/bletter.svg");
            svgImage32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
            svgImage32.Add("documentproperties", "image://svgimages/richedit/documentproperties.svg");
            // 
            // sidePanel1
            // 
@@ -324,6 +333,7 @@
            ((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
            sidePanel1.ResumeLayout(false);
            sidePanel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)behaviorManager1).EndInit();
            ResumeLayout(false);
        }

@@ -343,17 +353,19 @@
           private DevExpress.XtraBars.BarButtonItem barButtonItem1;
        private DevExpress.XtraGrid.Columns.GridColumn colName;
        private DevExpress.XtraGrid.Columns.GridColumn colCode;
        private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
        private DevExpress.XtraGrid.Columns.GridColumn colDescription;
        private BindingSource propViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colDefaultValue;
        private DevExpress.XtraGrid.Columns.GridColumn colFormat;
        private DevExpress.XtraGrid.Columns.GridColumn colIsNull;
        private DevExpress.XtraGrid.Columns.GridColumn colUnitName;
        private SysPropGroupTreeListCtrl propGroupTreeListCtrl1;
        public SysPropGroupTreeListCtrl propGroupTreeListCtrl1;
        private DevExpress.XtraGrid.Columns.GridColumn ColPropEdit;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.Utils.SvgImageCollection svgImage32;
        private DevExpress.XtraEditors.SidePanel sidePanel1;
        private DevExpress.XtraBars.BarCheckItem barCheckSorter;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
        private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
    }
}