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

src/api/model.ts

@@ -35,7 +35,7 @@ export interface ModelAttrs {
 }
 export interface Model extends ModelAttrs {
   id: string
-  url: string
+  url: Array<string>
   title: string
   fusionId?: number,
   type: ModelType
@@ -72,7 +72,7 @@ const serviceToLocal = (serviceModel: ServiceModel): Model => ({
   position: serviceModel.transform.position,
   rotation: serviceModel.transform.rotation,
   id: serviceModel.id.toString(),
-  url: serviceModel.modelUrl,
+  url: [serviceModel.modelUrl],
   title: serviceModel.modelTitle,
   fusionId: serviceModel.fusionId,
   type:  serviceModel.modelDateType === 'osgb' ? ModelType.OSGB : serviceModel.modelDateType === 'b3dm' ? ModelType.B3DM : serviceModel.type === 2 ? ModelType.SWMX : ModelType.SWMX,
@@ -86,7 +86,7 @@ const localToService = (model: Model): ServiceModel => ({
   hide: Number(!model.show),
   fusionId: model.fusionId,
   modelDateType: model.type,
-  modelUrl: model.url,
+  modelUrl: model.url[0],
   type: model.type === ModelType.SWSS ? 2 : 3,
   modelSize: model.size,
   modelTitle: model.title,

src/layout/model-list/index.vue

@@ -51,6 +51,7 @@ const modelList = computed(() =>
 )
 
 const addHandler = async (file: File) => {
+  console.error('addHandler?')
   await addModel(file)
   modelList.value.forEach(model => {
     if (!custom.showModelsMap.has(model.raw)) {

src/sdk/association.ts

@@ -41,13 +41,13 @@ const associationModels = (sdk: SDK) => {
       console.log('加载模型', {
         ...itemRaw,
         ...modelRange,
-        url: getResource(item.url)
+        url: item.url.map(getResource)
       })
       const sceneModel = sdk.addModel({
         ...itemRaw,
         ...modelRange,
         // type: ModelType.SWMX,
-        url: getResource(item.url)
+        url: item.url.map(getResource)
       })
       sceneModelMap.set(itemRaw, sceneModel)
 

src/sdk/sdk.ts

@@ -102,4 +102,4 @@ export const initialSDK = async (props: InialSDKProps) => {
   sdk.layout = props.layout
 }
 
-export default sdk
+export default sdk!