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

src/model/app.vue

@@ -38,15 +38,15 @@ export const Model = defineComponent({
       if (newURL !== url.value) {
         setTimeout(() => {
           const hook = (iframeRef.value?.contentWindow as any)?.beforeDestroy
-          console.error("当前iframe的beforeDestroy", hook)
+          console.error("当前iframe的beforeDestroy", hook,iframeRef.value?.contentWindow.winIndex )
           if (hook) {
             try {
               hook()
-            } catch {}
-            console.log("赋值1")
+            } catch(e) {
+              console.error(e)
+            }
             setTimeout(() => url.value = newURL, 300)
           } else {
-            console.log("赋值2")
             url.value = newURL
           }
         })
@@ -101,14 +101,13 @@ export const Model = defineComponent({
     watch(
       () => scene.value && scene.value.type, 
       (type, oldType, onCleanup) => {
-        if (!type) return;
+        if (type === false) return;
 
         const interval = setInterval(async () => {
           const target = iframeRef.value?.contentWindow?.document?.head
           if (!target) return;
           clearInterval(interval);
-          
-          (window as any).iframeCreated && (window as any).iframeCreated(iframeRef.value);
+          ;(window as any).iframeCreated && (window as any).iframeCreated(iframeRef.value);
           if (type === SceneType.SWSS) {
             const $style = document.createElement("style");
             $style.type = "text/css";
@@ -119,9 +118,8 @@ export const Model = defineComponent({
             `);
             $style.appendChild(textNode);
             target.appendChild($style);
-            console.log("定制完成")
           }
-        }, 100);
+        }, 16);
         onCleanup(() => clearInterval(interval));
       }, 
       {flush: 'post'}

src/router/constant.ts

@@ -71,25 +71,32 @@ export const paths = {
 export const metas = {
   [RoutesName.merge]: {
     icon: 'joint',
-    title: '拼接'
+    title: '拼接',
+    sysTitle: '多元融合'
   },
-  [RoutesName.proportion]: { full: true },
-  [RoutesName.registration]: { full: true },
+  [RoutesName.proportion]: { full: true,
+    sysTitle: '多元融合' },
+  [RoutesName.registration]: { full: true,
+    sysTitle: '多元融合' },
   [RoutesName.tagging]: {
     icon: 'label',
-    title: '标注'
+    title: '标注',
+    sysTitle: '多元融合'
   },
   [RoutesName.guide]: {
     icon: 'path',
-    title: '路径'
+    title: '路径',
+    sysTitle: '多元融合'
   },
   [RoutesName.measure]: {
     icon: 'nav-measure',
-    title: '测量'
+    title: '测量',
+    sysTitle: '多元融合'
   },
   [RoutesName.setting]: {
     icon: 'nav-setup',
-    title: '设置'
+    title: '设置',
+    sysTitle: '多元融合'
   },
 
   [RoutesName.view]: { sysTitle: '视图提取' },

src/store/sys.ts

@@ -27,7 +27,7 @@ export const title = computed(() => {
   console.error(currentMeta.value)
   const last = currentMeta.value && 'sysTitle' in currentMeta.value
     ? currentMeta.value.sysTitle
-    : (currentMeta.value as any)?.title || defTitle.value
+    : defTitle.value
 
   console.error(prefix.value)
   if (prefix.value && last) {