gemercheung 2 年 前
コミット
3e56741b91

+ 1 - 1
packages/qjkankan-editor/.env.eurprod

@@ -8,4 +8,4 @@ VUE_APP_PROXY_URL='https://eur.4dkankan.com/qjkankan/'
 VUE_APP_ORIGIN=aws
 
 VUE_APP_URL_FILL=/qjkankan
-VUE_APP_DEBBUG_FLAG=0529-01
+VUE_APP_DEBBUG_FLAG=0628-01

ファイルの差分が大きいため隠しています
+ 0 - 38364
packages/qjkankan-editor/package-lock.json


+ 2 - 2
packages/qjkankan-editor/src/components/materialSelectorFromWork.vue

@@ -43,7 +43,7 @@
 
     <div class="table table-pano" v-show="currentMaterialType === 'pano'">
       <div v-show="panoList.length !== 0" class="table-body">
-       <!-- 测试数据-- {{
+        <!-- 测试数据-- {{
           panoList.map((i) => {
             let t = {};
             t["id"] = i.id;
@@ -104,7 +104,7 @@
       <div v-show="scene3DList.length !== 0" class="table-body">
         <div
           class="table-body-row"
-          v-for="(item) in scene3DList"
+          v-for="item in scene3DList"
           :key="`${item.id}`"
           @click="onClickRow"
         >

+ 68 - 0
packages/qjkankan-editor/src/directives/vTitleInEditor.js

@@ -83,4 +83,72 @@ Vue.directive("title", {
     el.addEventListener("dragover", removeTitle);
     el.addEventListener("dragleave", removeTitle);
   },
+  update: function (el, binding) {
+    removeTitle();
+    if (!binding.value) {
+      return;
+    }
+    el.addEventListener(
+      "mousemove",
+      function (e) {
+        if (!isShowTitle) {
+          clearTimeout(timerId);
+          timerId = setTimeout(() => {
+            isShowTitle = true;
+
+            titleNode = document.createElement("div");
+
+            titleNode.style.position = "fixed";
+            titleNode.style.zIndex = 2147483647;
+            titleNode.style.backgroundColor = "#191A1C";
+            titleNode.style.borderRadius = "2px";
+            titleNode.style.border = "1px solid rgba(151, 151, 151, 0.2)";
+            titleNode.style.padding = "2px 6px";
+            titleNode.style.fontSize = "12px";
+            titleNode.style.color = "rgba(255, 255, 255, 0.6)";
+            titleNode.innerText = binding.value;
+            titleNode.style.left = e.clientX + 11 + "px";
+            titleNode.style.top = e.clientY + 18 + "px";
+
+            document.body.appendChild(titleNode);
+
+            if (
+              e.clientX + 11 + titleNode.offsetWidth >
+              document.documentElement.clientWidth
+            ) {
+              titleNode.style.left =
+                document.documentElement.clientWidth -
+                titleNode.offsetWidth +
+                "px";
+            }
+            if (
+              e.clientY + 18 + titleNode.offsetHeight >
+              document.documentElement.clientHeight
+            ) {
+              titleNode.style.top =
+                document.documentElement.clientHeight -
+                titleNode.offsetHeight +
+                "px";
+            }
+
+            intervalId = setInterval(() => {
+              if (!document.contains(el)) {
+                removeTitle();
+              }
+            }, 300);
+          }, 500);
+        }
+      },
+      {
+        passive: false,
+      }
+    );
+
+    el.addEventListener("mouseleave", removeTitle);
+    el.addEventListener("mousedown", removeTitle);
+    el.addEventListener("keydown", removeTitle);
+    el.addEventListener("scroll", removeTitle);
+    el.addEventListener("dragover", removeTitle);
+    el.addEventListener("dragleave", removeTitle);
+  },
 });

+ 1 - 0
packages/qjkankan-editor/src/views/hotspot/hotspotType/pdf.vue

@@ -43,6 +43,7 @@ export default {
   methods: {
     del() {
       this.hotspot.pdfInfo = {};
+      this.$refs["file-input"].value = "";
     },
     onClickSelect() {
       this.$refs["file-input"].click();

+ 1 - 1
packages/qjkankan-editor/src/views/hotspot/hotspotType/scene.vue

@@ -17,7 +17,7 @@
       </div>
       <div class="right-wrap">
         <button class="ui-button submit" @click="showScene = true">{{$i18n.t('hotspot.change_scene')}}</button>
-        <div class="scene-title" v-title="selected.sceneTitle">{{selected.sceneTitle}}</div>
+        <div class="scene-title" v-title="selected.sceneTitle" >{{selected.sceneTitle}}</div>
       </div>
     </div>
     

ファイルの差分が大きいため隠しています
+ 0 - 17918
packages/qjkankan-kankan-view/package-lock.json


+ 2 - 1
packages/qjkankan-view/.env.eurprod

@@ -2,6 +2,7 @@ NODE_ENV=production
 VUE_APP_STATIC_DIR=showviewer
 VUE_APP_CDN=https://eurs3.4dkankan.com
 VUE_APP_PROXY_URL_ROOT='https://eur.4dkankan.com'
+VUE_APP_RESOURCE_URL='https://eur.4dkankan.com/panorama/'
 VUE_APP_PROXY_URL='https://eur.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=/qjkankan
-VUE_APP_DEBBUG_FLAG=0529-01
+VUE_APP_DEBBUG_FLAG=0628-01

+ 1 - 0
packages/qjkankan-view/.env.eurtestdev

@@ -1,6 +1,7 @@
 VUE_APP_STATIC_DIR=showviewer
 VUE_APP_CDN=https://testeurs3.4dkankan.com
 VUE_APP_PROXY_URL_ROOT='https://testeur.4dkankan.com'
+VUE_APP_RESOURCE_URL='https://testeur.4dkankan.com/panorama/'
 VUE_APP_PROXY_URL='https://testeur.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=
 

+ 1 - 0
packages/qjkankan-view/.env.eurtestprod

@@ -2,6 +2,7 @@ NODE_ENV=production
 VUE_APP_STATIC_DIR=showviewer
 VUE_APP_CDN=https://testeurs3.4dkankan.com
 VUE_APP_PROXY_URL_ROOT='https://testeur.4dkankan.com'
+VUE_APP_RESOURCE_URL='https://testeur.4dkankan.com/panorama/'
 VUE_APP_PROXY_URL='https://testeur.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=/qjkankan
 # 接口请求地址

+ 3 - 0
packages/qjkankan-view/src/hooks/useAudio.js

@@ -63,6 +63,9 @@ async function initDefaultAudio() {
             unref(currentPlayer).resume();
           }
         }
+      } else {
+        console.log('为空暂时')
+        unref(currentPlayer) && unref(currentPlayer).stop();
       }
     },
     {

ファイルの差分が大きいため隠しています
+ 4263 - 4244
yarn.lock