Skip to content

Commit 552fff5

Browse files
committed
修复清清理空行不更新data_list的bug
修复替换和批量替换不更新data_list的bug
1 parent 98efd19 commit 552fff5

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

QBRssManager.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,7 @@ def search_tab_change(self, index):
741741
self.search_window.last_tab = index
742742

743743
def do_replace(self):
744+
global data_list
744745
logger.info(f'do_replace() 替换当前单元格内容')
745746
source_text = self.search_window.text_edit_list[self.search_window.last_tab].text()
746747
if not source_text:
@@ -750,10 +751,12 @@ def do_replace(self):
750751
pat = re.compile(re.escape(source_text), re.IGNORECASE)
751752
result = pat.sub(target_text, self.tableWidget.currentItem().text())
752753
logger.info(result)
754+
data_list[self.tableWidget.currentItem().row()][self.tableWidget.currentItem().column()] = result
753755
self.tableWidget.currentItem().setText(result)
754756
self.do_search()
755757

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

781786
self.tableWidget.blockSignals(False)
@@ -992,6 +997,7 @@ def on_save_click(self):
992997

993998
@pyqtSlot()
994999
def on_clean_row_click(self):
1000+
global data_list
9951001
# 防止触发 cellChange 事件导致重复更新
9961002
self.tableWidget.blockSignals(True)
9971003
data_list = clean_data_list()

0 commit comments

Comments
 (0)