|
@@ -21,9 +21,9 @@
|
|
|
|
|
|
<script lang="ts" setup>
|
|
|
import { custom, params } from '@/env'
|
|
|
-import { computed, ref, watch, watchEffect } from 'vue'
|
|
|
+import { computed, ref, watch, watchEffect, nextTick } from 'vue'
|
|
|
import { isEdit, prefix, appEl, initialSetting, caseProject, refreshCase } from '@/store'
|
|
|
-import { currentLayout, RoutesName } from './router';
|
|
|
+import router, { currentLayout, RoutesName } from './router';
|
|
|
import { loadPack } from '@/utils'
|
|
|
import PwdModel from '@/layout/pwd.vue'
|
|
|
|
|
@@ -32,7 +32,7 @@ const inputPwd = ref(false)
|
|
|
const stopWatch = watch(currentLayout, async (layout) => {
|
|
|
if (!layout) {
|
|
|
return;
|
|
|
- } else if (layout === RoutesName.signModel) {
|
|
|
+ } else if (layout === RoutesName.signModel || layout === RoutesName.error) {
|
|
|
loaded.value = true;
|
|
|
return;
|
|
|
}
|
|
@@ -51,12 +51,16 @@ const stopWatch = watch(currentLayout, async (layout) => {
|
|
|
}
|
|
|
|
|
|
params.share = true
|
|
|
- await loadPack(initialSetting)
|
|
|
await refreshCase()
|
|
|
- console.log(caseProject.value)
|
|
|
- prefix.value = caseProject.value!.caseTitle
|
|
|
- loaded.value = true
|
|
|
+ if (caseProject.value) {
|
|
|
+ await loadPack(initialSetting)
|
|
|
+ prefix.value = caseProject.value!.caseTitle
|
|
|
+ } else {
|
|
|
+ await router.replace({name: RoutesName.error})
|
|
|
+ }
|
|
|
stopWatch()
|
|
|
+ loaded.value = true
|
|
|
+ console.log(loaded.value)
|
|
|
}, { immediate: true })
|
|
|
|
|
|
const layoutClassNames = computed(() => {
|