fix: 修复脚本加载方法判断错误

oh-my-live2d · Mar 25, 2024 · 666a20a · 666a20a
1 parent 0b5977b
commit 666a20a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 30 deletions.
diff --git a/packages/oh-my-live2d/src/utils/index.ts b/packages/oh-my-live2d/src/utils/index.ts
@@ -78,26 +78,17 @@ export const createElement = (elConfig: ElementConfig): HTMLElement => {
  * @returns
  */
 export const loadScript = (sdkInfo: { url: string; id: string }): Promise<void> => {
-  // destroyElement(sdkInfo?.id);
-
   return new Promise((resolve) => {
-    const el = document.getElementById(sdkInfo.id);
+    destroyElement(sdkInfo?.id);
 
-    if (el) {
-      el.addEventListener('load', () => {
-        resolve();
-      });
-      // resolve();
-    } else {
-      const scriptElement = document.createElement('script');
-
-      scriptElement.id = sdkInfo?.id;
-      document.head.append(scriptElement);
-      scriptElement.src = sdkInfo?.url;
-      scriptElement.addEventListener('load', () => {
-        resolve();
-      });
-    }
+    const scriptElement = document.createElement('script');
+
+    scriptElement.id = sdkInfo?.id;
+    document.head.append(scriptElement);
+    scriptElement.src = sdkInfo?.url;
+    scriptElement.addEventListener('load', () => {
+      resolve();
+    });
   });
 };
 

diff --git a/tests/vite-app/src/main.ts b/tests/vite-app/src/main.ts
@@ -143,15 +143,16 @@ const foo = async () => {
   // setTimeout(() => {}, 10000);
   // console.log(oml2d);
   // oml2d.loadNextModel();
-  // const oml2d2 = await loadOml2d({
-  //   models: [
-  //     {
-  //       path: 'https://registry.npmmirror.com/oml2d-models/latest/files/models/Senko_Normals/senko.model3.json',
-  //       stageStyle: {},
-  //       mobileScale: 0.08
-  //     }
-  //   ]
-  // });
+
+  await loadOml2d({
+    models: [
+      {
+        path: 'https://registry.npmmirror.com/oml2d-models/latest/files/models/Senko_Normals/senko.model3.json',
+        stageStyle: {},
+        mobileScale: 0.08
+      }
+    ]
+  });
 
   // setTimeout(() => {
   //   oml2d.loadNextModel();

diff --git a/tests/vue-app/src/App.vue b/tests/vue-app/src/App.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
-import { onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
 import HelloWorld from './components/HelloWorld.vue';
 import { loadOml2d } from 'oh-my-live2d';
+const oml2d = ref();
 
 onMounted(() => {
-  console.log('sssssssssssss');
   loadOml2d({
+    parentElement: oml2d.value,
     primaryColor: 'pink',
-    sayHello: true,
+    sayHello: false,
     models: [
       {
         path: 'https://registry.npmmirror.com/oml2d-models/latest/files/models/Senko_Normals/senko.model3.json',
@@ -42,6 +43,7 @@ onMounted(() => {
     <img src="./assets/vue.svg" class="logo vue" alt="Vue logo" />
   </a>
   <HelloWorld msg="Vite + Vue" />
+  <div ref="oml2d"></div>
 </template>
 
 <style scoped>