From 3a0282af59dae2f498e8f7b05ee1f2209b955502 Mon Sep 17 00:00:00 2001
From: "ADMINISTRATOR\\Administrator" <951937200@qq.com>
Date: Thu, 20 Jun 2024 13:56:08 +0800
Subject: [PATCH] 0620

---
 UI/BlockParameterManageWidget.py |  2 +-
 UI/LoadingDataWidget.py          | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/UI/BlockParameterManageWidget.py b/UI/BlockParameterManageWidget.py
index b56c858..e83b7c3 100644
--- a/UI/BlockParameterManageWidget.py
+++ b/UI/BlockParameterManageWidget.py
@@ -50,7 +50,7 @@ class TbCombox(QComboBox):
         
         # 确保下拉列表宽度适应最长项
         # max_width = max(self.fontMetrics().width(self.itemText(i)) for i in range(self.count()))
-        self.view().setMinimumWidth(100)
+        self.view().setMinimumWidth(130)
 
   
 
diff --git a/UI/LoadingDataWidget.py b/UI/LoadingDataWidget.py
index 2399855..40dd0f9 100644
--- a/UI/LoadingDataWidget.py
+++ b/UI/LoadingDataWidget.py
@@ -15,9 +15,10 @@ class LoadDataThread(QThread):
 
 class LoadingDataWidget(QDialog):
     # loadDataSignal = pyqtSignal(int, int)
-    def __init__(self):
+    def __init__(self, refreshType = None):
         super().__init__()
-        self.initUI()
+        self.refreshType = refreshType#判断是单次刷新还是整体加载数据
+        self.initUI() 
         # self.loadDataSignal.connect(self.loadData)
 
     def initUI(self):
@@ -28,12 +29,17 @@ class LoadingDataWidget(QDialog):
         
         vbox.addWidget(self.label)
         vbox.addWidget(self.progressBar)
+
+        if self.refreshType:
+            self.thread = LoadDataThread()
+            self.thread.progress.connect(self.singleLoadData)
+            self.thread.start()
         
         self.setLayout(vbox)
         self.setWindowTitle('数据查询')
         self.setWindowFlags(Qt.Window | Qt.WindowTitleHint | Qt.CustomizeWindowHint)
         self.setModal(True)
-    
+
     # def loadSignalEmit(self, maxValue:int, value:int):
     #     # print(maxValue, value)
     #     self.loadDataSignal.emit(maxValue, value)
@@ -45,6 +51,11 @@ class LoadingDataWidget(QDialog):
         if maxValue == value:
             self.accept()
 
+    def singleLoadData(self, value):
+        value *= 4
+        self.loadData(100, value)
+
+
 if __name__ == '__main__':
     app = QApplication(sys.argv)
     ex = LoadingDataWidget()