bill 7 kuukautta sitten
vanhempi
commit
725450dd7b
5 muutettua tiedostoa jossa 15 lisäystä ja 7 poistoa
  1. 2 2
      src/api/scene.ts
  2. 1 1
      src/layout/edit/scene-select.vue
  3. 10 2
      src/store/fuse-model.ts
  4. 1 1
      src/store/scene.ts
  5. 1 1
      vite.config.ts

+ 2 - 2
src/api/scene.ts

@@ -67,8 +67,8 @@ const toLocalScene = (scene: Scene) => ({
 
 
 
-export const getSyncSceneInfo = async () => {
-  return (await axios.post<string>(SYNC_INFO, { caseId: params.caseId }));
+export const getSyncSceneInfo = async (scene: Scene) => {
+  return (await axios.post<string>(SYNC_INFO, { caseId: params.caseId, num: scene.raw.num }));
 };
 
 export const fetchScenes = async () => {

+ 1 - 1
src/layout/edit/scene-select.vue

@@ -97,7 +97,7 @@ type Key = Scene["modelId"];
 
 const Search = Input.Search;
 
-const selectIds = computed(() => fuseModels.value.map((item) => item.modelId));
+const selectIds = computed(() => fuseModels.value.filter(item => item.type !== SceneType.SWMX).map((item) => item.modelId));
 const visible = ref(false);
 const keyword = ref("");
 const SceneGroupTypeDesc: any = {

+ 10 - 2
src/store/fuse-model.ts

@@ -188,7 +188,7 @@ export const saveFuseModels = saveStoreItems(fuseModels, getBackupFuseModels, {
 
 export const autoSaveFuseModels = autoSetModeCallback(fuseModels, {
   isUpdate: (fuseModels) => {
-    if (isUnSet) return false
+    // if (isUnSet) return false
     return deepIsRevise(
       fuseModels.map((item) => ({
         ...item,
@@ -205,7 +205,15 @@ export const autoSaveFuseModels = autoSetModeCallback(fuseModels, {
     )
   },
   backup: backupFuseModels,
-  recovery: recoverFuseModels,
+  recovery: async () => {
+    recoverFuseModels()
+
+    await new Promise<void>((resolve) => {
+      setTimeout(() => {
+        resolve()
+      }, 100)
+    })
+  },
   save: async () => {
     await saveFuseModels();
 

+ 1 - 1
src/store/scene.ts

@@ -56,7 +56,7 @@ export const getSWKKSyncLink = async (scene: Scene) => {
 
   const url = new URL(SceneTypePaths[SceneType.SWKK][2], window.location.href);
   const userInfo = await getUserInfo();
-  const roomId = await getSyncSceneInfo();
+  const roomId = await getSyncSceneInfo(scene);
   const params = {
     vruserId: userInfo.userName,
     // platform: "fd",

+ 1 - 1
vite.config.ts

@@ -99,7 +99,7 @@ export default defineConfig({
   server: {
     host: '0.0.0.0',
     port: 7173,
-    open: true,
+    // open: true,
     proxy: proxy,
     https: true
   },