diff --git a/src/components/Crontab/src/Crontab.vue b/src/components/Crontab/src/Crontab.vue
index c7e250aee..90b40b2fb 100644
--- a/src/components/Crontab/src/Crontab.vue
+++ b/src/components/Crontab/src/Crontab.vue
@@ -968,37 +968,37 @@ const submit = () => {
diff --git a/src/components/Icon/src/IconSelect.vue b/src/components/Icon/src/IconSelect.vue
index f23130b11..d6ae6e65a 100644
--- a/src/components/Icon/src/IconSelect.vue
+++ b/src/components/Icon/src/IconSelect.vue
@@ -191,10 +191,10 @@ watch(
.icon-item {
&:hover {
- border-color: var(--el-color-primary);
color: var(--el-color-primary);
- transition: all 0.4s;
+ border-color: var(--el-color-primary);
transform: scaleX(1.05);
+ transition: all 0.4s;
}
}
@@ -215,15 +215,15 @@ watch(
}
:deep(.el-tabs__item) {
+ height: 30px;
font-size: 12px;
font-weight: normal;
- height: 30px;
line-height: 30px;
}
:deep(.el-tabs__header),
:deep(.el-tabs__nav-wrap) {
- margin: 0;
position: static;
+ margin: 0;
}
diff --git a/src/components/InputPassword/src/InputPassword.vue b/src/components/InputPassword/src/InputPassword.vue
index 3a8ac35d7..f97036940 100644
--- a/src/components/InputPassword/src/InputPassword.vue
+++ b/src/components/InputPassword/src/InputPassword.vue
@@ -96,7 +96,7 @@ $prefix-cls: #{$namespace}-input-password;
background-color: transparent;
border-color: var(--el-color-white);
border-style: solid;
- border-width: 0 5px 0 5px;
+ border-width: 0 5px;
content: '';
}
diff --git a/src/components/Qrcode/src/Qrcode.vue b/src/components/Qrcode/src/Qrcode.vue
index 4e31e76b7..337bc786f 100644
--- a/src/components/Qrcode/src/Qrcode.vue
+++ b/src/components/Qrcode/src/Qrcode.vue
@@ -243,7 +243,7 @@ $prefix-cls: #{$namespace}-qrcode;
.#{$prefix-cls} {
&--disabled {
- background: rgba(255, 255, 255, 0.95);
+ background: rgb(255 255 255 / 95%);
& > div {
transform: translate(-50%, -50%);
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 9dcc11fb8..0579baf4e 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -145,21 +145,25 @@ const listToString = (list: UploadUserFile[], separator?: string) => {
.upload-file-uploader {
margin-bottom: 5px;
}
+
:deep(.upload-file-list .el-upload-list__item) {
border: 1px solid #e4e7ed;
line-height: 2;
margin-bottom: 10px;
position: relative;
}
+
:deep(.el-upload-list__item-file-name) {
max-width: 250px;
}
+
:deep(.upload-file-list .ele-upload-list__item-content) {
display: flex;
justify-content: space-between;
align-items: center;
color: inherit;
}
+
:deep(.ele-upload-list__item-content-action .el-link) {
margin-right: 10px;
}
diff --git a/src/components/UploadFile/src/UploadImg.vue b/src/components/UploadFile/src/UploadImg.vue
index d04e2a77b..05339d181 100644
--- a/src/components/UploadFile/src/UploadImg.vue
+++ b/src/components/UploadFile/src/UploadImg.vue
@@ -81,7 +81,7 @@ const props = defineProps({
fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传(默认为 ["image/jpeg", "image/png", "image/gif"])
height: propTypes.string.def('150px'), // 组件高度 ==> 非必传(默认为 150px)
width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传(默认为 150px)
- borderRadius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传(默认为 8px)
+ borderradius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传(默认为 8px)
})
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@@ -132,29 +132,34 @@ const uploadError = () => {
:deep(.el-upload),
:deep(.el-upload-dragger) {
border: 1px dashed var(--el-color-danger) !important;
+
&:hover {
border-color: var(--el-color-primary) !important;
}
}
}
}
+
:deep(.disabled) {
.el-upload,
.el-upload-dragger {
cursor: not-allowed !important;
background: var(--el-disabled-bg-color);
border: 1px dashed var(--el-border-color-darker) !important;
+
&:hover {
border: 1px dashed var(--el-border-color-darker) !important;
}
}
}
+
.upload-box {
.no-border {
:deep(.el-upload) {
border: none !important;
}
}
+
:deep(.upload) {
.el-upload {
position: relative;
@@ -165,14 +170,17 @@ const uploadError = () => {
height: v-bind(height);
overflow: hidden;
border: 1px dashed var(--el-border-color-darker);
- border-radius: v-bind(borderRadius);
+ border-radius: v-bind(borderradius);
transition: var(--el-transition-duration-fast);
+
&:hover {
border-color: var(--el-color-primary);
+
.upload-handle {
opacity: 1;
}
}
+
.el-upload-dragger {
display: flex;
align-items: center;
@@ -183,20 +191,24 @@ const uploadError = () => {
overflow: hidden;
background-color: transparent;
border: 1px dashed var(--el-border-color-darker);
- border-radius: v-bind(borderRadius);
+ border-radius: v-bind(borderradius);
+
&:hover {
border: 1px dashed var(--el-color-primary);
}
}
+
.el-upload-dragger.is-dragover {
background-color: var(--el-color-primary-light-9);
border: 2px dashed var(--el-color-primary) !important;
}
+
.upload-image {
width: 100%;
height: 100%;
object-fit: contain;
}
+
.upload-empty {
position: relative;
display: flex;
@@ -206,11 +218,13 @@ const uploadError = () => {
font-size: 12px;
line-height: 30px;
color: var(--el-color-info);
+
.el-icon {
font-size: 28px;
color: var(--el-text-color-secondary);
}
}
+
.upload-handle {
position: absolute;
top: 0;
@@ -225,6 +239,7 @@ const uploadError = () => {
background: rgb(0 0 0 / 60%);
opacity: 0;
transition: var(--el-transition-duration-fast);
+
.handle-icon {
display: flex;
flex-direction: column;
@@ -232,11 +247,13 @@ const uploadError = () => {
justify-content: center;
padding: 0 6%;
color: aliceblue;
+
.el-icon {
margin-bottom: 40%;
font-size: 130%;
line-height: 130%;
}
+
span {
font-size: 85%;
line-height: 85%;
@@ -245,6 +262,7 @@ const uploadError = () => {
}
}
}
+
.el-upload__tip {
line-height: 18px;
text-align: center;
diff --git a/src/components/UploadFile/src/UploadImgs.vue b/src/components/UploadFile/src/UploadImgs.vue
index ab1c87884..bfa753721 100644
--- a/src/components/UploadFile/src/UploadImgs.vue
+++ b/src/components/UploadFile/src/UploadImgs.vue
@@ -82,7 +82,7 @@ const props = defineProps({
fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传(默认为 ["image/jpeg", "image/png", "image/gif"])
height: propTypes.string.def('150px'), // 组件高度 ==> 非必传(默认为 150px)
width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传(默认为 150px)
- borderRadius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传(默认为 8px)
+ borderradius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传(默认为 8px)
})
const uploadHeaders = ref({
@@ -90,7 +90,7 @@ const uploadHeaders = ref({
'tenant-id': getTenantId()
})
-const fileList = ref()
+const fileList = ref([])
// fix: 改为动态监听赋值解决图片回显问题
watch(
() => props.modelValue,
@@ -218,7 +218,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
padding: 0;
overflow: hidden;
border: 1px dashed var(--el-border-color-darker);
- border-radius: v-bind(borderRadius);
+ border-radius: v-bind(borderradius);
&:hover {
border: 1px dashed var(--el-color-primary);
@@ -235,7 +235,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
width: v-bind(width);
height: v-bind(height);
background-color: transparent;
- border-radius: v-bind(borderRadius);
+ border-radius: v-bind(borderradius);
}
.upload-image {
diff --git a/src/components/Verifition/src/Verify.vue b/src/components/Verifition/src/Verify.vue
index 861ed1637..02bcf86fa 100644
--- a/src/components/Verifition/src/Verify.vue
+++ b/src/components/Verifition/src/Verify.vue
@@ -31,7 +31,7 @@
-
diff --git a/src/views/Error/404.vue b/src/views/Error/404.vue
index c55d33251..fafb0e326 100644
--- a/src/views/Error/404.vue
+++ b/src/views/Error/404.vue
@@ -1,6 +1,8 @@
-
diff --git a/src/views/Error/500.vue b/src/views/Error/500.vue
index 6cfe47b7b..d1402d8b9 100644
--- a/src/views/Error/500.vue
+++ b/src/views/Error/500.vue
@@ -1,6 +1,8 @@
-
diff --git a/src/views/Profile/components/BasicInfo.vue b/src/views/Profile/components/BasicInfo.vue
index c8b2f8007..41a8ae514 100644
--- a/src/views/Profile/components/BasicInfo.vue
+++ b/src/views/Profile/components/BasicInfo.vue
@@ -14,8 +14,6 @@