Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
陈昱达
2025-04-23 09:28:43 +08:00
5 changed files with 16 additions and 38 deletions

View File

@@ -1,8 +1,7 @@
#app {
.main-container {
min-height: 100%;
transition: margin-left .28s;
transition: margin-left 0.28s;
margin-left: $sideBarWidth;
position: relative;
}
@@ -71,11 +70,11 @@
}
}
.is-active>.el-submenu__title {
.is-active > .el-submenu__title {
color: $subMenuActiveText !important;
}
& .nest-menu .el-submenu>.el-submenu__title,
& .nest-menu .el-submenu > .el-submenu__title,
& .el-submenu .el-menu-item {
min-width: $sideBarWidth !important;
background-color: $subMenuBg !important;
@@ -111,7 +110,7 @@
.el-submenu {
overflow: hidden;
&>.el-submenu__title {
& > .el-submenu__title {
padding: 0 !important;
.svg-icon {
@@ -126,8 +125,8 @@
.el-menu--collapse {
.el-submenu {
&>.el-submenu__title {
&>span {
& > .el-submenu__title {
& > span {
height: 0;
width: 0;
overflow: hidden;
@@ -150,7 +149,7 @@
}
.sidebar-container {
transition: transform .28s;
transition: transform 0.28s;
width: $sideBarWidth !important;
}
@@ -164,7 +163,6 @@
}
.withoutAnimation {
.main-container,
.sidebar-container {
transition: none;
@@ -174,13 +172,13 @@
// when menu collapsed
.el-menu--vertical {
&>.el-menu {
& > .el-menu {
.svg-icon {
margin-right: 16px;
}
}
.nest-menu .el-submenu>.el-submenu__title,
.nest-menu .el-submenu > .el-submenu__title,
.el-menu-item {
&:hover {
// you can use $subMenuHover
@@ -189,7 +187,7 @@
}
// the scroll bar appears when the subMenu is too long
>.el-menu--popup {
> .el-menu--popup {
max-height: 100vh;
overflow-y: auto;

View File

@@ -18,24 +18,7 @@ $width-list: 5 8 10 20 30 40 50 60 65 70 80 86 100 110 120 140 150 155 160 180 1
// 内外边距列表
$distance-list: 0 1 2 5 6 8 9 10 12 15 20 25 30 35 40 45 50 60 80 86 90 100 120 140;
$distance-class-list: m,
mv,
mh,
mt,
ml,
mr,
mb,
p,
pv,
ph,
pt,
pl,
pr,
pb,
top,
left,
right,
bottom;
$distance-class-list: m, mv, mh, mt, ml, mr, mb, p, pv, ph, pt, pl, pr, pb, top, left, right, bottom;
//圆角弧度
$radius: 1 2 3 4 5 6 7 8 9 10 12 13 14 15 18 20 50 100;

View File

@@ -1,5 +1,4 @@
<script>
export default {
name: 'dify',
data() {
@@ -13,9 +12,7 @@ export default {
</script>
<template>
<div class="container">
</div>
<div class="container"></div>
</template>
<style lang="scss" scoped></style>
<style lang="scss" scoped></style>

View File

@@ -74,4 +74,4 @@ export default {
<el-empty v-else />
</el-card>
</div>
</template>
</template>

View File

@@ -38,7 +38,7 @@ module.exports = {
target: 'http://localhost:3000',
changeOrigin: true,
onProxyRes: (proxyRes, req, res) => {
delete proxyRes.headers['x-frame-options'];
delete proxyRes.headers['x-frame-options']
},
pathRewrite: {
// '^/app': '/'
@@ -49,7 +49,7 @@ module.exports = {
target: 'http://localhost:3000',
changeOrigin: true,
onProxyRes: (proxyRes, req, res) => {
delete proxyRes.headers['x-frame-options'];
delete proxyRes.headers['x-frame-options']
},
pathRewrite: {
// '^/_next': '/'