three-base 2.0.92 → 2.0.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-base",
-  "version": "2.0.92",
+  "version": "2.0.94",
   "description": "three 3d three-base",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/threeLoader.js

@@ -25,7 +25,7 @@ import axios from "axios";
 import dracoDecoderWASM from "./lib/draco/draco_decoder.wasm?url";
 import threeUtils from "./threeUtils";
 import { generateUUID } from "three/src/math/MathUtils";
-import { isString } from "lodash";
+import { isEmpty, isString } from "lodash";
 // 加载器
 class ThreeLoader extends EventDispatcher {
     constructor() {
@@ -181,6 +181,9 @@ class ThreeLoader extends EventDispatcher {
     }
     /** 加载模型支持glb,gltf,fbx,stl,obj,usdz,dae,zip */
     async loadModel(url, filename = "") {
+        if (isEmpty(url)) {
+            throw new Error(`loadModel:无效的参数 url=${url}`);
+        }
         // 本次需要销毁的bloburl,加载完成后就去销毁本次的文件
         const revokeObjectfile = [];
         // 获取模型文件的后缀
@@ -241,7 +244,6 @@ class ThreeLoader extends EventDispatcher {
                     revokeObjectfile.push(file.name);
                     if (suffixs.includes(threeUtils.getSuffix(file.name))) {
                         modelurl = file.name;
-                        break;
                     }
                 }
                 return modelurl;
@@ -256,7 +258,9 @@ class ThreeLoader extends EventDispatcher {
                         responseType: "arraybuffer",
                     })
                         .then((res) => res.data)
-                    : url;
+                    : url instanceof File
+                        ? url
+                        : url[0];
                 return await JSZip.loadAsync(arrayBuffer).then(async (zip) => {
                     for (let filename in zip.files) {
                         if (!zip.files[filename].dir) {