advanced conditions enhance scalability

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

@@ -96,9 +96,16 @@
       type: Boolean,
       default: false,
     },
+    allowDuplicateFieldSearch: {
+      type: Boolean,
+      default: true,
+    },
     defineFieldApi: {
       type: Function as PropType<() => Promise<any>>
     },
+    defineFieldReplace: {
+      type: Function as PropType<(response: any) => DefineParamter[]>,
+    },
     listField: {
       type: String,
     }
@@ -202,14 +209,15 @@
   ]);
 
   const getAvailableParams = computed(() => {
-    // 如果每个字段只允许出现一次则取消注释
+    const { allowDuplicateFieldSearch } = props;
-    // const defineParams = unref(defineParamsRef);
+    if (allowDuplicateFieldSearch) {
-    // if (!defineParams.length) return[];
+      // 允许字段出现多次, 直接返回原数据
-    // return defineParams.filter(dp => !formMdel.paramters.some(fp => fp.field === dp.name));
+      return defineParamsRef.value;
-
+    }
-    // 允许字段出现多次,用于区间查询
+    // 每个字段只允许出现一次，已选择字段不再出现在可选列表
     const defineParams = unref(defineParamsRef);
-    return defineParams;
+    if (!defineParams.length) return[];
+    return defineParams.filter(dp => !formMdel.paramters.some(fp => fp.field === dp.name));
   });
 
   onMounted(fetch);
@@ -217,13 +225,18 @@
   const [registerModal, { closeModal }] = useModalInner();
 
   function fetch() {
-    const { useAdvancedSearch, defineFieldApi, listField } = props;
+    const { useAdvancedSearch, defineFieldApi, defineFieldReplace, listField } = props;
     if (!useAdvancedSearch) return;
     if (!defineFieldApi || !isFunction(defineFieldApi)) return;
     setLoading(true);
     defineFieldApi().then((res) => {
-      const isArrayResult = Array.isArray(res);
+      let resultItems: DefineParamter[] = [];
-      const resultItems: DefineParamter[] = isArrayResult ? res : get(res, listField || 'items');
+      if (defineFieldReplace && isFunction(defineFieldReplace)) {
+        resultItems = defineFieldReplace(res);
+      } else {
+        const isArrayResult = Array.isArray(res);
+        resultItems = isArrayResult ? res : get(res, listField || 'items');
+      }
       defineParamsRef.value = resultItems;
     }).finally(() => {
       setLoading(false);

apps/vue/src/components/Table/src/types/advancedSearch.ts

@@ -2,8 +2,15 @@
 export interface AdvanceSearchProps {
   /** 使用高级查询 */
   useAdvancedSearch?: boolean;
+  /** 允许字段重复搜索 */
+  allowDuplicateFieldSearch?: boolean;
   /** 字段列表api */
   defineFieldApi?: () => Promise<any>;
+  /**
+   * 自定义字段列表
+   * @remarks 从服务器返回字段列表后自定义过滤函数,返回字段列表
+   */
+  defineFieldReplace?: (response: any) => DefineParamter[];
   /**
    * 字段列表api返回结果字段
    * @remarks 从服务器返回字段列表在数据结构中的字段名,默认: items