diff --git a/README.md b/README.md index a99a103e7..19f2aac12 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ npm install - run ```bash -yarn serve +npm run serve ``` - build diff --git a/README.zh-CN.md b/README.zh-CN.md index 9f6413c6f..959c574d1 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -51,7 +51,7 @@ npm install - 运行 ```bash -yarn serve +npm run serve ``` - 打包 diff --git a/src/components/FlowChart/src/AddPanel.vue b/src/components/FlowChart/src/AddPanel.vue deleted file mode 100644 index d61ba14f1..000000000 --- a/src/components/FlowChart/src/AddPanel.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - - - diff --git a/src/components/FlowChart/src/Control.vue b/src/components/FlowChart/src/Control.vue index 3b57f33f6..5cb78315d 100644 --- a/src/components/FlowChart/src/Control.vue +++ b/src/components/FlowChart/src/Control.vue @@ -1,7 +1,21 @@ diff --git a/src/components/FlowChart/src/background/click.png b/src/components/FlowChart/src/assets/background/click.png similarity index 100% rename from src/components/FlowChart/src/background/click.png rename to src/components/FlowChart/src/assets/background/click.png diff --git a/src/components/FlowChart/src/background/download.png b/src/components/FlowChart/src/assets/background/download.png similarity index 100% rename from src/components/FlowChart/src/background/download.png rename to src/components/FlowChart/src/assets/background/download.png diff --git a/src/components/FlowChart/src/background/end.png b/src/components/FlowChart/src/assets/background/end.png similarity index 100% rename from src/components/FlowChart/src/background/end.png rename to src/components/FlowChart/src/assets/background/end.png diff --git a/src/components/FlowChart/src/background/push.png b/src/components/FlowChart/src/assets/background/push.png similarity index 100% rename from src/components/FlowChart/src/background/push.png rename to src/components/FlowChart/src/assets/background/push.png diff --git a/src/components/FlowChart/src/background/start.png b/src/components/FlowChart/src/assets/background/start.png similarity index 100% rename from src/components/FlowChart/src/background/start.png rename to src/components/FlowChart/src/assets/background/start.png diff --git a/src/components/FlowChart/src/background/time.png b/src/components/FlowChart/src/assets/background/time.png similarity index 100% rename from src/components/FlowChart/src/background/time.png rename to src/components/FlowChart/src/assets/background/time.png diff --git a/src/components/FlowChart/src/background/user.png b/src/components/FlowChart/src/assets/background/user.png similarity index 100% rename from src/components/FlowChart/src/background/user.png rename to src/components/FlowChart/src/assets/background/user.png diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.css b/src/components/FlowChart/src/assets/iconfont/iconfont.css new file mode 100644 index 000000000..f4c83794b --- /dev/null +++ b/src/components/FlowChart/src/assets/iconfont/iconfont.css @@ -0,0 +1,45 @@ +@font-face {font-family: "iconfont"; + src: url('iconfont.eot?t=1618544337340'); /* IE9 */ + src: url('iconfont.eot?t=1618544337340#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'), + url('iconfont.woff?t=1618544337340') format('woff'), + url('iconfont.ttf?t=1618544337340') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ + url('iconfont.svg?t=1618544337340#iconfont') format('svg'); /* iOS 4.1- */ +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-full-screen-hs:before { + content: "\e656"; +} + +.icon-watch-hs:before { + content: "\e766"; +} + +.icon-download-hs:before { + content: "\e6af"; +} + +.icon-enlarge-hs:before { + content: "\e765"; +} + +.icon-previous-hs:before { + content: "\e84c"; +} + +.icon-zoom-out-hs:before { + content: "\e744"; +} + +.icon-next-step-hs:before { + content: "\e84b"; +} + diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.eot b/src/components/FlowChart/src/assets/iconfont/iconfont.eot new file mode 100644 index 000000000..c77503fb2 Binary files /dev/null and b/src/components/FlowChart/src/assets/iconfont/iconfont.eot differ diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.js b/src/components/FlowChart/src/assets/iconfont/iconfont.js new file mode 100644 index 000000000..357339c31 --- /dev/null +++ b/src/components/FlowChart/src/assets/iconfont/iconfont.js @@ -0,0 +1 @@ +!function(c){var t,e,o,a,n,l,i='',s=(s=document.getElementsByTagName("script"))[s.length-1].getAttribute("data-injectcss");if(s&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function h(){n||(n=!0,o())}t=function(){var c,t,e,o;(o=document.createElement("div")).innerHTML=i,i=null,(e=o.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",c=e,(t=document.body).firstChild?(o=c,(e=t.firstChild).parentNode.insertBefore(o,e)):t.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(e=function(){document.removeEventListener("DOMContentLoaded",e,!1),t()},document.addEventListener("DOMContentLoaded",e,!1)):document.attachEvent&&(o=t,a=c.document,n=!1,(l=function(){try{a.documentElement.doScroll("left")}catch(c){return void setTimeout(l,50)}h()})(),a.onreadystatechange=function(){"complete"==a.readyState&&(a.onreadystatechange=null,h())})}(window); \ No newline at end of file diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.json b/src/components/FlowChart/src/assets/iconfont/iconfont.json new file mode 100644 index 000000000..6f91abb60 --- /dev/null +++ b/src/components/FlowChart/src/assets/iconfont/iconfont.json @@ -0,0 +1,58 @@ +{ + "id": "2491438", + "name": "liu'c'tu", + "font_family": "iconfont", + "css_prefix_text": "icon-", + "description": "", + "glyphs": [ + { + "icon_id": "755619", + "name": "自适应图标", + "font_class": "full-screen-hs", + "unicode": "e656", + "unicode_decimal": 58966 + }, + { + "icon_id": "14445801", + "name": "查看", + "font_class": "watch-hs", + "unicode": "e766", + "unicode_decimal": 59238 + }, + { + "icon_id": "9712640", + "name": "下载", + "font_class": "download-hs", + "unicode": "e6af", + "unicode_decimal": 59055 + }, + { + "icon_id": "1029099", + "name": "放大", + "font_class": "enlarge-hs", + "unicode": "e765", + "unicode_decimal": 59237 + }, + { + "icon_id": "20017362", + "name": "上一步", + "font_class": "previous-hs", + "unicode": "e84c", + "unicode_decimal": 59468 + }, + { + "icon_id": "1010015", + "name": "缩小", + "font_class": "zoom-out-hs", + "unicode": "e744", + "unicode_decimal": 59204 + }, + { + "icon_id": "20017363", + "name": "下一步", + "font_class": "next-step-hs", + "unicode": "e84b", + "unicode_decimal": 59467 + } + ] +} diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.svg b/src/components/FlowChart/src/assets/iconfont/iconfont.svg new file mode 100644 index 000000000..657d7c73f --- /dev/null +++ b/src/components/FlowChart/src/assets/iconfont/iconfont.svg @@ -0,0 +1,47 @@ + + + + + +Created by iconfont + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.ttf b/src/components/FlowChart/src/assets/iconfont/iconfont.ttf new file mode 100644 index 000000000..b332ae7da Binary files /dev/null and b/src/components/FlowChart/src/assets/iconfont/iconfont.ttf differ diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.woff b/src/components/FlowChart/src/assets/iconfont/iconfont.woff new file mode 100644 index 000000000..0743a9381 Binary files /dev/null and b/src/components/FlowChart/src/assets/iconfont/iconfont.woff differ diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.woff2 b/src/components/FlowChart/src/assets/iconfont/iconfont.woff2 new file mode 100644 index 000000000..98f6f354f Binary files /dev/null and b/src/components/FlowChart/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/utils/operate/index.ts b/src/utils/operate/index.ts index e53c5a6e8..b328131b0 100644 --- a/src/utils/operate/index.ts +++ b/src/utils/operate/index.ts @@ -3,7 +3,7 @@ export const hasClass = (ele: Element, cls: string): any => { } export const addClass = (ele: Element, cls: string, extracls?: string): any => { - if (!hasClass(ele, cls)) ele.className += ' ' + cls + if (!hasClass(ele, cls)) ele.className += (' ' + cls).trim() if (extracls) { if (!hasClass(ele, extracls)) ele.className += ' ' + extracls } diff --git a/src/views/flow-chart/index.vue b/src/views/flow-chart/index.vue index 398b607b1..9d662a4b9 100644 --- a/src/views/flow-chart/index.vue +++ b/src/views/flow-chart/index.vue @@ -94,7 +94,7 @@ export default {