浏览代码

Merge branch 'v1.9.0-jm' of http://192.168.0.115:3000/bill/fuse-code into v1.9.0-jm

xzw 7 月之前
父节点
当前提交
8b1b7e6462
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      src/sdk/association/fuseMode.ts
  2. 1 0
      src/store/fuse-model.ts
  3. 1 1
      src/store/sys.ts

+ 1 - 1
src/sdk/association/fuseMode.ts

@@ -249,7 +249,7 @@ export const associationModels = (sdk: SDK) => {
             () => item.scale,
             () => isUnSet || getSceneModel(item)?.changeScale(item.scale)
             // { immediate: true }
-          );
+          ); 
           watch(
             () => item.position,
             () => {

+ 1 - 0
src/store/fuse-model.ts

@@ -107,6 +107,7 @@ watchPostEffect(() => {
 let bcModels: FuseModels = [];
 export const getBackupFuseModels = () => bcModels;
 export const backupFuseModels = () => {
+  console.error('???')
   bcModels = JSON.parse(JSON.stringify(fuseModels.value))
   console.log('bcModels', bcModels)
   for (const model of fuseModels.value) {

+ 1 - 1
src/store/sys.ts

@@ -117,7 +117,7 @@ export const autoSetModeCallback = <T extends object>(
     (async () => {
       isLeaveIng = true;
       setting.recovery && (await setting.recovery());
-      setting.backup && (await setting.backup());
+      // setting.backup && (await setting.backup());
       setting.leave && (await setting.leave());
       isLeaveIng = false;
     });