diff --git a/src/assets/icons/iconfont.css b/src/assets/icons/iconfont.css index 268f5315..aa6e67cd 100644 --- a/src/assets/icons/iconfont.css +++ b/src/assets/icons/iconfont.css @@ -1,9 +1,9 @@ @font-face { font-family: "iconfont"; /* Project id 4227145 */ - src: url('iconfont.woff2?t=1728611284151') format('woff2'), - url('iconfont.woff?t=1728611284151') format('woff'), - url('iconfont.ttf?t=1728611284151') format('truetype'), - url('iconfont.svg?t=1728611284151#iconfont') format('svg'); + src: url('iconfont.woff2?t=1728892263234') format('woff2'), + url('iconfont.woff?t=1728892263234') format('woff'), + url('iconfont.ttf?t=1728892263234') format('truetype'), + url('iconfont.svg?t=1728892263234#iconfont') format('svg'); } .iconfont { @@ -14,6 +14,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-cancel-bottom-placement:before { + content: "\e79f"; +} + +.icon-bottom-up:before { + content: "\e7a0"; +} + .icon-domain:before { content: "\e7cf"; } @@ -182,11 +190,11 @@ content: "\e738"; } -.icon-arrow-left1:before { +.icon-arrow-left:before { content: "\e73f"; } -.icon-arrow-right1:before { +.icon-arrow-right:before { content: "\e737"; } @@ -574,10 +582,6 @@ content: "\e6d4"; } -.icon-arrow-left:before { - content: "\e6d1"; -} - .icon-scan:before { content: "\e6cf"; } @@ -650,10 +654,6 @@ content: "\e6c1"; } -.icon-arrow-right:before { - content: "\e6c2"; -} - .icon-zhibo-shixiao:before { content: "\e6bb"; } @@ -670,7 +670,7 @@ content: "\e6b8"; } -.icon-categroy-more:before { +.icon-category-more:before { content: "\e6b7"; } diff --git a/src/assets/icons/iconfont.js b/src/assets/icons/iconfont.js index 06093d34..34e9fd78 100644 --- a/src/assets/icons/iconfont.js +++ b/src/assets/icons/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4227145='',(h=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var c,o,i,m,v,t=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}c=function(){var a,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_4227145,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?t(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),c()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=c,m=h.document,v=!1,d(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,z())})}function z(){v||(v=!0,i())}function d(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(d,50)}z()}})(window); \ No newline at end of file +window._iconfont_svg_string_4227145='',(h=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var c,o,i,m,v,t=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}c=function(){var a,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_4227145,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?t(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),c()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=c,m=h.document,v=!1,d(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,z())})}function z(){v||(v=!0,i())}function d(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(d,50)}z()}})(window); \ No newline at end of file diff --git a/src/assets/icons/iconfont.json b/src/assets/icons/iconfont.json index b1363dc9..27e16ee6 100644 --- a/src/assets/icons/iconfont.json +++ b/src/assets/icons/iconfont.json @@ -5,6 +5,20 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "42097664", + "name": "取消置底", + "font_class": "cancel-bottom-placement", + "unicode": "e79f", + "unicode_decimal": 59295 + }, + { + "icon_id": "42097665", + "name": "置底", + "font_class": "bottom-up", + "unicode": "e7a0", + "unicode_decimal": 59296 + }, { "icon_id": "7561087", "name": "域名服务", @@ -21,7 +35,7 @@ }, { "icon_id": "38735708", - "name": "yinyong-shangchuan", + "name": "文件上传", "font_class": "upload-file", "unicode": "e72d", "unicode_decimal": 59181 @@ -302,14 +316,14 @@ { "icon_id": "40047124", "name": "进销存左箭头", - "font_class": "arrow-left1", + "font_class": "arrow-left", "unicode": "e73f", "unicode_decimal": 59199 }, { "icon_id": "40047129", "name": "进销存右箭头", - "font_class": "arrow-right1", + "font_class": "arrow-right", "unicode": "e737", "unicode_decimal": 59191 }, @@ -985,13 +999,6 @@ "unicode": "e6d4", "unicode_decimal": 59092 }, - { - "icon_id": "37356823", - "name": "箭头-向左", - "font_class": "arrow-left", - "unicode": "e6d1", - "unicode_decimal": 59089 - }, { "icon_id": "37354114", "name": "扫一扫", @@ -1118,13 +1125,6 @@ "unicode": "e6c1", "unicode_decimal": 59073 }, - { - "icon_id": "37288621", - "name": "箭头-向右", - "font_class": "arrow-right", - "unicode": "e6c2", - "unicode_decimal": 59074 - }, { "icon_id": "37272530", "name": "zhibo-shixiao", @@ -1156,7 +1156,7 @@ { "icon_id": "37217394", "name": "分类更多", - "font_class": "categroy-more", + "font_class": "category-more", "unicode": "e6b7", "unicode_decimal": 59063 }, diff --git a/src/assets/icons/iconfont.svg b/src/assets/icons/iconfont.svg index decb359b..dc9b5c8e 100644 --- a/src/assets/icons/iconfont.svg +++ b/src/assets/icons/iconfont.svg @@ -14,11 +14,15 @@ /> + + + + - + @@ -98,9 +102,9 @@ - + - + @@ -294,8 +298,6 @@ - - @@ -332,8 +334,6 @@ - - @@ -342,7 +342,7 @@ - + diff --git a/src/assets/icons/iconfont.ttf b/src/assets/icons/iconfont.ttf index e235418a..58a4531e 100644 Binary files a/src/assets/icons/iconfont.ttf and b/src/assets/icons/iconfont.ttf differ diff --git a/src/assets/icons/iconfont.woff b/src/assets/icons/iconfont.woff index d8456ed3..97fd3d39 100644 Binary files a/src/assets/icons/iconfont.woff and b/src/assets/icons/iconfont.woff differ diff --git a/src/assets/icons/iconfont.woff2 b/src/assets/icons/iconfont.woff2 index cb4193b8..def9123e 100644 Binary files a/src/assets/icons/iconfont.woff2 and b/src/assets/icons/iconfont.woff2 differ diff --git a/src/components/common/custom-module/model-icon/model-icon-style.vue b/src/components/common/custom-module/model-icon/model-icon-style.vue index 96fa842f..10fe19a8 100644 --- a/src/components/common/custom-module/model-icon/model-icon-style.vue +++ b/src/components/common/custom-module/model-icon/model-icon-style.vue @@ -39,9 +39,9 @@ - +
diff --git a/src/components/common/custom-module/model-image/model-image-style.vue b/src/components/common/custom-module/model-image/model-image-style.vue index 202917a1..21784fc6 100644 --- a/src/components/common/custom-module/model-image/model-image-style.vue +++ b/src/components/common/custom-module/model-image/model-image-style.vue @@ -26,9 +26,9 @@ - +
diff --git a/src/components/common/custom-module/model-lines/model-lines-style.vue b/src/components/common/custom-module/model-lines/model-lines-style.vue index bfa17240..6f70de76 100644 --- a/src/components/common/custom-module/model-lines/model-lines-style.vue +++ b/src/components/common/custom-module/model-lines/model-lines-style.vue @@ -31,9 +31,9 @@ - +
diff --git a/src/components/common/custom-module/model-panel/model-panel-style.vue b/src/components/common/custom-module/model-panel/model-panel-style.vue index e12942d8..359fc89b 100644 --- a/src/components/common/custom-module/model-panel/model-panel-style.vue +++ b/src/components/common/custom-module/model-panel/model-panel-style.vue @@ -20,9 +20,9 @@ - + diff --git a/src/components/common/custom-module/model-text/model-text-style.vue b/src/components/common/custom-module/model-text/model-text-style.vue index 5118642e..e8c379a2 100644 --- a/src/components/common/custom-module/model-text/model-text-style.vue +++ b/src/components/common/custom-module/model-text/model-text-style.vue @@ -59,9 +59,9 @@ - +
diff --git a/src/components/model-custom/components/index-default.ts b/src/components/model-custom/components/index-default.ts index b78cc02e..483d60ed 100644 --- a/src/components/model-custom/components/index-default.ts +++ b/src/components/model-custom/components/index-default.ts @@ -36,7 +36,7 @@ export const text_com_data = { border_size: 1, direction: '90deg', color_list: [{ color: '', color_percentage: undefined }], - bottom_up: '0', + z_index: 0 } // 图片的默认值 export const img_com_data = { @@ -68,7 +68,7 @@ export const img_com_data = { radius_bottom_right: 0, }, border_size: 1, - bottom_up: '0', + z_index: 0 } // 线条的默认值 export const line_com_data = { @@ -80,7 +80,7 @@ export const line_com_data = { line_width: 306, line_size: 1, line_color: '#000', - bottom_up: '1', + z_index: 0, } // icon的默认值 @@ -120,7 +120,7 @@ export const icon_com_data = { border_size: 1, direction: '90deg', color_list: [{ color: '', color_percentage: undefined }], - bottom_up: '0', + z_index: 0 } // 面板的默认值 @@ -144,7 +144,7 @@ export const panel_com_data = { border_size: 1, direction: '90deg', color_list: [{ color: '#fff', color_percentage: undefined }], - bottom_up: '0', + z_index: 0 } // 判断两个矩形是否有交集或者被包裹 diff --git a/src/components/model-custom/components/index.scss b/src/components/model-custom/components/index.scss index 963ad115..f33b97cc 100644 --- a/src/components/model-custom/components/index.scss +++ b/src/components/model-custom/components/index.scss @@ -341,4 +341,16 @@ .break{ word-wrap: break-word; word-break:break-all; +} + +.plug-in-show-component-line::after { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 0.1rem dashed #999; + border-radius: inherit; + pointer-events: none; /* 防止影子部分阻止鼠标事件 */ } \ No newline at end of file diff --git a/src/components/model-custom/components/index.vue b/src/components/model-custom/components/index.vue index 34e6d865..3c9bb06f 100644 --- a/src/components/model-custom/components/index.vue +++ b/src/components/model-custom/components/index.vue @@ -21,7 +21,12 @@
-
已选组件清除选中
+
已选组件 +
+ {{ !is_show_component_line ? '显示' : '关闭' }}参考线 + 清除选中 +
+
@@ -56,8 +61,18 @@
- - + + + + + + + + + + + +
@@ -65,9 +80,9 @@
- + - +