fix eventname not changable close #33
This commit is contained in:
@@ -306,6 +306,11 @@ export function useMemberTable() {
|
|||||||
if (typeof value === 'number') {
|
if (typeof value === 'number') {
|
||||||
return keys.includes(value.toString());
|
return keys.includes(value.toString());
|
||||||
}
|
}
|
||||||
|
if (typeof value === 'object') {
|
||||||
|
if ('name' in value) {
|
||||||
|
return keys.includes(value.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
if (typeof value === 'string') {
|
if (typeof value === 'string') {
|
||||||
return keys.includes(value);
|
return keys.includes(value);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,12 +76,8 @@
|
|||||||
v-on:clear="selectedColumnOptions = []"
|
v-on:clear="selectedColumnOptions = []"
|
||||||
v-model:column-filter="selectedColumnFilter"
|
v-model:column-filter="selectedColumnFilter"
|
||||||
v-model:column-option="selectedColumnOptions"
|
v-model:column-option="selectedColumnOptions"
|
||||||
@update:column-filter="
|
@update:column-filter="filterMembers"
|
||||||
filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
|
@update:column-option="filterMembers"
|
||||||
"
|
|
||||||
@update:column-option="
|
|
||||||
filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
|
|
||||||
"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="selectOption && selected.length > 0" class="text-weight-bold">
|
<div v-if="selectOption && selected.length > 0" class="text-weight-bold">
|
||||||
@@ -352,7 +348,14 @@ function setColumnOptions(columnName: string) {
|
|||||||
const values = allMembers.value
|
const values = allMembers.value
|
||||||
.map((e) => e[columnName as keyof Member]) // could be undefined
|
.map((e) => e[columnName as keyof Member]) // could be undefined
|
||||||
.filter((v): v is string | number => v !== null && v !== undefined)
|
.filter((v): v is string | number => v !== null && v !== undefined)
|
||||||
.map((v) => String(v));
|
.map((v) => {
|
||||||
|
if (typeof v === 'string') {
|
||||||
|
return v;
|
||||||
|
} else if (typeof v === 'object') {
|
||||||
|
const obj = v as Record<string, unknown>;
|
||||||
|
return String(obj['name']);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
const selection = [...new Set(values)];
|
const selection = [...new Set(values)];
|
||||||
|
|
||||||
@@ -364,9 +367,9 @@ function setColumnOptions(columnName: string) {
|
|||||||
return selection;
|
return selection;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function filterMembers(field: string, ...keys: string[]) {
|
async function filterMembers() {
|
||||||
setNewFilter(field, ...keys);
|
setNewFilter(selectedColumnFilter.value, ...(selectedColumnOptions.value || []));
|
||||||
setLocalPageDefaults(page.value, field, keys);
|
setLocalPageDefaults(page.value, selectedColumnFilter.value, selectedColumnOptions.value || []);
|
||||||
await updateTable();
|
await updateTable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user