瀏覽代碼

fix(AdvancedTable): Able to shift-click select deleted rows

Owen Diffey 3 年之前
父節點
當前提交
658cbaf02c
共有 1 個文件被更改,包括 9 次插入5 次删除
  1. 9 5
      frontend/src/components/AdvancedTable.vue

+ 9 - 5
frontend/src/components/AdvancedTable.vue

@@ -1201,7 +1201,7 @@ export default {
 				{
 				{
 					keyCode: 116, // 'F5' key
 					keyCode: 116, // 'F5' key
 					ctrl: true,
 					ctrl: true,
-					preventDefault: true,
+					preventDefault: false,
 					handler: () => {
 					handler: () => {
 						// Reset local storage
 						// Reset local storage
 						console.log("Reset local storage");
 						console.log("Reset local storage");
@@ -1391,7 +1391,8 @@ export default {
 							itemIndexUp > this.lastSelectedItemIndex;
 							itemIndexUp > this.lastSelectedItemIndex;
 							itemIndexUp -= 1
 							itemIndexUp -= 1
 						) {
 						) {
-							this.rows[itemIndexUp].selected = true;
+							if (!this.rows[itemIndexUp].removed)
+								this.rows[itemIndexUp].selected = true;
 						}
 						}
 					}
 					}
 					// Clicked item is higher than last item, so select downwards until it reaches the last selected item
 					// Clicked item is higher than last item, so select downwards until it reaches the last selected item
@@ -1401,7 +1402,8 @@ export default {
 							itemIndexDown < this.lastSelectedItemIndex;
 							itemIndexDown < this.lastSelectedItemIndex;
 							itemIndexDown += 1
 							itemIndexDown += 1
 						) {
 						) {
-							this.rows[itemIndexDown].selected = true;
+							if (!this.rows[itemIndexDown].removed)
+								this.rows[itemIndexDown].selected = true;
 						}
 						}
 					}
 					}
 				}
 				}
@@ -1419,7 +1421,8 @@ export default {
 							itemIndexUp >= this.lastSelectedItemIndex;
 							itemIndexUp >= this.lastSelectedItemIndex;
 							itemIndexUp -= 1
 							itemIndexUp -= 1
 						) {
 						) {
-							this.rows[itemIndexUp].selected = false;
+							if (!this.rows[itemIndexUp].removed)
+								this.rows[itemIndexUp].selected = false;
 						}
 						}
 					}
 					}
 					// Clicked item is higher than last item, so unselect downwards until it reaches the last selected item
 					// Clicked item is higher than last item, so unselect downwards until it reaches the last selected item
@@ -1429,7 +1432,8 @@ export default {
 							itemIndexDown <= this.lastSelectedItemIndex;
 							itemIndexDown <= this.lastSelectedItemIndex;
 							itemIndexDown += 1
 							itemIndexDown += 1
 						) {
 						) {
-							this.rows[itemIndexDown].selected = false;
+							if (!this.rows[itemIndexDown].removed)
+								this.rows[itemIndexDown].selected = false;
 						}
 						}
 					}
 					}
 				}
 				}