Skip to content

Commit aa8c71e

Browse files
committed
fix field selection ui bug
1 parent e227067 commit aa8c71e

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

src/ParquetViewer/FieldSelectionDialog.cs

+6-14
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,6 @@ private void doneButton_Click(object sender, EventArgs e)
255255
{
256256
try
257257
{
258-
//Clear filter text so all checked fields are loaded
259-
clearfilterColumnsButton_Click(null, null);
260-
261258
if (this.rememberMyChoiceCheckBox.Enabled && this.rememberMyChoiceCheckBox.Checked)
262259
AppSettings.AlwaysSelectAllFields = true;
263260
else
@@ -268,19 +265,14 @@ private void doneButton_Click(object sender, EventArgs e)
268265
{
269266
this.NewSelectedFields.AddRange(this.AvailableFields.Where(IsSupportedFieldType).Select(f => f.Name));
270267
}
268+
else if (this.PreSelectedFields.Count > 0)
269+
{
270+
this.NewSelectedFields.AddRange(this.PreSelectedFields);
271+
}
271272
else
272273
{
273-
foreach (Control control in this.fieldsPanel.Controls)
274-
{
275-
if (control is CheckBox checkbox && checkbox.Checked && !checkbox.Name.Equals(SelectAllCheckboxName) && checkbox.Enabled)
276-
this.NewSelectedFields.Add((string)control.Tag!);
277-
}
278-
279-
if (this.NewSelectedFields.Count == 0)
280-
{
281-
MessageBox.Show("Please select at least 1 field", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
282-
return;
283-
}
274+
MessageBox.Show("Please select at least 1 field", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
275+
return;
284276
}
285277

286278
this.DialogResult = DialogResult.OK;

0 commit comments

Comments
 (0)