update

packages/qjkankan-editor/public/static/template/customTooltip.xml

@@ -23,6 +23,7 @@
         set(hotspot[get(hsp_name)].hotlink,%7);
         set(hotspot[get(hsp_name)].ath,%5);
         set(hotspot[get(hsp_name)].atv,%6);
+        set(hotspot[get(hsp_name)].hovering, %9);
         set(hotspot[get(hsp_name)].visible,true);
         set(hotspot[get(hsp_name)].alpha,1);
         set(hotspot[get(hsp_name)].scale,1);
@@ -37,6 +38,8 @@
         set(hotspot[get(hsp_name)].pos,pos);
         txtadd(hotspot[get(hsp_name)].onloaded,"add_tooltip_label();add_tooltip_dot();");
 
+        trace('hovering::',%9);
+
         if(%2 LE 2,
             set(hotspot[get(hsp_name)].height,%8);
             set(hotspot[get(hsp_name)].width,%8);
@@ -45,11 +48,15 @@
                
                 if(%2 == 0,
                 txtreplace(iconUrl,'.svg','.png');
+                trace('新增::',iconUrl);
                 set(hotspot[get(hsp_name)].url,get(iconUrl));
-                set(hotspot[get(hsp_name)].frameNumber,60);
-                set(hotspot[get(hsp_name)].duration,1);
+                set(hotspot[get(hsp_name)].animatiedOn,1);
+                set(hotspot[get(hsp_name)].frameNumber,40);
+                set(hotspot[get(hsp_name)].xframes,1);
+                set(hotspot[get(hsp_name)].yframes,40);
                 set(hotspot[get(hsp_name)].frameRate,calc(1.0 / 60));
                 set(hotspot[get(hsp_name)].framewidth,84);
+                 
                 );
                 if(%2 == 1,
                 set(hotspot[get(hsp_name)].url,get(iconUrl));
@@ -59,6 +66,7 @@
                 set(hotspot[get(hsp_name)].url,get(iconUrl));
                 set(hotspot[get(hsp_name)].framewidth,get(framewidth));
                 set(hotspot[get(hsp_name)].frameNumber,get(frameNumber));
+                set(hotspot[get(hsp_name)].frameRate,calc(1.0 / get(frameNumber)));
                 );
         );
         
@@ -68,6 +76,7 @@
             set(hotspot[get(hsp_name)].width,1);
             set(hotspot[get(hsp_name)].padding,0);
             set(hotspot[get(hsp_name)].background,false);
+            set(hotspot[get(hsp_name)].visible,false);
             txtadd(line,'<div style="background-color: ',get(borderColor),';width:1px;height:80px;"></div>');
             copy(hotspot[get(hsp_name)].html,line);
     
@@ -81,24 +90,24 @@
 
 	<action name="do_crop_animation">
     <!-- 1 square:(w/h) 2:imageW 3 imageH 4 frameRate -->
-       trace('imagewidth::',imagewidth,'::imageheight::',imageheight);
+       <!-- trace('imagewidth::',imagewidth,'::imageheight::',imageheight); -->
         registerattribute(xframes, calc((imagewidth / %1) BOR 0));
         registerattribute(yframes, calc((imageheight / %2) BOR 0)); 
         registerattribute(frames, calc(xframes * yframes));
         registerattribute(frame, 0); 
         registerattribute(animatiedOn, 1); 
         registerattribute(frameRate, %3);
-        trace('frameRate::',get(frameRate));
+        <!-- trace('frameRate::',get(frameRate)); -->
         set(crop, '0|0|%1|%2'); 
         clearinterval(calc('crop_anim_' + name));
         if(%3 == '' OR frameRate == 0 OR isNaN(frameRate),
         set(frameRate,calc(1.0 / 60));
-        trace('没有frameRate',get(calc(1.0 / 60)));
-        trace('没有frameRate-1',get(frameRate));
+        <!-- trace('没有frameRate',get(calc(1.0 / 60)));
+        trace('没有frameRate-1',get(frameRate)); -->
         );
