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

duheng

2025-03-12 cec8d92bdca1da0b2eafe6eb3130f4bf6f03028b

 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.Designer.cs

@@ -38,6 +38,7 @@
            TagNameTextEdit = new DevExpress.XtraEditors.TextEdit();
            NameTextEdit = new DevExpress.XtraEditors.TextEdit();
            DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
            textEditManufacturer = new DevExpress.XtraEditors.ImageComboBoxEdit();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -46,9 +47,10 @@
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            textEditManufacturer = new DevExpress.XtraEditors.ImageComboBoxEdit();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            TextEditCatalogChoice = new DevExpress.XtraEditors.ImageComboBoxEdit();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)textEditParentList.Properties).BeginInit();
@@ -56,6 +58,7 @@
            ((System.ComponentModel.ISupportInitialize)TagNameTextEdit.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)NameTextEdit.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditManufacturer.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
@@ -64,13 +67,15 @@
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditManufacturer.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCatalogChoice.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(TextEditCatalogChoice);
            layoutControl1.Controls.Add(textEditParentList);
            layoutControl1.Controls.Add(BtnOk);
            layoutControl1.Controls.Add(btnCancel);
@@ -159,11 +164,20 @@
            // 
            // DescriptionTextEdit
            // 
            DescriptionTextEdit.Location = new Point(55, 104);
            DescriptionTextEdit.Location = new Point(55, 128);
            DescriptionTextEdit.Name = "DescriptionTextEdit";
            DescriptionTextEdit.Size = new Size(448, 137);
            DescriptionTextEdit.Size = new Size(448, 113);
            DescriptionTextEdit.StyleController = layoutControl1;
            DescriptionTextEdit.TabIndex = 4;
            // 
            // textEditManufacturer
            // 
            textEditManufacturer.Location = new Point(55, 80);
            textEditManufacturer.Name = "textEditManufacturer";
            textEditManufacturer.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            textEditManufacturer.Size = new Size(448, 20);
            textEditManufacturer.StyleController = layoutControl1;
            textEditManufacturer.TabIndex = 12;
            // 
            // Root
            // 
@@ -171,7 +185,7 @@
            Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, layoutControlItem5, layoutControlItem1, layoutControlItem6, emptySpaceItem1, layoutControlItem4, layoutControlItem2, layoutControlItem7 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, layoutControlItem5, layoutControlItem1, layoutControlItem6, emptySpaceItem1, layoutControlItem4, layoutControlItem2, layoutControlItem7, layoutControlItem8 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
            Root.Size = new Size(511, 275);
@@ -189,9 +203,9 @@
            // layoutControlItem5
            // 
            layoutControlItem5.Control = DescriptionTextEdit;
            layoutControlItem5.Location = new Point(0, 96);
            layoutControlItem5.Location = new Point(0, 120);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(499, 141);
            layoutControlItem5.Size = new Size(499, 117);
            layoutControlItem5.Text = "说明:";
            layoutControlItem5.TextSize = new Size(35, 14);
            // 
@@ -240,10 +254,6 @@
            layoutControlItem2.Text = "父级:";
            layoutControlItem2.TextSize = new Size(35, 14);
            // 
            // dxErrorProvider1
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = textEditManufacturer;
@@ -253,14 +263,27 @@
            layoutControlItem7.Text = "厂商:";
            layoutControlItem7.TextSize = new Size(35, 14);
            // 
            // textEditManufacturer
            // dxErrorProvider1
            // 
            textEditManufacturer.Location = new Point(55, 80);
            textEditManufacturer.Name = "textEditManufacturer";
            textEditManufacturer.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            textEditManufacturer.Size = new Size(448, 20);
            textEditManufacturer.StyleController = layoutControl1;
            textEditManufacturer.TabIndex = 12;
            dxErrorProvider1.ContainerControl = this;
            // 
            // TextEditCatalogChoice
            // 
            TextEditCatalogChoice.Location = new Point(55, 104);
            TextEditCatalogChoice.Name = "TextEditCatalogChoice";
            TextEditCatalogChoice.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            TextEditCatalogChoice.Size = new Size(448, 20);
            TextEditCatalogChoice.StyleController = layoutControl1;
            TextEditCatalogChoice.TabIndex = 11;
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = TextEditCatalogChoice;
            layoutControlItem8.Location = new Point(0, 96);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(499, 24);
            layoutControlItem8.Text = "分类:";
            layoutControlItem8.TextSize = new Size(35, 14);
            // 
            // AddAssetsPackageSeriesDlg
            // 
@@ -278,6 +301,7 @@
            ((System.ComponentModel.ISupportInitialize)TagNameTextEdit.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)NameTextEdit.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditManufacturer.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
@@ -286,9 +310,10 @@
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditManufacturer.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCatalogChoice.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
            ResumeLayout(false);
        }

@@ -314,5 +339,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraEditors.ImageComboBoxEdit textEditManufacturer;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraEditors.ImageComboBoxEdit TextEditCatalogChoice;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
    }
}