@cloudbase/weda-ui 3.17.7 → 3.18.0

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

@@ -111,11 +111,11 @@ export const WdInput = forwardRef(function WdInput(props, ref) {
         }
     };
     const onFocus = (e) => {
-        events.focus({ value: converValueFixWrap(e.target.value) }, { originEvent: e });
+        (events === null || events === void 0 ? void 0 : events.focus) && events.focus({ value: converValueFixWrap(e.target.value) }, { originEvent: e });
         setFocus(true);
     };
     const onBlur = (e) => {
-        events.blur({ value: converValueFixWrap(e.target.value) }, { originEvent: e });
+        (events === null || events === void 0 ? void 0 : events.blur) && events.blur({ value: converValueFixWrap(e.target.value) }, { originEvent: e });
         setFocus(false);
     };
     const handleZhStart = () => {

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

@@ -25,8 +25,8 @@ export const mapResult = (records, primaryColumn) => {
 export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value, isInsertSelectedValue = true, }) => {
     const [total, setTotal] = useState(0);
     const [loading, setLoading] = useState(true);
-    const { options, setOptions } = useSelectContext();
-    const unshiftVal = (transformedRecords, itemResult, originOption) => {
+    const { options = [], setOptions } = useSelectContext();
+    const unshiftVal = (transformedRecords, itemResult, originOption = []) => {
         if (itemResult &&
             transformedRecords.findIndex((item) => item._id === itemResult._id) < 0 &&
             originOption.findIndex((item) => item._id === itemResult._id) < 0) {
@@ -72,7 +72,9 @@ export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primary
             optionRes = [...options, ...optionRes];
         }
         optionRes = getUniqueOption(optionRes);
-        setOptions(optionRes);
+        if (typeof setOptions === 'function') {
+            setOptions(optionRes);
+        }
         setTotal(result === null || result === void 0 ? void 0 : result.total);
         setLoading(false);
         // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/web/components/wd-select/relationSelect/index.js

@@ -1,17 +1,12 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useState } from 'react';
 import { LoadingTip } from 'tea-component';
 import { EnumSelect } from './enumSelect';
 import { RelationSelect } from './relationSelect';
-import { WdIcon } from '../../wd-icon';
 export function CustomSelect(props) {
-    const { format, addRelationButtonText, enableAddRelationButton, events } = props;
+    const { format, addRelationButton } = props;
     const isEnumType = format === 'x-enum';
     const [refreshStatus, setRefreshStatus] = useState(false);
-    const addRelationButton = enableAddRelationButton && (_jsxs("span", { className: "wd-add-relation-button-wrap", onClick: () => {
-            var _a;
-            (_a = events === null || events === void 0 ? void 0 : events.onAddRelationButtonClick) === null || _a === void 0 ? void 0 : _a.call(events);
-        }, children: [_jsx(WdIcon, { size: 'xs', name: 'td:add-circle' }), addRelationButtonText] }));
     if (refreshStatus) {
         return _jsx(LoadingTip, {});
     }

package/dist/web/components/wd-select/relationSelect/relationSelect.js

@@ -52,7 +52,9 @@ const defaultSize = 50;
 const defaultPage = 1;
 export function RelationSelect(props) {
     var _a, _b;
-    const { placeholder, size, disabled, onChange, value, onSearch, addRelationButton, childRef, dataSourceName, selectFields, selectFieldType, primaryField, setRefreshStatus, mode, onRelationOptionJump, enableRelationOptionJump, listWidth = 700, ignoreCase = true, where, queryCondition, supportManyRelated, sorter, searchable, } = props;
+    const { placeholder, size, disabled, onChange, value, onSearch, childRef, dataSourceName, selectFields, selectFieldType, primaryField, setRefreshStatus, mode, onRelationOptionJump, enableRelationOptionJump, listWidth = 700, ignoreCase = true, where, queryCondition, supportManyRelated, sorter, searchable, selectFieldLabel, } = props;
+    // 选项名称 (默认是主列字段，支持自定义指定)
+    const showLabel = selectFieldLabel || primaryField;
     const selectFieldsLength = selectFieldType === 'custom' ? selectFields === null || selectFields === void 0 ? void 0 : selectFields.length : 0;
     // 设置下拉列表与下拉按钮同宽
     // 以传入为准，未传入，在自定义展示字段少于2个时设置为 true，否则设置为false，宽度设置为700，
@@ -90,7 +92,7 @@ export function RelationSelect(props) {
         dataSourceAPI,
         childDbName: dataSourceName,
         queryParams: query,
-        primaryColumn: primaryField,
+        primaryColumn: showLabel,
         value,
     });
     const [isLoading, setIsLoading] = useSyncValue(isValidating, isObjectEqual);
@@ -144,7 +146,7 @@ export function RelationSelect(props) {
             filter = {
                 ...filter,
                 where: {
-                    $and: [filter.where, { $and: [{ [primaryField]: { [`${search}`]: keyword } }] }],
+                    $and: [filter.where, { $and: [{ [showLabel]: { [`${search}`]: keyword } }] }],
                 },
             };
         }
@@ -161,5 +163,5 @@ export function RelationSelect(props) {
         }, onOpen: () => {
             setIsLoading(true);
             searchOptionListWithWhere();
-        }, footer: addRelationButton, mode: mode }));
+        }, mode: mode }));
 }

