UTS/AUTS_OLD
Archived
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1, ServiceController 中dbHost和ftpHost写入注册并步骤前置到lic验证之后

Browse Source 
2，Testplan隐藏行改为对高度设置来实现
This commit is contained in:
Wen Momo
2025-07-03 22:55:57 +08:00
parent 6d3dc10b0d
commit 3d56954029
5 changed files with 68 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
UTS_Core/UTSModule/Station/FrmStationPlan.Designer.vb generated
View File

@@ -419,6 +419,7 @@ Namespace UTSModule.Station
'SplPlanDesign
'
Me.SplPlanDesign.Dock = System.Windows.Forms.DockStyle.Fill
Me.SplPlanDesign.FixedPanel = System.Windows.Forms.FixedPanel.Panel2
Me.SplPlanDesign.Location = New System.Drawing.Point(0, 0)
Me.SplPlanDesign.Margin = New System.Windows.Forms.Padding(4)
Me.SplPlanDesign.Name = "SplPlanDesign"
@@ -691,7 +692,7 @@ Namespace UTSModule.Station
'
Me.SplitContainer1.Panel2.Controls.Add(Me.RtxColTip)
Me.SplitContainer1.Size = New System.Drawing.Size(446, 497)
Me.SplitContainer1.SplitterDistance = 409
Me.SplitContainer1.SplitterDistance = 407
Me.SplitContainer1.SplitterWidth = 6
Me.SplitContainer1.TabIndex = 1
'
@@ -706,7 +707,7 @@ Namespace UTSModule.Station
Me.GrdRowNode.Margin = New System.Windows.Forms.Padding(4)
Me.GrdRowNode.MouseWheelSpeed = CType(3, Short)
Me.GrdRowNode.Name = "GrdRowNode"
Me.GrdRowNode.Size = New System.Drawing.Size(446, 409)
Me.GrdRowNode.Size = New System.Drawing.Size(446, 407)
Me.GrdRowNode.TabIndex = 0
'
'RtxColTip
@@ -717,7 +718,7 @@ Namespace UTSModule.Station
Me.RtxColTip.Location = New System.Drawing.Point(0, 0)
Me.RtxColTip.Margin = New System.Windows.Forms.Padding(4)
Me.RtxColTip.Name = "RtxColTip"
Me.RtxColTip.Size = New System.Drawing.Size(446, 82)
Me.RtxColTip.Size = New System.Drawing.Size(446, 84)
Me.RtxColTip.TabIndex = 0
Me.RtxColTip.Text = ""
'
@@ -782,8 +783,8 @@ Namespace UTSModule.Station
Me.Text = "Form1"
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
Me.StuMain.ResumeLayout(false)
Me.StuMain.PerformLayout
Me.StuMain.ResumeLayout(False)
Me.StuMain.PerformLayout
Me.SplStationPlan.Panel1.ResumeLayout(false)
Me.SplStationPlan.Panel2.ResumeLayout(false)
CType(Me.SplStationPlan,System.ComponentModel.ISupportInitialize).EndInit

61
UTS_Core/UTSModule/Station/StationPlanGrid.vb
View File

