Browse Source

修改bug

bill 1 year ago
parent
commit
65c780fc11

+ 1 - 1
package.json

@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@simaq/core": "1.1.6",
+    "@simaq/core": "1.1.7",
     "ant-design-vue": "^3.3.0-beta.3",
     "axios": "^0.27.2",
     "less": "^4.1.3",

+ 4 - 4
pnpm-lock.yaml

@@ -1,7 +1,7 @@
 lockfileVersion: 5.4
 
 specifiers:
-  '@simaq/core': 1.1.6
+  '@simaq/core': 1.1.7
   '@types/node': ^18.6.5
   '@vitejs/plugin-vue': ^3.0.0
   ant-design-vue: ^3.3.0-beta.3
@@ -19,7 +19,7 @@ specifiers:
   vuedraggable: ^4.1.0
 
 dependencies:
-  '@simaq/core': 1.1.6
+  '@simaq/core': 1.1.7
   ant-design-vue: 3.3.0-beta.3_vue@3.2.37
   axios: 0.27.2
   less: 4.1.3
@@ -219,8 +219,8 @@ packages:
       '@octokit/openapi-types': 14.0.0
     dev: false
 
-  /@simaq/core/1.1.6:
-    resolution: {integrity: sha512-V7Cm7Fyc0o6QJZ6rYcBKHnbadzi4+IMZR05atb/R0cZvLyIxa7+NEIp5hMa+KTzkgl+6OutvugC/GTUdxnWIyA==}
+  /@simaq/core/1.1.7:
+    resolution: {integrity: sha512-6a9nHGsa80G7rR5XXuLRtugWS4TVTFkSfoQKJYN3THu80eKGtIJNn497oQduobLBau8vUreY3tyitSO+yFiBaQ==}
     dependencies:
       eventemitter3: 4.0.7
       rxjs: 7.5.7

+ 30 - 0
src/model/app.vue

