gemercheung 2 年之前
父節點
當前提交
9116e39f84

+ 9 - 7
packages/qjkankan-editor/public/static/template/customTooltip.xml

@@ -45,16 +45,17 @@
                
                 if(%2 == 0,
                 txtreplace(iconUrl,'.svg','.png');
-                trace('system::',get(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)].frameRate,calc(1.0 / 60));
                 set(hotspot[get(hsp_name)].framewidth,84);
                 );
-            
+                if(%2 == 1,
+                set(hotspot[get(hsp_name)].url,get(iconUrl));
+                set(hotspot[get(hsp_name)].animatiedOn,0);
+                );
                 if(%2 == 2,
-                trace('ser_frame::',get(framewidth));
                 set(hotspot[get(hsp_name)].url,get(iconUrl));
                 set(hotspot[get(hsp_name)].framewidth,get(framewidth));
                 set(hotspot[get(hsp_name)].frameNumber,get(frameNumber));
@@ -62,15 +63,14 @@
         );
         
         <!-- 个性化标签(3) -->
-        if(%2 == 3,    
-           
+        if(%2 == 3,        
             set(hotspot[get(hsp_name)].height,80);
             set(hotspot[get(hsp_name)].width,1);
             set(hotspot[get(hsp_name)].padding,0);
             set(hotspot[get(hsp_name)].background,false);
             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();"); -->
+    
             set_label_dir(get(hsp_name),get(lineDirection),0);
         );
      
@@ -423,7 +423,7 @@
         txtadd(iconUrl,'',%4);
         txtreplace(iconUrl,'|',',');
         jsget(timestamp,'Date.now();');
-        set(iconUrl,get(calc(iconUrl +'?'+ timestamp)));
+     
         trace('iconUrl::',iconUrl);
         set(hotspot[get(hsp_name)].height,%8);
         set(hotspot[get(hsp_name)].width,%8);
@@ -441,6 +441,7 @@
        
        if(get(hsp_type) == 0,
            txtreplace(iconUrl,'.svg','.png');
+           set(iconUrl,get(calc(iconUrl +'?'+ timestamp)));
            set(hotspot[get(hsp_name)].animatiedOn,1);
            set(hotspot[get(hsp_name)].framewidth,84);
            set(hotspot[get(hsp_name)].frameRate,calc( 1.0 / 60));
@@ -454,6 +455,7 @@
         if(get(hsp_type) == 2, 
           <!-- set(hotspot[get(hsp_name)].animatiedOn,1); -->
           <!-- delayedcall(0.2,set(hotspot[get(hsp_name)].animatiedOn,1);); -->
+          set(iconUrl,get(calc(iconUrl +'?'+ timestamp)));
           set(hotspot[get(hsp_name)].visible,true);
           calc(frameRate, duration / frameNumber);
 

+ 11 - 1
packages/qjkankan-editor/src/components/RichTextEditor.vue

@@ -142,7 +142,7 @@ export default Vue.extend({
   overflow: hidden;
   > .bottom-bar {
     padding: 10px;
-    background-color: #fff;
+    background-color: rgba(0,0,0,0.8);
     border-top: 1px solid #ccc;
     display: flex;
     justify-content: flex-end;
@@ -152,4 +152,14 @@ export default Vue.extend({
     }
   }
 }
+</style>
+<style>
+:root {
+    --w-e-textarea-bg-color: #333;
+    --w-e-textarea-color: #fff;
+    --w-e-toolbar-active-bg-color:#666;
+    --w-e-toolbar-color:#fff;
+    --w-e-toolbar-bg-color:rgba(0.0.0,0.9);
+    --w-e-modal-button-bg-color:rgba(0.0.0,0.5);
+}
 </style>

+ 4 - 1
packages/qjkankan-view/public/showviewer/lib/krpano/tooltip.xml

@@ -56,7 +56,10 @@
                 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));
+                set(hotspot[get(hsp_name)].animatiedOn,0);
+                );
                 if(%2 == 2,
                 trace('ser_frame::',get(framewidth));
                 set(hotspot[get(hsp_name)].url,get(iconUrl));

+ 2 - 2
packages/qjkankan-view/src/components/assembly/Opening.vue

@@ -7,7 +7,7 @@
     <video v-if="coverData.videoPc" x5-playsinline="true" playsinline="true" webkit-playsinline="true" class="video"
       ref="openvideo$" preload autoplay :poster="coverData.videoPcIcon"
       :class="coverData.videoPcLoc == 'center' ? 'contain' : 'cover'" :src="coverData.videoPc"
-      :controls="Boolean(coverData.coverVideoControl)"></video>
+      :controls="Boolean(coverData.coverVideoControl)" muted></video>
     <img v-show="bofanging" @click.stop="bofang" class="bofang" :src="require('@/assets/images/default/bofang.png')"
       alt="" />
 
@@ -38,7 +38,7 @@ const { t } = useI18n({ useScope: "global" });
 
 const props = defineProps({
   coverData: {
-    type: Boolean,
+    type: [Boolean,Object],
     default: () => { return {} },
   }
 });