diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index b894a860e..7d88e87b8 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,10 +1,10 @@ @font-face {font-family: "iconfont"; - src: url('iconfont.eot?t=1607695324289'); /* IE9 */ - src: url('iconfont.eot?t=1607695324289#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAOYAAsAAAAACDQAAANLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCfgqEFIMzATYCJAMMCwgABCAFhG0HRhsBB8gekiQBgDxM4A0kAIgioN8v3Ud3F2KVqgCpNrIc0GFVJBVVWVtFrBIhOx5JmMaWNar/v/v99nGtOz+KOqLjkL7t7ovvDWum0bJoImRoGiKExrYjC6g2lM6fV4PQ9vCs/c/l9Fp+RWXzA+Uyx9aoF2A0gQIaa2iUaIEk6CkMr13sMM8T0GwbFdns/NQS6pLRaQHhwtl8BnVldHIDMWgoaxVrs3BV0YiX4wdcCb4fftkeGkQloXMXToUp8n2d+DqZLlXbDngI/nSXQUHCFCQT1iptC1qj2JRWzVqszRC0rWGBr5NVxdcJj7fZPzyCSKihha1gDNJ4RXxH5tL4iIu49k3U0IwNvGUIvZ6i9FKZzM04f1vGCnHQizTFjAGXOnGWLmi8LgG9xC1WmK8lB4pOtBX0Kg4xYfE2ry5ey8Q6JbR6iyf7Mjpdw0qVKO8Uzh3pmbbum7XpTGXrUPUu9Y7qR9nckW8NQE7IjYWNjrm3/r2srSk+619wmEI3RohhGW4tZLwr/U/zycbfUpLCGCbLAW6wwYFl9c4IGxVz7/1lNW2pbcz0E4xYib5sbUw75r4GyvsNvC+bMxvPTkWYPDcepPTFWegO8LOcLO8GFpzGjRcnxHJeHkVhSpcJ8bkDkc+BJ8vxGUGffT10F1p7Vsv7gfWxseePRJdRGkL1OL1IM1D1JEWKPb/zN6bCpwOHB3f+brRk8Pn/w63AWz3Ouhs0btge+Hn8jjVZF1J9yirP4ZnJZFH76+GAIzpVqKvb33BFX+dCgoa+BKK6QUgahjCZMAVFi2l/TcPRCmk2KYrNLXpwrUJuwoQDAkGnV4jaPYak0w8mE36h6PcPNZ0hQbO10LNni5FwtnlmHTICKM5u4WKuXmO2UfSExQuQX6tkeFoYUAlwqRjEeo0un4xCDfgUC6T1vEEIhhmvV3GEXAaVSh03eL0EOaEpCNFwaLWs6kWaXL2KeszgQIYAKCxrC1aUU1fDvMZCT+HzC0DemooM3lBVYyUAJyn2julp6DpgorJap6pbGSxZl2cgCIydxHB1VVgEFlCxYnVYo3pUCcgRNAoDIg0OWqYe6yrTLK+ovt8uaEZ/l0IMKWQdJy8WhZqtVSpSjgPUemItQgA=') format('woff2'), - url('iconfont.woff?t=1607695324289') format('woff'), - url('iconfont.ttf?t=1607695324289') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ - url('iconfont.svg?t=1607695324289#iconfont') format('svg'); /* iOS 4.1- */ + src: url('iconfont.eot?t=1618822116404'); /* IE9 */ + src: url('iconfont.eot?t=1618822116404#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAQkAAsAAAAACWAAAAPWAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDKgqFXIRAATYCJAMUCwwABCAFhG0HdBvwByMRJnztRfZfEuS6lrOvYNUWLBYrKHuUFPQcqdIW23Ll3d/JYMdZJG0ywiQE2XibeOB/7dt9Nn92ZlFNoklck5hG8QQJTud0QvS4hLZsQyzkjzg4gYMfJMARR4FqiZ5Qv7nUxxktKhcgP2GOJ7yLe0h+e5+srP9bW5jUlU4kMovHteofSLoSClKhShx579qwZ1MiUVu+eGkhN9tVZaKjkibzPwC6wOKi2f+/36x4/pCg6W00erHHR00ShxBJGhKRNBGvSyt1HhdSn4V5ZXpPRi73jLsJaEw2R1i/cft+tYwfFBAunT97XF2Y5RF6UOuqnjOz8EpRxxexDy/dx4e/5oaaqCT8yN1nNpyy+scsD9L97n2HDAHa3/2gIGEOMuFCr/uUFNJzJM2iOFuMWmwX+THbPQ+63YY2S3Yt29UaDZLM/vEiocLVvaCuNmb3DCmn5E4iBGSAICDw60FGxHM6gwYjMUDYIyrVRqWiIFdVp5OlyCpHcnXQV+vUI7rXm1ptaTRp0Hm9oRXMpAmqQSOaIBI1qVN9nqAO5KJ7TSUHFIblUEH0NoQp0wBj2Q2AEXWiYHAwugaLKd4Eo1KgwDj+QGY+owqccO4AIaofYhlTYN6hW+7Dd6SN/U6MDzpzZvmgbx5r60OOaeZD09L3JEsc7b/PZS7X23TI3ef0CxrUrZmkfm3xJkO+8xhXHsctAM5NNHJurk5K9fjJ3SPN4BygE8ZXbqAMt2z918loI1PRgoKDpDcU3gQmajswlr/cWWUz2Q6bc9/7n0bOs+6t1GfZ/ldEG5O9TNajSIjEyBT1USyPdo/RXgiA3oVDIopCACvZkvDYFst63Sb6FTsjq0wOUp6dnghX/LXsUMRY0H2fviR0P6SgXfVX+Ru7rs1tjg5Zft1m0P/21LuO7v0s3ef7RmT0x0DEsbzEuaXk+bCSzr3FnrfVG/kf4H+IPMMN7Ec7ilxNUBuVIOqYBEltCjFT50DRmh+p1K6xmsZsm3B+a4QbkpB7MMsTBsFQ7yAa7D0kQ30lZuo3KEb7D5WhIUHjYBhxxdagBn/AqAQt6Dd4UwtJmxx87Te6e1Kc4479j9x9DNZpqXM3LMj7OKY/3CZCQFwzXNn9MKUKjWtAI9Mu0i7zTH2vNJmahwOMStAC/Qbe1EJmuhxa7/+N7p4Uj4xcCP8jd78+WE0WAvGmLqSR57J9f7iNCM32I64ZXOHEJNIVtP7dAhqZ7Fsk28XcTCKqejq+Nr/GK9Dg1y0hhhRyKKGSm3t9jln5Mj4CpbjNkL92by2Wnt997svLSPeUumHEcoimYQAAAA==') format('woff2'), + url('iconfont.woff?t=1618822116404') format('woff'), + url('iconfont.ttf?t=1618822116404') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ + url('iconfont.svg?t=1618822116404#iconfont') format('svg'); /* iOS 4.1- */ } .iconfont { @@ -15,6 +15,14 @@ -moz-osx-font-smoothing: grayscale; } +.team-iconshow-main-container:before { + content: "\e878"; +} + +.team-iconhidden-main-container:before { + content: "\e881"; +} + .team-iconexit-fullscreen:before { content: "\e62a"; } diff --git a/src/assets/iconfont/iconfont.eot b/src/assets/iconfont/iconfont.eot index f966cbb36..820ed6af1 100644 Binary files a/src/assets/iconfont/iconfont.eot and b/src/assets/iconfont/iconfont.eot differ diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js index dc74ca8fc..baaa7a1e8 100644 --- a/src/assets/iconfont/iconfont.js +++ b/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -!function(e){var t,c,l,n,o,i,d='',s=(s=document.getElementsByTagName("script"))[s.length-1].getAttribute("data-injectcss");if(s&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(e){console&&console.log(e)}}function a(){o||(o=!0,l())}t=function(){var e,t,c,l;(l=document.createElement("div")).innerHTML=d,d=null,(c=l.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",e=c,(t=document.body).firstChild?(l=e,(c=t.firstChild).parentNode.insertBefore(l,c)):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),t()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(l=t,n=e.document,o=!1,(i=function(){try{n.documentElement.doScroll("left")}catch(e){return void setTimeout(i,50)}a()})(),n.onreadystatechange=function(){"complete"==n.readyState&&(n.onreadystatechange=null,a())})}(window); \ No newline at end of file +!function(e){var t,c,l,n,o,i,d='',a=(a=document.getElementsByTagName("script"))[a.length-1].getAttribute("data-injectcss");if(a&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(e){console&&console.log(e)}}function m(){o||(o=!0,l())}t=function(){var e,t,c,l;(l=document.createElement("div")).innerHTML=d,d=null,(c=l.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",e=c,(t=document.body).firstChild?(l=e,(c=t.firstChild).parentNode.insertBefore(l,c)):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),t()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(l=t,n=e.document,o=!1,(i=function(){try{n.documentElement.doScroll("left")}catch(e){return void setTimeout(i,50)}m()})(),n.onreadystatechange=function(){"complete"==n.readyState&&(n.onreadystatechange=null,m())})}(window); \ No newline at end of file diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json index f7bf00e9d..7e71a97c2 100644 --- a/src/assets/iconfont/iconfont.json +++ b/src/assets/iconfont/iconfont.json @@ -5,6 +5,20 @@ "css_prefix_text": "team-icon", "description": "增删查改xi't", "glyphs": [ + { + "icon_id": "9626913", + "name": "全屏", + "font_class": "show-main-container", + "unicode": "e878", + "unicode_decimal": 59512 + }, + { + "icon_id": "9626952", + "name": "退出全屏", + "font_class": "hidden-main-container", + "unicode": "e881", + "unicode_decimal": 59521 + }, { "icon_id": "5698509", "name": "全屏缩小", diff --git a/src/assets/iconfont/iconfont.svg b/src/assets/iconfont/iconfont.svg index 5aaa95d17..f34905899 100644 --- a/src/assets/iconfont/iconfont.svg +++ b/src/assets/iconfont/iconfont.svg @@ -20,6 +20,12 @@ Created by iconfont /> + + + + + + diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index dadb82946..293c14919 100644 Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index c0899f6f3..41964cf31 100644 Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2 index 0e23e45bd..5e7f06538 100644 Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/components/PerfectTable/index.ts b/src/components/PerfectTable/index.ts new file mode 100644 index 000000000..e69de29bb diff --git a/src/components/PerfectTable/src/Dialog.vue b/src/components/PerfectTable/src/Dialog.vue new file mode 100644 index 000000000..e69de29bb diff --git a/src/components/PerfectTable/src/Search.vue b/src/components/PerfectTable/src/Search.vue new file mode 100644 index 000000000..e69de29bb diff --git a/src/components/PerfectTable/src/Table.vue b/src/components/PerfectTable/src/Table.vue new file mode 100644 index 000000000..e69de29bb diff --git a/src/components/SeamlessScroll/src/SeamlessScroll.vue b/src/components/SeamlessScroll/src/SeamlessScroll.vue index e1e6384db..a90b00632 100644 --- a/src/components/SeamlessScroll/src/SeamlessScroll.vue +++ b/src/components/SeamlessScroll/src/SeamlessScroll.vue @@ -14,6 +14,7 @@ @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" + @mousewheel="wheel" >
@@ -32,7 +33,12 @@ import { watchEffect, nextTick } from "vue"; -import { tryOnMounted, tryOnUnmounted, templateRef } from "@vueuse/core"; +import { + tryOnMounted, + tryOnUnmounted, + templateRef, + useDebounceFn +} from "@vueuse/core"; import * as utilsMethods from "./utils"; const { animationFrame, copyObj } = utilsMethods; animationFrame(); @@ -490,6 +496,19 @@ export default defineComponent({ } }); + // 鼠标滚轮事件 + function wheel(e) { + e.preventDefault(); + if ( + unref(options).direction === "left" || + unref(options).direction === "right" + ) + return; + useDebounceFn(() => { + e.deltaY > 0 ? (yPos.value -= step.value) : (yPos.value += step.value); + }, 50)(); + } + tryOnMounted(() => { scrollInitMove(); }); @@ -539,7 +558,8 @@ export default defineComponent({ scrollMove, scrollInitMove, scrollStartMove, - scrollStopMove + scrollStopMove, + wheel }; } }); diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 255481e67..b8511f227 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -10,7 +10,7 @@ - diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 2ec05b3b3..1c5103bb4 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -9,20 +9,21 @@
+ +
- + +

{{ usename }}

 @@ -48,7 +49,7 @@ export default defineComponent({ components: { Breadcrumb, Hamburger, - screenfull, + screenfull }, setup() { let langs = ref(true); @@ -95,7 +96,7 @@ export default defineComponent({ en, favicon }; - }, + } }); @@ -149,13 +150,11 @@ export default defineComponent({ display: flex; align-items: center; justify-content: space-around; - margin-right: 20px; + margin-right: 10px; + cursor: pointer; p { font-size: 13px; } - &:hover { - background: #f0f0f0; - } img { width: 22px; height: 22px; diff --git a/src/layout/components/screenfull/index.vue b/src/layout/components/screenfull/index.vue index 5bd3223f2..255511f1a 100644 --- a/src/layout/components/screenfull/index.vue +++ b/src/layout/components/screenfull/index.vue @@ -15,7 +15,7 @@ import { useFullscreen } from '@vueuse/core' import { defineComponent, -} from "vue"; +} from "vue" export default defineComponent({ name: "screenfull", setup() { @@ -24,7 +24,7 @@ export default defineComponent({ return { isFullscreen, toggle, - }; + } }, }); diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue index 33135798f..bc6b2f380 100644 --- a/src/layout/components/setting/index.vue +++ b/src/layout/components/setting/index.vue @@ -10,6 +10,10 @@ 色弱模式 +
  • + 隐藏标签页 + +
    • @@ -19,6 +23,7 @@ import panel from "../panel/index.vue"; import { onMounted, reactive, toRefs } from "vue"; import { storageLocal } from "/@/utils/storage"; import { toggleClass } from "/@/utils/operate"; +import { emitter } from "/@/utils/mitt"; export default { name: "setting", @@ -39,7 +44,8 @@ export default { const settings = reactive({ greyVal: storageLocal.getItem("greyVal"), - weekVal: storageLocal.getItem("weekVal") + weekVal: storageLocal.getItem("weekVal"), + tagsVal: storageLocal.getItem("tagsVal") }); settings.greyVal === null @@ -74,11 +80,20 @@ export default { : localOperate("weekVal", false, "set"); }; + const tagsChange = () => { + let showVal = settings.tagsVal; + showVal + ? storageLocal.setItem("tagsVal", true) + : storageLocal.setItem("tagsVal", false); + emitter.emit("tagViewsChange", showVal); + }; + return { ...toRefs(settings), localOperate, greyChange, - weekChange + weekChange, + tagsChange }; } }; diff --git a/src/layout/components/tag/index.vue b/src/layout/components/tag/index.vue index a4463a4c1..6e81ddaf4 100644 --- a/src/layout/components/tag/index.vue +++ b/src/layout/components/tag/index.vue @@ -1,5 +1,5 @@ @@ -173,4 +222,23 @@ $sideBarWidth: 210px; .mobile .fixed-header { width: 100%; } + +.right-func { + display: flex; + align-items: center; + background: #fff; + border: 0.5px solid rgba($color: #ccc, $alpha: 0.3); + font-size: 16px; + li { + width: 40px; + height: 34px; + line-height: 34px; + text-align: center; + border-right: 1px solid #ccc; + cursor: pointer; + } +} +.hidden-main-container { + margin-left: 0 !important; +} diff --git a/src/settings.ts b/src/settings.ts index b93803ec5..3c275da08 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -1,9 +1,9 @@ export default { - - title: 'CURE Admin', + title: "CURE Admin", fixedHeader: false, - sidebarLogo: false + sidebarLogo: false, -} + hiddenSideBar: false, +}; diff --git a/src/style/index.scss b/src/style/index.scss index 45d679de6..02bdc3b95 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -1,8 +1,8 @@ -@import './variables.scss'; -@import './mixin.scss'; -@import './transition.scss'; -@import './element-ui.scss'; -@import './sidebar.scss'; +@import "./variables.scss"; +@import "./mixin.scss"; +@import "./transition.scss"; +@import "./element-ui.scss"; +@import "./sidebar.scss"; body { width: 100%; @@ -12,7 +12,8 @@ body { -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, + Microsoft YaHei, Arial, sans-serif; } label { @@ -30,7 +31,7 @@ html { width: 100%; height: 100%; overflow: hidden; - background-color: #f0f2f5; + // background-color: #f0f2f5; } *, @@ -103,14 +104,14 @@ ul { // 灰色模式 .html-grey { - filter: grayscale(100%); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(100%); - -o-filter: grayscale(100%); - filter: url("data:image/svg+xml;utf8,#grayscale"); - filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); - -webkit-filter: grayscale(1); + filter: grayscale(100%); + -webkit-filter: grayscale(100%); + -moz-filter: grayscale(100%); + -ms-filter: grayscale(100%); + -o-filter: grayscale(100%); + filter: url("data:image/svg+xml;utf8,#grayscale"); + filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); + -webkit-filter: grayscale(1); } // 色弱模式 @@ -132,4 +133,4 @@ ul { .mobile-spacing { margin: 0; -} \ No newline at end of file +} diff --git a/src/style/variables.scss b/src/style/variables.scss index dfa2d0759..018d512b5 100644 --- a/src/style/variables.scss +++ b/src/style/variables.scss @@ -1,12 +1,12 @@ // sidebar -$menuText:#bfcbd9; -$menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; -$menuBg:#304156; -$menuHover:#263445; +$menuText: #bfcbd9; +$menuActiveText: #409eff; +$subMenuActiveText: #f4f4f5; +$menuBg: #304156; +$menuHover: #263445; -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg: #1f2d3d; +$subMenuHover: #001528; $sideBarWidth: 210px; diff --git a/src/views/editor/index.vue b/src/views/editor/index.vue index 95465b458..d215cee4d 100644 --- a/src/views/editor/index.vue +++ b/src/views/editor/index.vue @@ -46,4 +46,7 @@ export default { :deep(.w-e-text-container) { z-index: 99 !important; } +:deep(.w-e-toolbar) { + z-index: 999 !important; +} \ No newline at end of file diff --git a/src/views/flow-chart/index.vue b/src/views/flow-chart/index.vue index d2ad872fc..36c9154fd 100644 --- a/src/views/flow-chart/index.vue +++ b/src/views/flow-chart/index.vue @@ -91,11 +91,11 @@ export default {