-
+
@@ -39,7 +39,7 @@
import ajax from 'element-ui/packages/upload/src/ajax'
export default {
- name: "UploadPictureCard",
+ name: "UploadCardList",
props: {
//上传的地址
diff --git a/vue/full/src/component/Upload/Qiniu.vue b/vue/full/src/component/Upload/Qiniu.vue
index 2943226..65af246 100644
--- a/vue/full/src/component/Upload/Qiniu.vue
+++ b/vue/full/src/component/Upload/Qiniu.vue
@@ -1,5 +1,5 @@
-
- {this.checked && }
-
- )
- }
-}
-
-
-
diff --git a/vue/full/src/component/checkbox/Group.vue b/vue/full/src/component/checkbox/Group.vue
deleted file mode 100644
index 3e3c065..0000000
--- a/vue/full/src/component/checkbox/Group.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
diff --git a/vue/full/src/component/checkbox/ImgCheckbox.vue b/vue/full/src/component/checkbox/ImgCheckbox.vue
deleted file mode 100644
index 1881266..0000000
--- a/vue/full/src/component/checkbox/ImgCheckbox.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
diff --git a/vue/full/src/component/menu/ContextMenu/index.vue b/vue/full/src/component/menu/ContextMenu/index.vue
deleted file mode 100644
index ea23e8c..0000000
--- a/vue/full/src/component/menu/ContextMenu/index.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
diff --git a/vue/full/src/component/menu/NavMenu/index.vue b/vue/full/src/component/menu/NavMenu/index.vue
deleted file mode 100644
index f3f6c1d..0000000
--- a/vue/full/src/component/menu/NavMenu/index.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
diff --git a/vue/full/src/component/menu/NavMenu/item.vue b/vue/full/src/component/menu/NavMenu/item.vue
deleted file mode 100644
index 3e26f7d..0000000
--- a/vue/full/src/component/menu/NavMenu/item.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-
diff --git a/vue/full/src/component/menu/NavMenu/style.scss b/vue/full/src/component/menu/NavMenu/style.scss
deleted file mode 100644
index a1130cf..0000000
--- a/vue/full/src/component/menu/NavMenu/style.scss
+++ /dev/null
@@ -1,109 +0,0 @@
-@import "~@/asset/style/var";
-
-.el-menu {
- //图标的大小
- .icon {
- font-size: $menu-icon-size;
- }
-
- //图标与文字的间隔
- .icon + .menu-item-content {
- margin-left: $menu-icon-text-gap;
- }
-
- //菜单的高亮关键字
- .menu-highlight-result {
- vertical-align: unset;
- color: $--color-success;
- }
-}
-
-//原始样式使用 '>' 可能导致侧边栏折叠时还会显示右侧箭头图标
-//此样式只对垂直状态生效
-.el-menu--collapse .el-submenu .el-submenu__title .el-submenu__icon-arrow {
- display: none;
-}
-
-//hover时，菜单左侧图标放大（弹出菜单的父级不放大）
-.el-menu-item:not(.popover-menu__title),
-.el-submenu__title {
- > .icon,
- > .el-tooltip > .icon {
- transition: transform .1s;
- }
-
- &:hover > .icon,
- &:hover > .el-tooltip > .icon {
- transform: scale(1.2);
- }
-}
-
-//侧边栏垂直菜单
-.el-menu--vertical {
- &.el-menu {
- overflow-y: auto;
- }
-
- &.el-menu,
- .el-menu {
- //菜单文字
- .el-menu-item,
- .el-submenu__title {
- > .menu-item-content {
- text-overflow: ellipsis;
- overflow: hidden;
- //侧边栏宽度、菜单左右padding、左侧图标宽度、距离左右的距离、右侧图标宽度
- width: $aside-width - $menu-padding * 2 - $menu-icon-size - $menu-icon-text-gap * 2 - 12px;
- }
- }
-
- //弹出菜单的父级
- &.el-menu--popup .popover-menu__title {
- cursor: auto;
- border-bottom-width: 1px;
- border-bottom-style: solid;
- }
- }
-}
-
-//顶部水平菜单
-.el-menu--horizontal {
- //顶部菜单的顶级节点
- &.el-menu {
- //不显示折叠展开按钮
- > .el-submenu > .el-submenu__title > .el-submenu__icon-arrow {
- display: none;
- }
-
- //顶级节点的高度以及hover颜色
- > .el-menu-item,
- > .el-submenu > .el-submenu__title {
- height: $nav-height;
- line-height: $nav-height;
-
- &:hover {
- border-bottom: 2px solid $--color-primary;
- }
- }
- }
-
- &.el-menu,
- .el-menu {
- //菜单的文字以及hover颜色
- .el-menu-item,
- .el-submenu__title {
- > span {
- max-width: 100px;
- }
- }
-
- //submenu的右侧箭头会稍微偏上，不懂为啥
- .el-submenu__icon-arrow {
- margin-top: -4px;
- }
- }
-}
-
-
-@import "./theme-light";
-@import "./theme-dark";
diff --git a/vue/full/src/component/menu/NavMenu/theme-dark.scss b/vue/full/src/component/menu/NavMenu/theme-dark.scss
deleted file mode 100644
index 0f6d3b8..0000000
--- a/vue/full/src/component/menu/NavMenu/theme-dark.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-.el-menu--dark {
- //侧边栏垂直菜单
- &.el-menu--vertical {
- &.el-menu,
- .el-menu {
- background-color: $menu-background-dark;
-
- //菜单的文字以及hover颜色
- .el-menu-item,
- .el-submenu__title {
- color: $menu-text-color-dark;
-
- &:hover {
- color: $menu-text-hover-color-dark;
- }
- }
-
- //子级菜单的背景颜色
- &.el-menu--inline {
- background-color: $sub-menu-background-dark;
- }
-
- //子级菜单内阴影
- &.el-menu--inline {
- box-shadow: inset 0 2px 8px darken($sub-menu-background-dark, 10%)
- }
-
- //设置了显示弹出菜单的父级
- &.el-menu--popup .popover-menu__title {
- color: $menu-text-hover-color-dark;
- border-bottom-color: $--border-color-dark;
- }
- }
- }
-
- //顶部水平菜单
- &.el-menu--horizontal {
- &.el-menu,
- .el-menu {
- background-color: $root-menu-background-dark;
-
- //菜单的文字以及hover颜色
- .el-menu-item,
- .el-submenu__title {
- color: $menu-text-color-dark;
-
- &:hover {
- color: $menu-text-hover-color-dark;
- }
- }
- }
-
- &.el-menu > .el-menu-item,
- &.el-menu > .el-submenu > .el-submenu__title,
- &.el-menu > .el-menu-item:hover,
- &.el-menu > .el-submenu > .el-submenu__title:hover {
- border-bottom: none;
- }
- }
-}
diff --git a/vue/full/src/component/menu/NavMenu/theme-light.scss b/vue/full/src/component/menu/NavMenu/theme-light.scss
deleted file mode 100644
index d27ebbe..0000000
--- a/vue/full/src/component/menu/NavMenu/theme-light.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-.el-menu--light {
- //侧边栏垂直菜单
- &.el-menu--vertical {
- &.el-menu,
- .el-menu {
- //菜单的文字以及hover颜色
- .el-menu-item,
- .el-submenu__title {
- color: $menu-text-color-light;
-
- &:hover {
- color: $menu-text-hover-color-light;
- }
- }
-
- .el-menu-item::after {
- position: absolute;
- top: 10%;
- right: 0;
- height: 80%;
- border-right: 3px solid $--color-primary;
- opacity: 0;
- transform: scaleY(0);
- transition: transform .15s cubic-bezier(.645, .045, .355, 1);
- content: "";
- }
-
- .el-menu-item.is-active {
- &::before{
- position: absolute;
- top: 10%;
- left: 0;
- height: 80%;
- width: 100%;
- background-color: rgba($--color-primary, .1);
- content: "";
- }
-
- &::after {
- opacity: 1;
- transform: scaleY(1);
- }
- }
-
- //弹出菜单的父级
- &.el-menu--popup .popover-menu__title {
- color: $menu-text-hover-color-light;
- border-bottom-color: $--border-color-light;
- }
- }
- }
-
- //顶部水平菜单
- &.el-menu--horizontal {
- &.el-menu,
- .el-menu {
- //菜单的文字以及hover颜色
- .el-menu-item,
- .el-submenu__title {
- color: $menu-text-color-light;
-
- &:hover {
- color: $menu-text-hover-color-light;
- }
- }
- }
- }
-}
diff --git a/vue/full/src/config/index.js b/vue/full/src/config/index.js
index c875322..2f5c5ae 100644
--- a/vue/full/src/config/index.js
+++ b/vue/full/src/config/index.js
@@ -9,6 +9,9 @@ module.exports = {
//页面标题、登录注册页的标题
title: 'BiuBiuBiu~',
+ //logo地址
+ logo: `/static/img/logo.svg`,
+
//全局axios的baseUrl、devServer的路由前缀
apiPrefix: '/api',
diff --git a/vue/full/src/globalMethod/Guide/main.vue b/vue/full/src/globalMethod/Guide/main.vue
index 2d313df..d889c3f 100644
--- a/vue/full/src/globalMethod/Guide/main.vue
+++ b/vue/full/src/globalMethod/Guide/main.vue
@@ -87,7 +87,7 @@ export default {
watch: {
isActive(v) {
- document.body.classList[v ? 'add' : 'remove']('overflow-hidden')
+ document.body.classList[v ? 'add' : 'remove']('guide-body-overflow-hidden')
}
},
diff --git a/vue/full/src/globalMethod/Guide/style.scss b/vue/full/src/globalMethod/Guide/style.scss
index bf86ba0..6c4447d 100644
--- a/vue/full/src/globalMethod/Guide/style.scss
+++ b/vue/full/src/globalMethod/Guide/style.scss
@@ -42,6 +42,10 @@
}
}
+.guide-body-overflow-hidden {
+ overflow: hidden !important;
+}
+
#guide-stage {
position: absolute;
background-color: white;
diff --git a/vue/full/src/globalMethod/Verify/image/btn_move.png b/vue/full/src/globalMethod/Verify/image/btn_move.png
index b2462c361ad1e2a255dcd4d31c43340c8f698dac..0c4d596708d793d2d98328d58ccaefb641f7d545 100644
GIT binary patch
delta 1608
zcmV-O2Dkar7S0Ti8Gi!+007jA@Y(加载中...
@@ -34,7 +34,12 @@
-
+
@@ -53,21 +58,17 @@
-
-
diff --git a/vue/full/src/layout/component/Aside/component/OnePartRoot.vue b/vue/full/src/layout/component/Aside/component/OnePartRoot.vue
deleted file mode 100644
index 8cd661f..0000000
--- a/vue/full/src/layout/component/Aside/component/OnePartRoot.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-
diff --git a/vue/full/src/layout/component/Aside/component/TwoPartRoot.vue b/vue/full/src/layout/component/Aside/component/TwoPartRoot.vue
deleted file mode 100644
index 761135a..0000000
--- a/vue/full/src/layout/component/Aside/component/TwoPartRoot.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-
diff --git a/vue/full/src/layout/component/Aside/component/TwoPartSub.vue b/vue/full/src/layout/component/Aside/component/TwoPartSub.vue
deleted file mode 100644
index c7cc450..0000000
--- a/vue/full/src/layout/component/Aside/component/TwoPartSub.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-
diff --git a/vue/full/src/layout/component/Aside/index.vue b/vue/full/src/layout/component/Aside/index.vue
deleted file mode 100644
index 43d4420..0000000
--- a/vue/full/src/layout/component/Aside/index.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
diff --git a/vue/full/src/layout/component/Aside/style.scss b/vue/full/src/layout/component/Aside/style.scss
deleted file mode 100644
index f5603b5..0000000
--- a/vue/full/src/layout/component/Aside/style.scss
+++ /dev/null
@@ -1,101 +0,0 @@
-@import "~@/asset/style/var";
-@import "~@/asset/style/mixin.scss";
-
-.aside {
- display: flex;
- z-index: 11;
-
- //移动端下侧边栏抽屉不能设置z-index，否则会被el-drawer的遮罩遮住
- @include mobile {
- z-index: auto !important;
- }
-
- //单层和双层侧边栏
- .sidebar,
- .root-sidebar,
- .sub-sidebar {
- display: flex;
- flex-direction: column;
- height: 100%;
- width: $aside-width;
- box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
- transition: all 0.2s;
-
- //折叠状态
- &.collapse {
- width: $aside-collapse-width;
-
- //隐藏菜单文字
- .menu-item-content,
- .sub-sidebar-title {
- display: none;
- }
- }
- }
-
- //垂直菜单占满剩余空间
- .el-menu--vertical {
- flex: 1;
- }
-
- //底部汉堡包
- .hamburger {
- border-top-width: 1px;
- border-top-style: solid;
- }
-}
-
-//页面为上下结构时，侧边栏的抽屉模式需要扣除导航栏的高度
-.el-drawer.drawer-behind-header {
- top: $nav-height;
-}
-
-
-/* 双侧侧边栏开始 */
-
-.root-sidebar-container {
- position: relative;
- width: $aside-collapse-width;
- height: 100%;
-}
-
-.root-sidebar {
- position: absolute;
- overflow: hidden;
- z-index: 1;
- box-shadow: none !important;
- border-right-width: 1px;
- border-right-style: solid;
-}
-
-.sub-sidebar-title {
- height: $nav-height;
- line-height: $nav-height;
- padding-left: $menu-padding;
- font-size: 16px;
-}
-
-/* 双侧侧边栏结束 */
-
-
-/* 侧边栏切换动画开始 */
-
-.sidebar-enter-active {
- transition: all 0.2s;
-}
-
-.sidebar-enter,
-.sidebar-leave-active {
- opacity: 0;
- transform: translateY(30px) skewY(10deg)
-}
-
-.sidebar-leave-active {
- position: absolute;
-}
-
-/* 侧边栏切换动画结束 */
-
-
-@import "theme-light";
-@import "theme-dark";
diff --git a/vue/full/src/layout/component/Aside/theme-dark.scss b/vue/full/src/layout/component/Aside/theme-dark.scss
deleted file mode 100644
index c2b181c..0000000
--- a/vue/full/src/layout/component/Aside/theme-dark.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.aside.dark {
- &,
- > .el-drawer__wrapper .el-drawer__body {
- background-color: $menu-background-dark;
- }
-
- .root-sidebar,
- .root-sidebar > .el-menu--vertical.el-menu {
- background-color: $root-menu-background-dark;
- }
-
- .root-sidebar {
- border-right-color: $--border-color-dark;
- }
-
- .sub-sidebar-title {
- color: $--color-white;
- }
-
- .hamburger {
- border-top-color: $--border-color-dark;
-
- i {
- color: $menu-text-color-dark;
- }
- }
-}
diff --git a/vue/full/src/layout/component/Aside/theme-light.scss b/vue/full/src/layout/component/Aside/theme-light.scss
deleted file mode 100644
index a6e0e78..0000000
--- a/vue/full/src/layout/component/Aside/theme-light.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-.aside.light {
- .root-sidebar {
- background-color: $--color-white;
- border-right-color: $--border-color-light;
- }
-
- .hamburger {
- border-top-color: $--border-color-light;
-
- i {
- color: $menu-text-color-light;
- }
- }
-}
diff --git a/vue/full/src/layout/component/Footer/index.vue b/vue/full/src/layout/component/Footer/index.vue
new file mode 100644
index 0000000..74a2ab5
--- /dev/null
+++ b/vue/full/src/layout/component/Footer/index.vue
@@ -0,0 +1,11 @@
+
+
+
@@ -8,7 +8,7 @@
import {refreshPage} from "@/util/route"
export default {
- name: "Bell",
+ name: "NotifyBell",
computed: {
hidden() {
@@ -20,9 +20,7 @@ export default {
jump() {
const target = '/message/user'
- this.$route.path === target
- ? refreshPage()
- : this.$router.push(target)
+ this.$route.path === target ? refreshPage() : this.$router.push(target)
}
},
@@ -31,11 +29,3 @@ export default {
}
}
-
-
diff --git a/vue/full/src/layout/component/NotifyBell/style.scss b/vue/full/src/layout/component/NotifyBell/style.scss
new file mode 100644
index 0000000..17ac33f
--- /dev/null
+++ b/vue/full/src/layout/component/NotifyBell/style.scss
@@ -0,0 +1,5 @@
+.notify-bell-badge .el-badge__content {
+ top: 15px !important;
+ right: 10px !important;
+ border: none;
+}
diff --git a/vue/full/src/layout/component/Page/component/BackToTop.vue b/vue/full/src/layout/component/Page/component/BackToTop.vue
deleted file mode 100644
index 08f411d..0000000
--- a/vue/full/src/layout/component/Page/component/BackToTop.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/vue/full/src/layout/component/Page/component/KeepRouterViewAlive.vue b/vue/full/src/layout/component/Page/component/KeepRouterViewAlive.vue
deleted file mode 100644
index d454420..0000000
--- a/vue/full/src/layout/component/Page/component/KeepRouterViewAlive.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-
diff --git a/vue/full/src/layout/component/Page/component/PageFooter.vue b/vue/full/src/layout/component/Page/component/PageFooter.vue
deleted file mode 100644
index ad019b2..0000000
--- a/vue/full/src/layout/component/Page/component/PageFooter.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
diff --git a/vue/full/src/layout/component/Page/component/PageHeader.vue b/vue/full/src/layout/component/Page/component/PageHeader.vue
deleted file mode 100644
index 0872fad..0000000
--- a/vue/full/src/layout/component/Page/component/PageHeader.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
导航模式
@@ -124,14 +124,21 @@
-
-
diff --git a/vue/full/src/layout/component/SettingDrawer/style.scss b/vue/full/src/layout/component/SettingDrawer/style.scss
new file mode 100644
index 0000000..70eef94
--- /dev/null
+++ b/vue/full/src/layout/component/SettingDrawer/style.scss
@@ -0,0 +1,17 @@
+@import "~@/asset/style/var";
+@import "./component/checkbox/style";
+
+.drawer-container {
+ padding: 24px;
+ font-size: 14px;
+ line-height: 1.5;
+ word-wrap: break-word;
+
+ .drawer-item {
+ display: flex;
+ justify-content: space-between;
+ color: $--color-text-regular;
+ font-size: 14px;
+ padding: 12px 0;
+ }
+}
diff --git a/vue/full/src/layout/index.vue b/vue/full/src/layout/index.vue
index 6518ef5..fdd3d5c 100644
--- a/vue/full/src/layout/index.vue
+++ b/vue/full/src/layout/index.vue
@@ -1,93 +1,146 @@
+
+ 的缓存中
- * 以下调用无效：设置了不缓存、是iframe页、未设置唯一标识、已缓存
- * @param view {routeConfig}
- */
- addCacheOnly(view) {
- const {noCache, iframe, usePathKey, useFullPathKey} = view.meta || {}
-
- if (noCache || iframe || !view.name && !usePathKey && !useFullPathKey) {
- return
- }
-
- const key = getRouterViewCacheKey(view)
-
- if (store.cachedViews.includes(key)) {
- return
- }
-
- store.cachedViews.push(key)
- },
-
- /**
- * 同时调用{@link #addTagOnly}、{@link #addCacheOnly}
- * @param view {routeConfig}
- */
- addTagAndCache(view) {
- this.addTagOnly(view)
- this.addCacheOnly(view)
- },
-
- /**
- * 根据path从页签栏中移除一个页签
- * @param view {path}，routeConfig
- */
- delTagOnly(view) {
- const index = store.visitedViews.findIndex(i => i.path === view.path)
- index > -1 && store.visitedViews.splice(index, 1)
- },
-
- /**
- * 删除对应的缓存
- * @param view {routeConfig}
- */
- delCacheOnly(view) {
- const key = getRouterViewCacheKey(view)
- const index = store.cachedViews.indexOf(key)
- index > -1 && store.cachedViews.splice(index, 1)
- },
-
- /**
- * 同时调用{@link #delTagOnly}、{@link #delCacheOnly}，移除iframe页
- * @param view {routeConfig}
- */
- delTagAndCache(view) {
- this.delTagOnly(view)
- this.delCacheOnly(view)
-
- const iframe = view.meta && view.meta.iframe
- iframe && pageMutations.delIframe(iframe)
- },
-
- /**
- * 从页签栏上移除除了routeConfig以外的所有非固定页签
- * 并且从中移除除了routeConfig以外的所有缓存
- * @param view {routeConfig}
- */
- delOtherTagAndCache(view) {
- const visitedViews = store.visitedViews.filter(v => v.meta.affix || v.path === view.path)
- const key = store.cachedViews.find(key => key === getRouterViewCacheKey(view))
-
- store.visitedViews = visitedViews
- store.cachedViews = key ? [key] : []
- },
-
- /**
- * 从页签栏上移除所有非固定页签，并且移除的所有缓存
- */
- delAllTagAndCache() {
- store.visitedViews = store.visitedViews.filter(tag => tag.meta && tag.meta.affix)
- store.cachedViews = []
- }
-})
diff --git a/vue/full/src/layout/style.scss b/vue/full/src/layout/style.scss
new file mode 100644
index 0000000..f89fa8f
--- /dev/null
+++ b/vue/full/src/layout/style.scss
@@ -0,0 +1,8 @@
+@import "~el-admin-layout/src/style";
+@import "~el-admin-layout/src/style/maxViewHeight";
+
+@import "./component/Footer/style";
+@import "./component/NotifyBell/style";
+@import "./component/SettingDrawer/style";
+
+
diff --git a/vue/full/src/layout/util.js b/vue/full/src/layout/util.js
deleted file mode 100644
index e50283a..0000000
--- a/vue/full/src/layout/util.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import {getters as appGetters} from "@/layout/store/app"
-
-//获取路由页面缓存所需的key
-export function getRouterViewCacheKey({name, path, fullPath, meta = {}}) {
- const {usePathKey, useFullPathKey} = meta
- return usePathKey ? path : useFullPathKey ? fullPath : name
-}
-
-//获取侧边栏的菜单，如果是双层侧边栏导航时，获取的是子菜单
-export function getSidebarMenus() {
- const menus = appGetters.menus
-
- if (!Array.isArray(menus)) {
- return []
- }
-
- //移动端时，侧边栏只会按侧边栏导航模式渲染
- if (appGetters.isMobile) {
- return menus
- }
-
- switch (appGetters.navMode) {
- case 'aside':
- return menus
- case 'head':
- return []
- case 'aside-two-part':
- case 'mix':
- const root = menus.find(i => i.path === appGetters.activeRootMenu)
- return root ? root.children || [] : []
- default:
- return []
- }
-}
-
-//根据路由获取当前激活的菜单
-export function getActiveMenuByRoute({path, meta}) {
- return meta.activeMenu || path
-}
diff --git a/vue/full/src/layout/布局设计.md b/vue/full/src/layout/布局设计.md
deleted file mode 100644
index fa848e7..0000000
--- a/vue/full/src/layout/布局设计.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# 布局设计
-
-## 导航模式
-
-### 桌面端
-
-1.侧边栏导航：侧边栏菜单为完整菜单，顶部菜单不渲染
-
-2.顶部导航：侧边栏菜单不渲染，顶部菜单为完整菜单
-
-3.混合导航：顶部菜单为完整菜单的所有根节点，侧边栏菜单为当前激活的顶部菜单的子级
-
-4.双层侧边栏导航：侧边栏分为最左侧的根节点栏、二级子菜单，顶部菜单不渲染
-
-### 移动端
-
-1.侧边栏导航：侧边栏菜单为完整菜单，顶部菜单不渲染，侧边栏为抽屉模式
-
-2.顶部导航：设置无效，效果等同于侧边栏导航
-
-3.混合导航：设置无效，效果等同于侧边栏导航
-
-4.双层侧边栏导航：设置无效，效果等同于侧边栏导航
-
-## 侧边栏
-
-### 桌面端
-
-未设置自动隐藏时，折叠状态依据用户设置
-设置了自动隐藏时，折叠状态无效，侧边栏为抽屉模式
-
-当导航模式为*双层侧边栏导航*时，以下设置无效：
-- 折叠
-- 折叠时显示父级
-- 自动隐藏
-
-### 移动端
-
-侧边栏只能为抽屉模式
diff --git a/vue/full/src/router/define.js b/vue/full/src/router/define.js
index eeec943..d825d6b 100644
--- a/vue/full/src/router/define.js
+++ b/vue/full/src/router/define.js
@@ -1,4 +1,4 @@
-import Layout from "@/layout/index"
+import Layout from "@/layout"
import Redirect from "@/view/_app/redirect"
import Login from "@/view/_app/login/index"
import Page403 from "@/view/_app/403"
diff --git a/vue/full/src/router/guardian/iframe.js b/vue/full/src/router/guardian/iframe.js
index 0bacebd..13df8a6 100644
--- a/vue/full/src/router/guardian/iframe.js
+++ b/vue/full/src/router/guardian/iframe.js
@@ -1,4 +1,4 @@
-import {mutations as pageMutations} from "@/layout/store/page"
+import {pageMutations} from "el-admin-layout"
const beforeEach = (to, from, next) => {
//从iframe页面离开时，判断是否需要删除iframe
diff --git a/vue/full/src/router/util.js b/vue/full/src/router/util.js
index d81b344..062f75c 100644
--- a/vue/full/src/router/util.js
+++ b/vue/full/src/router/util.js
@@ -1,4 +1,4 @@
-import Layout from '@/layout'
+import Layout from "@/layout"
import SkeletonPage from '@/view/_common/SkeletonPage'
import Page500 from '@/view/_app/500'
import {isEmpty} from "@/util"
diff --git a/vue/full/src/store/module/resource.js b/vue/full/src/store/module/resource.js
index d492b44..132179c 100644
--- a/vue/full/src/store/module/resource.js
+++ b/vue/full/src/store/module/resource.js
@@ -1,6 +1,6 @@
import path from 'path'
import {route as routeConfig} from '@/config'
-import {mutations as appMutations} from "@/layout/store/app"
+import {appMutations} from "el-admin-layout"
import {addDynamicRoutes} from '@/router'
import {getDynamicRoutes} from '@/router/define'
import {str2routeConfig, metaExtend} from "@/router/util"
diff --git a/vue/full/src/store/module/user.js b/vue/full/src/store/module/user.js
index 20f89a0..bdcd885 100644
--- a/vue/full/src/store/module/user.js
+++ b/vue/full/src/store/module/user.js
@@ -2,7 +2,7 @@ import {createMutations} from "@/store/util"
import {emptyOrDefault} from "@/util"
import {autoCompleteUrl} from "@/util/file" //此处存在循环引用？
import {getUser, setUser} from "@/util/storage"
-import {mutations as tagsViewMutations} from "@/layout/store/tagsView"
+import {tagsViewMutations} from "el-admin-layout"
import {login, logout} from '@/api/account'
//刷新时从本地存储中获取用户信息
diff --git a/vue/full/src/util/browser.js b/vue/full/src/util/browser.js
index f23c986..6202b5d 100644
--- a/vue/full/src/util/browser.js
+++ b/vue/full/src/util/browser.js
@@ -1,26 +1,4 @@
-import cssVar from '@/asset/style/var.scss'
-
-const maxMobileWidth = parseFloat(cssVar.maxMobileWidth)
-
-/**
- * 根据body宽度判断是否为移动端，是则返回true
- *
- * @return {boolean}
- */
-export function isMobile() {
- const rect = document.body.getBoundingClientRect()
- return rect.width <= maxMobileWidth
-}
-
-/**
- * 判断是否为dom元素，是则返回true
- *
- * @param obj
- * @return {boolean}
- */
-export function isDom(obj) {
- return obj && typeof obj === 'object' && obj.nodeType === 1 && typeof obj.nodeName === 'string'
-}
+export {isMobile} from "el-admin-layout/src/util"
/**
* 获取元素的内宽（扣除左右padding后）
@@ -132,34 +110,6 @@ export function loadExternalResource(url, type = 'js') {
})
}
-/**
- * 将dom按最小距离垂直地滚动至视窗内
- * 比如dom在视窗下，那么会滚动到视窗底部
- *
- * @param child {HTMLElement} 需要滚动的dom
- * @param parent {HTMLElement|Window} 包含child的容器
- */
-export function scrollIntoViewVertically(child, parent = window) {
- const {scrollTop, scrollHeight, offsetHeight: containerHeight} = parent
-
- //当菜单高度不足以滚动时跳过
- if (scrollHeight <= containerHeight) return
-
- const elHeight = child.offsetHeight, between = getTopDistance(child, parent)
-
- //计算需要滚动的距离，undefined说明不需要滚动
- let distance
-
- if (between < 0) distance = between
- else if (between + elHeight > containerHeight) {
- distance = between + elHeight - containerHeight
- }
-
- if (distance !== undefined) {
- parent.scrollTo({top: scrollTop + distance, behavior: 'smooth'})
- }
-}
-
/**
* 平滑滚动至指定的位置
*
@@ -180,7 +130,7 @@ export function scrollTo(el, position, options) {
el = el()
}
- if (!isDom(el)) return
+ if (!el) return
const toTop = direction === 'top'
const elPosition = getScroll(el, toTop)
diff --git a/vue/full/src/util/element-ui/elMenu.js b/vue/full/src/util/element-ui/elMenu.js
deleted file mode 100644
index 29eaa6e..0000000
--- a/vue/full/src/util/element-ui/elMenu.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import {scrollIntoViewVertically} from "@/util/browser"
-
-/**
- * 将当前激活的菜单移动到视窗中（仅限垂直菜单）
- *
- * @param menu el-menu实例
- */
-export function moveToActiveMenuVertically(menu) {
- if (!menu) return
-
- const cur = menu.activeIndex
- if (!cur) return
-
- const curInstance = menu.items[cur]
- if (!curInstance) return
-
- let el = curInstance.$el
-
- //当侧边栏折叠时，需要滚动至可视区域的元素是激活菜单的最顶层父节点
- if (menu.collapse) {
- let rootParent = curInstance
- while (rootParent.$parent.$options.componentName !== 'ElMenu') {
- rootParent = rootParent.$parent
- }
- el = rootParent.$el
- }
-
- /*
- * 这里考虑了菜单展开时的200ms动画时间
- * 为什么不分情况讨论？比如当subMenu已经是展开状态时，无需延时滚动
- * 但这种情况无法判断，因为这时menu.openedMenus已经包含了subMenu，无论subMenu之前是否展开
- * 所以统一延时300ms
- * */
- window.setTimeout(() => scrollIntoViewVertically(el, menu.$el), 300)
-}
diff --git a/vue/full/src/util/index.js b/vue/full/src/util/index.js
index 56773e6..0aae132 100644
--- a/vue/full/src/util/index.js
+++ b/vue/full/src/util/index.js
@@ -1,12 +1,6 @@
-/**
- * 判断是否为空值，undefined、null、'' 都视为空值
- *
- * @param str 不定参数
- * @return {boolean} 若为空值，返回true，否则返回false
- */
-export function isEmpty(...str) {
- return str.some(i => i === undefined || i === null || i === '')
-}
+import {isEmpty, getInitialValue, debounce, bindThis, deepClone} from "el-admin-layout/src/util"
+
+export {isEmpty, getInitialValue, debounce, bindThis, deepClone}
/**
* 当传入空值时，返回默认值
@@ -33,21 +27,6 @@ export function replaceAll(str, substr, replacement) {
return str.replace(new RegExp(substr, 'gm'), replacement)
}
-/**
- * 根据传入值的类型，返回基础起始值
- *
- * @param v
- * @return {boolean|{}|string|*[]|number|null}
- */
-export function getInitialValue(v) {
- if (v === undefined || v === null) return null
- if (typeof v === 'string') return ''
- if (typeof v === 'boolean') return false
- if (typeof v === 'number') return 0
- if (typeof v === 'object') return {}
- if (Array.isArray(v)) return []
-}
-
/**
* 简单重置对象属性，遇到对象时会递归重置
* 重置方法使用{@link #getInitialValue}
@@ -135,51 +114,6 @@ export function timeFormat(fmt, date = new Date()) {
return fmt
}
-/**
- * 防抖
- *
- * @param func {function} 原函数
- * @param wait {number} 防抖间隔，单位毫秒
- * @param immediate {boolean} 是否立即执行一次
- * @return {function} 经过防抖包装后的函数
- */
-export function debounce(func, wait = 100, immediate = false) {
- let timeout, args, context, timestamp, result
-
- const later = function () {
- // 据上一次触发时间间隔
- const last = new Date().getTime() - timestamp
-
- // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
- if (last < wait && last > 0) {
- timeout = window.setTimeout(later, wait - last)
- }
- else {
- timeout = null
- // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
- if (!immediate) {
- result = func.apply(context, args)
- if (!timeout) context = args = null
- }
- }
- }
-
- return function () {
- context = this
- args = arguments
- timestamp = new Date().getTime()
- const callNow = immediate && !timeout
- // 如果延时不存在，重新设定延时
- if (!timeout) timeout = window.setTimeout(later, wait)
- if (callNow) {
- result = func.apply(context, args)
- context = args = null
- }
-
- return result
- }
-}
-
export function throttle(func, delay = 100) {
let timeoutID
let lastExec = 0
@@ -232,38 +166,3 @@ export function waitUntilSuccess(success, callback, interval = 1000, maxTryTime
fun = window.setInterval(check, interval)
})
}
-
-//将传入对象的所有函数的this绑定为其自身
-export function bindThis(obj, root = obj) {
- if (!obj || typeof obj !== 'object') return
-
- Object.entries(obj).forEach(([k, v]) => {
- if (typeof v === 'function') {
- obj[k] = v.bind(root)
- }
- bindThis(v, root)
- })
-
- return obj
-}
-
-export function deepClone(source) {
- if (source === null || typeof source !== 'object' || source instanceof Promise) {
- return source
- }
-
- if (Array.isArray(source)) {
- return source.map(i => deepClone(i))
- }
- else {
- return Object.keys(source).reduce((obj, key) => {
- obj[key] = deepClone(source[key])
- return obj
- }, {})
- }
-}
-
-//有空值判断的trim
-export function trim(str) {
- return isEmpty(str) ? str : str.trim()
-}
diff --git a/vue/full/src/util/observable.js b/vue/full/src/util/observable.js
deleted file mode 100644
index 7176ad6..0000000
--- a/vue/full/src/util/observable.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import {getInitialValue} from "@/util"
-
-//为Vue.observer返回的对象设置getter
-export function createGetters(store) {
- const getters = Object.create({})
- Object.defineProperties(
- getters,
- Object.keys(store).reduce((obj, key) => {
- obj[key] = {
- enumerable: true,
- get() {
- return store[key]
- }
- }
- return obj
- }, {})
- )
- return getters
-}
-
-//为Vue.observer返回的对象设置mutation
-export function createMutations(store, all = false) {
- const keys = Object.keys(store)
- const obj = {}
- keys.forEach(key => {
- obj[key] = v => store[key] = v
- })
- if (all) {
- obj['$all'] = v => {
- keys.forEach(key => {
- store[key] = v && v[key] || getInitialValue(store[key])
- })
- }
- }
- return obj
-}
diff --git a/vue/full/src/util/route.js b/vue/full/src/util/route.js
index 4e94bba..53a4df4 100644
--- a/vue/full/src/util/route.js
+++ b/vue/full/src/util/route.js
@@ -1,33 +1,18 @@
/**
* 路由控制工具类
*/
-
-import {isEmpty} from "@/util"
-import {isString} from "@/util/validate"
-import router from '@/router'
-import {mutations as tagsViewMutations} from "@/layout/store/tagsView"
+import router from "@/router"
+import {refreshPage as refreshLayoutPage, closeCurrentPage} from "el-admin-layout/src/util"
/**
* 路由刷新
*
- * @param route {string|route} 需要刷新的路由，不传时为当前路由，如果是字符串时请确保以'/'开头
- * @param replace {boolean} 是否使用replace进行跳转
+ * @param route 需要刷新的路由对象，不传时为当前路由
+ * @param replace {boolean} 是否使用replace进行跳转
* @return {Promise} 返回vue-router跳转的结果
*/
-export function refreshPage(route = router.currentRoute, replace = true) {
- const target = `/redirect${isString(route) ? route : route.fullPath}`
- return router[replace ? 'replace' : 'push'](target)
+export function refreshPage(route = router.currentRoute, replace) {
+ return refreshLayoutPage(route, router, replace)
}
-/**
- * 关闭当前页，如果传入next则跳转到next页面
- *
- * @param next {string|route} 跳转的目标页面，作为第一个参数传入vue-router.replace
- * @return {undefined|Promise} 仅在next有值时，返回vue-router.replace的结果
- */
-export function closeCurrentPage(next) {
- tagsViewMutations.delTagAndCache(router.currentRoute)
- if (!isEmpty(next)) {
- return router.replace(next)
- }
-}
+export {closeCurrentPage}
diff --git a/vue/full/src/view/_common/DetailPage/style.scss b/vue/full/src/view/_common/DetailPage/style.scss
index 5de86b0..23203c4 100644
--- a/vue/full/src/view/_common/DetailPage/style.scss
+++ b/vue/full/src/view/_common/DetailPage/style.scss
@@ -1,4 +1,5 @@
@import "~@/asset/style/var";
+@import "~el-admin-layout/src/style/var";
@import "~@/asset/style/mixin.scss";
.detail-page {
diff --git a/vue/full/src/view/_common/SkeletonPage/style.scss b/vue/full/src/view/_common/SkeletonPage/style.scss
index aaa2b99..59b2b9e 100644
--- a/vue/full/src/view/_common/SkeletonPage/style.scss
+++ b/vue/full/src/view/_common/SkeletonPage/style.scss
@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~el-admin-layout/src/style/var";
.skeleton-page-wrapper {
margin: $page-view-margin;
diff --git a/vue/full/src/view/admin/message/user/indexPage.vue b/vue/full/src/view/admin/message/user/indexPage.vue
index bf5498b..1abfff2 100644
--- a/vue/full/src/view/admin/message/user/indexPage.vue
+++ b/vue/full/src/view/admin/message/user/indexPage.vue
@@ -10,7 +10,7 @@
+ Copyright © 2020 - toesbieya
+
+
+
+
diff --git a/vue/full/src/layout/component/Footer/style.scss b/vue/full/src/layout/component/Footer/style.scss
new file mode 100644
index 0000000..37f8167
--- /dev/null
+++ b/vue/full/src/layout/component/Footer/style.scss
@@ -0,0 +1,9 @@
+.page-footer > .copyright {
+ color: $--color-text-secondary;
+ font-size: 14px;
+
+ > a:hover {
+ color: $--color-primary;
+ text-decoration: underline;
+ }
+}
diff --git a/vue/full/src/layout/component/Hamburger.vue b/vue/full/src/layout/component/Hamburger.vue
deleted file mode 100644
index 6812e6e..0000000
--- a/vue/full/src/layout/component/Hamburger.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
diff --git a/vue/full/src/layout/component/Logo.vue b/vue/full/src/layout/component/Logo.vue
deleted file mode 100644
index 2f55314..0000000
--- a/vue/full/src/layout/component/Logo.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
diff --git a/vue/full/src/layout/component/Navbar/component/HeadMenu.vue b/vue/full/src/layout/component/Navbar/component/HeadMenu.vue
deleted file mode 100644
index c3e9cb1..0000000
--- a/vue/full/src/layout/component/Navbar/component/HeadMenu.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-
diff --git a/vue/full/src/layout/component/Navbar/index.vue b/vue/full/src/layout/component/Navbar/index.vue
deleted file mode 100644
index 0be9479..0000000
--- a/vue/full/src/layout/component/Navbar/index.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
diff --git a/vue/full/src/layout/component/Navbar/style.scss b/vue/full/src/layout/component/Navbar/style.scss
deleted file mode 100644
index f77d547..0000000
--- a/vue/full/src/layout/component/Navbar/style.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-@import "~@/asset/style/var";
-
-.navbar {
- display: flex;
- justify-content: space-between;
- align-items: center;
- flex-wrap: nowrap;
- height: $nav-height;
- padding-left: $navbar-padding-left;
- z-index: 10;
- box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
- transition: all .2s;
-
- > div {
- display: flex;
- flex-wrap: nowrap;
- height: 100%;
- }
-
- .navbar-icon {
- font-size: 18px;
- }
-
- .navbar-item {
- display: flex;
- align-items: center;
- padding: 0 8px;
- cursor: pointer;
- }
-
- .logo-container {
- width: auto;
- min-width: $aside-width - $navbar-padding-left;
- padding-left: $menu-padding - $navbar-padding-left;
- }
-
- .avatar-wrapper {
- display: flex;
- align-items: center;
- height: 100%;
-
- span {
- margin-right: 5px;
- font-size: 18px;
- }
- }
-}
-
-@import "theme-light";
-@import "theme-dark";
diff --git a/vue/full/src/layout/component/Navbar/theme-dark.scss b/vue/full/src/layout/component/Navbar/theme-dark.scss
deleted file mode 100644
index 4cd9a22..0000000
--- a/vue/full/src/layout/component/Navbar/theme-dark.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.navbar.dark {
- background-color: $root-menu-background-dark;
-
- .navbar-item {
- color: $navbar-item-color-dark;
-
- &:hover {
- background-color: $navbar-item-hover-color-dark;
- }
- }
-}
-
-//暗色主题的下拉菜单
-.dark.el-dropdown-menu {
- background-color: $root-menu-background-dark;
- border: none;
-
- .el-dropdown-menu__item {
- color: $menu-text-color-dark;
-
- &:hover,
- &:focus {
- background-color: unset;
- color: $menu-text-hover-color-dark;
- }
- }
-}
diff --git a/vue/full/src/layout/component/Navbar/theme-light.scss b/vue/full/src/layout/component/Navbar/theme-light.scss
deleted file mode 100644
index 26b9c63..0000000
--- a/vue/full/src/layout/component/Navbar/theme-light.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.navbar.light {
- background-color: $--color-white;
-
- .navbar-item {
- color: $navbar-item-color-light;
-
- &:hover {
- background-color: $navbar-item-hover-color-light;
- }
- }
-}
diff --git a/vue/full/src/layout/component/Navbar/component/Bell.vue b/vue/full/src/layout/component/NotifyBell/index.vue
similarity index 55%
rename from vue/full/src/layout/component/Navbar/component/Bell.vue
rename to vue/full/src/layout/component/NotifyBell/index.vue
index 026b407..22ba734 100644
--- a/vue/full/src/layout/component/Navbar/component/Bell.vue
+++ b/vue/full/src/layout/component/NotifyBell/index.vue
@@ -1,5 +1,5 @@
-
- {{ title }}
-
-
-
- {{ item.meta.title }}
-
-
-
-
-
-
-
-
diff --git a/vue/full/src/layout/component/Page/component/PageView.vue b/vue/full/src/layout/component/Page/component/PageView.vue
deleted file mode 100644
index 68fe63d..0000000
--- a/vue/full/src/layout/component/Page/component/PageView.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-
diff --git a/vue/full/src/layout/component/Page/component/TagsView/ScrollPanel.vue b/vue/full/src/layout/component/Page/component/TagsView/ScrollPanel.vue
deleted file mode 100644
index 7c14ce7..0000000
--- a/vue/full/src/layout/component/Page/component/TagsView/ScrollPanel.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
diff --git a/vue/full/src/layout/component/Page/component/TagsView/index.vue b/vue/full/src/layout/component/Page/component/TagsView/index.vue
deleted file mode 100644
index 5ebe93a..0000000
--- a/vue/full/src/layout/component/Page/component/TagsView/index.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-
diff --git a/vue/full/src/layout/component/Page/component/TagsView/style.scss b/vue/full/src/layout/component/Page/component/TagsView/style.scss
deleted file mode 100644
index eb3c3ef..0000000
--- a/vue/full/src/layout/component/Page/component/TagsView/style.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-@import "~@/asset/style/var";
-
-.tags-view-container {
- height: $tags-view-height;
- box-shadow: inset 0 0 3px 2px hsla(0, 0%, 39.2%, .1);
-
- .tags-view-wrapper {
- height: 100%;
- white-space: nowrap;
- overflow-x: auto;
-
- &::-webkit-scrollbar {
- display: none;
- }
-
- .tags-view-item {
- $margin: 4px;
- $border-width: 1px;
-
- display: inline-block;
- cursor: pointer;
- height: #{$tags-view-height - $margin * 2};
- line-height: #{$tags-view-height - $margin * 2 - $border-width * 2};
- color: $--color-text-secondary;
- background-color: #ffffff;
- border-radius: 3px;
- border: $border-width solid $--border-color-base;
- padding: 0 12px;
- font-size: 12px;
- margin: $margin;
- user-select: none;
-
- &:first-of-type {
- margin-left: 15px;
- }
-
- &:last-of-type {
- margin-right: 15px;
- }
-
- &::before {
- content: '';
- position: relative;
- background-color: #e8eaec;
- display: inline-block;
- width: 12px;
- height: 12px;
- border-radius: 50%;
- top: 1px;
- margin-right: 5px;
- }
-
- &.active {
- color: $--color-primary;
-
- &::before {
- background-color: $--color-primary;
- }
- }
-
- .el-icon-close {
- border-radius: 50%;
- font-size: 14px;
- margin-left: 10px;
- }
- }
- }
-}
diff --git a/vue/full/src/layout/component/Page/index.vue b/vue/full/src/layout/component/Page/index.vue
deleted file mode 100644
index 634855a..0000000
--- a/vue/full/src/layout/component/Page/index.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
diff --git a/vue/full/src/layout/component/Page/style.scss b/vue/full/src/layout/component/Page/style.scss
deleted file mode 100644
index e7c743d..0000000
--- a/vue/full/src/layout/component/Page/style.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@import "~@/asset/style/var";
-
-.page-main {
- display: flex;
- flex-direction: column;
- flex: 1;
- position: relative;
- overflow: hidden;
- background-color: #f0f2f5;
-
- > .scroll-container {
- display: flex;
- flex: 1;
- flex-direction: column;
- overflow-y: overlay;
- overflow-x: inherit;
-
- > .page-view {
- margin: $page-view-margin;
- flex: 1;
- }
- }
-}
diff --git a/vue/full/src/layout/component/SettingDrawer/component/checkbox/ColorCheckbox.vue b/vue/full/src/layout/component/SettingDrawer/component/checkbox/ColorCheckbox.vue
new file mode 100644
index 0000000..6b02081
--- /dev/null
+++ b/vue/full/src/layout/component/SettingDrawer/component/checkbox/ColorCheckbox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/vue/full/src/layout/component/SettingDrawer/component/checkbox/Group.vue b/vue/full/src/layout/component/SettingDrawer/component/checkbox/Group.vue
new file mode 100644
index 0000000..2292365
--- /dev/null
+++ b/vue/full/src/layout/component/SettingDrawer/component/checkbox/Group.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/vue/full/src/layout/component/SettingDrawer/component/checkbox/ImgCheckbox.vue b/vue/full/src/layout/component/SettingDrawer/component/checkbox/ImgCheckbox.vue
new file mode 100644
index 0000000..9f5963e
--- /dev/null
+++ b/vue/full/src/layout/component/SettingDrawer/component/checkbox/ImgCheckbox.vue
@@ -0,0 +1,21 @@
+
+
+ ![]()
+
+
+
+
+
diff --git a/vue/full/src/component/checkbox/common.js b/vue/full/src/layout/component/SettingDrawer/component/checkbox/mixin.js
similarity index 100%
rename from vue/full/src/component/checkbox/common.js
rename to vue/full/src/layout/component/SettingDrawer/component/checkbox/mixin.js
diff --git a/vue/full/src/layout/component/SettingDrawer/component/checkbox/style.scss b/vue/full/src/layout/component/SettingDrawer/component/checkbox/style.scss
new file mode 100644
index 0000000..5c33195
--- /dev/null
+++ b/vue/full/src/layout/component/SettingDrawer/component/checkbox/style.scss
@@ -0,0 +1,34 @@
+@import "~@/asset/style/var";
+
+.checkbox-group {
+ display: flex;
+ flex-wrap: wrap;
+ width: 100%;
+}
+
+.color-checkbox {
+ width: 20px;
+ height: 20px;
+ margin: 5px;
+ border-radius: 2px;
+ cursor: pointer;
+ text-align: center;
+ font-weight: bold;
+ color: #ffffff;
+}
+
+.img-checkbox {
+ width: 55px;
+ margin: 10px;
+ border-radius: 2px;
+ cursor: pointer;
+ position: relative;
+
+ .el-icon-check {
+ position: absolute;
+ color: $--color-primary;
+ font-weight: bold;
+ top: 25px;
+ right: 10px;
+ }
+}
diff --git a/vue/full/src/layout/component/SettingDrawer.vue b/vue/full/src/layout/component/SettingDrawer/index.vue
similarity index 90%
rename from vue/full/src/layout/component/SettingDrawer.vue
rename to vue/full/src/layout/component/SettingDrawer/index.vue
index 612f55a..28ee53e 100644
--- a/vue/full/src/layout/component/SettingDrawer.vue
+++ b/vue/full/src/layout/component/SettingDrawer/index.vue
@@ -1,10 +1,10 @@