Merge branch '0630-main' into 'main'

fix:#61356

See merge request kylin-desktop/kylin-nm!74
This commit is contained in:
chen lelin 2021-06-30 13:19:42 +00:00
commit bd14d55d15
2 changed files with 30 additions and 9 deletions

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>424</width> <width>424</width>
<height>60</height> <height>142</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -172,7 +172,7 @@
<string/> <string/>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="leInfo_1"> <widget class="QLabel" name="leInfo_1">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>63</x> <x>63</x>
@ -181,8 +181,11 @@
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text">
<string/>
</property>
</widget> </widget>
<widget class="QLineEdit" name="leInfo_2"> <widget class="QLabel" name="leInfo_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>63</x> <x>63</x>
@ -191,8 +194,11 @@
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text">
<string/>
</property>
</widget> </widget>
<widget class="QLineEdit" name="leInfo_3"> <widget class="QLabel" name="leInfo_3">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>63</x> <x>63</x>
@ -201,6 +207,9 @@
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text">
<string/>
</property>
</widget> </widget>
<zorder>leInfo_1</zorder> <zorder>leInfo_1</zorder>
<zorder>leInfo_2</zorder> <zorder>leInfo_2</zorder>

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>424</width> <width>424</width>
<height>60</height> <height>167</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -100,7 +100,7 @@
<string/> <string/>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="leInfo_1"> <widget class="QLabel" name="leInfo_1">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>63</x> <x>63</x>
@ -109,8 +109,11 @@
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text">
<string/>
</property>
</widget> </widget>
<widget class="QLineEdit" name="leInfo_2"> <widget class="QLabel" name="leInfo_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>63</x> <x>63</x>
@ -119,8 +122,11 @@
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text">
<string/>
</property>
</widget> </widget>
<widget class="QLineEdit" name="leInfo_3"> <widget class="QLabel" name="leInfo_3">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>63</x> <x>63</x>
@ -129,8 +135,11 @@
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text">
<string/>
</property>
</widget> </widget>
<widget class="QLineEdit" name="leInfo_4"> <widget class="QLabel" name="leInfo_4">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>63</x> <x>63</x>
@ -139,6 +148,9 @@
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text">
<string/>
</property>
</widget> </widget>
<zorder>leInfo_1</zorder> <zorder>leInfo_1</zorder>
<zorder>leInfo_2</zorder> <zorder>leInfo_2</zorder>