src/components/ui/VnFilterPanel.vue

@@ -37,7 +37,7 @@ const $props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => ['filter', 'or', 'and'],
+        default: () => ['filter', 'search', 'or', 'and'],
     },
     customTags: {
         type: Array,
@@ -62,6 +62,7 @@ const emit = defineEmits([
     'update:modelValue',
     'refresh',
     'clear',
+    'search',
     'init',
     'remove',
     'setUserParams',

src/composables/useArrayData.js

@@ -74,10 +74,18 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             limit: store.limit,
         };
 
+        let exprFilter;
         let userParams = { ...store.userParams };
+        if (store?.exprBuilder) {
+            const where = buildFilter(userParams, (param, value) => {
+                const res = store.exprBuilder(param, value);
+                if (res) delete userParams[param];
+                return res;
+            });
+            exprFilter = where ? { where } : null;
+        }
 
-        Object.assign(filter, store.userFilter);
+        Object.assign(filter, store.userFilter, exprFilter);
-
         let where;
         if (filter?.where || store.filter?.where)
             where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@@ -87,28 +95,11 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
-        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order && store.order.length) params.filter.order = store.order;
-        if (store.order && store.order.length) params.filter.order = [...store.order];
         else delete params.filter.order;
 
-        store.currentFilter = JSON.parse(JSON.stringify(params));
-        delete store.currentFilter.filter.include;
-        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
-
-        let exprFilter;
-        if (store?.exprBuilder) {
-            exprFilter = buildFilter(params, (param, value) => {
-                if (param == 'filter') return;
-                const res = store.exprBuilder(param, value);
-                if (res) delete params[param];
-                return res;
-            });
-        }
-
-        if (params.filter.where || exprFilter)
-            params.filter.where = { ...params.filter.where, ...exprFilter };
         params.filter = JSON.stringify(params.filter);
-
+        store.currentFilter = params;
         store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,