冲突

Shuxia Ning

2024-11-09 4999c3c3884084c10c8a4bb2426e92cb63600166

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/17-valve/SetHydroValveDlg.cs

文件名从 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/17-valve/SetHydroValveDlg.cs 修改
@@ -7,6 +7,7 @@
            InitializeComponent();
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
            this.layoutControl1.SetupLayoutControl();
            this.generalOkAndCancelCtrl1.OkEvent += GeneralOkAndCancelCtrl1_OkEvent;
            InitialLinkStatus();
        }

@@ -77,7 +78,7 @@
        }

        //纭畾
        private void btnOk_Click(object sender, EventArgs e)
        private void GeneralOkAndCancelCtrl1_OkEvent()
        {
            if (_allParterList == null || _allParterList.Count < 1)
            {
@@ -106,7 +107,6 @@
            this.DialogResult = DialogResult.OK;
            this.Close();
        }


    }
}