package/dist/web/components/wd-select/select/index.js

@@ -1,9 +1,15 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { ConfigProvider } from 'tea-component';
 import { CustomSelect } from '../relationSelect/index';
 import { SelectUI as Select } from './selectUI';
+import { WdIcon } from '../../wd-icon';
 export function SelectCom(props) {
-    const { isRelation, filterable = false } = props;
+    const { isRelation, filterable = false, enableAddRelationButton, events, addRelationButtonText } = props;
     const filter = filterable ? () => true : undefined;
-    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: isRelation ? _jsx(CustomSelect, { ...props }) : _jsx(Select, { ...props, filter: filter }) }));
+    const onClick = () => {
+        var _a;
+        (_a = events === null || events === void 0 ? void 0 : events.onAddRelationButtonClick) === null || _a === void 0 ? void 0 : _a.call(events);
+    };
+    const addRelationButton = enableAddRelationButton ? (_jsxs("span", { className: "wd-add-relation-button-wrap", onClick: onClick, children: [_jsx(WdIcon, { size: 'xs', name: 'td:add-circle' }), addRelationButtonText] })) : null;
+    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: isRelation ? (_jsx(CustomSelect, { ...props, footer: addRelationButton })) : (_jsx(Select, { ...props, filter: filter, footer: addRelationButton })) }));
 }

package/dist/web/components/wd-select/select/selectUI.js

@@ -72,7 +72,7 @@ function SelectH5(props) {
                         setInputFocus(true);
                     }, children: [inputFocus ? (_jsx("input", { className: `${classPrefix}-input`, ref: focusRef, value: searchValue, autoFocus: true, onChange: handleSearch, onCompositionStart: handleZhStart, onCompositionEnd: handleZhEnd, placeholder: searchPlaceholder })) : (
                         // 此处主要为了兼容 iOS
-                        _jsx("div", { className: `${classPrefix}-input` })), _jsxs("div", { className: `${classPrefix}-custom-search-box__label`, children: [_jsx("span", { className: `${classPrefix}-custom-search-box__search-icon` }), _jsx("span", { className: `${classPrefix}-custom-search-box__search-placeholder`, children: searchPlaceholder })] }), inputFocus && searchValue !== '' && (_jsx("span", { className: `${classPrefix}-custom-search-box__dismiss-icon`, onClick: () => {
+                        _jsx("div", { className: `${classPrefix}-input` })), _jsxs("div", { className: `${classPrefix}-custom-search-box__label`, children: [_jsx("span", { className: `${classPrefix}-custom-search-box__search-icon` }), _jsx("span", { className: `${classPrefix}-custom-search-box__search-placeholder`, children: searchValue || searchPlaceholder })] }), inputFocus && searchValue !== '' && (_jsx("span", { className: `${classPrefix}-custom-search-box__dismiss-icon`, onClick: () => {
                                 getInitOptions();
                             } }))] }), _jsx("button", { className: `${classPrefix}-custom-search__btn-cancle`, onClick: () => {
                         setInputFocus(false);

package/dist/web/components/wd-select/style.d.ts

@@ -1,4 +1,2 @@
-import '../form/select/dropdown-select/index.css';
-import '../form/select/allTimePicker/index.css';
 import '../style';
 import './wd-select.css';

package/dist/web/components/wd-select/style.js

@@ -1,4 +1,4 @@
-import '../form/select/dropdown-select/index.css';
-import '../form/select/allTimePicker/index.css';
+// import '../form/select/dropdown-select/index.css';
+// import '../form/select/allTimePicker/index.css';
 import '../style';
 import './wd-select.css';

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

@@ -20,7 +20,7 @@ import { SelectProvider } from './contexts/selectContext';
  */
 export const WdSelect = forwardRef(function WsSelect(props, ref) {
     const { classRoot = 'select', clearable = X_RUNTIME_DEFAULT.clearable, placeholder, range, format, tipBlock = X_RUNTIME_DEFAULT.tipBlock, where = X_RUNTIME_DEFAULT.where, enumName, primaryField, viewId, dataSourceName, events = emptyObject, ignoreCase = X_RUNTIME_DEFAULT.ignoreCase, staticSearchable = X_RUNTIME_DEFAULT.staticSearchable, enableRelationalSetting = X_RUNTIME_DEFAULT.enableRelationalSetting, enableRelationalRefresh = X_RUNTIME_DEFAULT.enableRelationalRefresh, addRelationButtonText = X_RUNTIME_DEFAULT.addRelationButtonText, enableAddRelationButton = X_RUNTIME_DEFAULT.enableAddRelationButton, enableRelationOptionJump = X_RUNTIME_DEFAULT.enableRelationOptionJump, popupContainer, selectFields: customFields = [], // 自定义展示字段
-    selectFieldType = 'primary', searchPlaceholder, searchable = X_RUNTIME_DEFAULT.searchable, filterable = X_RUNTIME_DEFAULT.filterable, } = props;
+    selectFieldType = 'primary', searchPlaceholder, searchable = X_RUNTIME_DEFAULT.searchable, filterable = X_RUNTIME_DEFAULT.filterable, selectFieldLabel, } = props;
     const childRef = useRef(null);
     const [options, setOptions] = useSyncValue(range, isObjectEqual);
     const [innerHandle, setInnerHandle] = useState({});
@@ -85,11 +85,8 @@ export const WdSelect = forwardRef(function WsSelect(props, ref) {
         ...clearProps,
     };
     const selectFields = React.useMemo(() => {
-        if (['father-son', 'related'].includes(format)) {
-            return [];
-        }
-        return [primaryField];
-    }, [format, primaryField]);
+        return [selectFieldLabel || primaryField];
+    }, [primaryField, selectFieldLabel]);
     useSetWidgetApi(() => ({
         ...innerHandle,
         selectedLabel,
@@ -117,5 +114,5 @@ export const WdSelect = forwardRef(function WsSelect(props, ref) {
                                 }, enableRelationOptionJump: enableRelationOptionJump, onRelationOptionJump: (item) => {
                                     var _a;
                                     (_a = delayEvents === null || delayEvents === void 0 ? void 0 : delayEvents.onRelationOptionJump) === null || _a === void 0 ? void 0 : _a.call(delayEvents, item);
-                                }, selectFieldType: selectFieldType, selectFields: customFields, isRelation: isRelation, addRelationButtonText: addRelationButtonText, enableAddRelationButton: enableAddRelationButton, childRef: childRef, events: delayEvents, labelVisible: false, value: value, enumName: enumName, format: format, placeholder: placeholder, primaryField: primaryField, options: options, size: "full", tipBlock: tipBlock, viewId: viewId, where: where, dataSourceName: dataSourceName, readOnly: readOnly, disabled: disabled, mode: "selector", decorator: null, ignoreCase: ignoreCase, staticSearchable: staticSearchable, onChange: handleChange, onSearch: onSearchValueInput, popupContainer: popupContainer, searchable: searchable, searchPlaceholder: searchPlaceholder }) }) }), layout === 'horizontal' && LabelAdornment] }) }) }));
+                                }, selectFieldType: selectFieldType, selectFields: customFields, isRelation: isRelation, addRelationButtonText: addRelationButtonText, enableAddRelationButton: enableAddRelationButton, childRef: childRef, events: delayEvents, labelVisible: false, value: value, enumName: enumName, format: format, placeholder: placeholder, primaryField: primaryField, selectFieldLabel: selectFieldLabel, options: options, size: "full", tipBlock: tipBlock, viewId: viewId, where: where, dataSourceName: dataSourceName, readOnly: readOnly, disabled: disabled, mode: "selector", decorator: null, ignoreCase: ignoreCase, staticSearchable: staticSearchable, onChange: handleChange, onSearch: onSearchValueInput, popupContainer: popupContainer, searchable: searchable, searchPlaceholder: searchPlaceholder }) }) }), layout === 'horizontal' && LabelAdornment] }) }) }));
 });

