@cloudbase/weda-ui 3.17.7 → 3.18.0

package/dist/web/components/wd-table/components/FilterFieldsPanel/filterFieldsGenerate.js

@@ -1,3 +1,7 @@
+/* eslint-disable complexity */
+const NEW_SINGLE_RELATION_FORMATS = ['many-one', 'one-one', 'one-one-r'];
+const NEW_MULTIPLE_RELATION_FORMATS = ['many-many', 'one-many'];
+export const NEW_RELATION_FORMATS = ['many-one', 'one-one', 'one-one-r', 'many-many', 'one-many'];
 // 计算方式
 export const fieldCalculations = {
     number: [
@@ -13,10 +17,10 @@ export const fieldCalculations = {
     ],
     string: [
         { text: '包含', value: 'search_ci' },
-        { text: '不包含', value: 'exclude' },
+        { text: '不包含', value: 'nsearch_ci' },
         { text: '等于', value: 'eq' },
         { text: '不等于', value: 'neq' },
-        { text: '开头是', value: 'startWith' },
+        { text: '开头是', value: 'regex' },
         // { text: '为空', value: '$empty' },
         // { text: '不为空', value: '$nempty' },
     ],
@@ -39,6 +43,12 @@ export const fieldCalculations = {
  * 2、生成配置
  * 3、枚举/数字需要特殊处理(即format,用于处理查询数据转换)
  * { filterType: 'datetime' | 'date' | 'time' | 'string' |'number' | 'x-enumObj' , isRange: boolean }
+ *
+ *
+ * field?.type === 'array' && field?.format === ''  非关联关系 数组类型  不支持搜索
+ * field?.type === 'object' && field?.format === '' 非关联关系 对象类型  不支持搜索
+ * field?.name === '_departmentList' && field?.format === '' 所属部门 系统字段 不支持搜索
+ * ['x-markdown', 'x-location', 'x-music', 'x-json', 'x-video', 'x-file', 'x-image', 'x-rtf', 'function'] 不支持搜索
  */
 export const filterFieldsGenerate = (fields) => {
     var _a;
@@ -47,15 +57,14 @@ export const filterFieldsGenerate = (fields) => {
         if (!field)
             return false;
         if (((field === null || field === void 0 ? void 0 : field.type) === 'array' && (field === null || field === void 0 ? void 0 : field.format) === '') ||
-            ((field === null || field === void 0 ? void 0 : field.format) === 'father-son' && (field === null || field === void 0 ? void 0 : field.default) === '') ||
-            (field === null || field === void 0 ? void 0 : field.type) === 'object' ||
-            (field === null || field === void 0 ? void 0 : field.format) === 'x-file' ||
-            (field === null || field === void 0 ? void 0 : field.format) === 'x-image' ||
-            (field === null || field === void 0 ? void 0 : field.format) === 'x-rtf')
+            ((field === null || field === void 0 ? void 0 : field.type) === 'object' && (field === null || field === void 0 ? void 0 : field.format) === '') ||
+            ((field === null || field === void 0 ? void 0 : field.name) === '_departmentList' && (field === null || field === void 0 ? void 0 : field.format) === '') ||
+            ['x-markdown', 'x-location', 'x-music', 'x-json', 'x-video', 'x-file', 'x-image', 'x-rtf', 'function'].includes(field === null || field === void 0 ? void 0 : field.format)) {
             return false;
+        }
         return true;
     })) === null || _a === void 0 ? void 0 : _a.map((i) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // 生成计算方式
         const fieldCalculation = ['string', 'number'].includes(i.type)
             ? { type: i.type, value: fieldCalculations[i.type][0].value }
@@ -72,13 +81,17 @@ export const filterFieldsGenerate = (fields) => {
         };
         if (i.type === 'number' && ['time', 'date', 'datetime'].includes(i.format)) {
             filterFieldItemConfig.filterType = i.format;
+            if ('time' === i.format) {
+                filterFieldItemConfig.fieldCalculation.value = 'eq';
+                filterFieldItemConfig.isRange = false;
+            }
         }
         if (i.type === 'boolean') {
             filterFieldItemConfig.filterType = i.type;
             filterFieldItemConfig.options = [
-                { value: true, text: '是' },
-                { value: false, text: '否' },
-                { value: null, text: '空' },
+                { value: true, text: '是', label: '是' },
+                { value: false, text: '否', label: '否' },
+                { value: null, text: '空', label: '空' },
             ];
             filterFieldItemConfig.fieldCalculation.type = 'checkbox';
             filterFieldItemConfig.fieldCalculation.value = 'in';
@@ -88,8 +101,9 @@ export const filterFieldsGenerate = (fields) => {
             filterFieldItemConfig.options = i['x-enumObj'].map((enumItem) => ({
                 value: enumItem === null || enumItem === void 0 ? void 0 : enumItem.value,
                 text: enumItem === null || enumItem === void 0 ? void 0 : enumItem.label,
+                label: enumItem === null || enumItem === void 0 ? void 0 : enumItem.label,
             }));
-            filterFieldItemConfig.options.push({ value: null, text: '空' });
+            filterFieldItemConfig.options.push({ value: null, text: '空', label: '空' });
         }
         if (i.format === 'x-enum') {
             filterFieldItemConfig.fieldCalculation.value = 'eq';
@@ -99,17 +113,33 @@ export const filterFieldsGenerate = (fields) => {
             filterFieldItemConfig.fieldCalculation.type = filterFieldItemConfig.xMultiSelect ? 'checkbox' : 'radio';
             filterFieldItemConfig.fieldCalculation.value = filterFieldItemConfig.xMultiSelect ? 'in' : 'eq';
         }
-        if (i.format === 'father-son' || i.format === 'related') {
+        if (NEW_SINGLE_RELATION_FORMATS.includes(i.format) || i.format === 'father-son' || i.format === 'related') {
             filterFieldItemConfig.filterType = i.format;
             filterFieldItemConfig.childDbName = (_b = i['x-parent']) === null || _b === void 0 ? void 0 : _b.parentDataSourceName;
+            filterFieldItemConfig.primaryColumn = (_d = (_c = i === null || i === void 0 ? void 0 : i.parentDatasource) === null || _c === void 0 ? void 0 : _c.schema) === null || _d === void 0 ? void 0 : _d['x-primary-column'];
             filterFieldItemConfig.fieldCalculation.type = 'radio';
             filterFieldItemConfig.fieldCalculation.value = 'eq';
         }
+        if (NEW_MULTIPLE_RELATION_FORMATS.includes(i.format)) {
+            filterFieldItemConfig.filterType = i.format;
+            filterFieldItemConfig.childDbName = (_e = i['x-parent']) === null || _e === void 0 ? void 0 : _e.parentDataSourceName;
+            filterFieldItemConfig.primaryColumn = (_g = (_f = i === null || i === void 0 ? void 0 : i.parentDatasource) === null || _f === void 0 ? void 0 : _f.schema) === null || _g === void 0 ? void 0 : _g['x-primary-column'];
+            filterFieldItemConfig.fieldCalculation.type = 'checkbox';
+            filterFieldItemConfig.fieldCalculation.value = 'in';
+        }
+        if (i.format === 'x-area-code') {
+            filterFieldItemConfig.filterType = i.format;
+            filterFieldItemConfig.regionType = i['x-area-code-type'];
+            filterFieldItemConfig.fieldCalculation.type = 'string';
+            filterFieldItemConfig.fieldCalculation.value = 'search_ci';
+        }
         const fieldCalculationOption = fieldCalculations[filterFieldItemConfig.fieldCalculation.type];
         filterFieldItemConfig.fieldCalculationOption = fieldCalculationOption;
         // 用户自定义配置
         if (i === null || i === void 0 ? void 0 : i.filterConfig) {
-            filterFieldItemConfig.value = ((_c = i.filterConfig) === null || _c === void 0 ? void 0 : _c.value) || '';
+            // 配置关联关系展示其他字段，仅对关联关系筛选器有效
+            filterFieldItemConfig.primaryColumn = ((_h = i.filterConfig) === null || _h === void 0 ? void 0 : _h.relationFieldName) || filterFieldItemConfig.primaryColumn;
+            filterFieldItemConfig.value = (_k = (_j = i.filterConfig) === null || _j === void 0 ? void 0 : _j.value) !== null && _k !== void 0 ? _k : undefined;
             // 默认计算方式
             const customFieldCalculation = fieldCalculationOption === null || fieldCalculationOption === void 0 ? void 0 : fieldCalculationOption.find((option) => { var _a; return option.value === ((_a = i.filterConfig) === null || _a === void 0 ? void 0 : _a.filterType); });
             filterFieldItemConfig.fieldCalculation = customFieldCalculation || filterFieldItemConfig.fieldCalculation;

package/dist/web/components/wd-table/components/FilterFieldsPanel/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useEffect, forwardRef } from 'react';
 import { Row, Col, ConfigProvider, Drawer } from 'tea-component';
-import { formatDateToNumber, dateCalculation } from '../../../../utils/date';
+import { dateCalculation } from '../../../../utils/date';
 import isObjectEqual from '../../../../utils/isObjectEqual';
 import { useConfig } from '../../../../utils/config-context';
 import { FilterFieldItem } from './FilterFieldItem';
@@ -18,7 +18,7 @@ const getFilterConfig = (data) => data.map(({ name, label, value, fieldCalculati
 }));
 // 筛选表单
 export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
-    const { filterFields, fetchData, openMobileFilter, setOpenMobileFilter, setFilterConfig } = props;
+    const { filterFields, fetchData, openMobileFilter, setOpenMobileFilter, setFilterConfig, supportManyRelated } = props;
     const num = 2;
     const maxlength = 3;
     const { classPrefix } = useConfig();
@@ -58,7 +58,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                 // 若筛选字段为number类型，且为范围选择时，只要有一个值则返回
                 return i.value[0] || i.value[1];
             }
-            return !!(i.value && i.value.length);
+            return i.value !== null && i.value !== undefined && i.value !== '';
         });
         // 为空不为空筛选条件
         searchData.forEach((i) => {
@@ -107,14 +107,14 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                     else {
                         searchValues.push({
                             key: i.name,
-                            val: formatDateToNumber(i.filterType, i.value[0]),
+                            val: i.value[0],
                             rel: 'gte',
                         });
                         searchValues.push({
                             key: i.name,
                             // @ts-ignore 兼容字符串和数字
                             // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-                            val: formatDateToNumber(i.filterType, i.value[1]) + 999,
+                            val: i.value[1] + 999,
                             rel: 'lte',
                         });
                     }
@@ -140,7 +140,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                         searchValues.push(searchItem);
                     }
                     else if (['date', 'datetime', 'time'].includes(i.filterType)) {
-                        searchItem.val = formatDateToNumber(i.filterType, i.value);
+                        searchItem.val = i.value;
                         dateCalculation(searchItem, i.filterType).forEach((i) => {
                             searchValues.push(i);
                         });
@@ -151,6 +151,11 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                 }
             }
         });
