xuziqiang
/
SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat；sider样式补充

main
xuziqiang 3 months ago
parent
0c291263cd
commit
cecd3a0325
5 changed files with 242 additions and 211 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 294
      hx-ai-intelligent/src/App.vue
  2. 4
      hx-op/src/App.vue
  3. 72
      lib/saas/theme/global-antd.less
  4. 1
      lib/saas/theme/variable.less
  5. 82
      lib/saas/view/system/layout/sider.vue

294
hx-ai-intelligent/src/App.vue
View File

@ -43,160 +43,160 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
:deep(.ns-content) { // :deep(.ns-content) {
// padding-top: 80px !important; // // padding-top: 80px !important;
} // }
#app { // #app {
width: 100%; // width: 100%;
height: 100%; // height: 100%;
} // }
:deep(.ant-menu-title-content) { // :deep(.ant-menu-title-content) {
background: unset !important; // background: unset !important;
z-index: 9 !important; // z-index: 9 !important;
} // }
:deep(.ns-left-menu) { // :deep(.ns-left-menu) {
.ant-menu-item-selected { // .ant-menu-item-selected {
// color: #fff !important; // // color: #fff !important;
background: @primary-color; // background: @primary-color;
border-radius: 12px; // border-radius: 12px;
// height: 40px; // // height: 40px;
// line-height: 40px; // // line-height: 40px;
padding: 5px @ns-gap; // padding: 5px @ns-gap;
position: relative; // position: relative;
a { // a {
color: @white !important; // color: @white !important;
} // }
} // }
.ant-menu-item-active, // .ant-menu-item-active,
.ant-submenu-item-active { // .ant-submenu-item-active {
// color: rgba(@primary-color, 0.1) !important; // // color: rgba(@primary-color, 0.1) !important;
} // }
} // }
:deep(.ant-menu-light.ant-menu-horizontal > .ant-menu-item:hover) { // :deep(.ant-menu-light.ant-menu-horizontal > .ant-menu-item:hover) {
// background: @primary-color; // // background: @primary-color;
} // }
// :deep(.ant-menu-inline .ant-menu-submenu-title) { // // :deep(.ant-menu-inline .ant-menu-submenu-title) {
// color: rgba(255, 255, 255, 0.9) !important; // // color: rgba(255, 255, 255, 0.9) !important;
// // }
// :deep(.ns-left-menu .ant-layout-sider-children .ant-menu-sub.ant-menu-inline) {
// // position: relative;
// // &::before {
// // display: flex;
// // width: 2px;
// // height: calc(100% - 40px);
// // position: absolute;
// // top: 20px;
// // left: 20px;
// // content: '';
// // background-color: rgba(255, 255, 255, 0.2);
// // }
// } // }
:deep(.ns-left-menu .ant-layout-sider-children .ant-menu-sub.ant-menu-inline) {
// position: relative;
// &::before {
// display: flex;
// width: 2px;
// height: calc(100% - 40px);
// position: absolute;
// top: 20px;
// left: 20px;
// content: '';
// background-color: rgba(255, 255, 255, 0.2);
// }
}
//*************************含tab的 list列表样式 */ // //*************************含tab的 list列表样式 */
:deep(.tabListTable) { // :deep(.tabListTable) {
.ns-table-title { // .ns-table-title {
text-align: left; // text-align: left;
height: 46px; // height: 46px;
line-height: 46px; // line-height: 46px;
font-size: 18px; // font-size: 18px;
font-weight: bold; // font-weight: bold;
user-select: text; // user-select: text;
padding-left: 16px; // padding-left: 16px;
background: #fff; // background: #fff;
width: calc(100% + 32px); // width: calc(100% + 32px);
margin-left: -16px; // margin-left: -16px;
} // }
.tabs-list { // .tabs-list {
overflow: visible !important; // overflow: visible !important;
} // }
.ant-tabs-nav { // .ant-tabs-nav {
width: calc(100% + 32px); // width: calc(100% + 32px);
margin-left: -16px !important; // margin-left: -16px !important;
background: #fff; // background: #fff;
} // }
.ant-tabs-nav-wrap { // .ant-tabs-nav-wrap {
padding: 0 16px; // padding: 0 16px;
} // }
} // }
//*********************详情页返回修改 */ // //*********************详情页返回修改 */
:deep(.nsDetailView) { // :deep(.nsDetailView) {
min-height: 100%; // min-height: 100%;
height: 100%; // height: 100%;
.ns-detail-content { // .ns-detail-content {
padding: 0px 24px; // padding: 0px 24px;
border-top: 16px solid #e5ebf0; // border-top: 16px solid #e5ebf0;
} // }
.ant-descriptions-item-label { // .ant-descriptions-item-label {
color: rgba(0, 0, 0, 0.5); // color: rgba(0, 0, 0, 0.5);
font-family: PingFang SC; // font-family: PingFang SC;
font-size: 14px; // font-size: 14px;
} // }
.ant-descriptions-item-content { // .ant-descriptions-item-content {
color: rgba(0, 0, 0, 0.95); // color: rgba(0, 0, 0, 0.95);
font-family: PingFang SC; // font-family: PingFang SC;
font-size: 14px; // font-size: 14px;
} // }
.ant-descriptions-title { // .ant-descriptions-title {
&::after { // &::after {
content: ''; // content: '';
width: 75px; // width: 75px;
height: 7px; // height: 7px;
display: block; // display: block;
background: linear-gradient(90deg, #537fff 0%, #fff 82.67%); // background: linear-gradient(90deg, #537fff 0%, #fff 82.67%);
margin-left: 2px; // margin-left: 2px;
margin-top: -2px; // margin-top: -2px;
} // }
} // }
.ant-descriptions-row > th, // .ant-descriptions-row > th,
.ant-descriptions-row > td { // .ant-descriptions-row > td {
padding-bottom: 8px; // padding-bottom: 8px;
} // }
.ns-page-header { // .ns-page-header {
margin-bottom: 0 !important; // margin-bottom: 0 !important;
padding-top: 7px !important; // padding-top: 7px !important;
padding-bottom: 7px !important; // padding-bottom: 7px !important;
width: calc(100% + 32px); // width: calc(100% + 32px);
margin-left: -16px; // margin-left: -16px;
.title { // .title {
cursor: pointer; // cursor: pointer;
font-size: 18px !important; // font-size: 18px !important;
} // }
} // }
.ant-descriptions-header { // .ant-descriptions-header {
margin: 16px 0 16px 0 !important; // margin: 16px 0 16px 0 !important;
.ant-descriptions-title { // .ant-descriptions-title {
line-height: 16px; // line-height: 16px;
font-size: 16px; // font-size: 16px;
} // }
} // }
} // }
:deep(.ns-detail .ant-descriptions-header .descriptions-title) { // :deep(.ns-detail .ant-descriptions-header .descriptions-title) {
&:after { // &:after {
content: ''; // content: '';
width: 75px; // width: 75px;
height: 7px; // height: 7px;
display: block; // display: block;
background: linear-gradient(90deg, @primary-color 0%, #fff 82.67%); // background: linear-gradient(90deg, @primary-color 0%, #fff 82.67%);
margin-left: 2px; // margin-left: 2px;
margin-top: -2px; // margin-top: -2px;
} // }
} // }
:deep(.ant-descriptions-header .descriptions-title) { // :deep(.ant-descriptions-header .descriptions-title) {
&:after { // &:after {
content: ''; // content: '';
width: 75px; // width: 75px;
height: 7px; // height: 7px;
display: block; // display: block;
background: linear-gradient(90deg, @primary-color 0%, #fff 82.67%); // background: linear-gradient(90deg, @primary-color 0%, #fff 82.67%);
margin-left: 2px; // margin-left: 2px;
margin-top: -2px; // margin-top: -2px;
} // }
} // }
</style> </style>

4
hx-op/src/App.vue
View File

@ -23,7 +23,7 @@
}); });
</script> </script>
<style lang="less" scoped> <!-- <style lang="less" scoped>
:deep(.ns-content) { :deep(.ns-content) {
// padding-top: 80px !important; // padding-top: 80px !important;
} }
@ -177,4 +177,4 @@
margin-top: -2px; margin-top: -2px;
} }
} }
</style> </style> -->

