Browse Source

advanced queries allow fields to be used more than once

pull/716/head
cKey 3 years ago
parent
commit
d0a89b28fb
  1. 9
      apps/vue/src/components/Table/src/components/AdvancedSearch.vue
  2. 2
      apps/vue/src/components/Table/src/hooks/useDataSource.ts

9
apps/vue/src/components/Table/src/components/AdvancedSearch.vue

@ -202,9 +202,14 @@
]); ]);
const getAvailableParams = computed(() => { const getAvailableParams = computed(() => {
//
// const defineParams = unref(defineParamsRef);
// if (!defineParams.length) return[];
// return defineParams.filter(dp => !formMdel.paramters.some(fp => fp.field === dp.name));
// ,
const defineParams = unref(defineParamsRef); const defineParams = unref(defineParamsRef);
if (!defineParams.length) return[]; return defineParams;
return defineParams.filter(dp => !formMdel.paramters.some(fp => fp.field === dp.name));
}); });
onMounted(fetch); onMounted(fetch);

2
apps/vue/src/components/Table/src/hooks/useDataSource.ts

@ -256,7 +256,6 @@ export function useDataSource(
// 高级查询条件支持 // 高级查询条件支持
if (advancedSearchConfig?.useAdvancedSearch) { if (advancedSearchConfig?.useAdvancedSearch) {
const searchInput = getFieldsValue(); const searchInput = getFieldsValue();
console.log(searchInput);
if (Reflect.has(searchInput, 'queryable') && if (Reflect.has(searchInput, 'queryable') &&
Array.isArray(searchInput.queryable?.paramters) && Array.isArray(searchInput.queryable?.paramters) &&
searchInput.queryable.paramters.length > 0) searchInput.queryable.paramters.length > 0)
@ -294,7 +293,6 @@ export function useDataSource(
opt?.sortInfo ?? {}, opt?.sortInfo ?? {},
opt?.filterInfo ?? {}, opt?.filterInfo ?? {},
); );
console.log(params);
if (beforeFetch && isFunction(beforeFetch)) { if (beforeFetch && isFunction(beforeFetch)) {
params = (await beforeFetch(params)) || params; params = (await beforeFetch(params)) || params;
} }

Loading…
Cancel
Save