Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

xcd

2020-07-16 3ae459e2e79e567dfd4a552a3b5b8c1fce495167

 src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs

@@ -29,7 +29,7 @@
        IOperationConfig backOpConfig = new OperationConfigBase();
        List<IDevice> deviceList = null;
        IDevice currentDevice = null;
        public FrmDeviceOpConfigEditor(DeviceOpBind bind)
        public FrmDeviceOpConfigEditor(DeviceOpBind bind, bool isEnableSelectDevice = true)
        {
            InitializeComponent();

@@ -56,7 +56,15 @@
                    cboDevice.SelectedIndex = 0;
            }

            cboDevice.SelectedIndexChanged += CboDevice_SelectedIndexChanged;
            if (isEnableSelectDevice)
            {
                cboDevice.Enabled = true;
                cboDevice.SelectedIndexChanged += CboDevice_SelectedIndexChanged;
            }
            else
            {
                cboDevice.Enabled = false;
            }

            if (bind.OpConfig == null)
            {
@@ -120,6 +128,7 @@
        {
            Bind.Device = cboDevice.SelectedValue.ToString();
            Bind.OpConfig = propGrid.SelectedObject as IOperationConfig;
            Bind.OpConfig.DeviceId = Bind.Device;
            this.DialogResult = DialogResult.OK;
        }