72
lib/saas/theme/global-antd.less
View File

@ -1,43 +1,63 @@
/** /**
Ant全局组件样式 Ant全局组件样式
*/ */
.ant-menu-submenu-popup{ .ant-menu-submenu-popup {
.ant-menu-title-content a{ .ant-menu-title-content a {
margin-left: 0!important; margin-left: 0 !important;
} }
.ant-menu-submenu-title .anticon + span{ .ant-menu-submenu-title .anticon + span {
margin-left: 0 !important; margin-left: 0 !important;
} }
.ant-menu-submenu { .ant-menu-submenu {
height: 40px ; height: 40px;
margin-top: 4px !important; margin-top: 4px !important;
margin-bottom: 4px !important; margin-bottom: 4px !important;
// display: flex; // display: flex;
// align-items: center; // align-items: center;
} }
.ant-menu-submenu-title .ant-menu-title-content .anticon{ .ant-menu-submenu-title .ant-menu-title-content .anticon {
margin-left: 0 !important; margin-left: 0 !important;
margin-right: 6px; margin-right: 6px;
} }
li{ li {
display: flex; display: flex;
align-items: center; align-items: center;
} }
}
//侧边栏收缩单个菜单样式
.ant-menu-inline-collapsed-tooltip {
.ant-tooltip-inner,
.ant-tooltip-arrow-content {
background-color: @white;
a {
color: @black !important;
}
}
} }
#app .ant-layout-has-sider .ant-menu-vertical .ant-menu-item,#app .ant-menu-vertical-left .ant-menu-item, #app.ant-menu-vertical-right .ant-menu-item,#app .ant-menu-inline .ant-menu-item,#app .ant-menu-vertical .ant-menu-submenu-title,#app .ant-menu-vertical-left .ant-menu-submenu-title,#app .ant-menu-vertical-right .ant-menu-submenu-title,#app .ant-menu-inline .ant-menu-submenu-title {
margin-top: 0px !important; #app .ant-layout-has-sider .ant-menu-vertical .ant-menu-item,
#app .ant-menu-vertical-left .ant-menu-item,
#app.ant-menu-vertical-right .ant-menu-item,
#app .ant-menu-inline .ant-menu-item,
#app .ant-menu-vertical .ant-menu-submenu-title,
#app .ant-menu-vertical-left .ant-menu-submenu-title,
#app .ant-menu-vertical-right .ant-menu-submenu-title,
#app .ant-menu-inline .ant-menu-submenu-title {
margin-top: 0px !important;
margin-bottom: 0px !important; margin-bottom: 0px !important;
// height: 50px !important; // height: 50px !important;
} }
.ant-menu-vertical.ant-menu-sub, .ant-menu-vertical-left.ant-menu-sub, .ant-menu-vertical-right.ant-menu-sub{ .ant-menu-vertical.ant-menu-sub,
.ant-menu-vertical-left.ant-menu-sub,
.ant-menu-vertical-right.ant-menu-sub {
min-width: 0 !important; min-width: 0 !important;
} }
.ant-menu-submenu .ant-menu-sub{ .ant-menu-submenu .ant-menu-sub {
min-width: 0 !important; min-width: 0 !important;
} }
.ant-layout-sider-children{ .ant-layout-sider-children {
padding-bottom: 40px; padding-bottom: 40px;
} }
@ -84,11 +104,11 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
top:0; top: 0;
left:0; left: 0;
content: ''; content: '';
// background-color:red; // background-color:red;
opacity: .1; opacity: 0.1;
} }
// //
// .ant-menu-item:not(.ant-menu-item-selected) a:hover { // .ant-menu-item:not(.ant-menu-item-selected) a:hover {
@ -114,26 +134,23 @@
// } // }
.ant-menu-submenu-arrow { .ant-menu-submenu-arrow {
color: @layout-sider-arrow-color; color: @layout-sider-arrow-color;
} }
// //
// //
// //btn // //btn
// .ant-btn:hover { // .ant-btn:hover {
// border-color: @border-color-base; // border-color: @border-color-base;
// } // }
// //
.ant-btn-primary:hover, .ant-btn-primary:focus { .ant-btn-primary:hover,
.ant-btn-primary:focus {
// color: #fff !important; // color: #fff !important;
// color: #fff ; // color: #fff ;
} }
//禁用时鼠标光标 //禁用时鼠标光标
.ant-btn[disabled], .ant-btn[disabled],
.ant-btn[disabled]:hover, .ant-btn[disabled]:hover,
@ -154,7 +171,6 @@
box-shadow: none !important; box-shadow: none !important;
} }
.ant-input-affix-wrapper-focused { .ant-input-affix-wrapper-focused {
box-shadow: none !important; box-shadow: none !important;
} }
@ -195,8 +211,6 @@
} }
} }
//.ant-btn[disabled], //.ant-btn[disabled],
//.ant-btn[disabled]:hover { //.ant-btn[disabled]:hover {
// border: 1px solid transparent; // border: 1px solid transparent;
@ -266,13 +280,15 @@
// 表头加粗 // 表头加粗
.ant-table-thead > tr > th { .ant-table-thead > tr > th {
font-weight: bold; font-weight: bold;
} }
//表头不换行 //表头不换行
.ant-table-thead > tr > th{ .ant-table-thead > tr > th {
word-break: keep-all; word-break: keep-all;
white-space: nowrap; white-space: nowrap;
} }
.ant-menu.ant-menu-dark, .ant-menu-dark .ant-menu-sub, .ant-menu.ant-menu-dark .ant-menu-sub{ .ant-menu.ant-menu-dark,
.ant-menu-dark .ant-menu-sub,
.ant-menu.ant-menu-dark .ant-menu-sub {
background-size: cover; background-size: cover;
} }

