xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 修复 table中更多按钮切换主题色未生效修复问题

Browse Source
2.X
疯狂的狮子li 2 years ago
parent e9324fb9ce
commit 306f9e04d0
4 changed files with 281 additions and 280 deletions
Show Stats Download Patch File Download Diff File

547
ruoyi-ui/src/assets/styles/ruoyi.scss
Unescape Escape View File

@ -1,274 +1,273 @@
/** /**
* 通用css样式布局处理 * 通用css样式布局处理
* Copyright (c) 2019 ruoyi * Copyright (c) 2019 ruoyi
*/ */
/** 基础通用 **/ /** 基础通用 **/
.pt5 { .pt5 {
padding-top: 5px; padding-top: 5px;
} }
.pr5 { .pr5 {
padding-right: 5px; padding-right: 5px;
} }
.pb5 { .pb5 {
padding-bottom: 5px; padding-bottom: 5px;
} }
.mt5 { .mt5 {
margin-top: 5px; margin-top: 5px;
} }
.mr5 { .mr5 {
margin-right: 5px; margin-right: 5px;
} }
.mb5 { .mb5 {
margin-bottom: 5px; margin-bottom: 5px;
} }
.mb8 { .mb8 {
margin-bottom: 8px; margin-bottom: 8px;
} }
.ml5 { .ml5 {
margin-left: 5px; margin-left: 5px;
} }
.mt10 { .mt10 {
margin-top: 10px; margin-top: 10px;
} }
.mr10 { .mr10 {
margin-right: 10px; margin-right: 10px;
} }
.mb10 { .mb10 {
margin-bottom: 10px; margin-bottom: 10px;
} }
.ml10 { .ml10 {
margin-left: 10px; margin-left: 10px;
} }
.mt20 { .mt20 {
margin-top: 20px; margin-top: 20px;
} }
.mr20 { .mr20 {
margin-right: 20px; margin-right: 20px;
} }
.mb20 { .mb20 {
margin-bottom: 20px; margin-bottom: 20px;
} }
.ml20 { .ml20 {
margin-left: 20px; margin-left: 20px;
} }
.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
font-family: inherit; font-family: inherit;
font-weight: 500; font-weight: 500;
line-height: 1.1; line-height: 1.1;
color: inherit; color: inherit;
} }
.el-dialog:not(.is-fullscreen) { .el-dialog:not(.is-fullscreen) {
margin-top: 6vh !important; margin-top: 6vh !important;
} }
.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body { .el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
overflow: auto; overflow: auto;
overflow-x: hidden; overflow-x: hidden;
max-height: 70vh; max-height: 70vh;
padding: 10px 20px 0; padding: 10px 20px 0;
} }
.el-table { .el-table {
.el-table__header-wrapper, .el-table__fixed-header-wrapper { .el-table__header-wrapper, .el-table__fixed-header-wrapper {
th { th {
word-break: break-word; word-break: break-word;
background-color: #f8f8f9; background-color: #f8f8f9;
color: #515a6e; color: #515a6e;
height: 40px; height: 40px;
font-size: 13px; font-size: 13px;
} }
} }
.el-table__body-wrapper { .el-table__body-wrapper {
.el-button [class*="el-icon-"] + span { .el-button [class*="el-icon-"] + span {
margin-left: 1px; margin-left: 1px;
} }
} }
} }
/** 表单布局 **/ /** 表单布局 **/
.form-header { .form-header {
font-size:15px; font-size:15px;
color:#6379bb; color:#6379bb;
border-bottom:1px solid #ddd; border-bottom:1px solid #ddd;
margin:8px 10px 25px 10px; margin:8px 10px 25px 10px;
padding-bottom:5px padding-bottom:5px
} }
/** 表格布局 **/ /** 表格布局 **/
.pagination-container { .pagination-container {
position: relative; position: relative;
height: 25px; height: 25px;
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 15px; margin-top: 15px;
padding: 10px 20px !important; padding: 10px 20px !important;
} }
/* tree border */ /* tree border */
.tree-border { .tree-border {
margin-top: 5px; margin-top: 5px;
border: 1px solid #e5e6e7; border: 1px solid #e5e6e7;
background: #FFFFFF none; background: #FFFFFF none;
border-radius:4px; border-radius:4px;
} }
.pagination-container .el-pagination { .pagination-container .el-pagination {
right: 0; right: 0;
position: absolute; position: absolute;
} }
@media ( max-width : 768px) { @media ( max-width : 768px) {
.pagination-container .el-pagination > .el-pagination__jump { .pagination-container .el-pagination > .el-pagination__jump {
display: none !important; display: none !important;
} }
.pagination-container .el-pagination > .el-pagination__sizes { .pagination-container .el-pagination > .el-pagination__sizes {
display: none !important; display: none !important;
} }
} }
.el-table .fixed-width .el-button--mini { .el-table .fixed-width .el-button--mini {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
width: inherit; width: inherit;
} }
/** 表格更多操作下拉样式 */ /** 表格更多操作下拉样式 */
.el-table .el-dropdown-link { .el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {
cursor: pointer; cursor: pointer;
color: #409EFF; margin-left: 5px;
margin-left: 5px; }
}
.el-table .el-dropdown, .el-icon-arrow-down {
.el-table .el-dropdown, .el-icon-arrow-down { font-size: 12px;
font-size: 12px; }
}
.el-tree-node__content > .el-checkbox {
.el-tree-node__content > .el-checkbox { margin-right: 8px;
margin-right: 8px; }
}
.list-group-striped > .list-group-item {
.list-group-striped > .list-group-item { border-left: 0;
border-left: 0; border-right: 0;
border-right: 0; border-radius: 0;
border-radius: 0; padding-left: 0;
padding-left: 0; padding-right: 0;
padding-right: 0; }
}
.list-group {
.list-group { padding-left: 0px;
padding-left: 0px; list-style: none;
list-style: none; }
}
.list-group-item {
.list-group-item { border-bottom: 1px solid #e7eaec;
border-bottom: 1px solid #e7eaec; border-top: 1px solid #e7eaec;
border-top: 1px solid #e7eaec; margin-bottom: -1px;
margin-bottom: -1px; padding: 11px 0px;
padding: 11px 0px; font-size: 13px;
font-size: 13px; }
}
.pull-right {
.pull-right { float: right !important;
float: right !important; }
}
.el-card__header {
.el-card__header { padding: 14px 15px 7px;
padding: 14px 15px 7px; min-height: 40px;
min-height: 40px; }
}
.el-card__body {
.el-card__body { padding: 15px 20px 20px 20px;
padding: 15px 20px 20px 20px; }
}
.card-box {
.card-box { padding-right: 15px;
padding-right: 15px; padding-left: 15px;
padding-left: 15px; margin-bottom: 10px;
margin-bottom: 10px; }
}
/* button color */
/* button color */ .el-button--cyan.is-active,
.el-button--cyan.is-active, .el-button--cyan:active {
.el-button--cyan:active { background: #20B2AA;
background: #20B2AA; border-color: #20B2AA;
border-color: #20B2AA; color: #FFFFFF;
color: #FFFFFF; }
}
.el-button--cyan:focus,
.el-button--cyan:focus, .el-button--cyan:hover {
.el-button--cyan:hover { background: #48D1CC;
background: #48D1CC; border-color: #48D1CC;
border-color: #48D1CC; color: #FFFFFF;
color: #FFFFFF; }
}
.el-button--cyan {
.el-button--cyan { background-color: #20B2AA;
background-color: #20B2AA; border-color: #20B2AA;
border-color: #20B2AA; color: #FFFFFF;
color: #FFFFFF; }
}
/* text color */
/* text color */ .text-navy {
.text-navy { color: #1ab394;
color: #1ab394; }
}
.text-primary {
.text-primary { color: inherit;
color: inherit; }
}
.text-success {
.text-success { color: #1c84c6;
color: #1c84c6; }
}
.text-info {
.text-info { color: #23c6c8;
color: #23c6c8; }
}
.text-warning {
.text-warning { color: #f8ac59;
color: #f8ac59; }
}
.text-danger {
.text-danger { color: #ed5565;
color: #ed5565; }
}
.text-muted {
.text-muted { color: #888888;
color: #888888; }
}
/* image */
/* image */ .img-circle {
.img-circle { border-radius: 50%;
border-radius: 50%; }
}
.img-lg {
.img-lg { width: 120px;
width: 120px; height: 120px;
height: 120px; }
}
.avatar-upload-preview {
.avatar-upload-preview { position: relative;
position: relative; top: 50%;
top: 50%; left: 50%;
left: 50%; transform: translate(-50%, -50%);
transform: translate(-50%, -50%); width: 200px;
width: 200px; height: 200px;
height: 200px; border-radius: 50%;
border-radius: 50%; box-shadow: 0 0 4px #ccc;
box-shadow: 0 0 4px #ccc; overflow: hidden;
overflow: hidden; }
}
/* 拖拽列样式 */
/* 拖拽列样式 */ .sortable-ghost{
.sortable-ghost{ opacity: .8;
opacity: .8; color: #fff!important;
color: #fff!important; background: #42b983!important;
background: #42b983!important; }
}
.top-right-btn {
.top-right-btn { position: relative;
position: relative; float: right;
float: right; }
}

6
ruoyi-ui/src/utils/request.js
Unescape Escape View File

@ -101,6 +101,12 @@ service.interceptors.response.use(res => {
type: 'error' type: 'error'
}) })
return Promise.reject(new Error(msg)) return Promise.reject(new Error(msg))
} else if (code === 601) {
Message({
message: msg,
type: 'warning'
})
return Promise.reject('error')
} else if (code !== 200) { } else if (code !== 200) {
Notification.error({ Notification.error({
title: msg title: msg

4
ruoyi-ui/src/views/system/role/index.vue
Unescape Escape View File

@ -135,9 +135,7 @@
v-hasPermi="['system:role:remove']" v-hasPermi="['system:role:remove']"
>删除</el-button> >删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']"> <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
<span class="el-dropdown-link"> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleDataScope" icon="el-icon-circle-check" <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item> v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>

4
ruoyi-ui/src/views/system/user/index.vue
Unescape Escape View File

@ -180,9 +180,7 @@
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
>删除</el-button> >删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']"> <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
<span class="el-dropdown-link"> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key" <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item> v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>

Write Preview
Loading…
Cancel
Save