fix(系统设置): 工具箱-操作日志 icon不对;按钮位置和hover态不对

This commit is contained in:
dataeaseShu 2024-03-13 16:36:40 +08:00
parent 902d21842c
commit abd8c11af8
3 changed files with 12 additions and 3 deletions

View File

@ -1,7 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { propTypes } from '@/utils/propTypes' import { propTypes } from '@/utils/propTypes'
import { computed, PropType, reactive, toRefs } from 'vue' import { computed, PropType, reactive, toRefs, h } from 'vue'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import { Icon } from '@/components/icon-custom'
const { t } = useI18n() const { t } = useI18n()
@ -31,12 +32,13 @@ const props = defineProps({
title: propTypes.string title: propTypes.string
}) })
const { property } = toRefs(props) const { property } = toRefs(props)
const prefixIcon = h(Icon, { name: 'icon_calendar_outlined' })
const timeConfig = computed(() => { const timeConfig = computed(() => {
let obj = Object.assign( let obj = Object.assign(
{ {
showType: 'datetime', showType: 'datetime',
rangeSeparator: '-', rangeSeparator: '-',
prefixIcon: 'Calendar', prefixIcon,
startPlaceholder: t('datasource.start_time'), startPlaceholder: t('datasource.start_time'),
endPlaceholder: t('datasource.end_time'), endPlaceholder: t('datasource.end_time'),
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
@ -104,6 +106,9 @@ defineExpose({
.filter-item { .filter-item {
flex: 1; flex: 1;
.ed-date-editor {
width: 100%;
}
} }
} }
</style> </style>

View File

@ -135,7 +135,7 @@ defineExpose({
</div> </div>
<template #footer> <template #footer>
<el-button @click="reset">{{ t('commons.reset') }}</el-button> <el-button secondary @click="reset">{{ t('commons.reset') }}</el-button>
<el-button @click="trigger" type="primary">{{ t('common.sure') }}</el-button> <el-button @click="trigger" type="primary">{{ t('common.sure') }}</el-button>
</template> </template>
</el-drawer> </el-drawer>

View File

@ -394,3 +394,7 @@ em {
strong { strong {
font-synthesis: weight; font-synthesis: weight;
} }
.ed-date-editor .ed-range__icon {
font-size: 16px !important;
}