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

lixiaojun

2024-10-18 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915

 WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs

@@ -34,8 +34,9 @@
            barBtnEditPumpCurve = new DevExpress.XtraBars.BarButtonItem();
            BtnAdd = new DevExpress.XtraBars.BarButtonItem();
            BtnDelete = new DevExpress.XtraBars.BarButtonItem();
            BtnAddChild = new DevExpress.XtraBars.BarButtonItem();
            BtnPropEdit = new DevExpress.XtraBars.BarButtonItem();
            barBtnUpdateParent = 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();
@@ -46,12 +47,12 @@
            treeList1 = new DevExpress.XtraTreeList.TreeList();
            colName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colCode = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colSortCode = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colDescription = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            catalogViewModelBindingSource = new BindingSource(components);
            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();
@@ -60,15 +61,16 @@
            ((System.ComponentModel.ISupportInitialize)catalogViewModelBindingSource).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, BtnAddChild, BtnPropEdit });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete, BtnPropEdit, barBtnUpdateParent, barCheckSorter });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 19;
            ribbonControl1.MaxItemId = 23;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -80,7 +82,7 @@
            // 
            // barBtnEditPumpCurve
            // 
            barBtnEditPumpCurve.Caption = "编辑分类";
            barBtnEditPumpCurve.Caption = "编辑";
            barBtnEditPumpCurve.Id = 13;
            barBtnEditPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditPumpCurve.ImageOptions.SvgImage");
            barBtnEditPumpCurve.Name = "barBtnEditPumpCurve";
@@ -88,7 +90,7 @@
            // 
            // BtnAdd
            // 
            BtnAdd.Caption = "增加父级分类";
            BtnAdd.Caption = "增加";
            BtnAdd.Id = 15;
            BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
            BtnAdd.Name = "BtnAdd";
@@ -96,19 +98,11 @@
            // 
            // BtnDelete
            // 
            BtnDelete.Caption = "删除分类";
            BtnDelete.Caption = "删除";
            BtnDelete.Id = 16;
            BtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnDelete.ImageOptions.SvgImage");
            BtnDelete.Name = "BtnDelete";
            BtnDelete.ItemClick += BtnDelete_ItemClick;
            // 
            // BtnAddChild
            // 
            BtnAddChild.Caption = "增加子级分类";
            BtnAddChild.Id = 17;
            BtnAddChild.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAddChild.ImageOptions.SvgImage");
            BtnAddChild.Name = "BtnAddChild";
            BtnAddChild.ItemClick += BtnAddChild_ItemClick;
            // 
            // BtnPropEdit
            // 
@@ -117,6 +111,22 @@
            BtnPropEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnPropEdit.ImageOptions.SvgImage");
            BtnPropEdit.Name = "BtnPropEdit";
            BtnPropEdit.ItemClick += BtnPropEdit_ItemClick;
            // 
            // barBtnUpdateParent
            // 
            barBtnUpdateParent.Caption = "设置父级";
            barBtnUpdateParent.Id = 20;
            barBtnUpdateParent.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateParent.ImageOptions.SvgImage");
            barBtnUpdateParent.Name = "barBtnUpdateParent";
            barBtnUpdateParent.ItemClick += barBtnUpdateParent_ItemClick;
            // 
            // barCheckSorter
            // 
            barCheckSorter.Caption = "排序";
            barCheckSorter.Id = 22;
            barCheckSorter.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCheckSorter.ImageOptions.SvgImage");
            barCheckSorter.Name = "barCheckSorter";
            barCheckSorter.CheckedChanged += barCheckSorter_CheckedChanged;
            // 
            // ribbonPage1
            // 
@@ -127,7 +137,6 @@
            // ribbonPageGroup1
            // 
            ribbonPageGroup1.ItemLinks.Add(BtnAdd);
            ribbonPageGroup1.ItemLinks.Add(BtnAddChild);
            ribbonPageGroup1.ItemLinks.Add(barBtnEditPumpCurve);
            ribbonPageGroup1.ItemLinks.Add(BtnDelete);
            ribbonPageGroup1.Name = "ribbonPageGroup1";
@@ -136,6 +145,8 @@
            // ribbonPageGroup2
            // 
            ribbonPageGroup2.ItemLinks.Add(BtnPropEdit);
            ribbonPageGroup2.ItemLinks.Add(barBtnUpdateParent);
            ribbonPageGroup2.ItemLinks.Add(barCheckSorter);
            ribbonPageGroup2.Name = "ribbonPageGroup2";
            ribbonPageGroup2.Text = "更多";
            // 
@@ -181,7 +192,7 @@
            treeList1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            treeList1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            treeList1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName, colCode, colSortCode, colDescription });
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName, colCode, colDescription });
            treeList1.DataSource = catalogViewModelBindingSource;
            treeList1.Dock = DockStyle.Fill;
            treeList1.Location = new Point(0, 101);
@@ -214,17 +225,6 @@
            colCode.Visible = true;
            colCode.VisibleIndex = 1;
            colCode.Width = 211;
            // 
            // 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 = 3;
            colSortCode.Width = 100;
            // 
            // colDescription
            // 
@@ -283,6 +283,7 @@
            ((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
            sidePanel1.ResumeLayout(false);
            sidePanel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)behaviorManager1).EndInit();
            ResumeLayout(false);
        }

@@ -301,14 +302,15 @@
         private DevExpress.XtraTreeList.TreeList treeList1;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colName;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colCode;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colSortCode;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colDescription;
        private BindingSource catalogViewModelBindingSource;
        private SysTypeListBoxCtrl typeTreeListCtrl2;
        private DevExpress.XtraBars.BarButtonItem BtnAddChild;
        private DevExpress.XtraBars.BarButtonItem BtnPropEdit;
        private DevExpress.Utils.SvgImageCollection svgImage32;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
        private DevExpress.XtraEditors.SidePanel sidePanel1;
        private DevExpress.XtraBars.BarButtonItem barBtnUpdateParent;
        private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
        private DevExpress.XtraBars.BarCheckItem barCheckSorter;
    }
}