fasdfsa commited on
Commit
a282b13
·
1 Parent(s): 631cd41
src/WpfEditor/MainWindow.xaml.cs CHANGED
@@ -316,7 +316,7 @@ namespace WpfEditor
316
  var rect = (RectangleItem)((MenuItem)s).Tag;
317
 
318
  // 先删除选框下的文字
319
- int idx = -1;
320
  foreach (var (line, index) in Editor._lines.Select((line, index) => (line, index) ))
321
  {
322
  if (line.selected_rectange == null || !line.selected_rectange.HasValues)
@@ -326,18 +326,44 @@ namespace WpfEditor
326
  int Id = line.selected_rectange["Id"].Value<int>();
327
  if (rect.Id == Id)
328
  {
329
- idx = index;
330
- break;
331
  }
332
  }
333
- if (idx != -1)
334
  {
335
- Editor._lines.RemoveAt(idx);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
336
  }
337
 
338
- // 删除选框
339
- ViewModel.RemoveRectangle(rect);
340
-
341
  Editor.ClearSelection();
342
  _textChanged = true;
343
  Editor.InvalidateVisual();
 
316
  var rect = (RectangleItem)((MenuItem)s).Tag;
317
 
318
  // 先删除选框下的文字
319
+ List<int> idxs = new List<int>();
320
  foreach (var (line, index) in Editor._lines.Select((line, index) => (line, index) ))
321
  {
322
  if (line.selected_rectange == null || !line.selected_rectange.HasValues)
 
326
  int Id = line.selected_rectange["Id"].Value<int>();
327
  if (rect.Id == Id)
328
  {
329
+ idxs.Add(index);
 
330
  }
331
  }
332
+ if (idxs.Count > 0)
333
  {
334
+ // 后面的 ID 全部减 1
335
+ foreach (var (line, index) in Editor._lines.Select((line, index) => (line, index)))
336
+ {
337
+ if (line.selected_rectange == null || !line.selected_rectange.HasValues)
338
+ {
339
+ continue;
340
+ }
341
+ int Id = Editor._lines[index].selected_rectange["Id"].Value<int>();
342
+ if (Id > rect.Id)
343
+ {
344
+ Editor._lines[index].selected_rectange["Id"] = Id - 1;
345
+ }
346
+ }
347
+
348
+ foreach(RectangleItem item in ViewModel.rectangles)
349
+ {
350
+ if (item.Id > rect.Id)
351
+ {
352
+ item.Id -= 1;
353
+ }
354
+ }
355
+
356
+ foreach (int idx in idxs)
357
+ {
358
+ Editor._lines.RemoveAt(idx);
359
+ }
360
+
361
+ // 删除选框
362
+ ViewModel.RemoveRectangle(rect);
363
+ ViewModel.rectangleCounter -= 1;
364
+
365
  }
366
 
 
 
 
367
  Editor.ClearSelection();
368
  _textChanged = true;
369
  Editor.InvalidateVisual();
src/WpfEditor/ViewModel.cs CHANGED
@@ -62,11 +62,11 @@ namespace WpfEditor
62
 
63
  // 新增:矩形框集合
64
  [ObservableProperty]
65
- private ObservableCollection<RectangleItem> rectangles = new ObservableCollection<RectangleItem>();
66
 
67
  // 新增:矩形框计数器
68
  [ObservableProperty]
69
- private int rectangleCounter = 0;
70
 
71
  public ViewModel()
72
  {
 
62
 
63
  // 新增:矩形框集合
64
  [ObservableProperty]
65
+ public ObservableCollection<RectangleItem> rectangles = new ObservableCollection<RectangleItem>();
66
 
67
  // 新增:矩形框计数器
68
  [ObservableProperty]
69
+ public int rectangleCounter = 0;
70
 
71
  public ViewModel()
72
  {