1
lib/saas/theme/variable.less
View File

@ -20,6 +20,7 @@
@layout-header-padding: 0 50px; @layout-header-padding: 0 50px;
@layout-sider-width: 220px; //侧边导航宽度 @layout-sider-width: 220px; //侧边导航宽度
@layout-sider-collapsed-width: 60px; //侧边导航收缩宽度
@layout-sider-arrow-color: @black; //侧边导航箭头颜色 @layout-sider-arrow-color: @black; //侧边导航箭头颜色

82
lib/saas/view/system/layout/sider.vue
View File

@ -4,7 +4,7 @@
<div class="ns-left-menu-space" :class="{ 'ns-left-menu-space-collapsed': collapsed }"> <div class="ns-left-menu-space" :class="{ 'ns-left-menu-space-collapsed': collapsed }">
<a-layout-sider <a-layout-sider
class="ns-left-menu" class="ns-left-menu"
:collapsedWidth="48" :collapsedWidth="60"
:width="sideWidth" :width="sideWidth"
:collapsed="collapsed" :collapsed="collapsed"
breakpoint="lg" breakpoint="lg"
@ -222,6 +222,7 @@
// width: @layout-sider-width !important; // width: @layout-sider-width !important;
// max-width: @layout-sider-width !important; // max-width: @layout-sider-width !important;
// } // }
.ns-left-menu { .ns-left-menu {
position: fixed; position: fixed;
top: 0; top: 0;
@ -249,11 +250,10 @@
width: 90%; width: 90%;
} }
.ant-menu-item-active,
.ant-submenu-item-active {
// color: rgba(@primary-color, 0.1) !important;
}
:deep(.ant-layout-sider-children) { :deep(.ant-layout-sider-children) {
transition: all 0.1s;
padding: 0 @ns-gap;
// background-color: transparent; // background-color: transparent;
.ant-menu-root { .ant-menu-root {
// background-color: transparent; // background-color: transparent;
@ -261,6 +261,8 @@
.ant-menu-submenu-title, .ant-menu-submenu-title,
.ant-menu-item { .ant-menu-item {
height: @menu-item-height; height: @menu-item-height;
border-radius: @ns-border-radius;
// overflow: hidden;
// color: @black; // color: @black;
.ant-menu-submenu-arrow { .ant-menu-submenu-arrow {
// color: @black; // color: @black;
@ -269,30 +271,21 @@
.ant-menu { .ant-menu {
color: rgba(@black, 0.85); color: rgba(@black, 0.85);
} }
.ant-menu-item {
.ant-menu-sub.ant-menu-inline {
background-color: @white;
// > div {
// margin-inline: 20px; // margin-inline: 20px;
// }
} }
.ant-menu-item a { .ant-menu-item-active:not(.ant-menu-item-selected),
// color: rgba(@black, 0.8); .ant-submenu-item-active {
} // color: rgba(@primary-color, 0.1) !important;
.ant-menu-submenu-expand-icon, background-color: rgba(@primary-color, 0.1);
.ant-menu-submenu-arrow { border-radius: 12px;
// color: rgba(255, 255, 255, 0.9);
}
.ant-menu-inline {
}
.ant-menu-sub.ant-menu-inline {
// background-color: #001027;
> div {
// margin-inline: 20px;
}
} }
} }
} }
#iframeApplication .ns-left-menu {
padding-top: 0px;
}
.anticon + span { .anticon + span {
margin-left: @icon-gap !important; margin-left: @icon-gap !important;
} }
@ -301,18 +294,42 @@
height: auto; height: auto;
z-index: 9; z-index: 9;
box-shadow: @ns-box-shadow; box-shadow: @ns-box-shadow;
// background-color: #fff; // background-color: #fff;
overflow: hidden; overflow: hidden;
transition: all 0.2s; transition: all 0.2s;
flex: 0 0 @layout-sider-width; flex: 0 0 @layout-sider-width;
&.ns-left-menu-space-collapsed { // transition: all 0.1s;
width: 48px; // &:not(.ns-left-menu-space-collapsed) :deep(.ant-menu-title-content) {
flex: 0 0 48px; // padding-left: 8px;
// }
:deep(.ant-menu-item-selected) {
// color: #fff !important;
background: @primary-color;
// border-radius: 12px;
// height: 40px;
// line-height: 40px;
// width: auto;
// margin-inline: @ns-gap;
// padding-left: @ns-gap !important;
position: relative;
a {
color: @white !important;
}
} }
} }
.ns-left-menu-space-collapsed { .ns-left-menu-space-collapsed {
z-index: 11;
width: @layout-sider-collapsed-width;
flex: 0 0 @layout-sider-collapsed-width;
:deep(.ant-layout-sider-children) {
transition: all 0.1s;
padding: 0 calc(@ns-gap / 4) !important;
}
.ns-left-menu-trigger { .ns-left-menu-trigger {
width: 48px !important; width: @layout-sider-collapsed-width !important;
justify-content: center; justify-content: center;
padding-left: 0px; padding-left: 0px;
} }
@ -395,12 +412,9 @@
// content: ''; // content: '';
// } // }
:deep(.ant-menu-title-content) { // :deep(.firstMenuSub .ant-menu-submenu-title) {
padding-left: 8px; // padding-left: 8px !important;
} // }
:deep(.firstMenuSub .ant-menu-submenu-title) {
padding-left: 8px !important;
}
:deep(.firstMenuItem-selected) { :deep(.firstMenuItem-selected) {
background: @primary-color!important; background: @primary-color!important;

Write Preview
Loading…
Cancel
Save