diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 182eeaafe..c4d9a4149 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -96,6 +96,10 @@ const $props = defineProps({ type: [String, Boolean], default: '800px', }, + onDataSaved: { + type: Function, + default: () => {}, + }, }); const emit = defineEmits(['onFetch', 'onDataSaved']); const modelValue = computed( diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index d768c0256..dd2cefd89 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -134,6 +134,10 @@ const $props = defineProps({ createComplement: { type: Object, }, + dataCy: { + type: String, + default: 'vn-table', + }, }); const { t } = useI18n(); @@ -249,7 +253,9 @@ function splitColumns(columns) { col.columnFilter = { inWhere: true, ...col.columnFilter }; splittedColumns.value.columns.push(col); } - // Status column + + splittedColumns.value.create = createOrderSort(splittedColumns.value.create); + if (splittedColumns.value.chips.length) { splittedColumns.value.columnChips = splittedColumns.value.chips.filter( (c) => !c.isId, @@ -265,6 +271,24 @@ function splitColumns(columns) { } } +function createOrderSort(columns) { + const orderedColumn = columns + .map((column, index) => + column.createOrder !== undefined ? { ...column, originalIndex: index } : null, + ) + .filter((item) => item !== null); + + orderedColumn.sort((a, b) => a.createOrder - b.createOrder); + + const filteredColumns = columns.filter((col) => col.createOrder === undefined); + + orderedColumn.forEach((col) => { + filteredColumns.splice(col.createOrder, 0, col); + }); + + return filteredColumns; +} + const rowClickFunction = computed(() => { if ($props.rowClick != undefined) return $props.rowClick; if ($props.redirect) return ({ id }) => redirectFn(id); @@ -340,12 +364,11 @@ function hasEditableFormat(column) { const clickHandler = async (event) => { const clickedElement = event.target.closest('td'); - const isDateElement = event.target.closest('.q-date'); const isTimeElement = event.target.closest('.q-time'); - const isQselectDropDown = event.target.closest('.q-select__dropdown-icon'); + const isQSelectDropDown = event.target.closest('.q-select__dropdown-icon'); - if (isDateElement || isTimeElement || isQselectDropDown) return; + if (isDateElement || isTimeElement || isQSelectDropDown) return; if (clickedElement === null) { await destroyInput(editingRow.value, editingField.value); @@ -584,9 +607,24 @@ function removeTextValue(data, getChanges) { return data; } + +function handleRowClick(event, row) { + if (event.ctrlKey) return rowCtrlClickFunction.value(event, row); + if (rowClickFunction.value) rowClickFunction.value(row); +} + +const rowCtrlClickFunction = computed(() => { + if ($props.rowCtrlClick != undefined) return $props.rowCtrlClick; + if ($props.redirect) + return (evt, { id }) => { + stopEventPropagation(evt); + window.open(`/#/${$props.redirect}/${id}`, '_blank'); + }; + return () => {}; +});