Skip to content

Commit

Permalink
修复清清理空行不更新data_list的bug
Browse files Browse the repository at this point in the history
修复替换和批量替换不更新data_list的bug
  • Loading branch information
Nriver committed Jun 20, 2022
1 parent 98efd19 commit 552fff5
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions QBRssManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,7 @@ def search_tab_change(self, index):
self.search_window.last_tab = index

def do_replace(self):
global data_list
logger.info(f'do_replace() 替换当前单元格内容')
source_text = self.search_window.text_edit_list[self.search_window.last_tab].text()
if not source_text:
Expand All @@ -750,10 +751,12 @@ def do_replace(self):
pat = re.compile(re.escape(source_text), re.IGNORECASE)
result = pat.sub(target_text, self.tableWidget.currentItem().text())
logger.info(result)
data_list[self.tableWidget.currentItem().row()][self.tableWidget.currentItem().column()] = result
self.tableWidget.currentItem().setText(result)
self.do_search()

def do_replace_all(self):
global data_list
logger.info(f'do_replace_all() 替换全部单元格内容')
source_text = self.search_window.text_edit_list[self.search_window.last_tab].text()
if not source_text:
Expand All @@ -776,6 +779,8 @@ def do_replace_all(self):
item = QTableWidgetItem(d)
if cy in config['center_columns']:
item.setTextAlignment(Qt.AlignCenter)
# 注意这里要更新data_list的数据
data_list[cx][cy] = d
self.tableWidget.setItem(cx, cy, item)

self.tableWidget.blockSignals(False)
Expand Down Expand Up @@ -992,6 +997,7 @@ def on_save_click(self):

@pyqtSlot()
def on_clean_row_click(self):
global data_list
# 防止触发 cellChange 事件导致重复更新
self.tableWidget.blockSignals(True)
data_list = clean_data_list()
Expand Down

0 comments on commit 552fff5

Please sign in to comment.