Merge remote-tracking branch 'origin/main'

# Conflicts:
#	UI/BlockParameterManageWidget.py

UI/BlockParameterModel.py

@@ -147,11 +147,11 @@ class VarButtonDelegate(QItemDelegate):
             readORwirte = self.parent().model.datas[index.row()][4]
             if 'w' not in readORwirte:
                 return
+            
             dataType = self.parent().model.datas[index.row()][3]
             objectType =  self.parent().model.datas[index.row()][1]
 
             editlineLayout = ObjectTypeEditlayout(objectType, dataType)
-            # editlineLayout = objectTypeEditlayout.initUI()
 
             startActionBtn.index = [index.row(), index.column()]
             startActionBtn.setToolTip('强制')
@@ -165,11 +165,8 @@ class VarButtonDelegate(QItemDelegate):
             refreshButton.setToolTip('刷新')
             refreshButton.clicked.connect(self.refreshData)
             refreshButton.index = [index.row(), index.column()]
-            # parameEditline = QLineEdit()
-            # # parameEditline.setObjectName('parameEditline')
 
             boxLayout = QHBoxLayout()
-            # boxLayout.addWidget(parameEditline)
             boxLayout.addLayout(editlineLayout)
             boxLayout.addWidget(startActionBtn)
             boxLayout.addWidget(refreshButton)
@@ -178,7 +175,6 @@ class VarButtonDelegate(QItemDelegate):
             startActionBtn.setObjectName('startActionBtn')
 
             boxLayout.setContentsMargins(0, 0, 0, 0)
-            # boxLayout.setAlignment(Qt.AlignCenter)
             widget = QWidget()
             widget.setLayout(boxLayout)
             self.parent().setIndexWidget(
@@ -190,7 +186,6 @@ class VarButtonDelegate(QItemDelegate):
     def startAction(self, objectTypeEditlayout):
         sender = self.sender()
         model = self.parent().model
-        # value = model.datas[sender.index[0]][sender.index[1]]
         values = objectTypeEditlayout.getEditlineValue()
         if not values:
             reply = QMessageBox.question(self.parent(),
@@ -209,13 +204,13 @@ class VarButtonDelegate(QItemDelegate):
                                             QMessageBox.Yes)
                 return
         index = model.datas[sender.index[0]][0]
-        print(index, self.parent().dbModel.__name__, self.parent().blcoknumber + 1)
+        # print(index, self.parent().dbModel.__name__, self.parent().blcoknumber + 1)
     
     def refreshData(self):
         sender = self.sender()
         model = self.parent().model
-        index = model.datas[sender.index[0]][0]
-        print(index, self.parent().dbModel.__name__, self.parent().blcoknumber + 1)
+        # index = model.datas[sender.index[0]][0]
+        # print(index, self.parent().dbModel.__name__, self.parent().blcoknumber + 1)
 
         self.loadingDataWidget = LoadingDataWidget()
         self.loadingDataWidget.loadData()

utils/Globals.py

@@ -3,6 +3,7 @@ def _init():#初始化
     _globalDict = {}
     _globalDict['_touchMode'] = 0 # 触控模式
     _globalDict['MainWindow'] = None
+    _globalDict['blockManage'] = None
 def setValue(key,value):
     """ 定义一个全局变量 """
     _globalDict[key] = value