fix: 1

src/views/animation/index.vue

@@ -46,7 +46,7 @@ import GlobalFrame from "./right/frame.vue";
 import Bottom from "./bottom.vue";
 import BottomPano from "@/layout/bottom-pano.vue";
 import router from "@/router";
-import { enterEdit } from "@/store";
+import { enterEdit, sysBus } from "@/store";
 import { useViewStack } from "@/hook";
 import { ams, AnimationModel, autoSaveAnimationModel } from "@/store/animation";
 import { computed, nextTick, onUnmounted, reactive, ref, watch, watchEffect } from "vue";
@@ -69,6 +69,9 @@ import { useRMenus } from "@/components/right-menu";
 
 enterEdit(() => router.back());
 useViewStack(autoSaveAnimationModel);
+sysBus.on("leave", () => {
+  updateFocus();
+});
 useViewStack(() => {
   const showRight = ref(false);
   return mergeFuns(

src/views/animation/left.vue

@@ -86,7 +86,7 @@ const stop = watchEffect(() => {
     setTimeout(() => {
       emit("update:focus", ams.value[0]);
       stop();
-    }, 1000);
+    }, 100);
   }
 });
 // }

src/views/animation/right/frame.vue

@@ -13,7 +13,7 @@
         "
         class="fun-ctrl"
       >
-        <ui-icon :type="action.icon" />
+        <ui-icon :type="action.icon" :tip="action.tip" />
       </span>
     </div>
   </div>
@@ -23,9 +23,9 @@
 import { AnimationModelFrame } from "@/api";
 
 const actions = [
-  { key: "translate", icon: "a-move" },
-  { key: "rotate", icon: "a-rotate" },
-  { key: "scale", icon: "a-zoom" },
+  { key: "translate", icon: "a-move", tip: "移动" },
+  { key: "rotate", icon: "a-rotate", tip: "旋转" },
+  { key: "scale", icon: "a-zoom", tip: "缩放" },
   // { key: "originTranslate", icon: "a-anchor" },
 ];
 

src/views/merge/index.vue

@@ -108,8 +108,8 @@ const othActions = reactive([
   {
     icon: "rectification",
     text: "配准",
-    disabled: isOld,
     single: true,
+    disabled: computed(() => isOld.value || !!currentItem.value),
     action: () => {
       router.push({
         name: RoutesName.registration,