Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#1078] form 요소 레이아웃 깨짐 버그 수정 #1079

Merged
merged 1 commit into from
Feb 28, 2022
Merged

[#1078] form 요소 레이아웃 깨짐 버그 수정 #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "evui",
"version": "3.3.6",
"version": "3.3.7",
"description": "A EXEM Library project",
"author": "exem <dev_client@ex-em.com>",
"license": "MIT",
Expand Down
205 changes: 108 additions & 97 deletions src/components/datePicker/DatePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,114 +7,121 @@
disabled : $props.disabled,
}"
>
<template v-if="$props.mode === 'date' || $props.mode === 'dateTime'">
<span class="ev-date-picker-prefix-icon">
<i class="ev-icon-calendar" />
</span>
<input
v-model.trim="currentValue"
type="text"
class="ev-input"
:placeholder="$props.placeholder"
:disabled="$props.disabled"
@click="clickSelectInput"
@keydown.enter.prevent="validateValue(currentValue)"
@change="validateValue(currentValue)"
/>
</template>
<template v-else>
<div
class="ev-date-picker-tag-wrapper"
@click="clickSelectInput"
>
<div
ref="datePickerWrapper"
class="ev-date-picker__wrapper"
>
<template v-if="$props.mode === 'date' || $props.mode === 'dateTime'">
<span class="ev-date-picker-prefix-icon">
<i class="ev-icon-calendar" />
</span>
<input
v-model.trim="currentValue"
type="text"
class="ev-input readonly"
readonly
class="ev-input"
:placeholder="$props.placeholder"
:disabled="$props.disabled"
@click="clickSelectInput"
@keydown.enter.prevent="validateValue(currentValue)"
@change="validateValue(currentValue)"
/>
<template
v-if="$props.mode === 'dateMulti'
&& ($props.options.multiType === 'date' || !$props.options.tagShorten)"
</template>
<template v-else>
<div
class="ev-date-picker-tag-wrapper"
@click="clickSelectInput"
>
<div
v-for="(item, idx) in mv"
:key="`${item}_${idx}`"
class="ev-select-tag"
:class="{ num: $props.options.multiType !== 'date' }"
>
<span class="ev-tag-name"> {{ item }} </span>
<span
v-if="$props.options.multiType === 'date'"
class="ev-tag-suffix"
@click.stop="[removeMv(item), changeDropboxPosition()]"
>
<i class="ev-tag-suffix-close ev-icon-error" />
<span class="ev-date-picker-prefix-icon">
<i class="ev-icon-calendar" />
</span>
</div>
</template>
<template v-else-if="mv[0] && mv[mv.length - 1]">
<div class="ev-select-tag num">
<span class="ev-tag-name"> {{ mv[0] }} </span>
</div>
<div class="ev-select-tag num">
<span class="ev-tag-name"> ~ </span>
</div>
<div class="ev-select-tag num">
<span class="ev-tag-name"> {{ mv[mv.length - 1] }} </span>
</div>
</template>
</div>
</template>
<template v-if="$props.clearable">
<span
v-show="isClearableIcon"
class="ev-input-suffix"
@click.stop="[removeAllMv(), clickOutsideDropbox()]"
>
<i class="ev-icon-error" />
</span>
</template>
<div class="ev-date-picker-dropbox-wrapper">
<div
v-if="isDropbox"
ref="dropbox"
class="ev-date-picker-dropdown"
:class="$props.mode"
:style="dropboxPosition"
>
<div
v-if="usedShortcuts.length"
class="ev-date-picker-dropbox__button-layout">
<ev-button-group>
<ev-button
v-for="button in usedShortcuts"
:key="button.key"
:type="button.isActive ? 'primary' : 'default'"
@click="clickShortcut(button.key)"
<input
type="text"
class="ev-input readonly"
readonly
:placeholder="$props.placeholder"
:disabled="$props.disabled"
/>
<template
v-if="$props.mode === 'dateMulti'
&& ($props.options.multiType === 'date' || !$props.options.tagShorten)"
>
<div
v-for="(item, idx) in mv"
:key="`${item}_${idx}`"
class="ev-select-tag"
:class="{ num: $props.options.multiType !== 'date' }"
>
{{ button.label }}
</ev-button>
</ev-button-group>
<span class="ev-tag-name"> {{ item }} </span>
<span
v-if="$props.options.multiType === 'date'"
class="ev-tag-suffix"
@click.stop="[removeMv(item), changeDropboxPosition()]"
>
<i class="ev-tag-suffix-close ev-icon-error" />
</span>
</div>
</template>
<template v-else-if="mv[0] && mv[mv.length - 1]">
<div class="ev-select-tag num">
<span class="ev-tag-name"> {{ mv[0] }} </span>
</div>
<div class="ev-select-tag num">
<span class="ev-tag-name"> ~ </span>
</div>
<div class="ev-select-tag num">
<span class="ev-tag-name"> {{ mv[mv.length - 1] }} </span>
</div>
</template>
</div>
</template>
<template v-if="$props.clearable">
<span
v-show="isClearableIcon"
class="ev-input-suffix"
@click.stop="[removeAllMv(), clickOutsideDropbox()]"
>
<i class="ev-icon-error" />
</span>
</template>
<div class="ev-date-picker-dropbox-wrapper">
<div
v-if="isDropbox"
ref="dropbox"
class="ev-date-picker-dropdown"
:class="$props.mode"
:style="dropboxPosition"
>
<div
v-if="usedShortcuts.length"
class="ev-date-picker-dropbox__button-layout"
>
<ev-button-group>
<ev-button
v-for="button in usedShortcuts"
:key="button.key"
:type="button.isActive ? 'primary' : 'default'"
@click="clickShortcut(button.key)"
>
{{ button.label }}
</ev-button>
</ev-button-group>
</div>
<div
v-if="usedShortcuts.length"
class="ev-date-picker-dropbox__divider"
/>
<div
:class="{ 'ev-date-picker-dropbox__calendar':usedShortcuts.length }">
<ev-calendar
key="fromCalendar"
v-model="mv"
:mode="$props.mode"
:month-notation="$props.monthNotation"
:day-of-the-week-notation="$props.dayOfTheWeekNotation"
:options="$props.options"
/>
<div
:class="{ 'ev-date-picker-dropbox__calendar':usedShortcuts.length }"
>
<ev-calendar
key="fromCalendar"
v-model="mv"
:mode="$props.mode"
:month-notation="$props.monthNotation"
:day-of-the-week-notation="$props.dayOfTheWeekNotation"
:options="$props.options"
/>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -230,6 +237,7 @@ export default {
const {
isDropbox,
datePicker,
datePickerWrapper,
dropbox,
itemWrapper,
dropboxPosition,
Expand Down Expand Up @@ -261,6 +269,7 @@ export default {

isDropbox,
datePicker,
datePickerWrapper,
dropbox,
itemWrapper,
dropboxPosition,
Expand All @@ -279,13 +288,18 @@ export default {
@import '../../style/index.scss';

.ev-date-picker {
$select-height: 35px;
$select-height: $input-default-height;
display: block;
position: relative;
width: 100%;
min-height: $select-height;

@import '../../style/components/input.scss';

&__wrapper {
position: relative;
min-height: $select-height;
}

.ev-input {
$calendar-icon-width: 30px;
position: absolute;
Expand All @@ -312,15 +326,12 @@ export default {
height: 100%;
align-items: center;
cursor: pointer;


&:hover {
color: #409EFF;
}
}

.ev-date-picker-tag-wrapper {
$select-height: 35px;
display: flex;
width: 100%;
height: 100%;
Expand Down
4 changes: 3 additions & 1 deletion src/components/datePicker/uses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export const useDropdown = () => {

const isDropbox = ref(false);
const datePicker = ref(null);
const datePickerWrapper = ref(null);
const dropbox = ref(null);
const itemWrapper = ref(null);
const dropboxPosition = reactive({
Expand All @@ -138,7 +139,7 @@ export const useDropdown = () => {
*/
const changeDropboxPosition = async () => {
await nextTick();
const datePickerRect = datePicker.value?.getBoundingClientRect();
const datePickerRect = datePickerWrapper.value?.getBoundingClientRect();
const dropboxRect = dropbox.value?.getBoundingClientRect();
const datePickerHeight = datePickerRect.height;
const datePickerY = datePickerRect.y;
Expand Down Expand Up @@ -195,6 +196,7 @@ export const useDropdown = () => {
return {
isDropbox,
datePicker,
datePickerWrapper,
dropbox,
itemWrapper,
dropboxPosition,
Expand Down
49 changes: 27 additions & 22 deletions src/components/inputNumber/InputNumber.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,30 @@
readonly,
}"
>
<span
v-for="type in ['up', 'down']"
:key="`step-arrow-${type}`"
:class="['ev-input-number-icon', `step-${type}`]"
@click="stepValue(type)"
>
<i :class="`ev-icon-s-arrow-${type}`" />
</span>
<input
v-model.trim="currentValue"
class="ev-input"
type="text"
:placeholder="placeholder"
:disabled="disabled"
:readonly="readonly"
@focus="focusInput"
@blur="blurInput"
@change="changeMv"
@keydown.up.prevent="stepValue('up')"
@keydown.down.prevent="stepValue('down')"
@keydown.enter.prevent="validateValue(currentValue)"
/>
<div class="ev-input-number__wrapper">
<span
v-for="type in ['up', 'down']"
:key="`step-arrow-${type}`"
:class="['ev-input-number-icon', `step-${type}`]"
@click="stepValue(type)"
>
<i :class="`ev-icon-s-arrow-${type}`" />
</span>
<input
v-model.trim="currentValue"
class="ev-input"
type="text"
:placeholder="placeholder"
:disabled="disabled"
:readonly="readonly"
@focus="focusInput"
@blur="blurInput"
@change="changeMv"
@keydown.up.prevent="stepValue('up')"
@keydown.down.prevent="stepValue('down')"
@keydown.enter.prevent="validateValue(currentValue)"
/>
</div>
</div>
</template>

Expand Down Expand Up @@ -136,6 +138,9 @@ export default {
}
}
}
&__wrapper {
position: relative;
}
.ev-input {
$number-arrow-btn-width: 30px;
padding: 0 #{$number-arrow-btn-width + $input-default-padding} 0 $input-default-padding;
Expand Down
Loading