Merge branch 'release-buffer' of http://face3d.4dage.com:7005/chenlei/vue3-scene-web into demo

README.md

@@ -65,5 +65,35 @@ yarn serve
     举例：新增一个demo大场景
     1. 在 release-buffer 下新增 demo 分支
     2. 在 scripts 中新增 push:demo 指令，注意 push: 后的参数需要与分支名相同
+    3. 注意：不要在 release* 下发布版本
 
 测试环境项目地址：https://scene.4dage.com/?m=1172
+
+```bash
+mv .temp/* .
+
+scene=${SPUG_GIT_BRANCH%%/*}
+lastFileDir=$(ls -d -F /home/spug_backup/vue3-scene-web/* -t | grep '/$' | head -n 2 | tail -n 1)
+
+echo "当前场景值：$scene"
+echo "上一个部署目录：$lastFileDir"
+
+if [ -d "${lastFileDir}data/" ]
+then
+  echo "copy data file"
+  cp -r -n ${lastFileDir}data/ .
+fi
+
+if [ -d "${lastFileDir}resources/web/" ]
+then
+  echo "copy resources file"
+  if [ $scene = "test" ]
+  then
+    rsync -au --exclude=js --exclude=img --exclude=fonts --exclude=css ${lastFileDir}resources/web ./resources
+  else
+    rsync -au --exclude=$scene ${lastFileDir}resources/web ./resources
+  fi
+fi
+
+rm -r .temp
+```

src/views/home/index.tsx

@@ -23,11 +23,12 @@ export default defineComponent({
     Popup,
   },
   setup() {
-    // manage 配置是否加载完成
-    const configLoaded = ref(false);
+    const manageJsLoaded = ref(false);
+    const hotJsLoaded = ref(false);
 
     return {
-      configLoaded,
+      manageJsLoaded,
+      hotJsLoaded,
     };
   },
   render() {
@@ -75,16 +76,20 @@ export default defineComponent({
         </div>
 
         {/* TODO: 没有控制权，耦合严重；放在此处为了防止元素未渲染导致报错 */}
-        <JsScript src="/js/manage.js" onLoad={() => (this.configLoaded = true)} />
-        {this.configLoaded && (
+        <JsScript src="/js/manage.js" onLoad={() => (this.manageJsLoaded = true)} />
+        {this.manageJsLoaded && (
           <>
-            <JsScript src="/js/Hot.js" />
-            <JsScript src="/js/main_2020_show.js" />
-            {/* 延迟加载 */}
-            <JsScript src="/js/lib/player-0.0.12.min.js" />
-            <JsScript src="/js/lib/Tween.js" />
-            <JsScript src="/js/SpecialScene.js" />
-            <JsScript src="/js/loadCAD.js" />
+            <JsScript src="/js/Hot.js" onLoad={() => (this.hotJsLoaded = true)} />
+            {this.hotJsLoaded && (
+              <>
+                <JsScript src="/js/main_2020_show.js" />
+                {/* 延迟加载 */}
+                <JsScript src="/js/lib/player-0.0.12.min.js" />
+                <JsScript src="/js/lib/Tween.js" />
+                <JsScript src="/js/SpecialScene.js" />
+                <JsScript src="/js/loadCAD.js" />
+              </>
+            )}
           </>
         )}
       </div>