xiaohuimin/DHDHSoftware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交整体修改

Browse Source
This commit is contained in:
liyaobang
2025-03-27 11:37:48 +08:00
parent 1046978877
commit 2d98b2d8b8
22 changed files with 2560 additions and 2032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

584
DHSoftware/Views/MotionControl.cs
View File

@ -38,495 +38,9 @@ namespace DHSoftware.Views
btnAdd.Click += BtnAdd_Click;
btnDelete.Click += BtnDelete_Click;
PLCItemsTable.CellButtonClick += PLCItemsTable_CellButtonClick;
btnSartProcessAdd.Click += BtnSartProcessAdd_Click;
btnSartProcessDelete.Click += BtnSartProcessDelete_Click;
TableSartProcess.CellButtonClick += TableSartProcess_CellButtonClick;
btnStopProcessAdd.Click += BtnStopProcessAdd_Click;
btnStopProcessDelete.Click += BtnStopProcessDelete_Click;
TableStopProcess.CellButtonClick += TableStopProcess_CellButtonClick;
btnStartResetAdd.Click += BtnStartResetAdd_Click;
btnStartResetDelete.Click += BtnStartResetDelete_Click;
TableStartReset.CellButtonClick += TableStartReset_CellButtonClick;
btnStopResetAdd.Click += BtnStopResetAdd_Click;
btnStopResetDelete.Click += BtnStopResetDelete_Click;
TableStopReset.CellButtonClick += TableStopReset_CellButtonClick;
}
private void TableStopReset_CellButtonClick(object sender, TableButtonEventArgs e)
{
var buttontext = e.Btn.Text;
if (e.Record is PLCItem pLCItem)
{
switch (buttontext)
{
//暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
case "编辑":
var form = new MotionProcessEdit(window, "复位结束表操作-编辑", pLCItem, pLCBase.PLCItemList) { Size = new Size(500, 300) };
AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
{
OnLoad = () =>
{
AntdUI.Message.info(window, "进入复位结束表编辑", autoClose: 1);
},
OnClose = () =>
{
AntdUI.Message.info(window, "退出复位结束表编辑", autoClose: 1);
}
});
break;
case "删除":
var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
if (result == DialogResult.OK)
{
pLCBase.PLCStopResetList.Remove(pLCItem);
}
break;
case "上移":
if (e.RowIndex <= 1)
{
AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
return;
}
MoveItemUp(pLCBase.PLCStopResetList, pLCItem);
break;
case "下移":
if (e.RowIndex > pLCBase.PLCStopResetList.Count - 1)
{
AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
return;
}
MoveItemDown(pLCBase.PLCStopResetList, pLCItem);
break;
}
}
}
private void BtnStopResetDelete_Click(object? sender, EventArgs e)
{
if (pLCBase.PLCStopResetList.Count == 0 || !pLCBase.PLCStopResetList.Any(x => x.Selected))
{
AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3);
return;
}
var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
if (result == DialogResult.OK)
{
// 使用反转for循环删除主列表中选中的项
for (int i = pLCBase.PLCStopResetList.Count - 1; i >= 0; i--)
{
// 删除选中的主列表项
if (pLCBase.PLCStopResetList[i].Selected)
{
pLCBase.PLCStopResetList.RemoveAt(i);
}
}
// 提示删除完成
AntdUI.Message.success(window, "删除成功！", autoClose: 3);
}
}
private void BtnStopResetAdd_Click(object? sender, EventArgs e)
{
if (pLCBase.PLCItemList?.Count == 0)
{
AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3);
return;
}
PLCItem pLCItem = new PLCItem()
{
StartIndex = pLCBase.PLCStopResetList.Count + 1,
CellLinks = new CellLink[]
{
new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
}
};
var form = new MotionProcessEdit(window, "复位结束表操作-新增", pLCItem, pLCBase.PLCItemList) { Size = new Size(450, 550) };
AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
{
OnLoad = () =>
{
AntdUI.Message.info(window, "进入复位结束表新增", autoClose: 1);
},
OnClose = () =>
{
if (form.submit)
{
pLCBase.PLCStopResetList.Add(pLCItem);
}
AntdUI.Message.info(window, "退出复位结束表新增", autoClose: 1);
}
});
}
private void TableStartReset_CellButtonClick(object sender, TableButtonEventArgs e)
{
var buttontext = e.Btn.Text;
if (e.Record is PLCItem pLCItem)
{
switch (buttontext)
{
//暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
case "编辑":
var form = new MotionProcessEdit(window, "复位开始表操作-编辑", pLCItem, pLCBase.PLCItemList) { Size = new Size(500, 300) };
AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
{
OnLoad = () =>
{
AntdUI.Message.info(window, "进入复位开始表编辑", autoClose: 1);
},
OnClose = () =>
{
AntdUI.Message.info(window, "退出复位开始表编辑", autoClose: 1);
}
});
break;
case "删除":
var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
if (result == DialogResult.OK)
{
pLCBase.PLCStartResetList.Remove(pLCItem);
}
break;
case "上移":
if (e.RowIndex <= 1)
{
AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
return;
}
MoveItemUp(pLCBase.PLCStartResetList, pLCItem);
break;
case "下移":
if (e.RowIndex > pLCBase.PLCStartResetList.Count - 1)
{
AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
return;
}
MoveItemDown(pLCBase.PLCStartResetList, pLCItem);
break;
}
}
}
private void BtnStartResetDelete_Click(object? sender, EventArgs e)
{
if (pLCBase.PLCStartResetList.Count == 0 || !pLCBase.PLCStartResetList.Any(x => x.Selected))
{
AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3);
return;
}
var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
if (result == DialogResult.OK)
{
// 使用反转for循环删除主列表中选中的项
for (int i = pLCBase.PLCStartResetList.Count - 1; i >= 0; i--)
{
// 删除选中的主列表项
if (pLCBase.PLCStartResetList[i].Selected)
{
pLCBase.PLCStartResetList.RemoveAt(i);
}
}
// 提示删除完成
AntdUI.Message.success(window, "删除成功！", autoClose: 3);
}
}
private void BtnStartResetAdd_Click(object? sender, EventArgs e)
{
if (pLCBase.PLCItemList?.Count == 0)
{
AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3);
return;
}
PLCItem pLCItem = new PLCItem()
{
StartIndex = pLCBase.PLCStartResetList.Count + 1,
CellLinks = new CellLink[]
{
new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
}
};
var form = new MotionProcessEdit(window, "复位开始表操作-新增", pLCItem, pLCBase.PLCItemList) { Size = new Size(450, 550) };
AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
{
OnLoad = () =>
{
AntdUI.Message.info(window, "进入复位开始表新增", autoClose: 1);
},
OnClose = () =>
{
if (form.submit)
{
pLCBase.PLCStartResetList.Add(pLCItem);
}
AntdUI.Message.info(window, "退出复位开始表新增", autoClose: 1);
}
});
}
private void TableStopProcess_CellButtonClick(object sender, TableButtonEventArgs e)
{
var buttontext = e.Btn.Text;
if (e.Record is PLCItem pLCItem)
{
switch (buttontext)
{
//暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
case "编辑":
var form = new MotionProcessEdit(window, "流程结束表操作-编辑", pLCItem, pLCBase.PLCItemList) { Size = new Size(500, 300) };
AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
{
OnLoad = () =>
{
AntdUI.Message.info(window, "进入流程结束表编辑", autoClose: 1);
},
OnClose = () =>
{
AntdUI.Message.info(window, "退出流程结束表编辑", autoClose: 1);
}
});
break;
case "删除":
var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
if (result == DialogResult.OK)
{
pLCBase.PLCStopProcessList.Remove(pLCItem);
}
break;
case "上移":
if (e.RowIndex <= 1)
{
AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
return;
}
MoveItemUp(pLCBase.PLCStopProcessList, pLCItem);
break;
case "下移":
if (e.RowIndex > pLCBase.PLCStopProcessList.Count - 1)
{
AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
return;
}
MoveItemDown(pLCBase.PLCStopProcessList, pLCItem);
break;
}
}
}
private void BtnStopProcessDelete_Click(object? sender, EventArgs e)
{
if (pLCBase.PLCStopProcessList.Count == 0 || !pLCBase.PLCStopProcessList.Any(x => x.Selected))
{
AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3);
return;
}
var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
if (result == DialogResult.OK)
{
// 使用反转for循环删除主列表中选中的项
for (int i = pLCBase.PLCStopProcessList.Count - 1; i >= 0; i--)
{
// 删除选中的主列表项
if (pLCBase.PLCStopProcessList[i].Selected)
{
pLCBase.PLCStopProcessList.RemoveAt(i);
}
}
// 提示删除完成
AntdUI.Message.success(window, "删除成功！", autoClose: 3);
}
}
private void BtnStopProcessAdd_Click(object? sender, EventArgs e)
{
if (pLCBase.PLCItemList?.Count == 0)
{
AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3);
return;
}
PLCItem pLCItem = new PLCItem()
{
StartIndex = pLCBase.PLCStopProcessList.Count + 1,
CellLinks = new CellLink[]
{
new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
}
};
var form = new MotionProcessEdit(window, "流程结束表操作-新增", pLCItem, pLCBase.PLCItemList) { Size = new Size(450, 550) };
AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
{
OnLoad = () =>
{
AntdUI.Message.info(window, "进入流程结束表新增", autoClose: 1);
},
OnClose = () =>
{
if (form.submit)
{
pLCBase.PLCStopProcessList.Add(pLCItem);
}
AntdUI.Message.info(window, "退出流程结束表新增", autoClose: 1);
}
});
}
private void TableSartProcess_CellButtonClick(object sender, TableButtonEventArgs e)
{
var buttontext = e.Btn.Text;
if (e.Record is PLCItem pLCItem)
{
switch (buttontext)
{
//暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
case "编辑":
var form = new MotionProcessEdit(window, "流程开始表操作-编辑", pLCItem, pLCBase.PLCItemList) { Size = new Size(500, 300) };
AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
{
OnLoad = () =>
{
AntdUI.Message.info(window, "进入流程开始表编辑", autoClose: 1);
},
OnClose = () =>
{
AntdUI.Message.info(window, "退出流程开始表编辑", autoClose: 1);
}
});
break;
case "删除":
var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
if (result == DialogResult.OK)
{
pLCBase.PLCStartProcessList.Remove(pLCItem);
}
break;
case "上移":
if (e.RowIndex <= 1)
{
AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
return;
}
MoveItemUp(pLCBase.PLCStartProcessList, pLCItem);
break;
case "下移":
if (e.RowIndex > pLCBase.PLCStartProcessList.Count - 1)
{
AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
return;
}
MoveItemDown(pLCBase.PLCStartProcessList, pLCItem);
break;
}
}
}
private void BtnSartProcessDelete_Click(object? sender, EventArgs e)
{
if (pLCBase.PLCStartProcessList.Count == 0 || !pLCBase.PLCStartProcessList.Any(x => x.Selected))
{
AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3);
return;
}
var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
if (result == DialogResult.OK)
{
// 使用反转for循环删除主列表中选中的项
for (int i = pLCBase.PLCStartProcessList.Count - 1; i >= 0; i--)
{
// 删除选中的主列表项
if (pLCBase.PLCStartProcessList[i].Selected)
{
pLCBase.PLCStartProcessList.RemoveAt(i);
}
}
// 提示删除完成
AntdUI.Message.success(window, "删除成功！", autoClose: 3);
}
}
private void BtnSartProcessAdd_Click(object? sender, EventArgs e)
{
if (pLCBase.PLCItemList?.Count == 0)
{
AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3);
return;
}
PLCItem pLCItem = new PLCItem()
{
StartIndex = pLCBase.PLCStartProcessList.Count + 1,
CellLinks = new CellLink[]
{
new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
}
};
var form = new MotionProcessEdit(window, "流程开始表操作-新增", pLCItem, pLCBase.PLCItemList) { Size = new Size(450, 550) };
AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
{
OnLoad = () =>
{
AntdUI.Message.info(window, "进入流程开始表新增", autoClose: 1);
},
OnClose = () =>
{
if (form.submit)
{
pLCBase.PLCStartProcessList.Add(pLCItem);
}
AntdUI.Message.info(window, "退出流程开始表新增", autoClose: 1);
}
});
}
private void PLCItemsTable_CellButtonClick(object sender, TableButtonEventArgs e)
{
@ -787,101 +301,7 @@ namespace DHSoftware.Views
}
PLCItemsTable.Binding(pLCBase.PLCItemList);
TableSartProcess.Columns = new ColumnCollection() {
new ColumnCheck("Selected"){Fixed = true},
new Column("StartIndex", "序号", ColumnAlign.Center),
new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center),
new Column("Name", "名称", ColumnAlign.Center),
new Column("Type", "类型",ColumnAlign.Center){Visible=false},
new Column("Address", "地址",ColumnAlign.Center){Visible=false},
new Column("Value", "值",ColumnAlign.Center),
new Column("CellLinks", "操作", ColumnAlign.Center)
};
if (pLCBase.PLCStartProcessList.Count > 0)
{
foreach (var item in pLCBase.PLCStartProcessList)
{
item.CellLinks = new CellLink[] {
new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
};
}
}
//TableSartProcess.Binding(pLCBase.PLCStartProcessList);
TableSartProcess.Binding(pLCBase.PLCStartProcessList);
TableStopProcess.Columns = new ColumnCollection() {
new ColumnCheck("Selected"){Fixed = true},
new Column("StartIndex", "序号", ColumnAlign.Center),
new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center),
new Column("Name", "名称", ColumnAlign.Center),
new Column("Type", "类型",ColumnAlign.Center){Visible=false},
new Column("Address", "地址",ColumnAlign.Center){Visible=false},
new Column("Value", "值",ColumnAlign.Center),
new Column("CellLinks", "操作", ColumnAlign.Center)
};
if (pLCBase.PLCStopProcessList.Count > 0)
{
foreach (var item in pLCBase.PLCStopProcessList)
{
item.CellLinks = new CellLink[] {
new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
};
}
}
TableStopProcess.Binding(pLCBase.PLCStopProcessList);
TableStartReset.Columns = new ColumnCollection() {
new ColumnCheck("Selected"){Fixed = true},
new Column("StartIndex", "序号", ColumnAlign.Center),
new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center),
new Column("Name", "名称", ColumnAlign.Center),
new Column("Type", "类型",ColumnAlign.Center){Visible=false},
new Column("Address", "地址",ColumnAlign.Center){Visible=false},
new Column("Value", "值",ColumnAlign.Center),
new Column("CellLinks", "操作", ColumnAlign.Center)
};
if (pLCBase.PLCStartResetList.Count > 0)
{
foreach (var item in pLCBase.PLCStartResetList)
{
item.CellLinks = new CellLink[] {
new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
};
}
}
TableStartReset.Binding(pLCBase.PLCStartResetList);
TableStopReset.Columns = new ColumnCollection() {
new ColumnCheck("Selected"){Fixed = true},
new Column("StartIndex", "序号", ColumnAlign.Center),
new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center),
new Column("Name", "名称", ColumnAlign.Center),
new Column("Type", "类型",ColumnAlign.Center){Visible=false},
new Column("Address", "地址",ColumnAlign.Center){Visible=false},
new Column("Value", "值",ColumnAlign.Center),
new Column("CellLinks", "操作", ColumnAlign.Center)
};
if (pLCBase.PLCStopResetList.Count > 0)
{
foreach (var item in pLCBase.PLCStopResetList)
{
item.CellLinks = new CellLink[] {
new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
};
}
}
TableStopReset.Binding(pLCBase.PLCStopResetList);
}
private void SetupDataBindings()