WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/01-EditPumpPartProp/EditPumpPartPropDlg.cs
@@ -8,6 +8,7 @@ { InitializeComponent(); this.gridView1.Columns["PropGroupName"].Group(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private BLL.PumpPartMain _bll = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/02-ViewPumpInformation/ViewPumpInformationDlg.cs
@@ -5,6 +5,7 @@ public ViewPumpInformationDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } } } WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/03-PumpType/AddPumpTypeDlg.cs
@@ -5,6 +5,7 @@ public AddPumpTypeDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Vmo.PumpTypeVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/03-PumpType/EditPumpTypeDlg.cs
@@ -5,6 +5,7 @@ public EditPumpTypeDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Vmo.PumpTypeVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/AddPumpProductGroupDlg.cs
@@ -5,6 +5,7 @@ public AddPumpProductGroupDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Vmo.PumpGroupVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/AddPumpProductMainDlg.cs
@@ -8,6 +8,7 @@ public AddPumpProductMainDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private Yw.BLL.SysCatalog _bll = null; @@ -55,7 +56,7 @@ private async void BtnOk_ClickAsync(object sender, EventArgs e) { if (!(Valid())) return; return; _PumpMain.Name = TextEditName.Text.Trim(); _PumpMain.TagName = TextEditTagName.Text.Trim(); double ratedFlow; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/AddPumpProductSeriesDlg.cs
@@ -7,6 +7,7 @@ public AddPumpProductSeriesDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Vmo.PumpSeriesVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/EditPumpProductGroupDlg.cs
@@ -7,6 +7,7 @@ public EditPumpProductGroupDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Vmo.PumpGroupVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/EditPumpProductMainDlg.cs
@@ -7,6 +7,7 @@ public EditPumpProductMainDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private Vmo.PumpMainVmo _Update = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/EditPumpProductSeriesDlg.cs
@@ -7,6 +7,7 @@ public EditPumpProductSeriesDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Vmo.PumpSeriesVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductMainPanel.Designer.cs
@@ -238,6 +238,7 @@ // gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colTagName, colSortCode, colDescription, colRatedFlow, colRatedHead, colD2, colErosion, colRatedEfficiency, colRatedPower, colRatedSpeed }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AdaptingManageMainPanel.Designer.cs
@@ -152,6 +152,7 @@ // gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterial, colCoefficient, colDescription, colAdaptingType }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AddAdaptingMainDlg.cs
@@ -7,6 +7,7 @@ public AddAdaptingMainDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private Vmo.AdaptingManageVmo _AdaptingVmo = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.cs
@@ -7,6 +7,7 @@ public EditAdaptingMainDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private Vmo.AdaptingManageVmo _AdaptingVmo = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-ValveManage/ValveManageMainPanel.Designer.cs
@@ -74,11 +74,14 @@ ribbonControl1.MaxItemId = 22; ribbonControl1.Name = "ribbonControl1"; ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 }); ribbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010; ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True; ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide; ribbonControl1.ShowToolbarCustomizeItem = false; ribbonControl1.Size = new Size(690, 101); ribbonControl1.Toolbar.ShowCustomizeItem = false; ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; // // BtnAdd @@ -131,10 +134,12 @@ // // sidePanel1 // sidePanel1.BorderThickness = 0; sidePanel1.Controls.Add(gridControl1); sidePanel1.Controls.Add(ribbonControl1); sidePanel1.Dock = DockStyle.Fill; sidePanel1.Location = new Point(200, 0); sidePanel1.Margin = new Padding(0); sidePanel1.Name = "sidePanel1"; sidePanel1.Size = new Size(690, 520); sidePanel1.TabIndex = 2; @@ -160,6 +165,7 @@ // gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterial, colCoefficient, colDescription, colCreateName, colCreateTime }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-ValveManage/ValveTypeTreeListCtrl.resx
@@ -125,7 +125,7 @@ <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh @@ -133,10 +133,11 @@ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0 QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0 LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N Cjwvc3ZnPgs= dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZCI+DQogICAgPHBhdGggZD0iTTI3LDE0aC05VjVj MC0wLjUtMC41LTEtMS0xaC0yYy0wLjUsMC0xLDAuNS0xLDF2OUg1Yy0wLjUsMC0xLDAuNS0xLDF2MmMw LDAuNSwwLjUsMSwxLDFoOXY5ICAgYzAsMC41LDAuNSwxLDEsMWgyYzAuNSwwLDEtMC41LDEtMXYtOWg5 YzAuNSwwLDEtMC41LDEtMXYtMkMyOCwxNC41LDI3LjUsMTQsMjcsMTR6IiBjbGFzcz0iR3JlZW4iIC8+ DQogIDwvZz4NCjwvc3ZnPgs= </value> </data> <data name="barBtnEdit.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -172,19 +173,23 @@ <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJIDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRlbGV0ZUNpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0x Niw0QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHog TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4NCiAgICA8cGF0aCBk PSJNMTguOCwxNmw4LjktOC45YzAuNC0wLjQsMC40LTEsMC0xLjRsLTEuNC0xLjRjLTAuNC0wLjQtMS0w LjQtMS40LDBMMTYsMTMuMkw3LjEsNC4zYy0wLjQtMC40LTEtMC40LTEuNCwwICAgTDQuMyw1LjdjLTAu NCwwLjQtMC40LDEsMCwxLjRsOC45LDguOWwtOC45LDguOWMtMC40LDAuNC0wLjQsMSwwLDEuNGwxLjQs MS40YzAuNCwwLjQsMSwwLjQsMS40LDBsOC45LTguOWw4LjksOC45ICAgYzAuNCwwLjQsMSwwLjQsMS40 LDBsMS40LTEuNGMwLjQtMC40LDAuNC0xLDAtMS40TDE4LjgsMTZ6IiBjbGFzcz0iUmVkIiAvPg0KICA8 L2c+DQo8L3N2Zz4L </value> </data> </root> WinFrmUI/HStation.WinFrmUI.Assets.Core/05-valveManage/01-series/AddValveSeriesDlg.cs
@@ -5,6 +5,7 @@ public AddValveSeriesDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Vmo.ValveSeriesVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-valveManage/01-series/EditValveSeriesDlg.cs
@@ -5,6 +5,7 @@ public EditValveSeriesDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Vmo.ValveSeriesVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-valveManage/02-main/AddValveMainDlg.cs
@@ -7,6 +7,7 @@ public AddValveMainDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private Vmo.ValveMainVmo _ValveMain = null; //阀门型号 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-valveManage/02-main/EditValveMainDlg.cs
@@ -8,6 +8,7 @@ public EditValveMainDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private Vmo.ValveMainVmo _ValveMain = null; //阀门型号 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs
@@ -7,6 +7,7 @@ public AddPipeLineMainDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private Vmo.PipeLineManageVmo _PipeLineVmo = null; WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/DescriptionDlg.cs
@@ -5,6 +5,7 @@ public DescriptionDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } } } WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/EditPipeLineMainDlg.cs
@@ -8,6 +8,7 @@ public EditPipeLineMainDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private ToolTipControlInfo toolTipController; WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/AddSysMoudleDlg.cs
@@ -7,6 +7,7 @@ public AddSysMoudleDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysModuleVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/AddSysTypeDlg.cs
@@ -8,6 +8,7 @@ public AddSysTypeDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysTypeVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/EditSysMoudleDlg.cs
@@ -8,6 +8,7 @@ public EditSysMoudleDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysModuleVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/EditSysTypeDlg.cs
@@ -9,6 +9,7 @@ public EditSysTypeDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysTypeVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/AddSysCatalogDlg.cs
@@ -7,6 +7,7 @@ public AddSysCatalogDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysCatalogVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/EditSysCatalogDlg.cs
@@ -8,6 +8,7 @@ public EditSysCatalogDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysCatalogVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.cs
@@ -6,17 +6,14 @@ namespace HStation.WinFrmUI.Basic { public partial class SetSysPropForCatalogDlg : Form public partial class SetSysPropForCatalogDlg : DevExpress.XtraEditors.XtraForm { public SetSysPropForCatalogDlg() { InitializeComponent(); // this.treeList1.Columns["GroupName"].; /* this.gridView1.Columns["GroupName"].Group(); */ repositoryItemCheckedComboBoxEdit1.DisplayMember = "Name"; repositoryItemCheckedComboBoxEdit1.ValueMember = "ID"; this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private List<SysPropMappingViewModel> _allBindingList = new List<SysPropMappingViewModel>(); @@ -195,7 +192,7 @@ private void treeList1_AfterCheckNode(object sender, DevExpress.XtraTreeList.NodeEventArgs e) { SetCheckedChildNodes(e.Node, e.Node.CheckState, e); } } #region 设置子节点状态 @@ -213,10 +210,10 @@ { node.Nodes[i].CheckState = CheckState.Checked; SetCheckedChildNodes(node.Nodes[i], check, e); } } } } #endregion 设置子节点状态 } } } WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/AddSysPropDlg.cs
@@ -8,6 +8,7 @@ public AddSysPropDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysPropVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/AddSysPropGrouoDlg.cs
@@ -7,6 +7,7 @@ public AddSysPropGrouoDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysPropGroupVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/EditSysPropDlg.cs
@@ -9,6 +9,7 @@ public EditSysPropDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysPropVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/EditSysPropGrouoDlg.cs
@@ -8,6 +8,7 @@ public EditSysPropGrouoDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysPropGroupVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SetSysPropChoiceDlg.cs
@@ -9,6 +9,7 @@ public SetSysPropChoiceDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private Yw.BLL.SysPropChoice _bll = null; @@ -41,8 +42,8 @@ choiceitem.PropID = _PropID; AddSysPropChoices.Add(choiceitem); } var alllist = await _bll.GetByPropID(_PropID); var alllist = await _bll.GetByPropID(_PropID); foreach (var item in alllist) { await _bll.DeleteByID(item.ID); @@ -51,7 +52,7 @@ { MessageBoxHelper.ShowSuccess("设置成功!"); } else if (await _bll.Inserts(AddSysPropChoices)) else if (await _bll.Inserts(AddSysPropChoices)) { MessageBoxHelper.ShowSuccess("设置成功!"); } WinFrmUI/HStation.WinFrmUI.Dict.Core/02-type/AddDictTypeDlg.cs
@@ -5,6 +5,7 @@ public AddDictTypeDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysDictTypeVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Dict.Core/02-type/EditDictTypeDlg.cs
@@ -5,6 +5,7 @@ public EditDictTypeDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } public event Func<Yw.Vmo.SysDictTypeVmo, Task<bool>> ReloadDataEvent = null; WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.resx
@@ -125,7 +125,7 @@ <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh @@ -133,10 +133,11 @@ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0 QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0 LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N Cjwvc3ZnPgs= dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZCI+DQogICAgPHBhdGggZD0iTTI3LDE0aC05VjVj MC0wLjUtMC41LTEtMS0xaC0yYy0wLjUsMC0xLDAuNS0xLDF2OUg1Yy0wLjUsMC0xLDAuNS0xLDF2MmMw LDAuNSwwLjUsMSwxLDFoOXY5ICAgYzAsMC41LDAuNSwxLDEsMWgyYzAuNSwwLDEtMC41LDEtMXYtOWg5 YzAuNSwwLDEtMC41LDEtMXYtMkMyOCwxNC41LDI3LjUsMTQsMjcsMTR6IiBjbGFzcz0iR3JlZW4iIC8+ DQogIDwvZz4NCjwvc3ZnPgs= </value> </data> <data name="barBtnEdit.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -172,19 +173,23 @@ <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJIDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRlbGV0ZUNpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0x Niw0QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHog TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4NCiAgICA8cGF0aCBk PSJNMTguOCwxNmw4LjktOC45YzAuNC0wLjQsMC40LTEsMC0xLjRsLTEuNC0xLjRjLTAuNC0wLjQtMS0w LjQtMS40LDBMMTYsMTMuMkw3LjEsNC4zYy0wLjQtMC40LTEtMC40LTEuNCwwICAgTDQuMyw1LjdjLTAu NCwwLjQtMC40LDEsMCwxLjRsOC45LDguOWwtOC45LDguOWMtMC40LDAuNC0wLjQsMSwwLDEuNGwxLjQs MS40YzAuNCwwLjQsMSwwLjQsMS40LDBsOC45LTguOWw4LjksOC45ICAgYzAuNCwwLjQsMSwwLjQsMS40 LDBsMS40LTEuNGMwLjQtMC40LDAuNC0xLDAtMS40TDE4LjgsMTZ6IiBjbGFzcz0iUmVkIiAvPg0KICA8 L2c+DQo8L3N2Zz4L </value> </data> </root> WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.Designer.cs
@@ -167,6 +167,7 @@ // gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colDescription, colDictValue, colSortCode }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; WinFrmUI/HStation.WinFrmUI.Dict.Core/SetSysPropChoiceDlg.cs
@@ -8,6 +8,7 @@ public SetDictDataDlg() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; } private long _typeId; @@ -58,7 +59,7 @@ { isfinish = true; } } } else if ((await _bll.GetByTypeID(_typeId)).Count == 0) { if (await _bll.Inserts(AddSysPropChoices)) WinFrmUI/HStation.WinFrmUI.Dict.Core/SetSysPropChoiceDlg.resx
@@ -125,19 +125,21 @@ <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRlbGV0ZUNpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0x Niw0QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHog TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44 LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs= </value> </data> </root> WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs
@@ -136,6 +136,7 @@ ribbonControl1.MaxItemId = 15; ribbonControl1.Name = "ribbonControl1"; ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 }); ribbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010; ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.False; WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-autoMatching/02-AsstesFormCtrl/AssetsMatchingHelper.cs
@@ -612,6 +612,10 @@ private static int CountCommonCharacters(string baseString, string compareString) { // 将字符串转换为字符集合 if (baseString == string.Empty||baseString==null || compareString == string.Empty||compareString==null) { return 0; } HashSet<char> baseChars = new HashSet<char>(baseString); HashSet<char> comparisonChars = new HashSet<char>(compareString); // 计算两个集合的交集