@@ -1412,19 +1412,22 @@ Namespace UTSModule.Station
For i As Integer = 0 To _headNode.RowList.Count - 1
If _headNode.RowList(i).RowType = RowNode.RowTypeEnum.FixedModule Then
_grd.Row(i).Visible = True
'_grd.Row(i).Visible = True
SetRowVisible(i, True)
ElseIf _headNode.RowList(i).RowType = RowNode.RowTypeEnum.Module Then
If action = False Then
_grd.Row(i).Visible = True
'_grd.Row(i).Visible = True
SetRowVisible(i, True)
Else
If _headNode.RowList(i).Action Then
_grd.Row(i).Visible = True
' _grd.Row(i).Visible = True
SetRowVisible(i, True)
Else
_grd.Row(i).Visible = False
' _grd.Row(i).Visible = False
SetRowVisible(i, False)
For j As Integer = 1 To _headNode.RowList(i).AllChildCount
_grd.Row(i + j).Visible = False
'_grd.Row(i + j).Visible = False
SetRowVisible(i + j, False)
Next
i += _headNode.RowList(i).AllChildCount
@@ -1433,12 +1436,15 @@ Namespace UTSModule.Station
Else
If action Then
If _headNode.RowList(i).Action Then
_grd.Row(i).Visible = True
'_grd.Row(i).Visible = True
SetRowVisible(i, True)
Else
_grd.Row(i).Visible = False
'_grd.Row(i).Visible = False
SetRowVisible(i, False)
End If
Else
_grd.Row(i).Visible = True
'_grd.Row(i).Visible = True
SetRowVisible(i, True)
End If
End If
Next
@@ -1446,6 +1452,14 @@ Namespace UTSModule.Station
UnLockGridAutoRedraw()
End Sub
Public Sub SetRowVisible(row As Integer, visible As Boolean)
If visible Then
_grd.Row(row).Height = _grd.Row(0).Height
Else
_grd.Row(row).Height = 0
End If
End Sub
Public Sub SetNodeRecordShowMode(recode As Boolean)
If _headNode Is Nothing Then Return
@@ -1454,18 +1468,23 @@ Namespace UTSModule.Station
For i As Integer = 0 To _headNode.RowList.Count - 1
If _headNode.RowList(i).RowType = RowNode.RowTypeEnum.FixedModule Then
_grd.Row(i).Visible = True
' _grd.Row(i).Visible = True
SetRowVisible(i, True)
ElseIf _headNode.RowList(i).RowType = RowNode.RowTypeEnum.Module Then
_grd.Row(i).Visible = Not recode
'_grd.Row(i).Visible = Not recode
SetRowVisible(i, Not recode)
Else
If recode Then
If _headNode.RowList(i).SaveToDb Then
_grd.Row(i).Visible = True
'_grd.Row(i).Visible = True
SetRowVisible(i, True)
Else
_grd.Row(i).Visible = False
'_grd.Row(i).Visible = False
SetRowVisible(i, False)
End If
Else
_grd.Row(i).Visible = True
'_grd.Row(i).Visible = True
SetRowVisible(i, True)
End If
End If
Next
@@ -1481,20 +1500,24 @@ Namespace UTSModule.Station
For i As Integer = 1 To _headNode.RowList.Count - 1
If _headNode.RowList(i).RowType = RowNode.RowTypeEnum.FixedModule Then
_grd.Row(i).Visible = True
' _grd.Row(i).Visible = True
SetRowVisible(i, True)
ElseIf _headNode.RowList(i).RowType = RowNode.RowTypeEnum.Module Then
_headNode.RowList(i).Expanded = expand
For Each node As RowNode In _headNode.RowList(i).Children
_grd.Row(node.RowListIndex).Visible = expand
'_grd.Row(node.RowListIndex).Visible = expand
SetRowVisible(node.RowListIndex, expand)
Next
Else
If expand Then
_grd.Row(i).Visible = True
'_grd.Row(i).Visible = True
SetRowVisible(i, True)
Else
If String.IsNullOrEmpty(_headNode.RowList(i).Description) Then
_grd.Row(i).Visible = expand
'_grd.Row(i).Visible = expand
SetRowVisible(i, expand)
End If
End If
End If

2
UTS_Core/UTSModule/UtsDb.vb
View File

@@ -10,7 +10,7 @@ Namespace UTSModule
Public Shared Sub InitConnectParams(license As License.License)
RemoteDbType = DbExecutor.DbTypeEnum.Mysql
_remoteConn.Add("Server", UtsRegistry.DbHost) '从注册表中获取
_remoteConn.Add("Server", license.MysqlServer) '从注册表中获取
_remoteConn.Add("Port", license.MysqlPort)
_remoteConn.Add("User id", license.MysqlUserID)
_remoteConn.Add("Password", license.MysqlPassword)