package/dist/web/components/wd-select-multiple/wd-select-multiple.js

@@ -21,7 +21,7 @@ import { SelectProvider } from '../wd-select/contexts/selectContext';
  */
 export const WdSelectMultiple = forwardRef(function WdSelectMultiple(props, ref) {
     const { classRoot = 'select-multiple', clearable = X_RUNTIME_DEFAULT.clearable, placeholder, range, enumName, format, primaryField, tipBlock = X_RUNTIME_DEFAULT.tipBlock, viewId, dataSourceName, events = emptyObject, ignoreCase = X_RUNTIME_DEFAULT.ignoreCase, staticSearchable = X_RUNTIME_DEFAULT.staticSearchable, where = X_RUNTIME_DEFAULT.where, enableRelationalSetting = X_RUNTIME_DEFAULT.enableRelationalSetting, enableRelationalRefresh = X_RUNTIME_DEFAULT.enableRelationalRefresh, addRelationButtonText = X_RUNTIME_DEFAULT.addRelationButtonText, enableAddRelationButton = X_RUNTIME_DEFAULT.enableAddRelationButton, enableRelationOptionJump = X_RUNTIME_DEFAULT.enableRelationOptionJump, popupContainer, selectFields: customFields = [], // 自定义展示字段
-    selectFieldType = 'primary', searchPlaceholder, searchable = X_RUNTIME_DEFAULT.searchable, filterable = X_RUNTIME_DEFAULT.filterable, } = props;
+    selectFieldType = 'primary', searchPlaceholder, searchable = X_RUNTIME_DEFAULT.searchable, filterable = X_RUNTIME_DEFAULT.filterable, selectFieldLabel, } = props;
     const childRef = useRef(null);
     const [options, setOptions] = useSyncValue(range, isObjectEqual);
     const [innerHandle, setInnerHandle] = useState({});
@@ -89,10 +89,10 @@ export const WdSelectMultiple = forwardRef(function WdSelectMultiple(props, ref)
     useSetWidgetApi(() => ({
         ...innerHandle,
         selectedLabel,
-        selectFields: [primaryField],
+        selectFields: [selectFieldLabel || primaryField],
         item: selectedItem,
         value,
-    }), [innerHandle, selectedLabel, primaryField, selectedItem, value], ref);
+    }), [innerHandle, selectedLabel, selectFieldLabel, primaryField, selectedItem, value], ref);
     const eventsRef = useSyncedRef(events);
     const debouncedTriggerSearchEvent = useDebouncedCallback((value) => {
         var _a, _b;
@@ -113,5 +113,5 @@ export const WdSelectMultiple = forwardRef(function WdSelectMultiple(props, ref)
                                 }, enableRelationOptionJump: enableRelationOptionJump, onRelationOptionJump: (item) => {
                                     var _a;
                                     (_a = delayEvents === null || delayEvents === void 0 ? void 0 : delayEvents.onRelationOptionJump) === null || _a === void 0 ? void 0 : _a.call(delayEvents, item);
-                                }, selectFieldType: selectFieldType, selectFields: customFields, isRelation: isRelation, addRelationButtonText: addRelationButtonText, enableAddRelationButton: enableAddRelationButton, childRef: childRef, events: delayEvents, labelVisible: false, value: value, enumName: enumName, format: format, placeholder: placeholder, primaryField: primaryField, options: options, size: "full", tipBlock: tipBlock, viewId: viewId, dataSourceName: dataSourceName, readOnly: readOnly, disabled: disabled, mode: "multiple", decorator: null, ignoreCase: ignoreCase, staticSearchable: staticSearchable, where: where, onChange: handleChange, onSearch: onSearchValueInput, popupContainer: popupContainer, searchable: searchable, searchPlaceholder: searchPlaceholder }) }) }), layout === 'horizontal' && LabelAdornment] }) }) }));
+                                }, selectFieldType: selectFieldType, selectFields: customFields, isRelation: isRelation, addRelationButtonText: addRelationButtonText, enableAddRelationButton: enableAddRelationButton, childRef: childRef, events: delayEvents, labelVisible: false, value: value, enumName: enumName, format: format, placeholder: placeholder, primaryField: primaryField, selectFieldLabel: selectFieldLabel, options: options, size: "full", tipBlock: tipBlock, viewId: viewId, dataSourceName: dataSourceName, readOnly: readOnly, disabled: disabled, mode: "multiple", decorator: null, ignoreCase: ignoreCase, staticSearchable: staticSearchable, where: where, onChange: handleChange, onSearch: onSearchValueInput, popupContainer: popupContainer, searchable: searchable, searchPlaceholder: searchPlaceholder }) }) }), layout === 'horizontal' && LabelAdornment] }) }) }));
 });

