同步代码

View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.cpp

@@ -320,8 +320,8 @@ void ControlOperationPage::on_moduleTypeComboBox_currentIndexChanged(int index)
         }
     }
 
-    UpdataModuleType(strMod, 1);
     m_isAdd = false;
+    UpdataModuleType(strMod, 1);
 }
 
 void ControlOperationPage::on_axisTypeComboBox_currentIndexChanged(int index)

View/die-bonder-ui/Src/RewriteControl/LightJoystickSwitchPage.ui

@@ -409,6 +409,16 @@
        <string>↑</string>
       </property>
      </widget>
+     <widget class="JoystickPage" name="widgetPage" native="true">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>-20</y>
+        <width>141</width>
+        <height>101</height>
+       </rect>
+      </property>
+     </widget>
     </widget>
     <widget class="QPushButton" name="move_Button">
      <property name="geometry">
@@ -499,16 +509,6 @@
       <string>当前选中：模组xxx   轴:x</string>
      </property>
     </widget>
-    <widget class="JoystickPage" name="widgetPage" native="true">
-     <property name="geometry">
-      <rect>
-       <x>100</x>
-       <y>10</y>
-       <width>141</width>
-       <height>101</height>
-      </rect>
-     </property>
-    </widget>
     <widget class="QLabel" name="showLabel">
      <property name="geometry">
       <rect>