-        trace('params::1::',%1,'::2::',%2,'::3::',%3,':frameRate:',get(frameRate));
+        <!-- trace('params::1::',%1,'::2::',%2,'::3::',%3,':frameRate:',get(frameRate));
         trace('xframes1::',get(xframes),'::yframes1::',get(yframes));
-   
+    -->
                
         if(frameRate GE 0,
         setinterval(
@@ -220,13 +229,12 @@
      txtadd(dir,'',%3);
      <!-- trace('get-lineDirection::',%2); -->
      <!-- trace('set_label_dir::1::',get(dirItem),'::2::',get(lineDirection),'::3::',get(dir)); -->
+  
      if(
         get(dir)==1,
         <!-- trace('set_label_dir::1::',get(dirItem),'::2::',get(lineDirection),'::3::',get(dir)); -->
         copy(labelWidth,layer[get(dirItem)].width);
         copy(labelHeight,layer[get(dirItem)].height);
-  
-  
      );
 
         if(
@@ -300,6 +308,8 @@
 
         );
 
+             if(get(dir)==0, set(hotspot[get(dirItem)].visible,true););
+
     </action>
 
     <action name='set_label_pos'>
@@ -445,8 +455,8 @@
            set(hotspot[get(hsp_name)].animatiedOn,1);
            set(hotspot[get(hsp_name)].framewidth,84);
            set(hotspot[get(hsp_name)].frameRate,calc( 1.0 / 60));
-           set(hotspot[get(hsp_name)].xframes,40);
-           set(hotspot[get(hsp_name)].yframes,1);
+           set(hotspot[get(hsp_name)].xframes,1);
+           set(hotspot[get(hsp_name)].yframes,40);
         );
         if(get(hsp_type) == 1,
            set(hotspot[get(hsp_name)].animatiedOn,0);

packages/qjkankan-editor/src/core/hotspot.js

@@ -40,10 +40,13 @@ const convertBaseStyle = (dest, origin) => {
         dest.style.position = origin.titlePosition
 
         if (origin && origin.titleDisplayMode == "always") {
-            dest.visible = true
+            dest.visible = 0
         }
         if (origin && origin.titleDisplayMode == "never") {
-            dest.visible = false
+            dest.visible = 1
+        }
+        if (origin && origin.titleDisplayMode == "hover") {
+            dest.visible = 2
         }
         dest.style.borderColor = '';
         dest.style.fillColor = 'rgba(0,0,0,0.8)';

packages/qjkankan-editor/src/views/hotspot/HotSpotList.vue

@@ -406,9 +406,9 @@ export default {
           hotspotData.personalizedTagInfo = {
             isShowLine: true,
             lineDirection: "left-top",
-            fillColor: "rgba(0, 0, 0, 1)",
-            borderColor: "rgba(0, 0, 0, 1)",
-            textColor: "rgba(0, 0, 0, 1)",
+            fillColor: "rgba(0, 0, 0, 0.5)",
+            borderColor: "rgba(255, 255, 255, 0.8)",
+            textColor: "rgba(255, 255, 255, 1)",
             textDirection: "left-right",
             isTextWrap: false,
             textNumPerLine: 10,

packages/qjkankan-editor/src/views/hotspot/hotspotIconType/personalized_tag.vue

@@ -72,7 +72,7 @@
     </div>
 
     <div class="remark">{{ $i18n.t("hotspot.text_direction") }}</div>
-    <TabbarSwitcherIcon
+    <!-- <TabbarSwitcherIcon
       class="text-direction-switcher"
       :tabList="[
         {
@@ -86,9 +86,9 @@
       ]"
       :activeIdx="currentTextDirectionIdx"
       @select="onSelectTextDirection"
-    />
+    /> -->
 
-    <div class="text-wrap-setting switcher-wrap">
+    <!-- <div class="text-wrap-setting switcher-wrap">
       <span class="label">{{ $i18n.t("hotspot.if_wrap") }}</span>
       <Switcher
         :value="hotspot.personalizedTagInfo.isTextWrap"
@@ -113,7 +113,7 @@
         />
         <span class="remark">{{ $i18n.t("hotspot.words") }}</span>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>