package/dist/web/components/wd-table/components/FilterFieldsPanel/Fields.d.ts

@@ -1,13 +1,13 @@
 import { SelectSearch } from './SelectSearch';
 export { SelectSearch };
-export declare const DatePickerField: ({ disabled, showTime, isRange, updateValue, value, }: {
+export declare const DatePickerField: ({ disabled, showTime, isRange, updateValue, value }: {
     disabled?: boolean;
     showTime?: boolean;
     isRange: any;
     updateValue: any;
     value: any;
 }) => JSX.Element;
-export declare const TimePickerField: ({ disabled, isRange, updateValue, value, }: {
+export declare const TimePickerField: ({ disabled, isRange, updateValue, value }: {
     disabled?: boolean;
     isRange: any;
     updateValue: any;
@@ -23,7 +23,7 @@ export declare const MultipleNumber: ({ disabled, value, updateValue }: {
     value: any;
     updateValue: any;
 }) => JSX.Element;
-export declare const NumberField: ({ disabled, value, updateValue, isRange, }: {
+export declare const NumberField: ({ disabled, value, updateValue, isRange }: {
     disabled?: boolean;
     value: any;
     updateValue: any;

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

@@ -1,59 +1,61 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { DatePicker, TimePicker, Input, Tooltip, Select, SelectMultiple, } from 'tea-component';
+import { TimePicker, Tooltip } from 'tea-component';
 import moment from 'moment';
 import { useEnumContext } from '../../../../utils/hooks/context';
-const { RangePicker } = DatePicker;
 import { SelectSearch } from './SelectSearch';
+import { WdDate, WdDateRange, WdTime, WdInput, WdSelectMultiple, WdSelect } from '../../../../components';
 export { SelectSearch };
 // 时间日期
-export const DatePickerField = ({ disabled = false, showTime = false, isRange, updateValue, value, }) => isRange ? (_jsx(Tooltip, { title: value && `${value[0]}~${value[1]}`, children: _jsx(RangePicker, { disabled: disabled, clearable: true, value: value ? [moment(value[0]), moment(value[1])] : null, showTime: showTime, onChange: (value) => {
-            var _a, _b;
-            updateValue({
-                value: value[0]
-                    ? [
-                        (_a = value[0]) === null || _a === void 0 ? void 0 : _a.format('YYYY-MM-DD HH:mm:ss'),
-                        (_b = value[1]) === null || _b === void 0 ? void 0 : _b.format('YYYY-MM-DD HH:mm:ss'),
-                    ]
-                    : null,
-            });
-        } }) })) : (_jsx(Tooltip, { title: value, children: _jsx(DatePicker, { disabled: disabled, clearable: true, value: value ? moment(value) : null, showTime: showTime, onChange: (value) => updateValue({ value: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD HH:mm:ss') }) }) }));
+export const DatePickerField = ({ disabled = false, showTime = false, isRange, updateValue, value }) => isRange ? (_jsx(Tooltip, { title: value && `${value[0]}~${value[1]}`, children: _jsx(WdDateRange, { status: disabled ? 'disabled' : 'edit', value: value ? [moment(value[0]), moment(value[1])] : null, mode: showTime ? 'datetime' : 'date', "$widget": { closest: () => { } }, events: {
+            change: ({ value }) => {
+                updateValue({ value });
+            },
+        }, labelVisible: false, startPlaceholder: "\u5F00\u59CB\u65F6\u95F4", endPlaceholder: "\u7ED3\u675F\u65F6\u95F4", suffixIcon: "td:calendar", suffixType: "inner" }) })) : (_jsx(Tooltip, { title: value, children: _jsx(WdDate, { status: disabled ? 'disabled' : 'edit', clearable: true, value: value ? moment(value) : null, mode: showTime ? 'datetime' : 'date', events: {
+            change: ({ value }) => {
+                updateValue({ value });
+            },
+        }, labelVisible: false, "$widget": { closest: () => { } }, suffixIcon: "td:calendar", suffixType: "inner" }) }));
 // 时间
-export const TimePickerField = ({ disabled = false, isRange, updateValue, value, }) => isRange ? (_jsx(TimePicker.RangePicker, { disabled: disabled, clearable: true, value: value
-        ? [moment(value[0], 'HH:mm:ss'), moment(value[1], 'HH:mm:ss')]
-        : [null, null], onChange: (value) => {
+export const TimePickerField = ({ disabled = false, isRange, updateValue, value }) => isRange ? (_jsx(TimePicker.RangePicker, { disabled: disabled, clearable: true, value: value ? [moment(value[0], 'HH:mm:ss'), moment(value[1], 'HH:mm:ss')] : [null, null], onChange: (value) => {
         var _a, _b;
         updateValue({
-            value: value[0]
-                ? [(_a = value[0]) === null || _a === void 0 ? void 0 : _a.format('HH:mm:ss'), (_b = value[1]) === null || _b === void 0 ? void 0 : _b.format('HH:mm:ss')]
-                : null,
+            value: value[0] ? [(_a = value[0]) === null || _a === void 0 ? void 0 : _a.format('HH:mm:ss'), (_b = value[1]) === null || _b === void 0 ? void 0 : _b.format('HH:mm:ss')] : null,
         });
-    } })) : (_jsx(TimePicker, { disabled: disabled, clearable: true, value: value ? moment(value, 'HH:mm:ss') : null, onChange: (value) => updateValue({ value: value === null || value === void 0 ? void 0 : value.format('HH:mm:ss') }) }));
+    } })) : (_jsx(WdTime, { status: disabled ? 'disabled' : 'edit', labelVisible: false, clearable: true, value: value ? moment(value, 'HH:mm:ss') : null, events: {
+        change: ({ value }) => {
+            updateValue({ value });
+        },
+    }, "$widget": { closest: () => { } }, suffixIcon: "pending", suffixType: "inner" }));
 // 文本输入框
-export const InputField = ({ disabled = false, value, updateValue }) => (_jsx(Input, { disabled: disabled, size: "full", value: value, onChange: (value) => {
-        updateValue({ value });
-    } }));
+export const InputField = ({ disabled = false, value, updateValue }) => (_jsx(WdInput, { status: disabled ? 'disabled' : 'edit', size: "full", inputValue: value, "$widget": { closest: () => { } }, events: { change: updateValue }, labelVisible: false, placeholder: "\u8BF7\u8F93\u5165" }));
 // 数字范围输入
 export const MultipleNumber = ({ disabled = false, value, updateValue }) => {
     const val1 = value ? value[0] : '';
     const val2 = value ? value[1] : '';
-    return (_jsxs("div", { className: "_wedamodal-fn-input-range", children: [_jsx(Input, { disabled: disabled, size: "s", placeholder: "\u8BF7\u8F93\u5165", value: val1, onChange: (value) => {
-                    if (isNaN(Number(value))) {
-                        return;
-                    }
-                    updateValue({ value: [value, val2] });
-                } }), _jsx("span", { className: "_wedamodal-fn-input-range__split", children: "~" }), _jsx(Input, { disabled: disabled, value: val2, onChange: (value) => {
-                    if (isNaN(Number(value))) {
-                        return;
-                    }
-                    updateValue({ value: [val1, value] });
-                }, size: "s", placeholder: "\u8BF7\u8F93\u5165" })] }));
+    return (_jsxs("div", { className: "_wedamodal-fn-input-range", children: [_jsx(WdInput, { status: disabled ? 'disabled' : 'edit', placeholder: "\u8BF7\u8F93\u5165", inputValue: val1, events: {
+                    change: ({ value }) => {
+                        if (isNaN(Number(value))) {
+                            return;
+                        }
+                        updateValue({ value: [value, val2] });
+                    },
+                }, labelVisible: false, "$widget": { closest: () => { } } }), _jsx("span", { className: "_wedamodal-fn-input-range__split", children: "~" }), _jsx(WdInput, { status: disabled ? 'disabled' : 'edit', inputValue: val2, events: {
+                    change: ({ value }) => {
+                        if (isNaN(Number(value))) {
+                            return;
+                        }
+                        updateValue({ value: [val1, value] });
+                    },
+                }, labelVisible: false, "$widget": { closest: () => { } }, placeholder: "\u8BF7\u8F93\u5165" })] }));
 };
 // 数字输入框
-export const NumberField = ({ disabled = false, value, updateValue, isRange, }) => isRange ? (_jsx(MultipleNumber, { disabled: disabled, value: value, updateValue: updateValue })) : (_jsx(Input, { disabled: disabled, size: "full", value: value, onChange: (value) => {
-        if (isNaN(Number(value))) {
-            return;
-        }
-        updateValue({ value });
+export const NumberField = ({ disabled = false, value, updateValue, isRange }) => isRange ? (_jsx(MultipleNumber, { disabled: disabled, value: value, updateValue: updateValue })) : (_jsx(WdInput, { status: disabled ? 'disabled' : 'edit', size: "full", labelVisible: false, "$widget": { closest: () => { } }, inputValue: value, placeholder: "\u8BF7\u8F93\u5165", events: {
+        change: ({ value }) => {
+            if (isNaN(Number(value))) {
+                return;
+            }
+            updateValue({ value });
+        },
     } }));
 // 多选下拉框
 export const SelectMultipleField = (props) => {
@@ -63,20 +65,19 @@ export const SelectMultipleField = (props) => {
     if (!optionName && options) {
         option = options;
     }
-    return (_jsx(SelectMultiple, { disabled: disabled, size: "full", searchable: true, staging: false, matchButtonWidth: true, value: value, appearance: "button", options: option, onChange: (value) => {
-            updateValue({ value });
-        } }));
+    return (_jsx(WdSelectMultiple, { status: disabled ? 'disabled' : 'edit', size: "full", searchable: true, value: value, range: option === null || option === void 0 ? void 0 : option.map((i) => ({ ...i, label: i.text })), "$widget": { closest: () => { } }, events: {
+            change: ({ value }) => {
+                updateValue({ value });
+            },
+        }, labelVisible: false, placeholder: "\u8BF7\u9009\u62E9" }));
 };
 // 下拉单选
 export const SelectField = ({ optionName, value, updateValue, disabled }) => {
     const { enumOptions } = useEnumContext();
     const option = (enumOptions === null || enumOptions === void 0 ? void 0 : enumOptions[optionName]) || [];
-    return (_jsx(Select, { disabled: disabled, size: "full", clearable: true, searchable: true, 
-        // @ts-ignore 不存在的属性
-        staging: false, matchButtonWidth: true, value: value, appearance: "button", options: option, onChange: (value) => {
-            updateValue({ value });
-        }, button: () => {
-            var _a, _b;
-            return value ? (_jsx(Tooltip, { title: (_a = option === null || option === void 0 ? void 0 : option.find((i) => i.value === value)) === null || _a === void 0 ? void 0 : _a.text, children: _jsx("span", { children: ((_b = option === null || option === void 0 ? void 0 : option.find((i) => i.value === value)) === null || _b === void 0 ? void 0 : _b.text) || value }) })) : (_jsx("span", { className: "wedatea2td-text-weak", children: "\u8BF7\u9009\u62E9" }));
-        } }));
+    return (_jsx(WdSelect, { status: disabled ? 'disabled' : 'edit', size: "full", clearable: true, searchable: true, value: value, range: option === null || option === void 0 ? void 0 : option.map((i) => ({ ...i, label: i.text })), "$widget": { closest: () => { } }, events: {
+            change: ({ value }) => {
+                updateValue({ value });
+            },
+        }, labelVisible: false, placeholder: "\u8BF7\u9009\u62E9" }));
 };

package/dist/web/components/wd-table/components/FilterFieldsPanel/FilterFieldItem.d.ts

@@ -1,4 +1,5 @@
-export declare const FilterFieldItem: ({ updateFilterData, ...filterFieldItemConfig }: {
+export declare const FilterFieldItem: ({ supportManyRelated, updateFilterData, ...filterFieldItemConfig }: {
     [x: string]: any;
+    supportManyRelated: any;
     updateFilterData: any;
 }) => JSX.Element;

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

@@ -5,8 +5,9 @@ import { DatePickerField, TimePickerField, InputField, NumberField, SelectMultip
 import { InputAdornment } from './InputAdornment';
 import { usePlatform } from '../../../../utils/platform';
 import { useConfig } from '../../../../utils/config-context';
+import { NEW_RELATION_FORMATS } from './filterFieldsGenerate';
 // 计算方式下拉选框
-const CalculationSelect = ({ arg, cb, isDate = false, fieldCalculationOption, }) => {
+const CalculationSelect = ({ arg, cb, isDate = false, fieldCalculationOption }) => {
     const { classPrefix } = useConfig();
     const isH5 = usePlatform() === 'h5'; // 响应式判定
     const [value, setValue] = useState(arg.value);
@@ -26,9 +27,7 @@ const CalculationSelect = ({ arg, cb, isDate = false, fieldCalculationOption, })
     useEffect(() => {
         setValue(arg.value);
     }, [arg]);
-    const options = isDate
-        ? fieldCalculationOption.filter((i) => i.value !== 'neq')
-        : fieldCalculationOption;
+    const options = isDate ? fieldCalculationOption.filter((i) => i.value !== 'neq') : fieldCalculationOption;
     // eslint-disable-next-line @typescript-eslint/no-magic-numbers
     const visible = (fieldCalculationOption === null || fieldCalculationOption === void 0 ? void 0 : fieldCalculationOption.length) === 1;
     return isH5 ? (_jsx("div", { className: `${classPrefix}-space ${visible ? 'hidden' : ''}`, children: options.map((i) => (_jsx("div", { className: `${classPrefix}-space-item`, children: _jsx("div", { className: `${classPrefix}-table-wrap-filter__tag ${i.value === value ? 'is-selected ' : ''}`, onClick: () => {
@@ -36,9 +35,9 @@ const CalculationSelect = ({ arg, cb, isDate = false, fieldCalculationOption, })
                 }, children: i.text }) }, i.value))) })) : (_jsx(Select, { className: `${visible ? 'hidden' : ''}`, size: "auto", options: options, value: value, onChange: (value) => calculation(value) }));
 };
 // 筛选项
-export const FilterFieldItem = ({ updateFilterData, ...filterFieldItemConfig }) => {
+export const FilterFieldItem = ({ supportManyRelated, updateFilterData, ...filterFieldItemConfig }) => {
     const [disabled, setDisabled] = useState(false);
-    const { filterType, isRange, label, options, fieldCalculation, value, fieldCalculationOption, } = filterFieldItemConfig;
+    const { filterType, isRange, label, options, fieldCalculation, value, fieldCalculationOption } = filterFieldItemConfig;
     const updateFilterConfig = (value) => {
         const lastFilterConfig = { ...filterFieldItemConfig, ...value };
         // 选择为空不为空，则清空数据
@@ -55,6 +54,9 @@ export const FilterFieldItem = ({ updateFilterData, ...filterFieldItemConfig })
             setDisabled(false);
         }
     }, [fieldCalculation.value]);
+    if (!supportManyRelated && NEW_RELATION_FORMATS.includes(filterType)) {
+        return (_jsx(InputAdornment, { label: label, before: null, children: _jsx(Input, { size: "full", disabled: true, defaultValue: '该类型暂不支持表格筛选器' }) }));
+    }
     const renderFieldItem = () => {
         switch (filterType) {
             case 'datetime':
@@ -82,9 +84,17 @@ export const FilterFieldItem = ({ updateFilterData, ...filterFieldItemConfig })
                 return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectField, { optionName: filterFieldItemConfig.xOptionName, updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
             case 'father-son':
             case 'related':
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectSearch, { fields: filterFieldItemConfig.fields, format: filterType, childDbName: filterFieldItemConfig.childDbName, value: value, updateValue: updateFilterConfig, dbName: filterFieldItemConfig.dbName, disabled: disabled }) }));
+            case 'many-one':
+            case 'one-one':
+            case 'one-one-r':
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectSearch, { multiple: false, format: filterType, childDbName: filterFieldItemConfig.childDbName, value: value, updateValue: updateFilterConfig, disabled: disabled, primaryColumn: filterFieldItemConfig.primaryColumn, name: filterFieldItemConfig.name }) }));
+            case 'many-many':
+            case 'one-many':
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectSearch, { format: filterType, childDbName: filterFieldItemConfig.childDbName, value: value, updateValue: updateFilterConfig, disabled: disabled, primaryColumn: filterFieldItemConfig.primaryColumn, name: filterFieldItemConfig.name, multiple: true }) }));
+            case 'x-area-code':
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectSearch, { format: filterType, childDbName: filterFieldItemConfig.childDbName, value: value, updateValue: updateFilterConfig, disabled: disabled, primaryColumn: filterFieldItemConfig.primaryColumn, name: filterFieldItemConfig.name, regionType: filterFieldItemConfig.regionType }) }));
             default:
-                return (_jsx(Input, { size: "full", disabled: true, defaultValue: '该类型暂不支持表单筛选器' }));
+                return (_jsx(InputAdornment, { label: label, before: null, children: _jsx(Input, { size: "full", disabled: true, defaultValue: '该类型暂不支持表格筛选器' }) }));
         }
     };
     return renderFieldItem();

package/dist/web/components/wd-table/components/FilterFieldsPanel/SelectSearch.d.ts

@@ -1,9 +1,11 @@
-export declare const SelectSearch: ({ value, updateValue, format, childDbName, dbName, fields, disabled, }: {
+export declare const SelectSearch: ({ value, updateValue, format, childDbName, disabled, name, primaryColumn, multiple, regionType, }: {
     value: any;
     updateValue: any;
     format: any;
     childDbName: any;
-    dbName: any;
-    fields: any;
     disabled?: boolean;
+    name: any;
+    primaryColumn: any;
+    multiple?: boolean;
+    regionType?: string;
 }) => JSX.Element;

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

@@ -1,45 +1,24 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useState, useMemo } from 'react';
-import { Select, LoadingTip } from 'tea-component';
-import { useChooseList, getDataBaseInfo } from '../../hooks/useChooseList';
-import { DataSource } from '../../../../utils/datasource';
+import { WdSelect } from '../../../wd-select';
+import { WdSelectMultiple } from '../../../wd-select-multiple';
+import { WdRegion } from '../../../wd-region';
+const regionTypeMap = { 0: 'levelOne', 1: 'levelTwo', 2: 'levelThree' };
 // 搜索下拉
-export const SelectSearch = ({ value, updateValue, format, childDbName, dbName, fields, disabled = false, }) => {
-    // 每次请求数据个数
-    const defaultSize = 50;
-    const defaultPage = 1;
-    const dataSourceAPI = useMemo(() => new DataSource(dbName), [dbName]); // datasource 方法-模型
-    const dataBase = useMemo(() => getDataBaseInfo(fields, format, childDbName), [childDbName, fields, format]);
-    const primaryColumn = dataBase === null || dataBase === void 0 ? void 0 : dataBase.primaryColumn;
-    const [query, setQuery] = useState({
-        pageNo: defaultPage,
-        pageSize: defaultSize,
-        where: [],
-    });
-    const { result, total, isValidating, empty } = useChooseList({
-        dataSourceAPI,
-        childDbName,
-        queryParams: query,
-        primaryColumn: primaryColumn,
-        value,
-    });
-    return (_jsx(Select, { disabled: disabled, size: "full", clearable: true, searchable: true, matchButtonWidth: true, appearance: "button", autoClearSearchValue: true, options: result, value: value, bottomTips: isValidating ? _jsx(LoadingTip, {}) : '', onChange: (value) => {
-            updateValue({ value });
-        }, onOpen: () => {
-            empty();
-            setQuery({ ...query, pageNo: defaultPage, where: [] });
-        }, onScrollBottom: () => {
-            if (!isValidating && result.length < total) {
-                setQuery((query) => ({
-                    ...query,
-                    pageNo: query.pageNo + defaultPage,
-                }));
-            }
-        }, onSearchValueChange: (value) => {
-            const where = (value === null || value === void 0 ? void 0 : value.length)
-                ? [{ key: primaryColumn, val: `${value}`, rel: 'search' }]
-                : [];
-            empty();
-            setQuery({ ...query, pageNo: defaultPage, where });
+export const SelectSearch = ({ value, updateValue, format, childDbName, disabled = false, name, primaryColumn, multiple = false, regionType = regionTypeMap[0], }) => {
+    if (format === 'x-area-code') {
+        return (_jsx(WdRegion, { placeholder: "\u8BF7\u9009\u62E9", status: disabled ? 'disabled' : 'edit', value: value, regionType: regionTypeMap[regionType] || regionTypeMap[0], labelVisible: false, name: name, "$widget": { closest: () => { } }, events: {
+                change: ({ value }) => {
+                    updateValue({ value });
+                },
+            } }));
+    }
+    return multiple ? (_jsx(WdSelectMultiple, { placeholder: "\u8BF7\u9009\u62E9", status: disabled ? 'disabled' : 'edit', value: value, format: format, labelVisible: false, dataSourceName: childDbName, name: name, primaryField: primaryColumn, "$widget": { closest: () => { } }, events: {
+            change: ({ value }) => {
+                updateValue({ value });
+            },
+        } })) : (_jsx(WdSelect, { placeholder: "\u8BF7\u9009\u62E9", status: disabled ? 'disabled' : 'edit', value: value, format: format, labelVisible: false, dataSourceName: childDbName, name: name, primaryField: primaryColumn, "$widget": { closest: () => { } }, events: {
+            change: ({ value }) => {
+                updateValue({ value });
+            },
         } }));
 };

package/dist/web/components/wd-table/components/FilterFieldsPanel/filterFieldsGenerate.d.ts

@@ -1,3 +1,4 @@
+export declare const NEW_RELATION_FORMATS: string[];
 export declare const fieldCalculations: {
     number: {
         text: string;
@@ -22,5 +23,11 @@ export declare 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 declare const filterFieldsGenerate: (fields: any) => any;