|
@@ -61,8 +61,8 @@
|
|
|
</div>
|
|
|
</div> -->
|
|
|
|
|
|
- <div class="ui-message tip-left">{{$t('fuse.vre')}}</div>
|
|
|
- <div class="ui-message tip-right">{{$t('fuse.hre')}}</div>
|
|
|
+ <div class="ui-message tip-left">{{ $t("fuse.vre") }}</div>
|
|
|
+ <div class="ui-message tip-right">{{ $t("fuse.hre") }}</div>
|
|
|
</template>
|
|
|
</template>
|
|
|
|
|
@@ -70,7 +70,7 @@
|
|
|
import { ref, computed, watch, watchEffect } from "vue";
|
|
|
import { ControlPanl } from "@/components/control-panl/";
|
|
|
import { modelRange, getSceneModel, sdk } from "@/sdk";
|
|
|
-import { diffArrayChange } from "@/utils";
|
|
|
+import { diffArrayChange, together, togetherCallback } from "@/utils";
|
|
|
import { useViewStack } from "@/hook";
|
|
|
import { autoSaveFuseModels, getFuseModel, leave } from "@/store";
|
|
|
import { router, RoutesName } from "@/router";
|
|
@@ -98,9 +98,9 @@ const model = computed(() => {
|
|
|
|
|
|
const sceneModel = computed(() => model.value && getSceneModel(model.value));
|
|
|
const options = [
|
|
|
- { desc: $t('fuse.move'), icon: "move", key: "move" },
|
|
|
- { desc: $t('fuse.flip'), icon: "flip", key: "rotate" },
|
|
|
- { desc: $t('fuse.opacity1'), icon: "transparency", key: "opacity" },
|
|
|
+ { desc: $t("fuse.move"), icon: "move", key: "move" },
|
|
|
+ { desc: $t("fuse.flip"), icon: "flip", key: "rotate" },
|
|
|
+ { desc: $t("fuse.opacity1"), icon: "transparency", key: "opacity" },
|
|
|
];
|
|
|
const selectOptions = ref<typeof options>([]);
|
|
|
const selectExpose = ref<ControlExpose>();
|
|
@@ -142,20 +142,29 @@ watchEffect((onCleanup) => {
|
|
|
if (smodel) {
|
|
|
smodel.enterAlignment();
|
|
|
const pop = currentModelStack.push(model as any);
|
|
|
- showPathStack.push(ref(undefined));
|
|
|
- showPathsStack.push(ref(false));
|
|
|
- showTaggingsStack.push(ref(false));
|
|
|
+ onCleanup(
|
|
|
+ togetherCallback([
|
|
|
+ currentModelStack.push(model as any),
|
|
|
+ showPathStack.push(ref(undefined)),
|
|
|
+ showPathsStack.push(ref(false)),
|
|
|
+ showTaggingsStack.push(ref(false)),
|
|
|
+ () => {
|
|
|
+ smodel.leaveTransform();
|
|
|
+ smodel.leaveAlignment();
|
|
|
+ },
|
|
|
+ ])
|
|
|
+ );
|
|
|
|
|
|
selectOptions.value = [options[0]];
|
|
|
|
|
|
- onCleanup(() => {
|
|
|
- smodel.leaveTransform();
|
|
|
- smodel.leaveAlignment();
|
|
|
- showPathsStack.pop();
|
|
|
- showPathStack.pop();
|
|
|
- showTaggingsStack.pop();
|
|
|
- pop();
|
|
|
- });
|
|
|
+ // onCleanup(() => {
|
|
|
+ // smodel.leaveTransform();
|
|
|
+ // smodel.leaveAlignment();
|
|
|
+ // showPathsStack.pop();
|
|
|
+ // showPathStack.pop();
|
|
|
+ // showTaggingsStack.pop();
|
|
|
+ // pop();
|
|
|
+ // });
|
|
|
} else if (isCurrent.value) {
|
|
|
leave();
|
|
|
}
|