duheng
2024-09-25 89d0f68df0ef91b88098912ddcbb54b3d7e2dd5c
修改属性修改界面
已修改2个文件
39 ■■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs
@@ -40,8 +40,9 @@
            colIsNull = new DevExpress.XtraGrid.Columns.GridColumn();
            colUnitName = new DevExpress.XtraGrid.Columns.GridColumn();
            colDefaultValue = new DevExpress.XtraGrid.Columns.GridColumn();
            gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            colPropChoice = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemCheckedComboBoxEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit();
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            btnCancel = new DevExpress.XtraEditors.SimpleButton();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -55,6 +56,7 @@
            ((System.ComponentModel.ISupportInitialize)sysCatalogPropViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemCheckedComboBoxEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
@@ -94,7 +96,7 @@
            gridControl1.Location = new Point(2, 2);
            gridControl1.MainView = gridView1;
            gridControl1.Name = "gridControl1";
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemCheckedComboBoxEdit1 });
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemCheckedComboBoxEdit1, repositoryItemButtonEdit1 });
            gridControl1.Size = new Size(704, 378);
            gridControl1.TabIndex = 4;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
@@ -107,7 +109,7 @@
            // 
            gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colGroupName, colName, colIsHave, colIsNull, colUnitName, colDefaultValue, gridColumn1 });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colGroupName, colName, colIsHave, colIsNull, colUnitName, colDefaultValue, colPropChoice });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
@@ -171,21 +173,28 @@
            colDefaultValue.Visible = true;
            colDefaultValue.VisibleIndex = 2;
            // 
            // gridColumn1
            // colPropChoice
            // 
            gridColumn1.Caption = "属性选项";
            gridColumn1.ColumnEdit = repositoryItemCheckedComboBoxEdit1;
            gridColumn1.FieldName = "DisplayChoice";
            gridColumn1.Name = "gridColumn1";
            gridColumn1.Visible = true;
            gridColumn1.VisibleIndex = 5;
            colPropChoice.Caption = "属性选项";
            colPropChoice.ColumnEdit = repositoryItemCheckedComboBoxEdit1;
            colPropChoice.FieldName = "DisplayChoice";
            colPropChoice.Name = "colPropChoice";
            colPropChoice.Visible = true;
            colPropChoice.VisibleIndex = 5;
            // 
            // repositoryItemCheckedComboBoxEdit1
            // 
            repositoryItemCheckedComboBoxEdit1.AutoHeight = false;
            repositoryItemCheckedComboBoxEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            repositoryItemCheckedComboBoxEdit1.Name = "repositoryItemCheckedComboBoxEdit1";
            repositoryItemCheckedComboBoxEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            repositoryItemCheckedComboBoxEdit1.EditValueChanged += repositoryItemCheckedComboBoxEdit1_EditValueChanged;
            //
            // repositoryItemButtonEdit1
            //
            repositoryItemButtonEdit1.AutoHeight = false;
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph) });
            repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            // 
            // btnCancel
            // 
@@ -267,6 +276,7 @@
            ((System.ComponentModel.ISupportInitialize)sysCatalogPropViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemCheckedComboBoxEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
@@ -295,7 +305,8 @@
        private DevExpress.XtraGrid.Columns.GridColumn colIsNull;
        private DevExpress.XtraGrid.Columns.GridColumn colUnitName;
        private DevExpress.XtraGrid.Columns.GridColumn colDefaultValue;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn colPropChoice;
        private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
    }
}
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.cs
@@ -43,10 +43,9 @@
                        model.UnitName = child.UnitName;
                        model.Inherit = child.Inherit;
                        model.ChoiceList = child.ChoiceList;
                        var stringList = child.ChoiceList.Where(x => x.Have == true).ToList().Select(x => x.Name.ToString()).ToList();
                        var stringList = child.ChoiceList.Where(x => x.Have == true).ToList().Select(x => x.ID.ToString()).ToList();
                        string result = string.Join(", ", stringList);
                        model.DisplayChoice = result;
                        //   model.ChoiceIds = child.ChoiceList;
                        _allBindingList.Add(model);
                    }
                }
@@ -96,11 +95,10 @@
            {
                e.Cancel = true;
            }
            if (gridView1.FocusedColumn.Name == "gridColumn1")
            if (gridView1.FocusedColumn.Name == "colPropChoice")
            {
                repositoryItemCheckedComboBoxEdit1.Items.Clear();
                repositoryItemCheckedComboBoxEdit1.DataSource = vm.ChoiceList;
                //     repositoryItemCheckedComboBoxEdit1.edit
            }
        }