@@ -95,6 +95,36 @@ export const Model = defineComponent({
       { immediate: true, flush: 'post' }
     )
 
+    // 处理iframe 定制页面
+    watch(
+      () => scene.value && scene.value.type, 
+      (type, oldType, onCleanup) => {
+        if (!type) 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);
+          if (type === SceneType.SWSS) {
+            const $style = document.createElement("style");
+            $style.type = "text/css";
+            var textNode = document.createTextNode(`
+              .mode-tab > .model-mode-tab.strengthen {
+                display: none !important;
+              }
+            `);
+            $style.appendChild(textNode);
+            target.appendChild($style);
+            console.log("定制完成")
+          }
+        }, 100);
+        onCleanup(() => clearInterval(interval));
+      }, 
+      {flush: 'post'}
+    )
+
     return {
       iframeRef,
       fuseRef,

+ 6 - 7
src/store/sys.ts

@@ -97,9 +97,8 @@ export const unSetModelUpdate = (run: () => void) => {
   run()
   nextTick(() => isUnset = false)
 }
-export const autoSetModeCallback = <T extends object>(current: T, setting: AutoSetModeSetting<T>) => {
+export const autoSetModeCallback = <T extends object>(current: T, setting: AutoSetModeSetting<T>, last = true) => {
   let isSave = false
-
   const leaveCallback = (setting.recovery || setting.backup)
     && (() => {
       setting.recovery && setting.recovery()
@@ -108,7 +107,7 @@ export const autoSetModeCallback = <T extends object>(current: T, setting: AutoS
     })
   
   const saveCallback = async () => {
-    leaveCallback && sysBus.off('leave', leaveCallback, { last: true })
+    leaveCallback && sysBus.off('leave', leaveCallback, { last })
     isSave = true
     await setting.save()
     setting.backup && setting.backup()
@@ -120,9 +119,9 @@ export const autoSetModeCallback = <T extends object>(current: T, setting: AutoS
     if (!setting.isUpdate || setting.isUpdate(newv, oldv)) {
       isEdit.value || enterEdit()
       isOld.value ||  enterOld()
-      saveCallback && sysBus.on('save', saveCallback, { last: true })
+      saveCallback && sysBus.on('save', saveCallback, { last })
     }
-    leaveCallback && sysBus.on('leave', leaveCallback, { last: true })
+    leaveCallback && sysBus.on('leave', leaveCallback, { last })
   }
 
   return () => {
@@ -131,7 +130,7 @@ export const autoSetModeCallback = <T extends object>(current: T, setting: AutoS
   }
 }
 
-export const useAutoSetMode = <T extends object>(current: T, setting: AutoSetModeSetting<T>) => {
-  const startWatch = autoSetModeCallback(current, setting)
+export const useAutoSetMode = <T extends object>(current: T, setting: AutoSetModeSetting<T>, last = true) => {
+  const startWatch = autoSetModeCallback(current, setting, last)
   useViewStack(startWatch)
 }

+ 1 - 0
src/utils/store-help.ts

@@ -158,6 +158,7 @@ export const saveStoreItems = <T extends {id: any}>(
     added
   } = diffStoreItemsChange(newItems.value, oldItems)
 
+  console.log(deleted, updated, added, newItems.value.length, oldItems.length)
   const promiseAll: Promise<any>[] = []
   
   if (actions.delete) {

+ 3 - 2
src/views/guide/edit-paths.vue

@@ -126,10 +126,11 @@ useAutoSetMode(paths, {
       .filter(path => !oldPaths.includes(path))
       .concat(paths.value)
     if (isTemploraryID(props.data.id)) {
+      console.error("现在才保存?")
       guides.value.push(props.data)
     }
-  }
-})
+  },
+}, false)
 
 const addPath = () => {
   loadPack(async () => {

+ 3 - 0
src/views/guide/sign.vue

@@ -62,6 +62,9 @@ const actions = {
       resolution: '4k',
       autoDownload: false,
       platform: 'web',
+      config: {
+        frameRate: 60
+      },
       disbaledAudio: false,
       systemAudio: false,
       debug: false,

BIN
src/views/setting/images/huimengmeng.jpg


BIN
src/views/setting/images/lantianbaiyun.jpg


BIN
src/views/setting/images/lantianbaiyun.png


BIN
src/views/setting/images/pic_hmm@2x.png


BIN
src/views/setting/images/pic_hmm_hdr@2x.png


BIN
src/views/setting/images/pic_ltby@2x.png


BIN
src/views/setting/images/pic_ltby_hdr@2x.png


BIN
src/views/setting/images/pic_xk@2x.png


BIN
src/views/setting/images/pic_xk_hdr@2x.png


BIN
src/views/setting/images/pic_yj@2x.png


BIN
src/views/setting/images/preller_drive_2k.jpg


+ 0 - 1
src/views/setting/images/vue.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>

BIN
src/views/setting/images/xingkong.jpg


+ 8 - 8
src/views/setting/index.vue

@@ -32,14 +32,14 @@
 
 <script lang="ts" setup>
 import { RightFillPano } from '@/layout'
-import ltby from '@/assets/pic_ltby@2x.png'
-import hmm from '@/assets/pic_hmm@2x.png'
-import xk from '@/assets/pic_xk@2x.png'
-import yk from '@/assets/pic_yj@2x.png'
-import hmm360 from './images/huimengmeng.jpg'
-import ltby360 from './images/lantianbaiyun.jpg'
-import yk360 from './images/preller_drive_2k.jpg'
-import xk360 from './images/xingkong.jpg'
+import ltby from './images/pic_ltby@2x.png'
+import hmm from './images/pic_hmm@2x.png'
+import xk from './images/pic_xk@2x.png'
+import yk from './images/pic_yj@2x.png'
+import hmm360 from './images/pic_hmm_hdr@2x.png'
+import ltby360 from './images/pic_ltby_hdr@2x.png'
+import yk360 from './images/lantianbaiyun.png'
+import xk360 from './images/pic_xk_hdr@2x.png'
 import { enterEdit, enterOld, setting, isEdit, updataSetting } from '@/store'
 import { reactive, ref } from 'vue'
 import { togetherCallback, getFileUrl, loadPack } from '@/utils'