Поправил баг при двойном нажатии 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>
<ItemGroup>
<PackageReference Include="Components" Version="1.0.1" />
<PackageReference Include="FixedWinFormsLibrary1" Version="1.0.0" />
<PackageReference Include="Components" Version="1.0.5" />
<PackageReference Include="FixedWinFormsLibrary1" Version="1.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

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

View File

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

View File

@ -117,4 +117,10 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</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>