Поправил баг при двойном нажатии Insert в списке продуктов

This commit is contained in:
Никита Потапов 2024-12-04 12:10:03 +04:00
parent 63668122c2
commit dbb2838638
4 changed files with 48 additions and 26 deletions

View File

@ -9,8 +9,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Components" Version="1.0.1" /> <PackageReference Include="Components" Version="1.0.5" />
<PackageReference Include="FixedWinFormsLibrary1" Version="1.0.0" /> <PackageReference Include="FixedWinFormsLibrary1" Version="1.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -29,6 +29,8 @@
private void InitializeComponent() private void InitializeComponent()
{ {
dataGridView = new DataGridView(); dataGridView = new DataGridView();
ColumnId = new DataGridViewTextBoxColumn();
ColumnName = new DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout(); SuspendLayout();
// //
@ -40,7 +42,9 @@
dataGridView.AllowUserToResizeRows = false; dataGridView.AllowUserToResizeRows = false;
dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName });
dataGridView.Dock = DockStyle.Fill; dataGridView.Dock = DockStyle.Fill;
dataGridView.EditMode = DataGridViewEditMode.EditOnF2;
dataGridView.Location = new Point(0, 0); dataGridView.Location = new Point(0, 0);
dataGridView.MultiSelect = false; dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
@ -52,6 +56,22 @@
dataGridView.CellEndEdit += dataGridView_CellEndEdit; dataGridView.CellEndEdit += dataGridView_CellEndEdit;
dataGridView.CellValidating += dataGridView_CellValidating; dataGridView.CellValidating += dataGridView_CellValidating;
// //
// ColumnId
//
ColumnId.DataPropertyName = "Id";
ColumnId.HeaderText = "Id";
ColumnId.MinimumWidth = 6;
ColumnId.Name = "ColumnId";
ColumnId.ReadOnly = true;
ColumnId.Visible = false;
//
// ColumnName
//
ColumnName.DataPropertyName = "Name";
ColumnName.HeaderText = "Name";
ColumnName.MinimumWidth = 6;
ColumnName.Name = "ColumnName";
//
// FormProductsList // FormProductsList
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
@ -69,5 +89,7 @@
#endregion #endregion
private DataGridView dataGridView; private DataGridView dataGridView;
private DataGridViewTextBoxColumn ColumnId;
private DataGridViewTextBoxColumn ColumnName;
} }
} }

View File

@ -8,7 +8,7 @@ namespace InternetShopForms.Products
public partial class FormProductsList : Form public partial class FormProductsList : Form
{ {
private IProductLogic _productLogic; private IProductLogic _productLogic;
private List<ProductViewModel> _products; private List<ProductViewModel> _products = new List<ProductViewModel>();
public FormProductsList(IProductLogic productLogic) public FormProductsList(IProductLogic productLogic)
{ {
InitializeComponent(); InitializeComponent();
@ -18,19 +18,6 @@ namespace InternetShopForms.Products
private void FormProductsList_Load(object sender, EventArgs e) private void FormProductsList_Load(object sender, EventArgs e)
{ {
var idColumn = new DataGridViewColumn();
var nameColumn = new DataGridViewColumn();
var dataGridViewCell = new DataGridViewTextBoxCell();
idColumn.Visible = false;
idColumn.DataPropertyName = "Id";
idColumn.Name = "Id";
idColumn.CellTemplate = dataGridViewCell;
nameColumn.DataPropertyName = "Name";
nameColumn.HeaderText = "Название";
nameColumn.Name = "Name";
nameColumn.CellTemplate = dataGridViewCell;
dataGridView.Columns.Add(idColumn);
dataGridView.Columns.Add(nameColumn);
LoadData(); LoadData();
} }
@ -42,7 +29,7 @@ namespace InternetShopForms.Products
dataGridView.Rows.Clear(); dataGridView.Rows.Clear();
foreach (var product in _products) foreach (var product in _products)
{ {
dataGridView.Rows.Add(product); dataGridView.Rows.Add(product.Id, product.Name);
} }
} }
catch (Exception ex) catch (Exception ex)
@ -55,8 +42,15 @@ namespace InternetShopForms.Products
{ {
if (e.KeyCode == Keys.Insert) if (e.KeyCode == Keys.Insert)
{ {
dataGridView.Rows.Add(); try
dataGridView.CurrentCell = dataGridView.Rows[dataGridView.RowCount - 1].Cells[1]; {
dataGridView.Rows.Add();
dataGridView.CurrentCell = dataGridView.Rows[dataGridView.RowCount - 1].Cells[1];
}
catch (Exception ex)
{
dataGridView.Rows.RemoveAt(dataGridView.RowCount - 1);
}
e.Handled = true; e.Handled = true;
} }
else if (e.KeyCode == Keys.Delete) else if (e.KeyCode == Keys.Delete)
@ -64,16 +58,16 @@ namespace InternetShopForms.Products
if (dataGridView.SelectedRows.Count == 1) if (dataGridView.SelectedRows.Count == 1)
{ {
DataGridViewRow selectedRow = dataGridView.SelectedRows[0]; DataGridViewRow selectedRow = dataGridView.SelectedRows[0];
var selectedItemIdValue = selectedRow.Cells["Id"].Value; var selectedItemIdValue = selectedRow.Cells["ColumnId"].Value;
if (selectedItemIdValue == null) if (selectedItemIdValue == null)
{ {
dataGridView.Rows.Remove(selectedRow); dataGridView.Rows.Remove(selectedRow);
return; return;
} }
int selectedItemId = Convert.ToInt32(selectedItemIdValue); int selectedItemId = Convert.ToInt32(selectedItemIdValue);
string selectedItemName = (string)selectedRow.Cells["Name"].Value; string selectedItemName = (string)selectedRow.Cells["ColumnName"].Value;
var result = MessageBox.Show( var result = MessageBox.Show(
$"Удалить товар \"{selectedRow.Cells["Id"].Value}\"?", $"Удалить товар \"{selectedRow.Cells["ColumnId"].Value}\"?",
"Подтверждение", "Подтверждение",
MessageBoxButtons.YesNo, MessageBoxButtons.YesNo,
MessageBoxIcon.Question MessageBoxIcon.Question
@ -100,19 +94,19 @@ namespace InternetShopForms.Products
try try
{ {
DataGridViewRow currentRow = dataGridView.Rows[e.RowIndex]; DataGridViewRow currentRow = dataGridView.Rows[e.RowIndex];
if (currentRow.Cells["Id"].Value == null || Convert.ToInt32(currentRow.Cells["Id"].Value) == 0) if (currentRow.Cells["ColumnId"].Value == null || Convert.ToInt32(currentRow.Cells["ColumnId"].Value) == 0)
{ {
_productLogic.Create(new ProductBindingModel _productLogic.Create(new ProductBindingModel
{ {
Name = currentRow.Cells["Name"].Value.ToString()!, Name = currentRow.Cells["ColumnName"].Value.ToString()!,
}); });
} }
else else
{ {
_productLogic.Update(new ProductBindingModel _productLogic.Update(new ProductBindingModel
{ {
Id = Convert.ToInt32(currentRow.Cells["Id"].Value), Id = Convert.ToInt32(currentRow.Cells["ColumnId"].Value),
Name = currentRow.Cells["Name"].Value.ToString(), Name = currentRow.Cells["ColumnName"].Value.ToString()!,
}); });
} }
MessageBox.Show("Запись сохранена"); MessageBox.Show("Запись сохранена");

View File

@ -117,4 +117,10 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="ColumnId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ColumnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>