Merge branch 'v1.2.0-ga' of http://192.168.0.115:3000/bill/fuse-code into v1.2.0-ga

src/api/guide.ts

@@ -33,16 +33,17 @@ export interface Guide {
 export type Guides = Guide[]
 
 const serviceToLocal = (serviceGuide: ServiceGuide): Guide => ({
-  showTagging: true,
   showMeasure: true,
   showMonitor: true,
   showPath: true,
   ...serviceGuide,
+  showTagging: serviceGuide.showTaggings === undefined ? true : serviceGuide.showTaggings,
   id: serviceGuide.fusionGuideId.toString(),
 })
 
 const localToService = (guide: Guide): ServiceGuide => ({
   ...guide,
+  showTaggings: guide.showTagging,
   fusionGuideId: Number(guide.id),
 })
 

src/components/view-setting/index.vue

@@ -61,7 +61,8 @@ watch(
     showOptions.forEach((item) => {
       item.stack.value = props.value![item.key];
     });
-  }
+  },
+  { immediate: true }
 );
 
 watchEffect(() => {

src/views/animation/index.vue

@@ -21,6 +21,7 @@
       @apply-global="k => ams.forEach((am: any) => (am[k] = focusAM![k]))"
     />
     <GlobalFrame
+      class="global-frame"
       v-if="activeAttrib?.key !== 'frames' && !play"
       :data="{ id: '0', name: 'global-frame', time: 0 }"
       :frame-action="frameAction"
@@ -67,9 +68,10 @@ import {
 enterEdit(() => router.back());
 useViewStack(autoSaveAnimationModel);
 useViewStack(() => {
+  const showRight = ref(false);
   return mergeFuns(
     showBottomBarStack.push(ref(true)),
-    showRightPanoStack.push(ref(true)),
+    showRightPanoStack.push(showRight),
     showLeftPanoStack.push(ref(true)),
     showLeftCtrlPanoStack.push(computed(() => !play.value)),
     showSearchStack.push(computed(() => !play.value)),
@@ -82,6 +84,9 @@ useViewStack(() => {
         cleanups.push(showLeftPanoStack.push(ref(false)));
       }
       onCleanup(mergeFuns(cleanups));
+    }),
+    watchEffect(() => {
+      showRight.value = !!focusAM.value;
     })
   );
 });

src/views/animation/left.vue

@@ -78,12 +78,12 @@ const updateSelectAm = (item: AnimationModel, select: boolean) => {
   updateSelect(item, select);
 };
 
-if (import.meta.env.DEV) {
-  activeKey.value = "animation";
-  setTimeout(() => {
-    emit("update:focus", ams.value[0]);
-  });
-}
+// if (import.meta.env.DEV) {
+activeKey.value = "animation";
+setTimeout(() => {
+  emit("update:focus", ams.value[0]);
+});
+// }
 
 const delHandler = (item: AnimationModel) => {
   const ndx = ams.value.indexOf(item);