8282-testToMaster #1057

Merged
alexm merged 215 commits from 8282-testToMaster into master 2024-12-10 06:23:36 +00:00
2 changed files with 5 additions and 18 deletions
Showing only changes of commit 7f4a73fd56 - Show all commits

View File

@ -143,6 +143,10 @@ function alignRow() {
const showFilter = computed( const showFilter = computed(
() => $props.column?.columnFilter !== false && $props.column.name != 'tableActions' () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
); );
const onTabPressed = async () => {
if (model.value) enterEvent['keyup.enter']();
};
</script> </script>
<template> <template>
<div <div
@ -157,6 +161,7 @@ const showFilter = computed(
v-model="model" v-model="model"
:components="components" :components="components"
component-prop="columnFilter" component-prop="columnFilter"
@keydown.tab="onTabPressed"
/> />
</div> </div>
</template> </template>

View File

@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { toDate } from 'src/filters'; import { toDate } from 'src/filters';
import { useArrayData } from 'composables/useArrayData';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import RightMenu from 'src/components/common/RightMenu.vue'; import RightMenu from 'src/components/common/RightMenu.vue';
import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue'; import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
@ -14,8 +13,6 @@ import VnImg from 'src/components/ui/VnImg.vue';
const stateStore = useStateStore(); const stateStore = useStateStore();
const { t } = useI18n(); const { t } = useI18n();
const tableRef = ref(); const tableRef = ref();
const arrayData = useArrayData('LatestBuys', { searchUrl: 'Buys/latestBuysFilter' });
const lastParams = {};
const columns = [ const columns = [
{ {
align: 'center', align: 'center',
@ -244,20 +241,6 @@ onMounted(async () => {
}); });
onUnmounted(() => (stateStore.rightDrawer = false)); onUnmounted(() => (stateStore.rightDrawer = false));
const onTabPressed = async () => {
let params = tableRef.value.params;
if (
Object.keys(params).length > 0 &&
JSON.stringify(params) !== JSON.stringify(lastParams)
) {
Object.assign(lastParams, params);
await arrayData.addFilter({ filter: { where: params } });
}
params = {};
};
</script> </script>
<template> <template>
@ -277,7 +260,6 @@ const onTabPressed = async () => {
:row-click="({ entryFk }) => tableRef.redirect(entryFk)" :row-click="({ entryFk }) => tableRef.redirect(entryFk)"
auto-load auto-load
:right-search="false" :right-search="false"
@keydown.tab="onTabPressed"
/> />
</template> </template>