lisang
/
d2-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message 

Former-commit-id: f7ba33518846257aae5268858d680b9109294667 [formerly 8eb2a86ad37d78bcf52375760709db98d776512c] [formerly f7ba33518846257aae5268858d680b9109294667 [formerly 8eb2a86ad37d78bcf52375760709db98d776512c] [formerly f7ba33518846257aae5268858d680b9109294667 [formerly 8eb2a86ad37d78bcf52375760709db98d776512c] [formerly 8eb2a86ad37d78bcf52375760709db98d776512c [formerly e243925654ec6a8cfe98203e6961137a1078deaf [formerly cc58ac91b6cf31b77929a105f0e2ef40750b65ba]]]]]
Former-commit-id: fcd287104b6c9a31699f61e44117f7dff2a94870
Former-commit-id: 30b27fc7454da4e836ab5185689d423cf573cdfc
Former-commit-id: 24e9d0161ecdb0a747ed1236ad6860191c6b8fda [formerly 0f90def6ce7858ad9e6cd22d845731a6c9f93c4e]
Former-commit-id: 26b5ad3e654e30993e378cc2a1a1e65876032449
Former-commit-id: c563fe12250e2b496208ea2d1bbc9b036b97f1b9
Former-commit-id: 5212ef499e8de74b8fe925d7db39db4149c8db1e
Former-commit-id: 1a1680cc9d36fafd1790b5e0ad825bc538c02393
Former-commit-id: 4e44335b9846b0e502d584ae7ef431de9363c672
This commit is contained in:
liyang 2018-06-30 23:05:33 +08:00
parent ac4c5acc7e
commit b4b5f8a89b
11 changed files with 72 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
design.sketch.REMOVED.git-id
View File

@ -1 +1 @@
fa557a428388c3e73ddee4997e5feb56297e1304
471d1d7f715345325951f4b26ad14275b4c3e745

14
src/assets/style/theme/theme-base.scss
View File

