gemercheung 2 éve
szülő
commit
d7067ac05b

+ 13 - 2
packages/qjkankan-view/public/showviewer/lib/krpano/tooltip.xml

@@ -79,7 +79,15 @@
             txtadd(line,'<div style="background-color: ',get(borderColor),';width:1px;height:80px;"></div>');
             copy(hotspot[get(hsp_name)].html,line);
             <!-- txtadd(hotspot[get(hsp_name)].onloaded,"add_tooltip_label();add_tooltip_dot();"); -->
-            if(isShowLine == 1, set_label_dir(get(hsp_name),get(lineDirection),0););
+            if(isShowLine == 1, 
+            txtadd(tooltipname, 'tooltip_', get(hsp_name)); 
+            txtadd(tooltipdot, 'tooldot_', get(hsp_name)); 
+            set(hotspot[get(hsp_name)].visible,false);
+            set(layer[get(tooltipname)].visible,false);
+            set(layer[get(tooltipdot)].visible,false);
+             
+            set_label_dir(get(hsp_name),get(lineDirection),0);
+            );
            
              if(isShowLine == 0, 
                 txtadd(tooltipname, 'tooltip_', get(hsp_name)); 
@@ -149,7 +157,6 @@
 	</action>
 
     <action name="add_tooltip_label">
-        showlog();
         txtadd(tooltipname, 'tooltip_', get(name)); 
       
         txtsplit(hotspotStyle,'|',fontSize,pos,isHover,borderColor,fillColor,textColor,isShowLine,isTextWrap,lineDirection,textDirection,textNumPerLine,duration,frameNumber);
@@ -342,6 +349,10 @@
             if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-40););
 
         );
+          
+          if(get(dir)==0, set(hotspot[get(dirItem)].visible,true););
+          if(get(dir)==1, set(layer[get(dirItem)].visible,true););
+          if(get(dir)==2, set(layer[get(dirItem)].visible,true););
 
     </action>
 

+ 2 - 2
packages/qjkankan-view/src/components/assembly/Tags/metas/metas-imagetext.vue

@@ -13,7 +13,7 @@
         >
           <img
             class="image"
-            :src="currentTag.imageTextInfo.imageList[currentIndex].ossPath"
+            v-lazy="currentTag.imageTextInfo.imageList[currentIndex].ossPath"
             :style="imageStyle"
             @wheel.prevent="onImageWheel"
           />
@@ -35,7 +35,7 @@
                 v-if="currentTag.imageTextInfo.imageList.length > 1"
                 class="iconfont icon-material_preview_next1 hover-tips append-splitter"
                 :class="{
-                  disabled: currentIndex === currentTag.image.length - 1,
+                  disabled: currentIndex === currentTag.imageTextInfo.imageList.length - 1,
                 }"
                 @click="onClickNext()"
               >

+ 2 - 1
packages/qjkankan-view/src/pages/show.js

@@ -7,7 +7,7 @@ import { createApp } from "vue";
 import Checkbrowser from '@/components/assembly/Checkbrowser.vue'
 import ClickOutSide from "../utils/fns/ClickOutSide";
 import ToolTip from "../utils/fns/ToolTip";
-
+import VueLazyLoad from 'vue3-lazyload'
 import browser from "../utils/browser";
 import Deferred from "@/utils/Deferred";
 import store from '../store'
@@ -52,6 +52,7 @@ loadLocaleMessages(i18n, local).then(() => {
   app.use(i18n);
   app.use(store);
   app.use(Components);
+  app.use(VueLazyLoad);
   app.directive("click-outside", ClickOutSide);
   app.directive("tooltip", ToolTip);
   app.mount("#app");

+ 2 - 1
packages/qjkankan-view/src/pages/showMobile.js

@@ -9,7 +9,7 @@ import Checkbrowser from '@/components/assembly/Checkbrowser.vue'
 import browser from "../utils/browser";
 import Deferred from "@/utils/Deferred";
 import store from '../store'
-
+import VueLazyLoad from 'vue3-lazyload'
 
 let App;
 if (
@@ -49,6 +49,7 @@ loadLocaleMessages(i18n, local).then(() => {
   app.use(i18n);
   app.use(store);
   app.use(Components);
+  app.use(VueLazyLoad);
   app.directive("click-outside", ClickOutSide);
   app.mount("#app");
 });

+ 12 - 0
yarn.lock

@@ -16672,6 +16672,11 @@ vue-cropperjs@^4.2.0:
   dependencies:
     cropperjs "^1.5.6"
 
+vue-demi@^0.12.5:
+  version "0.12.5"
+  resolved "https://mirrors.cloud.tencent.com/npm/vue-demi/-/vue-demi-0.12.5.tgz#8eeed566a7d86eb090209a11723f887d28aeb2d1"
+  integrity sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==
+
 vue-eslint-parser@^7.0.0:
   version "7.11.0"
   resolved "https://mirrors.cloud.tencent.com/npm/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf"
@@ -16818,6 +16823,13 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
   resolved "https://mirrors.cloud.tencent.com/npm/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
+vue3-lazyload@^0.3.6:
+  version "0.3.6"
+  resolved "https://mirrors.cloud.tencent.com/npm/vue3-lazyload/-/vue3-lazyload-0.3.6.tgz#87c509e7f0139ea5e00eb76c368519905ad19678"
+  integrity sha512-UcVnEN9JzxeFBa7nNAPWKXHTtvVAzWYhBSvRU+Gmx9MdTGLWKwjZiNSyB1Os25jr9HaFHWY0DaU8uugXkGu9Gw==
+  dependencies:
+    vue-demi "^0.12.5"
+
 vue3-smooth-scrollbar@^1.0.2:
   version "1.0.2"
   resolved "https://mirrors.cloud.tencent.com/npm/vue3-smooth-scrollbar/-/vue3-smooth-scrollbar-1.0.2.tgz#21d87a1893c8c2adfd739b99556145f5bc1c3f9d"