fix: refs #9021 improve event handling in VnFilter and remove unused blur emit in VnComponent
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
2f669b7d3a
commit
a052c68e67
|
@ -43,7 +43,9 @@ const columnFilter = computed(() => $props.column?.columnFilter);
|
||||||
|
|
||||||
const updateEvent = { 'update:modelValue': addFilter };
|
const updateEvent = { 'update:modelValue': addFilter };
|
||||||
const enterEvent = {
|
const enterEvent = {
|
||||||
'keyup.enter': () => addFilter(model.value),
|
keyup: ({ key }) => {
|
||||||
|
if (key === 'Enter') addFilter(model.value);
|
||||||
|
},
|
||||||
remove: () => addFilter(null),
|
remove: () => addFilter(null),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,6 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const emit = defineEmits(['blur']);
|
|
||||||
|
|
||||||
const componentArray = computed(() => {
|
const componentArray = computed(() => {
|
||||||
if (typeof $props.prop === 'object') return [$props.prop];
|
if (typeof $props.prop === 'object') return [$props.prop];
|
||||||
return $props.prop;
|
return $props.prop;
|
||||||
|
@ -57,7 +55,6 @@ function toValueAttrs(attrs) {
|
||||||
v-bind="mix(toComponent).attrs"
|
v-bind="mix(toComponent).attrs"
|
||||||
v-on="mix(toComponent).event ?? {}"
|
v-on="mix(toComponent).event ?? {}"
|
||||||
v-model="model"
|
v-model="model"
|
||||||
@blur="emit('blur')"
|
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -120,14 +120,6 @@ const handleInsertMode = (e) => {
|
||||||
const handleUppercase = () => {
|
const handleUppercase = () => {
|
||||||
value.value = value.value?.toUpperCase() || '';
|
value.value = value.value?.toUpperCase() || '';
|
||||||
};
|
};
|
||||||
|
|
||||||
const listeners = computed(() =>
|
|
||||||
Object.fromEntries(
|
|
||||||
Object.entries($attrs).filter(
|
|
||||||
([key, val]) => key.startsWith('on') && typeof val === 'function',
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -136,7 +128,6 @@ const listeners = computed(() =>
|
||||||
ref="vnInputRef"
|
ref="vnInputRef"
|
||||||
v-model="value"
|
v-model="value"
|
||||||
v-bind="{ ...$attrs, ...styleAttrs }"
|
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||||
v-on="listeners"
|
|
||||||
:type="$attrs.type"
|
:type="$attrs.type"
|
||||||
:class="{ required: isRequired }"
|
:class="{ required: isRequired }"
|
||||||
@keydown="handleKeydown"
|
@keydown="handleKeydown"
|
||||||
|
|
Loading…
Reference in New Issue