diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue index a8bed34f8..98b611743 100644 --- a/src/components/FormModelPopup.vue +++ b/src/components/FormModelPopup.vue @@ -58,21 +58,6 @@ defineExpose({

{{ subtitle }}

- +
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 7e0757f6c..3e1923b4c 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -340,8 +340,9 @@ const clickHandler = async (event) => { const isDateElement = event.target.closest('.q-date'); const isTimeElement = event.target.closest('.q-time'); + const isQselectDropDown = event.target.closest('.q-select__dropdown-icon'); - if (isDateElement || isTimeElement) return; + if (isDateElement || isTimeElement || isQselectDropDown) return; if (clickedElement === null) { destroyInput(editingRow.value, editingField.value); @@ -411,7 +412,7 @@ async function renderInput(rowId, field, clickedElement) { focusOnMount: true, eventHandlers: { 'update:modelValue': async (value) => { - if (isSelect) { + if (isSelect && value) { row[column.name] = value[column.attrs?.optionValue ?? 'id']; row[column?.name + 'TextValue'] = value[column.attrs?.optionLabel ?? 'name']; @@ -593,6 +594,7 @@ const checkbox = ref(null); @row-click="(_, row) => rowClickFunction && rowClickFunction(row)" @update:selected="emit('update:selected', $event)" @selection="(details) => handleSelection(details, rows)" + :hide-selected-banner="true" >