Bläddra i källkod

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

xzw 1 år sedan
förälder
incheckning
882e6e8b9a
2 ändrade filer med 9 tillägg och 3 borttagningar
  1. 3 2
      src/sdk/sdk.ts
  2. 6 1
      src/utils/loading.ts

+ 3 - 2
src/sdk/sdk.ts

@@ -1,5 +1,5 @@
 import cover from './cover'
-import { loadLib } from '@/utils'
+import { createLoadPack, loadLib } from '@/utils'
 
 import { FuseModelAttrs, FuseModel, GuidePath, MeasureType, Measure as StoreMeasure, MeasurePosition } from '@/store'
 import type { Emitter } from 'mitt'
@@ -140,7 +140,8 @@ export const initialSDK = async (props: InialSDKProps) => {
 
   (window as any).sdk = sdk = localSdk
   sdk.layout = props.layout
-  
+  sdk.hideGrid();
+  sdk.screenshot = createLoadPack(sdk.screenshot)
 }
 
 export default sdk!

+ 6 - 1
src/utils/loading.ts

@@ -6,7 +6,12 @@ import type { AsyncComponentLoader, Component } from 'vue'
 export const loadPack = <T, K extends (...args: any[]) => Promise<T>>(fn: K | Promise<T>): Promise<T> => {
     Loading.show()
     const ret = typeof fn === 'function' ? fn() : fn
-    ret.finally(() => Loading.hide())
+    if (ret.finally) {
+      ret.finally(() => Loading.hide())
+    } else {
+      ret.then(() => Loading.hide())
+      ret.catch(() => Loading.hide())
+    }
     return ret
 }