+        searchValues = searchValues.map((i) => {
+            var _a;
+            const format = (_a = filterValues.find((j) => j.name === i.key)) === null || _a === void 0 ? void 0 : _a.filterType;
+            return { ...i, format };
+        });
         fetchData(searchValues);
     };
     const onFormSubmit = (e) => {
@@ -170,7 +175,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
     useSetWidgetApi(() => ({ resetFilter }), [initFilterData], ref);
     return (_jsxs(ConfigProvider, { classPrefix: "wedatea2td", children: [_jsx(Drawer, { className: `${classPrefix}-table-mobile-filter-drawer ${classPrefix}-table-wrap-filter ${classPrefix}-h5-table-wrap-filter`, title: "\u7B5B\u9009\u5668", visible: isH5 && openMobileFilter, onClose: () => {
                     setOpenMobileFilter(false);
-                }, children: _jsxs("div", { children: [_jsx("div", { className: `${classPrefix}-table-wrap-filter__body`, children: filterData === null || filterData === void 0 ? void 0 : filterData.map((i) => (_jsx(FilterFieldItem, { ...i, updateFilterData: updateFilterData, fields: filterFields }, i.id))) }), _jsx("div", { className: `${classPrefix}-table-wrap-filter__footer`, children: _jsxs("div", { className: `${classPrefix}-table-wrap-filter__btn`, children: [_jsx("div", { className: `${classPrefix}-table-wrap-filter__btn-item`, children: _jsx(WdButton, { theme: "primary", variant: "outline", size: "lg", text: "\u91CD\u7F6E", events: {
+                }, children: _jsxs("div", { children: [_jsx("div", { className: `${classPrefix}-table-wrap-filter__body`, children: filterData === null || filterData === void 0 ? void 0 : filterData.map((i) => (_jsx(FilterFieldItem, { ...i, updateFilterData: updateFilterData, fields: filterFields, supportManyRelated: supportManyRelated }, i.id))) }), _jsx("div", { className: `${classPrefix}-table-wrap-filter__footer`, children: _jsxs("div", { className: `${classPrefix}-table-wrap-filter__btn`, children: [_jsx("div", { className: `${classPrefix}-table-wrap-filter__btn-item`, children: _jsx(WdButton, { theme: "primary", variant: "outline", size: "lg", text: "\u91CD\u7F6E", events: {
                                                 tap: resetFilter,
                                             } }) }), _jsx("div", { className: `${classPrefix}-table-wrap-filter__btn-item`, children: _jsx(WdButton, { theme: "primary", size: "lg", text: "\u786E\u5B9A", events: {
                                                 tap: () => {
@@ -179,7 +184,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                                                 },
                                             } }) })] }) })] }) }), !isH5 && !!filterData.length && (_jsx("form", { className: `${classPrefix}-table-wrap-filter`, onSubmit: onFormSubmit, children: _jsxs(Row, { gap: 20, verticalAlign: 'bottom', style: { justifyContent: 'space-between' }, children: [_jsx(_Fragment, { children: filterData === null || filterData === void 0 ? void 0 : filterData.map((i, index) => (_jsx(Col, { span: 6, style: {
                                     display: `${index > num && collapse ? 'none' : 'block'}`,
-                                }, children: _jsx(FilterFieldItem, { ...i, updateFilterData: updateFilterData, fields: filterFields }) }, i.id))) }), _jsx(Col, { span: 24, style: { flex: '1', textAlign: 'right' }, children: _jsxs("div", { className: `${classPrefix}-space`, children: [_jsx("div", { className: `${classPrefix}-space-item`, children: _jsx(WdButton, { size: "md", theme: "secondary", text: "\u91CD\u7F6E", events: {
+                                }, children: _jsx(FilterFieldItem, { ...i, updateFilterData: updateFilterData, fields: filterFields, supportManyRelated: supportManyRelated }) }, i.id))) }), _jsx(Col, { span: 24, style: { flex: '1', textAlign: 'right' }, children: _jsxs("div", { className: `${classPrefix}-space`, children: [_jsx("div", { className: `${classPrefix}-space-item`, children: _jsx(WdButton, { size: "md", theme: "secondary", text: "\u91CD\u7F6E", events: {
                                                 tap: resetFilter,
                                             } }) }), _jsxs("div", { className: `${classPrefix}-space-item`, children: [_jsx("input", { type: "submit", style: { display: 'none' } }), _jsx(WdButton, { size: "md", theme: "primary", text: "\u67E5\u8BE2", events: {
                                                     tap: () => {

package/dist/web/components/wd-table/utils/index.d.ts

@@ -2,6 +2,24 @@ export declare const getSlots: (props: any) => {
     globalButton?: any;
 };
 export declare const whereList: (whereProxy: any) => any[];
+export declare const getFilter: ({ wList, searchValues, searchConfig, conditionConfig, relatedSearchValues }: {
+    wList: any;
+    searchValues: any;
+    searchConfig?: any[];
+    conditionConfig?: any[];
+    relatedSearchValues: any;
+}) => {
+    where: {};
+    relateWhere: {};
+};
+export declare const getSearchValues: (searchValues?: any[]) => {
+    commonSearchValue: {
+        [x: number]: {
+            [x: string]: any;
+        };
+    }[];
+    relatedSearchValues: any;
+};
 export declare const getQueryParams: ({ queryParams, wList, viewFieldsData, connectorParams, isModel, isViewTable, authFields, supportManyRelated, columns, selectFieldType, selectFields, isSupportMultipleSort, }: any) => {
     pageNo: number;
     pageSize: number;

package/dist/web/components/wd-table/utils/index.js

@@ -3,6 +3,7 @@ import { TABLE_SLOT_PREFIX, GLOBAL_BUTTON, REL_DICT } from '../../../utils/const
 import { callWedaApi, appCloudGetWedaUserId, getIsExitApi } from '../../../utils/tcb';
 import { isObj, deepClone } from '../../../utils/tool';
 import { errorHandler } from '../../../utils/error';
+import { NEW_RELATION_FORMATS } from '../components/FilterFieldsPanel/filterFieldsGenerate';
 // 新接口没有返回关联表的主列字段，从旧接口中查询出来
 const getPrimaryColumn = (fields, dataViewPropertiesList, selectedView) => {
     var _a, _b;
@@ -63,7 +64,7 @@ export const whereList = (whereProxy) => {
                             val = `^${val}`;
                         }
                         if ('_exclude' === rel) {
-                            rel = 'nsearch';
+                            rel = 'nsearch_ci';
                         }
                         rule['$' + rel] = val;
                         item2Result[item2 === null || item2 === void 0 ? void 0 : item2.key] = rule;
@@ -124,67 +125,68 @@ const selectParam = (columns, authFields, selectParam) => {
     }
     return select;
 };
+const isObject = (v) => v && typeof v === 'object' && !Array.isArray(v);
 // 拼接filter参数
-const getFilter = (wList, searchValues, SearchConfig, ConditionConfig) => {
+export const getFilter = ({ wList, searchValues, searchConfig = [], conditionConfig = [], relatedSearchValues }) => {
     var _a, _b, _c;
-    let where = [];
-    let filter = { where: {} };
-    if ((_a = wList === null || wList === void 0 ? void 0 : wList.where) === null || _a === void 0 ? void 0 : _a.$or) {
-        const wListWhere = ((_b = wList === null || wList === void 0 ? void 0 : wList.where) === null || _b === void 0 ? void 0 : _b.$or) || [];
-        if ((wList === null || wList === void 0 ? void 0 : wList.constructor) === Object) {
-            where = [...SearchConfig, ...ConditionConfig, ...wListWhere];
-            filter = {
-                ...wList,
-                where: {
-                    $or: where,
-                },
-            };
-        }
-    }
-    else {
-        const wListWhere = ((_c = wList === null || wList === void 0 ? void 0 : wList.where) === null || _c === void 0 ? void 0 : _c.$and) || [];
-        if ((wList === null || wList === void 0 ? void 0 : wList.constructor) === Object) {
-            where = [...SearchConfig, ...ConditionConfig, ...wListWhere];
-            filter = {
-                ...wList,
-                where: {
-                    $and: where,
-                },
-            };
-        }
-    }
+    let filter = { where: {}, relateWhere: {} };
     if (Array.isArray(wList)) {
-        where = [...wList, ...SearchConfig, ...ConditionConfig];
+        // 兼容旧版筛选器传递的数据，没有relateWhere属性
+        filter.where = { $and: [...wList, ...searchConfig, ...conditionConfig] };
+    }
+    else if (isObject(wList)) {
+        const isOr = (_a = wList.where) === null || _a === void 0 ? void 0 : _a.$or;
+        const conditions = [...searchConfig, ...conditionConfig, ...(isOr ? wList.where.$or : ((_b = wList.where) === null || _b === void 0 ? void 0 : _b.$and) || [])];
         filter = {
-            where: {
-                $and: where,
-            },
+            ...filter,
+            ...wList,
+            where: conditions.length
+                ? {
+                    [isOr ? '$or' : '$and']: conditions,
+                }
+                : {},
         };
     }
     if (searchValues === null || searchValues === void 0 ? void 0 : searchValues.length) {
         // 筛选面板的查询条件与数据过滤的查询条件是且的关系
-        filter = {
-            ...filter,
-            where: {
-                $and: [filter.where, { $and: searchValues }],
-            },
+        filter.where = {
+            $and: [filter.where, { $and: searchValues }],
         };
     }
+    if (relatedSearchValues && ((_c = Object.keys(relatedSearchValues)) === null || _c === void 0 ? void 0 : _c.length)) {
+        // 关联模型字段的查询条件与数据过滤的查询条件是且的关系，默认数据筛选的查询条件优先级更高
+        const _relateWhere = deepClone(filter.relateWhere);
+        Object.keys(relatedSearchValues).forEach((key) => {
+            _relateWhere[key] = _relateWhere[key] || { where: { $and: [] } };
+            _relateWhere[key].where.$and = [...(_relateWhere[key].where.$and || []), ...relatedSearchValues[key].where.$and];
+        });
+        filter.relateWhere = _relateWhere;
+    }
     return filter;
 };
 // 拼接筛选条件参数
-const getSearchValues = (searchValues) => {
-    return searchValues.map((item) => {
-        const obj = {};
-        const exp = {};
-        if (item.val !== undefined && item.key !== undefined && item.rel !== undefined) {
-            exp[`$${item.rel}`] = item.val;
-            obj[item.key] = exp;
-        }
-        return {
-            ...obj,
-        };
-    });
+export const getSearchValues = (searchValues = []) => {
+    // 1. 过滤无效条件（空值、缺失关键字段）
+    const isValidValue = (val) => val !== undefined && val !== null && val !== '' && !(Array.isArray(val) && val.length === 0);
+    const searchValuesList = (searchValues === null || searchValues === void 0 ? void 0 : searchValues.filter((item) => item.key && item.rel && isValidValue(item.val))) || [];
+    // 关联字段的特殊处理
+    const relatedSearchValues = searchValuesList
+        .filter((i) => NEW_RELATION_FORMATS.includes(i.format))
+        .reduce((acc, i) => {
+        const foreignKey = i.foreignKey || '_id'; // 默认使用 _id，可配置其他外键
+        const condition = { [foreignKey]: { [`$${i.rel}`]: i.val } };
+        acc[i.key] = acc[i.key] || { where: { $and: [] } };
+        acc[i.key].where.$and.push(condition);
+        return acc;
+    }, {});
+    // 普通字段的直接条件
+    const commonSearchValue = searchValuesList
+        .filter((i) => !NEW_RELATION_FORMATS.includes(i.format))
+        .map((item) => ({ [item.key]: { [`$${item.rel}`]: item.val } }));
+    return {
+        commonSearchValue,
+        relatedSearchValues,
+    };
 };
 const orderByFieldKey = (key, columns) => {
     var _a;
@@ -234,21 +236,27 @@ export const getQueryParams = ({ queryParams, wList, viewFieldsData, connectorPa
         const { orderBy, orderType } = queryParams;
         const { viewList, selectedViewId } = viewFieldsData;
         const viewed = viewList === null || viewList === void 0 ? void 0 : viewList.filter((item) => item.ViewId === selectedViewId)[0];
-        const SearchConfig = (viewed === null || viewed === void 0 ? void 0 : viewed.SearchConfig) || [];
+        const searchConfig = (viewed === null || viewed === void 0 ? void 0 : viewed.SearchConfig) || [];
         const searchValues = (queryParams === null || queryParams === void 0 ? void 0 : queryParams.searchValues) || [];
-        let ConditionConfig;
+        let conditionConfig;
         if (supportManyRelated) {
-            ConditionConfig = (viewed === null || viewed === void 0 ? void 0 : viewed.ConditionConfig) ? [viewed === null || viewed === void 0 ? void 0 : viewed.ConditionConfig] : [];
-            const formatSearchValues = getSearchValues(searchValues);
-            params.filter = getFilter(wList, formatSearchValues, SearchConfig, ConditionConfig);
+            conditionConfig = (viewed === null || viewed === void 0 ? void 0 : viewed.ConditionConfig) ? [viewed === null || viewed === void 0 ? void 0 : viewed.ConditionConfig] : [];
+            const { relatedSearchValues, commonSearchValue } = getSearchValues(searchValues);
+            params.filter = getFilter({
+                wList,
+                searchValues: commonSearchValue,
+                relatedSearchValues,
+                searchConfig,
+                conditionConfig,
+            });
             params.select = selectParam(columns, authFields, {
                 selectFieldType,
                 selectFields,
             });
         }
         else {
-            ConditionConfig = (viewed === null || viewed === void 0 ? void 0 : viewed.ConditionConfig) || {};
-            params.where = [...searchValues, ...wList, ...SearchConfig, ConditionConfig];
+            conditionConfig = (viewed === null || viewed === void 0 ? void 0 : viewed.ConditionConfig) || {};
+            params.where = [...searchValues, ...wList, ...searchConfig, conditionConfig];
         }
         // 如果视图里存在排序设置则以视图为主
         if (isViewTable && (viewed === null || viewed === void 0 ? void 0 : viewed.sortItem)) {

package/dist/web/components/wd-table/wd-table.js

@@ -184,7 +184,9 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
         }));
     }
     // 筛选字段
-    const filterFieldsData = getFilterFields(filterFields, fields);
+    const filterFieldsData = useMemo(() => {
+        return getFilterFields(filterFields, fields);
+    }, [fields, filterFields]);
     const [filterConfig, setFilterConfig] = useState(() => {
         return filterFieldsData.map((i) => (i === null || i === void 0 ? void 0 : i.filterConfig) || { name: i.name, label: i.title });
     });
@@ -725,7 +727,7 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
     };
     const errorStatus = isError || fieldsError;
     const errorMsg = isError ? errorObj : fieldsError;
-    return (_jsx(ConfigProvider, { classPrefix: classPrefix, children: _jsx(EnumHoc, { fields: authFields, children: _jsxs("div", { className: classNames(wrapClassList, className), style: style, id: id, children: [hasFilterButton && (_jsx(FilterFieldsPanel, { ref: filterMethodsRef, openMobileFilter: openMobileFilter, setOpenMobileFilter: setOpenMobileFilter, filterFields: filterFieldsData, fetchData: onFilterChange, setFilterConfig: setFilterConfig })), _jsxs("div", { className: `${classPrefix}-table-container`, children: [!isH5 && !isNoDataSourceBind && (_jsxs("div", { className: `${classPrefix}-table-wrap-toolbar`, children: [enableGlobalButton && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-start`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) })), (enableRefreshBtn || enableTableHeightSizeBtn) && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-end`, children: _jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: onRefreshBtnClick, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
+    return (_jsx(ConfigProvider, { classPrefix: classPrefix, children: _jsx(EnumHoc, { fields: authFields, children: _jsxs("div", { className: classNames(wrapClassList, className), style: style, id: id, children: [hasFilterButton && (_jsx(FilterFieldsPanel, { ref: filterMethodsRef, openMobileFilter: openMobileFilter, setOpenMobileFilter: setOpenMobileFilter, filterFields: filterFieldsData, fetchData: onFilterChange, setFilterConfig: setFilterConfig, supportManyRelated: supportManyRelated })), _jsxs("div", { className: `${classPrefix}-table-container`, children: [!isH5 && !isNoDataSourceBind && (_jsxs("div", { className: `${classPrefix}-table-wrap-toolbar`, children: [enableGlobalButton && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-start`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) })), (enableRefreshBtn || enableTableHeightSizeBtn) && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-end`, children: _jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: onRefreshBtnClick, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
                                                 setOpenMobileFilter(true);
                                             }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination }) }))] })), isH5 && (enablePagination || enableRefreshBtn || enableTableHeightSizeBtn || hasFilterButton) && (_jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: onRefreshBtnClick, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
                                     setOpenMobileFilter(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.17.7",
+  "version": "3.18.0",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",

package/dist/web/components/wd-table/hooks/useChooseList.d.ts

@@ -1,16 +0,0 @@
-export declare const getDataBaseInfo: (fields: any, format: any, childDbName: any) => any;
-export declare const mapResult: (records: any, primaryColumn: any) => any;
-export declare const useChooseList: ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value, isInsertSelectedValue, }: {
-    dataSourceAPI: any;
-    queryParams: any;
-    childDbName: any;
-    primaryColumn: any;
-    value: any;
-    isInsertSelectedValue?: boolean;
-}) => {
-    result: any[];
-    total: number;
-    isValidating: boolean;
-    empty: () => void;
-    getRelationOptions: () => Promise<void>;
-};

package/dist/web/components/wd-table/hooks/useChooseList.js

@@ -1,126 +0,0 @@
-import { useState, useEffect, useCallback } from 'react';
-const defaultPage = 1;
-const getUniqueOption = (option) => {
-    var _a;
-    const optionMap = option.reduce((acc, item) => {
-        if (!acc[item.value]) {
-            acc[item.value] = item;
-        }
-        return acc;
-    }, {});
-    const uniqueOption = (_a = Object.values(optionMap)) === null || _a === void 0 ? void 0 : _a.filter((item) => item === null || item === void 0 ? void 0 : item.value);
-    return uniqueOption;
-};
-const getDataBase = (format, fields) => {
-    const filter = fields.filter((item) => (item === null || item === void 0 ? void 0 : item.format) === format);
-    const data = filter === null || filter === void 0 ? void 0 : filter.map((item) => {
-        var _a, _b, _c;
-        const childDbName = (_a = item['x-parent']) === null || _a === void 0 ? void 0 : _a.parentDataSourceName;
-        const primaryColumn = (_c = (_b = item.parentDatasource) === null || _b === void 0 ? void 0 : _b.schema) === null || _c === void 0 ? void 0 : _c['x-primary-column'];
-        const childItem = {
-            childDbName,
-            primaryColumn,
-        };
-        return childItem;
-    });
-    return data;
-};
-export const getDataBaseInfo = (fields, format, childDbName) => {
-    var _a;
-    const FORMAT_FATHER_SON = 'father-son';
-    const FORMAT_RELATED = 'related';
-    const fatherSon = getDataBase(FORMAT_FATHER_SON, fields);
-    const related = getDataBase(FORMAT_RELATED, fields);
-    const dsList = [
-        {
-            format: FORMAT_FATHER_SON,
-            list: fatherSon,
-        },
-        {
-            format: FORMAT_RELATED,
-            list: related,
-        },
-    ];
-    const dataBase = (_a = dsList === null || dsList === void 0 ? void 0 : dsList.find((child) => child.format === format)) === null || _a === void 0 ? void 0 : _a.list.find((item) => item.childDbName === childDbName);
-    return dataBase;
-};
-export const mapResult = (records, primaryColumn) => {
-    var _a;
-    return (_a = records === null || records === void 0 ? void 0 : records.filter((i) => i._id)) === null || _a === void 0 ? void 0 : _a.map((childItem) => ({
-        _id: childItem._id,
-        value: childItem._id,
-        text: childItem[primaryColumn] ? childItem[primaryColumn] : childItem._id,
-        label: childItem[primaryColumn] ? childItem[primaryColumn] : childItem._id,
-        extra: childItem,
-    }));
-};
-export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value, isInsertSelectedValue = true, }) => {
-    const [option, setOption] = useState([]);
-    const [total, setTotal] = useState(0);
-    const [loading, setLoading] = useState(true);
-    const unshiftVal = (transformedRecords, itemResult, originOption) => {
-        if (itemResult &&
-            transformedRecords.findIndex((item) => item._id === itemResult._id) < 0 &&
-            originOption.findIndex((item) => item._id === itemResult._id) < 0) {
-            return [itemResult, ...transformedRecords];
-        }
-        return transformedRecords;
-    };
-    const fetchData = useCallback(async () => {
-        setLoading(true);
-        const isMultiple = Array.isArray(value);
-        const promiseList = [
-            dataSourceAPI.getRecordList(queryParams, {
-                db: childDbName,
-            }),
-        ];
-        if (value && isInsertSelectedValue) {
-            if (isMultiple) {
-                value.forEach((i) => {
-                    if (i) {
-                        promiseList.push(dataSourceAPI.getRecord(i, {
-                            db: childDbName,
-                        }));
-                    }
-                });
-            }
-            else {
-                promiseList.push(dataSourceAPI.getRecord(value, {
-                    db: childDbName,
-                }));
-            }
-        }
-        const [result, ...rest] = await Promise.all(promiseList);
-        let transformedRecords = [...((result === null || result === void 0 ? void 0 : result.records) || [])];
-        const itemResult = [...rest];
-        // 若下拉列表中无选中值，则将选中值插到数组头部
-        if ((isMultiple && (value === null || value === void 0 ? void 0 : value.length) && isInsertSelectedValue) || (value && isInsertSelectedValue)) {
-            itemResult.forEach((i) => {
-                transformedRecords = unshiftVal(transformedRecords, i, option);
-            });
-        }
-        let optionRes = mapResult(transformedRecords, primaryColumn);
-        if ((queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageNo) > defaultPage) {
-            optionRes = [...option, ...optionRes];
-        }
-        optionRes = getUniqueOption(optionRes);
-        setOption(optionRes);
-        setTotal(result === null || result === void 0 ? void 0 : result.total);
-        setLoading(false);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [childDbName, primaryColumn, queryParams, value]);
-    useEffect(() => {
-        if (childDbName) {
-            fetchData();
-        }
-    }, [childDbName, fetchData]);
-    return {
-        result: option || [],
-        total: total,
-        isValidating: loading,
-        empty: () => {
-            setOption([]);
-        },
-        getRelationOptions: fetchData,
-    };
-};