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

src/layout/edit/scene-select.vue

@@ -90,7 +90,7 @@ import {
 } from "@/store";
 
 import { SceneType, uploadMaterialToModel, type Scene } from "@/api";
-import { getSceneModel } from "@/sdk";
+import { activeModel, getSceneModel } from "@/sdk";
 import { selectMaterials } from "@/components/materials/quisk";
 import { custom } from "@/env";
 import { actionItems, currentItem } from "@/views/merge";
@@ -196,7 +196,8 @@ const addModelHandler = createLoadPack(async (modelIds: number[]) => {
   await asyncTimeout(100);
   await save();
 
-  custom.currentModel = addModels[addModels.length - 1]
+  activeModel({ showMode: 'fuse', active: addModels[addModels.length - 1] })
+  // custom.currentModel = addModels[addModels.length - 1]
   currentItem.value = actionItems[0]
 });
 

src/views/tagging/hot/images.vue

@@ -15,7 +15,6 @@
           @click="inFull && $emit('pull', ndx)"
         >
           <!-- v-if="ndx === index" -->
-          {{ ndx }}
           <ResourceView :data="getFileUrl(raw)" class="p-item" :focus="ndx === index" />
           <!-- <img :src="getResource(getFileUrl(raw))" /> -->
         </div>