diff --git a/package.json b/package.json index ae008bf..48a2670 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "front-next", - "version": "5.0.3", + "version": "5.1.0", "scripts": { "dev": "vite --host", "build": "vite build", diff --git a/src/modules/base/components/icon-svg/index.vue b/src/modules/base/components/icon-svg/index.vue deleted file mode 100644 index b731583..0000000 --- a/src/modules/base/components/icon-svg/index.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - - - diff --git a/src/modules/base/pages/layout/components/process.vue b/src/modules/base/pages/layout/components/process.vue index 77477e6..3aceeac 100644 --- a/src/modules/base/pages/layout/components/process.vue +++ b/src/modules/base/pages/layout/components/process.vue @@ -1,7 +1,7 @@ @@ -36,11 +28,11 @@ import { watch } from "vue"; import { last } from "/@/cool/utils"; import { useCool } from "/@/cool"; -import { ArrowLeft, ArrowRight, Close } from "@element-plus/icons-vue"; +import { ArrowLeft, Close } from "@element-plus/icons-vue"; import { ContextMenu } from "@cool-vue/crud"; import { useBaseStore } from "/$/base"; -const { refs, setRefs, store, route, router }: any = useCool(); +const { refs, setRefs, route, router } = useCool(); const { process } = useBaseStore(); // 跳转 @@ -61,11 +53,6 @@ function scrollTo(left: number) { }); } -// 左右移动 -function toScroll(f: boolean) { - scrollTo(refs.value.scroller.scrollLeft + (f ? -100 : 100)); -} - // 调整滚动位置 function adScroll(index: number) { const el = refs.value[`item-${index}`]; @@ -103,8 +90,7 @@ function openCM(e: any, item: any) { { label: "关闭其他", callback(done) { - store.commit( - "SET_PROCESS", + process.set( process.list.filter((e: any) => e.value == item.value || e.value == "/") ); done(); @@ -114,10 +100,7 @@ function openCM(e: any, item: any) { { label: "关闭所有", callback(done) { - store.commit( - "SET_PROCESS", - process.list.filter((e: any) => e.value == "/") - ); + process.set(process.list.filter((e: any) => e.value == "/")); done(); toPath(); } @@ -143,30 +126,22 @@ watch( margin-bottom: 10px; padding: 0 10px; - &__left, - &__right { + &__back { display: flex; justify-content: center; align-items: center; background-color: #fff; height: 30px; - padding: 0 2px; + padding: 0 10px; border-radius: 3px; cursor: pointer; + margin-right: 10px; &:hover { background-color: #eee; } } - &__left { - margin-right: 10px; - } - - &__right { - margin-left: 10px; - } - &__scroller { width: 100%; flex: 1; @@ -222,6 +197,8 @@ watch( &.active { span { color: var(--color-primary); + font-weight: bold; + user-select: none; } i { diff --git a/src/modules/base/pages/layout/components/slider.vue b/src/modules/base/pages/layout/components/slider.vue index cc6aca3..ac9d8ca 100644 --- a/src/modules/base/pages/layout/components/slider.vue +++ b/src/modules/base/pages/layout/components/slider.vue @@ -155,7 +155,7 @@ export default defineComponent({ .app-slider { height: 100%; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3); - background-color: var(--menu-bg-color); + background-color: #2f3447; &__logo { display: flex; @@ -215,7 +215,6 @@ export default defineComponent({ .icon-svg, span { - // color: var(--menu-font-color); color: #fff; } } @@ -224,7 +223,7 @@ export default defineComponent({ .el-sub-menu__title, &-item, &__title { - color: var(--menu-font-color); + color: #eee; letter-spacing: 0.5px; height: 50px; line-height: 50px; diff --git a/src/modules/base/pages/layout/components/topbar.vue b/src/modules/base/pages/layout/components/topbar.vue index 165d029..e6edcbe 100644 --- a/src/modules/base/pages/layout/components/topbar.vue +++ b/src/modules/base/pages/layout/components/topbar.vue @@ -17,7 +17,9 @@ @@ -107,16 +109,12 @@ function onCommand(name: string) { align-items: center; list-style: none; height: 45px; - padding: 0 10px; - margin-right: 10px; + width: 45px; + border-radius: 3px; cursor: pointer; - i { - font-size: 18px; - - &:hover { - opacity: 0.8; - } + &:hover { + background-color: rgba(0, 0, 0, 0.1); } } } diff --git a/src/modules/base/pages/layout/components/views.vue b/src/modules/base/pages/layout/components/views.vue index 0f95b68..6ed7500 100644 --- a/src/modules/base/pages/layout/components/views.vue +++ b/src/modules/base/pages/layout/components/views.vue @@ -2,7 +2,9 @@
- + + +
diff --git a/src/modules/base/pages/layout/index.vue b/src/modules/base/pages/layout/index.vue index b366445..a3cf360 100644 --- a/src/modules/base/pages/layout/index.vue +++ b/src/modules/base/pages/layout/index.vue @@ -27,7 +27,7 @@ const { app } = useBaseStore();