Merge remote-tracking branch 'origin/develop' into local-test

src/components/line-app/infos/TrainInfo.vue

@@ -627,11 +627,11 @@ const options = [
     value: 2,
   },
   {
-    label: '列车驾驶台',
+    label: '取消连接',
     value: 3,
   },
   {
-    label: '取消连接',
+    label: '列车驾驶台',
     value: 4,
   },
   {
@@ -645,9 +645,9 @@ function doTrainOperation(option: { label: string; value: number }) {
     setTrain();
   } else if (option.value == 2) {
     linkTrain();
-  } else if (option.value == 3) {
-    openTccDialog();
   } else if (option.value == 4) {
+    openTccDialog();
+  } else if (option.value == 3) {
     cancelTrainLink();
   } else if (option.value == 5) {
     clearTrain();

src/drawApp/graphics/TrainInteraction.ts

@@ -719,8 +719,8 @@ const TrainOperateMenu: ContextMenu = ContextMenu.init({
       items: [
         TrainParam,
         TrainLink,
-        DrivingCabConfig,
         CancelLink,
+        DrivingCabConfig,
         removeTrainConfig,
       ],
     },