20250102 删除合并编辑

Front/main.py

@@ -629,13 +629,13 @@ class MainWindow(QMainWindow):
         # action_1.triggered.connect(lambda: self.do_something(index))
         # menu.addAction(action_1)
         # 添加菜单项和对应的操作
-        action_1 = QAction("删除该行", self)
-        action_1.triggered.connect(self.del_Dataclicked)
-        menu.addAction(action_1)
         action_2 = QAction("编辑单元格", self)
         action_2.triggered.connect(self.edit_dataclicked)
         menu.addAction(action_2)
-        action_3 = QAction("添加数据", self)
+        action_1 = QAction("删除该行", self)
+        action_1.triggered.connect(self.del_Dataclicked)
+        menu.addAction(action_1)
+        action_3 = QAction("添加一行", self)
         action_3.triggered.connect(self.add_Dataclicked)
         menu.addAction(action_3)
         menu.exec(self.ui.resultTableView1.mapToGlobal(pos))
@@ -1017,38 +1017,12 @@ class MainWindow(QMainWindow):
 
     # 右键对应行可删除对应行
     def del_Dataclicked(self):
-        select_item = self.ui.allTreeWidget.currentItem()
-        if select_item == None:
-            select_item = self.ui.qureyTreeWidget.currentItem()
-        # 获取数据库路径和表名
-        tablename = select_item.text(0)
-        tablename_utf8 = tablename.encode('utf-8')
-        # 获取父节点
-        parent_item = select_item.parent()
-        parent_name = parent_item.text(0)
-        dbname = parent_item.parent().text(0)
-        dbpath = os.path.join(os.path.abspath('../SQL'), f"{dbname}.db")
         curIndex = self.selectModel.currentIndex()
-        # self.ui.resultTableView1.model().removeRow(curIndex.row())
-        col = curIndex.column()
-        row = curIndex.row()
-        # 重新组织表的内容，方便重新计算
-        UIFunctions.del_row_from_db(self, row, parent_name, tablename_utf8, dbpath)
-        # 1秒后自动跳转
-        QTimer.singleShot(1000, lambda: self.simulateButtonClick("btn_new"))
-        # 刷新树和tableview
-        self.refresh_tree()
-
-        # 数据库路径，哪种方法，表名
-        self.selectModel = UIFunctions.search_data_to_show(self, dbpath, parent_name, tablename)
-        # self.ui.resultTableView1.doubleClicked.connect(self.seleceModel_itemclicked)
-
-        # 设置右键菜单策略为CustomContextMenu
-        self.ui.resultTableView1.setContextMenuPolicy(Qt.CustomContextMenu)
-
-        # 关联自定义的右键菜单方法到customContextMenuRequested信号
-        self.ui.resultTableView1.customContextMenuRequested.connect(self.show_custom_context_menu)
+        self.ui.resultTableView1.model().removeRow(curIndex.row())
+        # 所有条件都可以开启编辑
+        self.ui.resultTableView1.setEditTriggers(QTableView.EditTrigger.AllEditTriggers)
 
+    #编辑完了集中读取
     def update_dataclicked(self):
         inputmodel = self.ui.resultTableView1.model()
         # 转化为list