Jelajahi Sumber

Merge branch 'master' of http://192.168.0.115:3000/bill/fuse-code

xzw 2 tahun lalu
induk
melakukan
effd0fd3e8

+ 1 - 1
src/components/static-preview/index.vue

@@ -9,7 +9,7 @@
           <Sign :media="raw" />
         </template>
       </ui-slide>
-      <Sign :media="items[0]" />
+      <Sign :media="items[0]" v-else />
     </div>
   </teleport>
 </template>

+ 1 - 1
src/components/static-preview/style.scss

@@ -19,7 +19,7 @@
 .pull-preview {
   position: absolute;
   z-index: 9999;
-  display: flex;
+  // display: flex;
   align-items: center;
   top: 0;
   right: 0;

+ 1 - 1
src/env/index.ts

@@ -15,7 +15,7 @@ export const bottomBarHeightStack = stackFactory(ref<string>('60px'))
 export const showTaggingsStack = stackFactory(ref<boolean>(true))
 export const showMeasuresStack = stackFactory(ref<boolean>(false))
 export const currentModelStack = stackFactory(ref<FuseModel | null>(null))
-export const showModelsMapStack = stackFactory(ref<Map<FuseModel, boolean>>(new Map), true)
+export const showModelsMapStack = stackFactory(ref<WeakMap<FuseModel, boolean>>(new WeakMap()))
 export const modelsChangeStoreStack = stackFactory(ref<boolean>(false))
 export const showTaggingPositionsStack = stackFactory(ref<WeakSet<TaggingPosition>>(new WeakSet()))
 export const currentViewStack = stackFactory(ref<View>())

+ 6 - 0
src/layout/edit/fuse-edit.vue

@@ -83,6 +83,12 @@ watch(router.currentRoute, (_n, _, onClean) => {
     ]))
   }
 }, { flush: 'post', immediate: true })
+
+watchEffect((onCleanup) => {
+  if (!fuseModels.value.length) {
+    onCleanup(showRightPanoStack.push(ref(false)))
+  }
+})
 </script>
 
 <style lang="scss" scoped>

+ 1 - 1
src/sdk/association.ts

@@ -220,7 +220,7 @@ const associationModels = (sdk: SDK) => {
           watch(
             () => custom.currentModel === item,
             (selected) => {
-              console.log(item.title, selected, getSceneModel(item))
+              isUnSet || console.log(item.title, selected, getSceneModel(item))
               isUnSet || getSceneModel(item)?.changeSelect(selected)
             }
           )

+ 4 - 0
src/store/fuse-model.ts

@@ -82,6 +82,9 @@ export const backupFuseModels = () => {
     rotation: {...model.rotation},
     position: {...model.position},
   }))
+  for (const model of fuseModels.value) {
+    initFuseModel(model)
+  }
 }
 watch(fuseModels, () => {
   for (const model of bcModels) {
@@ -111,6 +114,7 @@ export const recoverFuseModels = () => {
     const model = fuseModels.value.find(item => item.id === oldItem.id)
     return model ? Object.assign(model, oldItem) : serviceToLocal(oldItem)
   })
+  console.log(backupItems)
 }
 
 export const updateFuseModel = updateStoreItem(fuseModels, postUpdateFuseModels)