lingyun/NetAdmin
lingyun/NetAdmin
Template
7
0
Fork 0
mirror of https://github.com/nsnail/NetAdmin.git synced 2025-06-17 01:13:22 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix: 🐛 --el-color-primary 变量有闪烁现象 (#194)

Browse Source 
Co-authored-by: tk <fiyne1a@dingtalk.com>
This commit is contained in:
nsnail 2024-11-12 10:33:53 +08:00 committed by GitHub
parent 3069b8fbc4
commit 26e3698f57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
25 changed files with 282 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.json
View File

@ -3,14 +3,15 @@
"SpecificationDocumentSettings": { "SpecificationDocumentSettings": {
"GroupOpenApiInfos": [ "GroupOpenApiInfos": [
{ {
"Description": "NetAdmin - 系统组件",
"Group": "Sys", "Group": "Sys",
"TermsOfService": "https://github.com/nsnail/NetAdmin",
"Title": "系统组件", "Title": "系统组件",
"Description": "NetAdmin - 系统组件"
}, },
{ {
"Description": "NetAdmin - 管理服务",
"Group": "Adm", "Group": "Adm",
"Title": "管理服务", "Title": "管理服务",
"Description": "NetAdmin - 管理服务"
}, },
{ {
"Group": "Tpl", "Group": "Tpl",

6
src/frontend/admin/package.json
View File

@ -10,7 +10,7 @@
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "2.3.1", "@element-plus/icons-vue": "2.3.1",
"ace-builds": "1.36.3", "ace-builds": "1.36.4",
"aieditor": "1.2.5", "aieditor": "1.2.5",
"axios": "1.7.7", "axios": "1.7.7",
"clipboard": "2.0.11", "clipboard": "2.0.11",
@ -37,12 +37,12 @@
"vuex": "4.1.0" "vuex": "4.1.0"
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "5.1.4", "@vitejs/plugin-vue": "5.1.5",
"prettier": "3.3.3", "prettier": "3.3.3",
"prettier-plugin-organize-attributes": "1.0.0", "prettier-plugin-organize-attributes": "1.0.0",
"sass": "1.80.6", "sass": "1.80.6",
"terser": "5.36.0", "terser": "5.36.0",
"vite": "5.4.10" "vite": "5.4.11"
}, },
"browserslist": [ "browserslist": [
"> 1%", "> 1%",

4
src/frontend/admin/src/components/naVersionUpdater/index.vue
View File

@ -43,7 +43,7 @@ export default {
const contents = [] const contents = []
const msg = h('p', { style: 'width:230px;display:flex;justify-content:space-between' }, [ const msg = h('p', { style: 'width:230px;display:flex;justify-content:space-between' }, [
h('span', {}, this.$t('即将开始更新……')), h('span', {}, this.$t('即将开始更新……')),
h('a', { style: 'color:var(--el-color-primary)', href: 'javascript:window.location.reload()' }, this.$t('立即更新')), h('a', { style: 'color:var(--na-color-primary)', href: 'javascript:window.location.reload()' }, this.$t('立即更新')),
]) ])
const task = h('p', { style: 'font-weight:bold' }, version) const task = h('p', { style: 'font-weight:bold' }, version)
const progress = h( const progress = h(
@ -55,7 +55,7 @@ export default {
style: { style: {
width: '230px', width: '230px',
height: '6px', height: '6px',
'background-color': 'var(--el-color-primary)', 'background-color': 'var(--na-color-primary)',
'margin-top': '6px', 'margin-top': '6px',
'border-radius': '6px', 'border-radius': '6px',
}, },

2
src/frontend/admin/src/components/scCron/index.vue
View File

@ -828,7 +828,7 @@ export default {
} }
.sc-cron:deep(.el-tabs__item.is-active) .sc-cron-num h4 { .sc-cron:deep(.el-tabs__item.is-active) .sc-cron-num h4 {
background: var(--el-color-primary); background: var(--na-color-primary);
color: #fff; color: #fff;
} }

2
src/frontend/admin/src/components/scDialog/index.vue
View File

@ -97,7 +97,7 @@ export default {
} }
.sc-dialog__headerbtn button:hover .el-dialog__close { .sc-dialog__headerbtn button:hover .el-dialog__close {
color: var(--el-color-primary); color: var(--na-color-primary);
} }
.sc-dialog:deep(.el-dialog).is-fullscreen { .sc-dialog:deep(.el-dialog).is-fullscreen {

2
src/frontend/admin/src/components/scFileSelect/index.vue
View File

@ -440,7 +440,7 @@ export default {
} }
.sc-file-select__item__file .item-file.item-file-doc { .sc-file-select__item__file .item-file.item-file-doc {
color: var(--el-color-primary); color: var(--na-color-primary);
} }
.sc-file-select__item__upload { .sc-file-select__item__upload {

2
src/frontend/admin/src/components/scFilterBar/my.vue
View File

@ -125,7 +125,7 @@ export default {
.sc-filter-my-list li:hover { .sc-filter-my-list li:hover {
background: #ecf5ff; background: #ecf5ff;
color: var(--el-color-primary); color: var(--na-color-primary);
} }
.sc-filter-my-list li label { .sc-filter-my-list li label {

4
src/frontend/admin/src/components/scIconSelect/index.vue
View File

@ -185,11 +185,11 @@ export default {
} }
.sc-icon-select__list li:hover { .sc-icon-select__list li:hover {
box-shadow: 0 0 1px 0.3rem var(--el-color-primary); box-shadow: 0 0 1px 0.3rem var(--na-color-primary);
background: var(--el-color-primary-light-9); background: var(--el-color-primary-light-9);
} }
.sc-icon-select__list li:hover i { .sc-icon-select__list li:hover i {
color: var(--el-color-primary); color: var(--na-color-primary);
} }
</style> </style>

2
src/frontend/admin/src/components/scMini/scStatusIndicator.vue
View File

@ -47,7 +47,7 @@ export default {
} }
.sc-state-bg--primary { .sc-state-bg--primary {
background: var(--el-color-primary); background: var(--na-color-primary);
} }
.sc-state-bg--success { .sc-state-bg--success {

2
src/frontend/admin/src/components/scPageHeader/index.vue
View File

@ -53,7 +53,7 @@ export default {
.sc-page-header__icon span { .sc-page-header__icon span {
width: 2.5rem; width: 2.5rem;
height: 2.5rem; height: 2.5rem;
background: var(--el-color-primary); background: var(--na-color-primary);
border-radius: 40%; border-radius: 40%;
display: flex; display: flex;
align-items: center; align-items: center;

4
src/frontend/admin/src/components/scSelectFilter/index.vue
View File

@ -180,11 +180,11 @@ export default {
} }
.sc-select-filter__item-options li:hover { .sc-select-filter__item-options li:hover {
color: var(--el-color-primary); color: var(--na-color-primary);
} }
.sc-select-filter__item-options li.active { .sc-select-filter__item-options li.active {
background: var(--el-color-primary); background: var(--na-color-primary);
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
} }

4
src/frontend/admin/src/layout/components/search.vue
View File

@ -183,8 +183,8 @@ export default {
} }
.sc-search-result li:hover { .sc-search-result li:hover {
background: var(--el-color-primary); background: var(--na-color-primary);
color: #fff; color: #fff;
border-color: var(--el-color-primary); border-color: var(--na-color-primary);
} }
</style> </style>

4
src/frontend/admin/src/layout/components/sideM.vue
View File

@ -142,8 +142,8 @@ export default {
z-index: 10; z-index: 10;
width: 4rem; width: 4rem;
height: 4rem; height: 4rem;
background: var(--el-color-primary); background: var(--na-color-primary);
box-shadow: 0 0.2rem 1rem 0 var(--el-color-primary); box-shadow: 0 0.2rem 1rem 0 var(--na-color-primary);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

4
src/frontend/admin/src/layout/components/tasks.vue
View File

@ -105,7 +105,7 @@ export default {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }
.user-bar-jobs-item:hover { .user-bar-jobs-item:hover {
border-color: var(--el-color-primary); border-color: var(--na-color-primary);
} }
.user-bar-jobs-item.alert:hover { .user-bar-jobs-item.alert:hover {
@ -124,7 +124,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: var(--el-color-primary); color: var(--na-color-primary);
border-radius: 1.5rem; border-radius: 1.5rem;
} }
.user-bar-jobs-item-body .jobMain { .user-bar-jobs-item-body .jobMain {

2
src/frontend/admin/src/layout/index.vue
View File

@ -122,7 +122,7 @@
<div v-if="!ismobile" class="adminui-header-menu"> <div v-if="!ismobile" class="adminui-header-menu">
<el-menu <el-menu
:default-active="active" :default-active="active"
active-text-color="var(--el-color-primary)" active-text-color="var(--na-color-primary)"
mode="horizontal" mode="horizontal"
router router
text-color="var(--el-text-color-primary)"> text-color="var(--el-text-color-primary)">

15
src/frontend/admin/src/style/app.scss
View File

@ -1,4 +1,7 @@
/* 全局 */ /* 全局 */
:root {
--na-color-primary: #21a675;
}
#app, #app,
body, body,
html { html {
@ -92,7 +95,7 @@ textarea {
bottom: 10rem; bottom: 10rem;
right: 0; right: 0;
z-index: 100; z-index: 100;
background: var(--el-color-primary); background: var(--na-color-primary);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
@ -164,7 +167,7 @@ textarea {
} }
.adminui-header .nav li.active { .adminui-header .nav li.active {
color: var(--el-color-primary); color: var(--na-color-primary);
} }
.adminui-header .user-bar .panel-item:hover { .adminui-header .user-bar .panel-item:hover {
@ -234,7 +237,7 @@ textarea {
} }
.aminui-side-split li.active { .aminui-side-split li.active {
background: var(--el-color-primary); background: var(--na-color-primary);
color: #fff; color: #fff;
} }
@ -297,7 +300,7 @@ textarea {
} }
.adminui-side-bottom:hover { .adminui-side-bottom:hover {
color: var(--el-color-primary); color: var(--na-color-primary);
} }
.aminui-side.isCollapse { .aminui-side.isCollapse {
@ -411,7 +414,7 @@ textarea {
} }
.adminui-tags li.active { .adminui-tags li.active {
background: var(--el-color-primary); background: var(--na-color-primary);
} }
.adminui-tags li.active a { .adminui-tags li.active a {
@ -546,7 +549,7 @@ textarea {
&:after { &:after {
content: ''; content: '';
margin: 2rem 0; margin: 2rem 0;
border-bottom: var(--el-color-primary) 1px dashed; border-bottom: var(--na-color-primary) 1px dashed;
display: block; display: block;
} }

10
src/frontend/admin/src/style/fix.scss
View File

@ -26,7 +26,7 @@
} }
.el-menu--inline { .el-menu--inline {
--el-menu-active-color: var(--el-color-primary) !important; --el-menu-active-color: var(--na-color-primary) !important;
} }
.el-form-item--default { .el-form-item--default {
@ -269,7 +269,7 @@
} }
.aminui-side-split li.active { .aminui-side-split li.active {
background-color: var(--el-color-primary); background-color: var(--na-color-primary);
} }
.adminui-tags li:hover { .adminui-tags li:hover {
@ -277,7 +277,7 @@
} }
.adminui-tags li.active { .adminui-tags li.active {
background-color: var(--el-color-primary) !important; background-color: var(--na-color-primary) !important;
} }
.contextmenu li:hover { .contextmenu li:hover {
@ -286,12 +286,12 @@
} }
.data-box .item-background { .data-box .item-background {
background-color: var(--el-color-primary) !important; background-color: var(--na-color-primary) !important;
} }
.layout-setting, .layout-setting,
.diy-grid-setting { .diy-grid-setting {
background-color: var(--el-color-primary) !important; background-color: var(--na-color-primary) !important;
} }
.el-descriptions__body .el-descriptions__table { .el-descriptions__body .el-descriptions__table {

4
src/frontend/admin/src/style/pages.scss
View File

@ -70,7 +70,7 @@
.common-header-right a { .common-header-right a {
font-size: 1.3rem; font-size: 1.3rem;
color: var(--el-color-primary); color: var(--na-color-primary);
cursor: pointer; cursor: pointer;
} }
@ -107,7 +107,7 @@
} }
.common-main .link { .common-main .link {
color: var(--el-color-primary); color: var(--na-color-primary);
cursor: pointer; cursor: pointer;
} }

4
src/frontend/admin/src/views/guest/login.vue
View File

@ -166,7 +166,7 @@ export default {
} }
.login-form:deep(.login-forgot) a { .login-form:deep(.login-forgot) a {
color: var(--el-color-primary); color: var(--na-color-primary);
} }
.login-form:deep(.login-forgot) a:hover { .login-form:deep(.login-forgot) a:hover {
@ -179,7 +179,7 @@ export default {
} }
.login-form:deep(.login-reg) a { .login-form:deep(.login-reg) a {
color: var(--el-color-primary); color: var(--na-color-primary);
} }
.login-form:deep(.login-reg) a:hover { .login-form:deep(.login-reg) a:hover {

2
src/frontend/admin/src/views/home/widgets/components/change-log.vue
View File

@ -44,7 +44,7 @@ export default {
display: none; display: none;
} }
a { a {
color: var(--el-color-primary); color: var(--na-color-primary);
} }
} }
</style> </style>

10
src/frontend/admin/src/views/home/widgets/index.vue
View File

@ -330,7 +330,7 @@ export default {
} }
.customizing .widgets-wrapper .draggable-box { .customizing .widgets-wrapper .draggable-box {
border: 1px dashed var(--el-color-primary); border: 1px dashed var(--na-color-primary);
padding: 1rem; padding: 1rem;
} }
@ -359,7 +359,7 @@ export default {
} }
.customize-overlay label { .customize-overlay label {
background: var(--el-color-primary); background: var(--na-color-primary);
color: #fff; color: #fff;
height: 4rem; height: 4rem;
padding: 0 3rem; padding: 0 3rem;
@ -466,15 +466,15 @@ export default {
} }
.selectLayout-item:hover { .selectLayout-item:hover {
border-color: var(--el-color-primary); border-color: var(--na-color-primary);
} }
.selectLayout-item.active { .selectLayout-item.active {
border-color: var(--el-color-primary); border-color: var(--na-color-primary);
} }
.selectLayout-item.active span { .selectLayout-item.active span {
background: var(--el-color-primary); background: var(--na-color-primary);
} }
.dark { .dark {

4
src/frontend/admin/src/views/home/work/components/myapp.vue
View File

@ -178,8 +178,8 @@ export default {
.modItem-add:hover, .modItem-add:hover,
.modItem-add:hover i { .modItem-add:hover i {
border-color: var(--el-color-primary); border-color: var(--na-color-primary);
color: var(--el-color-primary) !important; color: var(--na-color-primary) !important;
} }
.setMods { .setMods {