twh_eastasia/pure-admin-thin
1
0
Fork 0
mirror of https://github.com/pure-admin/pure-admin-thin.git synced 2025-04-25 16:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update element-plus@2.0.0

Browse Source
This commit is contained in:
xiaoxian521 2022-02-07 13:53:59 +08:00
parent 1b93ce989c
commit 7cc69ac52d
6 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -36,7 +36,7 @@
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"axios": "^0.25.0", "axios": "^0.25.0",
"css-color-function": "^1.3.3", "css-color-function": "^1.3.3",
"element-plus": "1.3.0-beta.1", "element-plus": "^2.0.0",
"element-resize-detector": "^1.2.3", "element-resize-detector": "^1.2.3",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",

8
pnpm-lock.yaml generated
View File

@ -31,7 +31,7 @@ specifiers:
axios: ^0.25.0 axios: ^0.25.0
cross-env: 7.0.3 cross-env: 7.0.3
css-color-function: ^1.3.3 css-color-function: ^1.3.3
element-plus: 1.3.0-beta.1 element-plus: ^2.0.0
element-resize-detector: ^1.2.3 element-resize-detector: ^1.2.3
eslint: 7.30.0 eslint: 7.30.0
eslint-plugin-prettier: 3.4.0 eslint-plugin-prettier: 3.4.0
@ -85,7 +85,7 @@ dependencies:
animate.css: 4.1.1 animate.css: 4.1.1
axios: 0.25.0 axios: 0.25.0
css-color-function: 1.3.3 css-color-function: 1.3.3
element-plus: 1.3.0-beta.1_vue@3.2.29 element-plus: 2.0.0_vue@3.2.29
element-resize-detector: 1.2.4 element-resize-detector: 1.2.4
js-cookie: 3.0.1 js-cookie: 3.0.1
lodash-es: 4.17.21 lodash-es: 4.17.21
@ -2862,10 +2862,10 @@ packages:
} }
dev: true dev: true
/element-plus/1.3.0-beta.1_vue@3.2.29: /element-plus/2.0.0_vue@3.2.29:
resolution: resolution:
{ {
integrity: sha512-q3vMaKElPpuSTeIF7kuDmMOE+N1YVCCIG3fshXpz6qgjnxPbgZumVM0qGfhr8DTu9JxRbBoDok49dqtX/BWn3w== integrity: sha512-bLt/Ahn0ejOKuYA4HR3iuGLHTt4pRzQZwCx1G2BLHEJLZi7CfLiFnjZMhGhYNkk49ir4JHtnBJTgLhNNaKALcA==
} }
peerDependencies: peerDependencies:
vue: ^3.2.0 vue: ^3.2.0

18
src/layout/components/navbar.vue
View File

@ -234,14 +234,8 @@ function translationEn() {
} }
.translation { .translation {
.el-dropdown-menu__item { ::v-deep(.el-dropdown-menu__item) {
padding: 5px 40px !important; padding: 5px 40px;
}
.el-dropdown-menu__item:focus,
.el-dropdown-menu__item:not(.is-disabled):hover {
color: #606266;
background: #f0f0f0;
} }
.check-zh { .check-zh {
@ -258,16 +252,10 @@ function translationEn() {
.logout { .logout {
max-width: 120px; max-width: 120px;
.el-dropdown-menu__item { ::v-deep(.el-dropdown-menu__item) {
min-width: 100%; min-width: 100%;
display: inline-flex; display: inline-flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.el-dropdown-menu__item:focus,
.el-dropdown-menu__item:not(.is-disabled):hover {
color: #606266;
background: #f0f0f0;
}
} }
</style> </style>

2
src/layout/components/panel/index.vue
View File

@ -125,7 +125,7 @@ emitter.on("openPanel", () => {
&:hover { &:hover {
cursor: pointer; cursor: pointer;
color: red; color: var(--el-color-primary);
} }
} }
} }

19
src/layout/components/tag/index.scss
View File

@ -92,7 +92,7 @@
.el-icon-close { .el-icon-close {
font-size: 10px; font-size: 10px;
color: #1890ff; color: var(--el-color-primary);
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
top: 50%; top: 50%;
@ -190,7 +190,8 @@
align-items: center; align-items: center;
&:hover { &:hover {
background: #eee; background: var(--el-color-primary-light-9);
color: var(--el-color-primary);
} }
svg { svg {
@ -236,7 +237,7 @@
} }
.scroll-item.is-active { .scroll-item.is-active {
background-color: #eaf4fe; background-color: var(--el-color-primary-light-9);
position: relative; position: relative;
color: #fff; color: #fff;
@ -249,7 +250,7 @@
} }
a { a {
color: #1890ff; color: var(--el-color-primary);
} }
} }
@ -288,10 +289,10 @@
/* 卡片模式下鼠标移入显示蓝色边框 */ /* 卡片模式下鼠标移入显示蓝色边框 */
.card-in { .card-in {
color: #1890ff; color: var(--el-color-primary);
a { a {
color: #1890ff; color: var(--el-color-primary);
} }
} }
@ -312,7 +313,7 @@
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0; bottom: 0;
background: #1890ff; background: var(--el-color-primary);
} }
/* 灵动模式下鼠标移入显示蓝色进度条 */ /* 灵动模式下鼠标移入显示蓝色进度条 */
@ -322,7 +323,7 @@
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0; bottom: 0;
background: #1890ff; background: var(--el-color-primary);
animation: scheduleInWidth 400ms ease-in; animation: scheduleInWidth 400ms ease-in;
} }
@ -333,7 +334,7 @@
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0; bottom: 0;
background: #1890ff; background: var(--el-color-primary);
animation: scheduleOutWidth 400ms ease-in; animation: scheduleOutWidth 400ms ease-in;
} }

6
src/layout/components/tag/index.vue
View File

@ -722,7 +722,11 @@ const getContextMenuStyle = computed((): CSSProperties => {
:disabled="item.disabled" :disabled="item.disabled"
@click="onClickDrop(key, item)" @click="onClickDrop(key, item)"
> >
<component :is="item.icon" :key="key" /> <component
:is="item.icon"
:key="key"
style="margin-right: 6px"
/>
{{ $t(item.text) }} {{ $t(item.text) }}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>