diff --git a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue index eb3a3851aa..99e882a074 100644 --- a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue @@ -211,11 +211,26 @@ const multipleChange = (val: boolean, isMultipleChange = false) => { const changeMultiple = val => { multiple.value = val } +const inputCom = ref() +const displayTypeChange = () => { + inputCom.value?.displayTypeChange?.() +} + +const mult = () => { + inputCom.value?.mult?.handleClickOutside?.() +} + +const single = () => { + inputCom.value?.single?.handleClickOutside?.() +} defineExpose({ multipleChange, handleDialogClick, - changeMultiple + changeMultiple, + displayTypeChange, + mult, + single }) diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue index 2a9f4c0263..2ac068acce 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -290,8 +290,6 @@ const handleCheckedFieldsChangeTree = (value: string[]) => { setType() } -const inputCom = ref() - const setParameters = () => { const fieldArr = Object.values(curComponent.value.checkedFieldsMap).filter(ele => !!ele) curComponent.value.parameters = fields.value @@ -347,7 +345,7 @@ const setTypeChange = () => { handleDialogClick() nextTick(() => { curComponent.value.field.id = '' - inputCom.value?.displayTypeChange?.() + defaultConfigurationRef.value?.displayTypeChange?.() if ( +curComponent.value.displayType === 7 && ['yearrange', 'monthrange', 'daterange', 'datetimerange'].includes( @@ -772,16 +770,16 @@ const validate = () => { } const handleBeforeClose = () => { - inputCom.value?.mult?.handleClickOutside?.() - inputCom.value?.single?.handleClickOutside?.() + defaultConfigurationRef.value?.mult() + defaultConfigurationRef.value?.single() handleDialogClick() dialogVisible.value = false } const emits = defineEmits(['queryData']) const confirmClick = () => { if (validate()) return - inputCom.value?.mult?.handleClickOutside?.() - inputCom.value?.single?.handleClickOutside?.() + defaultConfigurationRef.value?.mult() + defaultConfigurationRef.value?.single() handleDialogClick() dialogVisible.value = false conditions.value.forEach(ele => { diff --git a/core/core-frontend/src/custom-component/v-query/Time.vue b/core/core-frontend/src/custom-component/v-query/Time.vue index edf53d79e3..9f83365111 100644 --- a/core/core-frontend/src/custom-component/v-query/Time.vue +++ b/core/core-frontend/src/custom-component/v-query/Time.vue @@ -135,7 +135,7 @@ const handleValueChange = () => { }) return } - config.value.defaultValue = new Date(value).toLocaleString() + config.value.defaultValue = value.map(ele => new Date(ele).toLocaleString()) } const init = () => { diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue index 29b466a05c..9dcdbc82cf 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue @@ -890,12 +890,19 @@ const mousedownDrag = () => { width: 20px; box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1); border: 1px solid var(--deCardStrokeColor, #dee0e3); - border-top-right-radius: 13px; - border-bottom-right-radius: 13px; + display: flex; + align-items: center; + padding-left: 2px; + border-top-right-radius: 12px; + border-bottom-right-radius: 12px; font-size: 12px; background: #fff; - .ed-icon { - margin-left: 2px; + &:hover { + padding-left: 4px; + width: 24px; + .ed-icon { + color: var(--ed-color-primary, #3370ff); + } } } diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue index 9b72530df8..a7496bf735 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue @@ -2098,12 +2098,20 @@ const getDsIconName = data => { width: 20px; box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1); border: 1px solid var(--deCardStrokeColor, #dee0e3); - border-top-right-radius: 13px; - border-bottom-right-radius: 13px; + display: flex; + align-items: center; + padding-left: 2px; + border-top-right-radius: 12px; + border-bottom-right-radius: 12px; background: #fff; font-size: 12px; - .ed-icon { - margin-left: 2px; + + &:hover { + padding-left: 4px; + width: 24px; + .ed-icon { + color: var(--ed-color-primary, #3370ff); + } } }