diff --git a/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue b/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue index 2eff60e48f..126fa9cc0e 100644 --- a/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue +++ b/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue @@ -9,7 +9,7 @@ v-if="isPublicLink" ref="widget-div" class="function-div" - :class="functionClass" + :class="[{['function-back-div']: backToTopBtn},functionClass]" > {{ $t('panel.down') }} @@ -48,15 +48,8 @@ style="width: 12px;height: 12px" :icon-class="fullscreenState?'public_fullscreen_exit':'public_fullscreen'" />{{ fullscreenState?$t('panel.fullscreen_exit'): $t('panel.fullscreen_preview') }} - {{ $t('panel.back_to_top') }} -
{{ $t('panel.back_to_top') }}
+
+ {{ $t('panel.back_to_top') }} +
@@ -293,4 +296,14 @@ export default { } } + .link-public { + top: -49px; + right: 8px; + opacity: 0.8; + position: absolute; + } + + .function-back-div { + right: 100px!important; + } diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue index 073ec965e9..5b4c69346f 100644 --- a/core/frontend/src/components/canvas/components/editor/Preview.vue +++ b/core/frontend/src/components/canvas/components/editor/Preview.vue @@ -846,6 +846,7 @@ export default { canvasScroll() { // 当滚动距离超过 100px 时显示返回顶部按钮，否则隐藏按钮 this.backToTopBtnShow = this.$refs[this.previewOutRefId].scrollTop > 200 + console.log('top=' + this.$refs[this.previewOutRefId].scrollTop + ';this.backToTopBtnShow=' + this.backToTopBtnShow) bus.$emit('onScroll') }, initListen() { diff --git a/core/frontend/src/styles/deicon/demo_index.html b/core/frontend/src/styles/deicon/demo_index.html index ce0939bfac..0fde073f21 100644 --- a/core/frontend/src/styles/deicon/demo_index.html +++ b/core/frontend/src/styles/deicon/demo_index.html @@ -55,9 +55,9 @@
  • - +
    返回顶部
    -
    
    +
    
  • @@ -828,9 +828,9 @@ 
    @font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1705486315942') format('woff2'),
-       url('iconfont.woff?t=1705486315942') format('woff'),
-       url('iconfont.ttf?t=1705486315942') format('truetype');
+  src: url('iconfont.woff2?t=1706079293312') format('woff2'),
+       url('iconfont.woff?t=1706079293312') format('woff'),
+       url('iconfont.ttf?t=1706079293312') format('truetype');
 }

    第二步：定义使用 iconfont 的样式

    diff --git a/core/frontend/src/styles/deicon/iconfont.css b/core/frontend/src/styles/deicon/iconfont.css index 84e2f644f9..4a9d18eb03 100644 --- a/core/frontend/src/styles/deicon/iconfont.css +++ b/core/frontend/src/styles/deicon/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2459092 */ - src: url('iconfont.woff2?t=1705486315942') format('woff2'), - url('iconfont.woff?t=1705486315942') format('woff'), - url('iconfont.ttf?t=1705486315942') format('truetype'); + src: url('iconfont.woff2?t=1706079293312') format('woff2'), + url('iconfont.woff?t=1706079293312') format('woff'), + url('iconfont.ttf?t=1706079293312') format('truetype'); } .iconfont { @@ -14,7 +14,7 @@ } .icon-back-top:before { - content: "\e667"; + content: "\e63f"; } .icon-adaptor:before { diff --git a/core/frontend/src/styles/deicon/iconfont.js b/core/frontend/src/styles/deicon/iconfont.js index 250ab59f90..3e7bdbb09e 100644 --- a/core/frontend/src/styles/deicon/iconfont.js +++ b/core/frontend/src/styles/deicon/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2459092='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,t,v,o,z=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}h=function(){var l,c=document.createElement("div");c.innerHTML=a._iconfont_svg_string_2459092,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?z(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(t=h,v=a.document,o=!1,p(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,m())})}function m(){o||(o=!0,t())}function p(){try{v.documentElement.doScroll("left")}catch(l){return void setTimeout(p,50)}m()}}(window); \ No newline at end of file +window._iconfont_svg_string_2459092='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,t,v,o,z=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}h=function(){var l,c=document.createElement("div");c.innerHTML=a._iconfont_svg_string_2459092,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?z(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(t=h,v=a.document,o=!1,p(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,m())})}function m(){o||(o=!0,t())}function p(){try{v.documentElement.doScroll("left")}catch(l){return void setTimeout(p,50)}m()}}(window); \ No newline at end of file diff --git a/core/frontend/src/styles/deicon/iconfont.json b/core/frontend/src/styles/deicon/iconfont.json index 019fb540b1..b68b3d8db4 100644 --- a/core/frontend/src/styles/deicon/iconfont.json +++ b/core/frontend/src/styles/deicon/iconfont.json @@ -6,11 +6,11 @@ "description": "", "glyphs": [ { - "icon_id": "831197", + "icon_id": "8224825", "name": "返回顶部", "font_class": "back-top", - "unicode": "e667", - "unicode_decimal": 58983 + "unicode": "e63f", + "unicode_decimal": 58943 }, { "icon_id": "34289857", diff --git a/core/frontend/src/styles/deicon/iconfont.ttf b/core/frontend/src/styles/deicon/iconfont.ttf index 05c72cfad0..5f98b4141f 100644 Binary files a/core/frontend/src/styles/deicon/iconfont.ttf and b/core/frontend/src/styles/deicon/iconfont.ttf differ diff --git a/core/frontend/src/styles/deicon/iconfont.woff b/core/frontend/src/styles/deicon/iconfont.woff index 88c252e4fe..e2c7751ddd 100644 Binary files a/core/frontend/src/styles/deicon/iconfont.woff and b/core/frontend/src/styles/deicon/iconfont.woff differ diff --git a/core/frontend/src/styles/deicon/iconfont.woff2 b/core/frontend/src/styles/deicon/iconfont.woff2 index d65d7dc63c..9646cb562d 100644 Binary files a/core/frontend/src/styles/deicon/iconfont.woff2 and b/core/frontend/src/styles/deicon/iconfont.woff2 differ