@ -1,5 +1,5 @@
// 主题公用
.layout-main-group {
.d2-layout-main-group {
&.grayMode {
-webkit-filter: grayscale(100%);
-moz-filter: grayscale(100%);
@ -23,14 +23,14 @@
left: 0px;
}
// 主体
.layout-main {
.el-container.d2-layout-main-content {
position: absolute;
top: 0px;
right: 0px;
bottom: 0px;
left: 0px;
// [布局] 顶栏
.el-header {
.el-header.d2-theme-header {
padding: 0px;
// logo区域
.logo-group {
@ -56,7 +56,7 @@
}
}
// [菜单] 顶栏
.el-menu {
.el-menu.d2-theme-header-menu {
float: left;
border-bottom: none;
background-color: transparent;
@ -96,9 +96,9 @@
}
}
// [布局] 顶栏下面
.el-container {
.el-container.d2-theme-container {
// 侧边栏
.el-aside {
.el-aside.d2-theme-container-aside {
transition: width .3s;
overflow: auto;
// [菜单] 正常状态
@ -155,7 +155,7 @@
}
}
// 右下 主体
.el-main {
.el-main.d2-theme-container-main {
padding: 0px;
position: relative;
overflow: hidden;

14
src/assets/style/theme/theme.scss
View File

@ -2,9 +2,9 @@
.theme-#{$theme-name} {
// 背景图片和遮罩
.layout-main-group {
.d2-layout-main-group {
background-color: $theme-bg-color;
.layout-main-mask {
.d2-layout-main-mask {
background: $theme-bg-mask;
}
}
@ -39,7 +39,7 @@
}
// 顶栏
.el-header {
.el-header.d2-theme-header {
// 切换按钮
.toggle-aside-btn {
i {
@ -51,7 +51,7 @@
}
}
// 顶栏菜单
.el-menu {
.el-menu.d2-theme-header-menu {
.el-menu-item {
transition: border-top-color 0s;
color: $theme-header-item-color;
@ -115,9 +115,9 @@
}
}
// [布局] 顶栏下面
.el-container {
.el-container.d2-theme-container {
// 侧边栏
.el-aside {
.el-aside.d2-theme-container-aside {
// 菜单为空的时候显示的信息
.menu-empty {
background: $theme-aside-menu-empty-background-color;
@ -191,7 +191,7 @@
}
}
}
.el-main {
.el-main.d2-theme-container-main {
// 主体部分分为多页面控制器 和主体
.d2-layout-main-header {
// 多页面控制器

2
src/assets/style/theme/violet/index.scss
View File

@ -2,7 +2,7 @@
@import '../theme.scss';
.theme-#{$theme-name} {
.layout-main-group {
.d2-layout-main-group {
background: #bc00e3;
background: linear-gradient(120deg, #bc00e3 0%, #4EFFFB 100%);
}

21
src/components/core/d2-layout-main/index.vue
View File

@ -1,9 +1,14 @@
<template>
<div class="layout-main-group" :style="styleLayoutMainGroup" :class="{grayMode: isGrayMode}">
<div class="layout-main-mask"></div>
<el-container class="layout-main">
<div
class="d2-layout-main-group"
:style="styleLayoutMainGroup"
:class="{grayMode: isGrayMode}">
<!-- 半透明遮罩 -->
<div class="d2-layout-main-mask"></div>
<!-- 主体内容 -->
<el-container class="d2-layout-main-content">
<!-- 顶栏 -->
<el-header>
<el-header class="d2-theme-header">
<div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
<img v-if="collapse" :src="`${$assetsPublicPath}static/image/theme/${themeActive.value}/logo/icon-only.png`">
<img v-else :src="`${$assetsPublicPath}static/image/theme/${themeActive.value}/logo/all.png`">
@ -11,7 +16,7 @@
<div class="toggle-aside-btn" @click="collapse = !collapse">
<d2-icon name="bars"/>
</div>
<d2-layout-main-menu-header/>
<d2-layout-main-menu-header class="d2-theme-header-menu"/>
<!-- 顶栏右侧 -->
<div class="d2-header-right">
<d2-layout-main-header-github/>
@ -22,13 +27,13 @@
</div>
</el-header>
<!-- 下面 主体 -->
<el-container>
<el-container class="d2-theme-container">
<!-- 主体 侧边栏 -->
<el-aside ref="aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
<el-aside ref="aside" class="d2-theme-container-aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
<d2-layout-main-menu-side :collapse="collapse"/>
</el-aside>
<!-- 主体 -->
<el-main>
<el-main class="d2-theme-container-main">
<div class="d2-layout-main-header">
<d2-multiple-page-control/>
</div>

2
src/menu/index.js.REMOVED.git-id
View File

@ -1 +1 @@
5d07a0a3c1939c6162e76c9f15d7614697aa5a7d
371d0012ac6ca136b6eb1ced00b4f1f1d4410111

9
src/pages/core/setting/index/index.vue Normal file
View File

@ -0,0 +1,9 @@
<template>
<d2-container type="full">
<d2-demo-page-cover
title="设置"
sub-title="系统设置">
<img :src="`${$assetsPublicPath}static/image/icon/500/setting.png`">
</d2-demo-page-cover>
</d2-container>
</template>

29
src/pages/core/setting/theme/index.vue Normal file
View File

@ -0,0 +1,29 @@
<template>
<d2-container type="full" class="page">
<el-container>
<el-aside>1</el-aside>
<el-main>2</el-main>
</el-container>
</d2-container>
</template>
<script>
export default {
data () {
return {}
},
computed: {
},
methods: {
}
}
</script>
<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page {
// Your page style here
// Do not use empty rulesets
// If empty, delete it
}
</style>

4
src/pages/demo/playground/theme/index.vue
View File

@ -1,5 +1,5 @@
<template>
<d2-container type="full" class="page-demo-playground-theme">
<d2-container type="full" class="page">
<template slot="header">主题</template>
<el-table :data="themeList" v-bind="table">
<el-table-column prop="name" align="center" width="260"/>
@ -60,7 +60,7 @@ export default {
<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page-demo-playground-theme {
.page {
.theme-preview {
height: 50px;
width: 100px;

2
src/router/routes.js.REMOVED.git-id
View File

@ -1 +1 @@
f8c29d259d65f4cb1bf09a96087e6bd73c78f24f
85c7b06c7b454a5dc839da0766ea8db873a5c448

1
static/image/icon/500/setting.png.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
9851294b2913d958bb04963a36bd096527b0f506