@cloudbase/weda-ui 3.22.5 → 3.23.1

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

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint max-lines: [error, 500] */
 import { forwardRef, useImperativeHandle, useEffect, useMemo, useRef, useState, useCallback } from 'react';
+import { Tag } from 'tea-component';
 import { WdFormItem, WdInputGroup } from '../wd-form-item';
 import { useFormInputTrait } from '../form-input-hooks';
 import WdIcon from '../wd-icon';
@@ -14,16 +15,46 @@ import isEqual from 'lodash.isequal';
 import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default';
 import { usePlatform } from '../../utils/platform';
 const inputTypes = { idcard: 'text', digit: 'number' };
+const InputComponent = forwardRef(function InputComponent({ isTagInput, contentCls, ...props }, ref) {
+    var _a;
+    const tagInputValue = isTagInput ? (_a = [].concat(props.tagInputValue)) === null || _a === void 0 ? void 0 : _a.filter((i) => !!i) : [];
+    const [inputValue, setInputValue] = useState('');
+    const onChange = (e) => {
+        setInputValue(e.target.value);
+    };
+    const onKeyDown = (e) => {
+        if (e.key === 'enter' || e.keyCode === KEY_DOWN_CODE) {
+            props.onChange([...tagInputValue, e.target.value]);
+            setInputValue('');
+        }
+    };
+    useImperativeHandle(ref, () => ({
+        clearInput: () => setInputValue(''),
+    }), []);
+    return isTagInput ? (_jsx("div", { className: contentCls, onFocus: props.onFocus, onBlur: props.onBlur, children: _jsxs(Tag.Group, { children: [tagInputValue === null || tagInputValue === void 0 ? void 0 : tagInputValue.map((value, index) => (_jsx(Tag, { onClose: () => {
+                        const newValue = tagInputValue.filter((tag, valueIndex) => valueIndex !== index);
+                        props.onChange(newValue);
+                    }, children: value }, index))), _jsx("input", { disabled: props.disabled, value: inputValue, onChange: onChange, onKeyDown: onKeyDown, placeholder: "\u56DE\u8F66\u952E\u6DFB\u52A0", onBlur: (e) => {
+                        var _a;
+                        if ((_a = e.target.value) === null || _a === void 0 ? void 0 : _a.trim()) {
+                            props.onChange([...tagInputValue, e.target.value]);
+                        }
+                        setInputValue('');
+                    } })] }) })) : (_jsx("div", { className: contentCls, children: _jsx("input", { ...props }) }));
+});
 /**
  * 标准化：单行输入组件
  */
+// eslint-disable-next-line complexity
 export const WdInput = forwardRef(function WdInput(props, ref) {
-    const { name, password = X_RUNTIME_DEFAULT.password, type = X_RUNTIME_DEFAULT.type, placeholder, focus: _focus = X_RUNTIME_DEFAULT.focus, maxLength = X_RUNTIME_DEFAULT.maxLength, clearable = X_RUNTIME_DEFAULT.clearable, events, isUnionValue = X_RUNTIME_DEFAULT.isUnionValue, prefixType, prefixIcon, prefixSrc = X_RUNTIME_DEFAULT.prefixSrc, suffixType, suffixIcon, suffixSrc = X_RUNTIME_DEFAULT.suffixSrc, classRoot = 'input', wrapClassName = '', counterVisible = X_RUNTIME_DEFAULT.counterVisible, label, required = X_RUNTIME_DEFAULT.required, inputPattern, template, isConvert = true, } = props;
+    const { name, password = X_RUNTIME_DEFAULT.password, type = X_RUNTIME_DEFAULT.type, placeholder, focus: _focus = X_RUNTIME_DEFAULT.focus, maxLength = X_RUNTIME_DEFAULT.maxLength, clearable = X_RUNTIME_DEFAULT.clearable, events, isUnionValue = X_RUNTIME_DEFAULT.isUnionValue, prefixType, prefixIcon, prefixSrc = X_RUNTIME_DEFAULT.prefixSrc, suffixType, suffixIcon, suffixSrc = X_RUNTIME_DEFAULT.suffixSrc, classRoot = 'input', wrapClassName = '', counterVisible = X_RUNTIME_DEFAULT.counterVisible, label, required = X_RUNTIME_DEFAULT.required, inputPattern, template, isConvert = true, isTagInput = false, } = props;
     const zhRef = useRef(false); // 判断是否输入中文
     const { before, after, inputValue } = useStringProp(props);
     const [innerHandle, setInnerHandle] = useState({}); // hook里挂出的属性
     const [currentInputValue, setCurrentInputValue] = useSyncValue(inputValue); // 监听inputValue
-    const formValue = useMemo(() => converValueFix(inputValue, before, after, type, isUnionValue, isConvert), [inputValue, before, after, type, isUnionValue, isConvert]);
+    const initTagInputValue = useMemo(() => { var _a, _b; return (_b = (_a = [].concat(props.inputValue)) === null || _a === void 0 ? void 0 : _a.filter((i) => !!i)) !== null && _b !== void 0 ? _b : []; }, [props.inputValue]);
+    const [tagInputValue, setTagInputValue] = useSyncValue(initTagInputValue);
+    const formValue = useMemo(() => (isTagInput ? props.inputValue : converValueFix(inputValue, before, after, type, isUnionValue, isConvert)), [isTagInput, props.inputValue, inputValue, before, after, type, isUnionValue, isConvert]);
     const rules = useRules(props); // 含前后缀和必填时，仅对输入框校验
     const traitProps = {
         ...props,
@@ -34,6 +65,7 @@ export const WdInput = forwardRef(function WdInput(props, ref) {
     };
     const { value, // 代表组件值，含前后缀
     onChange: _onChange, disabled, readOnly, validateErrorMsg, validateState, visible, } = useFormInputTrait(traitProps);
+    const tagInputRef = useRef(null);
     const wrapRef = useRef(null);
     const valueRef = useRef(null);
     const size = useSize(props);
@@ -43,7 +75,8 @@ export const WdInput = forwardRef(function WdInput(props, ref) {
     const inputId = useMemo(() => getUuid(), []);
     const [focus, setFocus] = useSyncValue(_focus);
     const inputType = password ? 'password' : inputTypes[type] || type;
-    const hasClearIcon = clearable && focus && !disabled && (currentInputValue === null || currentInputValue === void 0 ? void 0 : currentInputValue.length) > 0;
+    const hasValue = isTagInput ? (tagInputValue === null || tagInputValue === void 0 ? void 0 : tagInputValue.length) > 0 : (currentInputValue === null || currentInputValue === void 0 ? void 0 : currentInputValue.length) > 0;
+    const hasClearIcon = clearable && focus && !disabled && hasValue;
     const counter = typeof currentInputValue === 'string' ? currentInputValue.length : 0;
     const root = `${classPrefix}-${classRoot}`;
     const inputWrap = `${classPrefix}-form-input-wrap`;
@@ -59,6 +92,7 @@ export const WdInput = forwardRef(function WdInput(props, ref) {
         [`${inputWrap}--no-radius-left`]: before,
         [`${inputWrap}--no-radius-right`]: after,
         [`${inputWrap}--no-radius`]: before && after,
+        [`${classPrefix}-form-tag-input-wrap`]: isTagInput,
     });
     const countCls = `${classPrefix}-input__limit-number`;
     const platform = usePlatform();
@@ -69,8 +103,9 @@ export const WdInput = forwardRef(function WdInput(props, ref) {
             return; // 监听非输入引起的value变化，比如调用 setValue, clearValue
         const currentInputValue = converInputValue(value, before, after, isUnionValue);
         setCurrentInputValue(currentInputValue);
+        setTagInputValue(value);
         valueRef.current = value;
-    }, [value, before, after, isUnionValue, setCurrentInputValue]);
+    }, [value, before, after, isUnionValue, setCurrentInputValue, setTagInputValue]);
     const changeForm = useCallback((val) => {
         valueRef.current = val;
         _onChange(val);
@@ -80,42 +115,59 @@ export const WdInput = forwardRef(function WdInput(props, ref) {
         return converValueFix(val, before, after, type, isUnionValue, isConvert);
     };
     const onChange = (e) => {
-        var _a;
-        const text = typeof e === 'string' ? e : e.target.value;
-        const reg = new RegExp(inputPattern);
-        if (inputPattern && !reg.test(text)) {
-            return;
+        var _a, _b, _c;
+        let text = (_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.value;
+        if (isTagInput) {
+            text = Array.isArray(e) ? e : [].concat(text);
+            setTagInputValue(text);
+            changeForm(text);
+            (_b = events.change) === null || _b === void 0 ? void 0 : _b.call(events, { value: text }, { originEvent: e });
         }
-        setCurrentInputValue(text);
-        if (!zhRef.current) {
-            const newValue = converValueFixWrap(text);
-            changeForm(newValue);
-            (_a = events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: newValue }, { originEvent: e });
+        else {
+            text = typeof e === 'string' ? e : text;
+            const reg = new RegExp(inputPattern);
+            // 只针对非标签输入框做校验
+            if (inputPattern && !reg.test(text)) {
+                return;
+            }
+            setCurrentInputValue(text);
+            if (!zhRef.current) {
+                const newValue = converValueFixWrap(text);
+                changeForm(newValue);
+                (_c = events.change) === null || _c === void 0 ? void 0 : _c.call(events, { value: newValue }, { originEvent: e });
+            }
         }
     };
     const onClear = (e) => {
         var _a, _b;
         setCurrentInputValue('');
+        setTagInputValue(null);
         const newValue = converValueFixWrap('');
         changeForm(newValue);
         (_a = events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: newValue }, { originEvent: e });
         (_b = events.clear) === null || _b === void 0 ? void 0 : _b.call(events, { originValue: value }, { originEvent: e });
         e.preventDefault();
+        if (tagInputRef.current && isTagInput) {
+            tagInputRef.current.clearInput();
+        }
     };
     const onKeyDown = (e) => {
+        var _a;
         if (e.key === 'enter' || e.keyCode === KEY_DOWN_CODE) {
-            events.confirm({ value: converValueFixWrap(e.target.value) }, { originEvent: e });
+            (_a = events === null || events === void 0 ? void 0 : events.confirm) === null || _a === void 0 ? void 0 : _a.call(events, { value: converValueFixWrap(e.target.value) }, { originEvent: e });
         }
         if (inputType === 'number' && e.key === 'e') {
             e.preventDefault();
         }
     };
     const onFocus = (e) => {
-        (events === null || events === void 0 ? void 0 : events.focus) && events.focus({ value: converValueFixWrap(e.target.value) }, { originEvent: e });
+        (events === null || events === void 0 ? void 0 : events.focus) &&
+            events.focus({ value: isTagInput ? tagInputValue : converValueFixWrap(e.target.value) }, { originEvent: e });
         setFocus(true);
     };
     const onBlur = (e) => {
-        (events === null || events === void 0 ? void 0 : events.blur) && events.blur({ value: converValueFixWrap(e.target.value) }, { originEvent: e });
+        (events === null || events === void 0 ? void 0 : events.blur) &&
+            events.blur({ value: isTagInput ? tagInputValue : converValueFixWrap(e.target.value) }, { originEvent: e });
         setFocus(false);
     };
     const handleZhStart = () => {
@@ -172,5 +224,5 @@ export const WdInput = forwardRef(function WdInput(props, ref) {
         return null;
     return (_jsx(WdFormItem, { ...formItemProps, children: _jsxs(_Fragment, { children: [_jsx(WdInputGroup, { ...inputGroupProps, children: _jsxs("div", { className: `${cls} ${template === 'greySearchBox' ? 'wd-input-input-search template search-box color-grey is-pc-bordered' : ''} ${template === 'whiteSearchBox'
                             ? 'wd-input-input-search template search-box color-white is-pc-bordered'
-                            : ''} ${isH5 ? 'is-h5-borderless' : ''}`, ref: wrapRef, onFocus: () => { var _a, _b; return (_b = (_a = wrapRef.current) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.add('is-focused'); }, onBlur: () => { var _a, _b; return (_b = (_a = wrapRef.current) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.remove('is-focused'); }, children: [prefixType && (_jsx("div", { className: prefixCls, onClick: () => inputAdornmentClick('prefix'), children: _jsx(WdIcon, { size: iconSize, name: prefixIcon, type: prefixType, src: prefixSrc, className: prefixIconCls }) })), _jsx("div", { className: contentCls, children: _jsx("input", { id: inputId, className: inputCls, type: currentInputType, placeholder: placeholder, value: currentInputValue !== null && currentInputValue !== void 0 ? currentInputValue : '', disabled: disabled, name: name, autoFocus: focus, autoComplete: "off", maxLength: maxLength, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown, onCompositionStart: handleZhStart, onCompositionEnd: handleZhEnd, ...startWithOnProps }) }), hasClearIcon && (_jsx("div", { className: suffixCls, children: _jsx(WdIcon, { size: iconSize, className: `${classPrefix}-icon__trigger`, name: "td:close-circle-filled", onMouseDown: onClear }) })), !hasClearIcon && suffixType && (_jsx("div", { className: suffixCls, onClick: () => inputAdornmentClick('suffix'), children: _jsx(WdIcon, { size: iconSize, name: suffixIcon, type: suffixType, src: suffixSrc, className: suffixIconCls }) })), counterVisible && (_jsxs("span", { className: countCls, children: [counter, "/", maxLength] }))] }) }), password && passwordIconRender()] }) }));
+                            : ''} ${isH5 ? 'is-h5-borderless' : ''}`, ref: wrapRef, onFocus: () => { var _a, _b; return (_b = (_a = wrapRef.current) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.add('is-focused'); }, onBlur: () => { var _a, _b; return (_b = (_a = wrapRef.current) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.remove('is-focused'); }, children: [prefixType && (_jsx("div", { className: prefixCls, onClick: () => inputAdornmentClick('prefix'), children: _jsx(WdIcon, { size: iconSize, name: prefixIcon, type: prefixType, src: prefixSrc, className: prefixIconCls }) })), _jsx(InputComponent, { ref: tagInputRef, contentCls: contentCls, isTagInput: isTagInput, id: inputId, className: inputCls, type: currentInputType, placeholder: placeholder, value: currentInputValue !== null && currentInputValue !== void 0 ? currentInputValue : '', tagInputValue: tagInputValue !== null && tagInputValue !== void 0 ? tagInputValue : [], disabled: disabled, name: name, autoFocus: focus, autoComplete: "off", maxLength: maxLength, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown, onCompositionStart: handleZhStart, onCompositionEnd: handleZhEnd, ...startWithOnProps }), hasClearIcon && (_jsx("div", { className: suffixCls, children: _jsx(WdIcon, { size: iconSize, className: `${classPrefix}-icon__trigger`, name: "td:close-circle-filled", onMouseDown: onClear }) })), !hasClearIcon && suffixType && (_jsx("div", { className: suffixCls, onClick: () => inputAdornmentClick('suffix'), children: _jsx(WdIcon, { size: iconSize, name: suffixIcon, type: suffixType, src: suffixSrc, className: suffixIconCls }) })), counterVisible && (_jsxs("span", { className: countCls, children: [counter, "/", maxLength] }))] }) }), password && passwordIconRender()] }) }));
 });

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

@@ -102,7 +102,14 @@ export declare const formatDataToXlsx: (datas: any, fields: any, enumOptions?: {
  */
 export declare const getSearchAttributes: (fields: any) => any;
 export declare const getFieldValue: (name: any, _record: any, relatedFieldName?: any, isManyField?: any) => any;
-export declare const slotRender: (Slot: any, props?: {}) => any;
+interface SlotRenderProps {
+    recordIndex?: number | string;
+    record?: any;
+    rowKey?: string;
+    column?: any;
+    columnIndex?: number | string;
+}
+export declare const slotRender: (Slot: any, props?: SlotRenderProps) => any;
 /**
  * 根据列管理，过滤表格列信息
  * columns: { key, header, width, align, render,fixed }[] Tea Table 的列
@@ -150,3 +157,4 @@ export declare const getTableColumns: ({ fields, columnSets, slots, fixedFront,
     showRelationWithTag?: boolean;
 }) => any;
 export declare const mapColumKey: (columnSets: any) => any;
+export {};

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

@@ -25,6 +25,8 @@ import { textToString } from '../../../../utils/platform';
 import { getWhereParam, getSortColumns } from '../../utils';
 import lodashGet from 'lodash.get';
 import { convertMoment } from '../../../../utils/moment';
+import { FormFieldObjProvider, useFormFieldObj } from '../../../wd-form/contexts/form-field-obj-context';
+import { useFormField } from '../../../wd-form/contexts/form-field-context';
 const MODAL_SIZE = '80%';
 // 文字提示框包裹组件
 export const TextWrap = React.memo(function TextWrapComp(props) {
@@ -726,10 +728,35 @@ export const getFieldValue = (name, _record, relatedFieldName, isManyField) => {
     }
     return record === null || record === void 0 ? void 0 : record[name];
 };
-export const slotRender = (Slot, props = {}) => {
+const FunctionSlotRenderer = ({ Slot, ...props }) => {
+    var _a;
+    const formField = useFormField();
+    const { formFieldsValue = [], getFieldValue } = formField || {};
+    const formFieldObjsContext = useFormFieldObj();
+    const parentNamePath = (formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.isChildField) ? formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath : [];
+    const recordIndex = props.recordIndex;
+    const namePath = useMemo(() => [...parentNamePath, recordIndex], [parentNamePath, recordIndex]);
+    const _formFieldValues = useMemo(() => {
+        try {
+            return (parentNamePath === null || parentNamePath === void 0 ? void 0 : parentNamePath.length) && getFieldValue ? getFieldValue === null || getFieldValue === void 0 ? void 0 : getFieldValue({ namePath: parentNamePath }) : formFieldsValue;
+        }
+        catch (error) {
+            errorHandler({
+                code: 'FormFieldValuesError',
+                error,
+            });
+            return [];
+        }
+    }, [parentNamePath, formFieldsValue, getFieldValue]);
+    const providerProps = useMemo(() => ({
+        namePath,
+        isChildField: true,
+    }), [namePath]);
+    return (_jsx(FormFieldObjProvider, { ...providerProps, children: _jsx(Slot, { ...props, value: _formFieldValues, rowValue: (_a = _formFieldValues === null || _formFieldValues === void 0 ? void 0 : _formFieldValues[recordIndex]) !== null && _a !== void 0 ? _a : {} }) }));
+};
+export const slotRender = (Slot, props = { recordIndex: 0 }) => {
     if (typeof Slot === 'function') {
-        // console.log(Slot, 'slot', props, 'props');
-        return _jsx(Slot, { ...props });
+        return _jsx(FunctionSlotRenderer, { Slot: Slot, ...props });
     }
     return Slot !== null && Slot !== void 0 ? Slot : null;
 };
@@ -828,7 +855,9 @@ export const filterCustomColumns = ({ columns, columnSets, slots, fields, isH5,
         if (genre === 'slot') {
             // 拿到列对应的插槽
             const slot = slots[`${TABLE_SLOT_PREFIX}${(item2 === null || item2 === void 0 ? void 0 : item2.slotKey) || key}`];
-            customColumn.render = (record, rowKey, recordIndex, column, columnIndex) => (_jsx(TableSlotCell, { record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex, slot: slot }));
+            customColumn.render = (record, rowKey, recordIndex, column, columnIndex) => {
+                return (_jsx(TableSlotCell, { record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex, slot: slot }));
+            };
         }
         return customColumn;
     });

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

@@ -13,10 +13,12 @@ export declare const TimePickerField: ({ disabled, isRange, updateValue, value }
     updateValue: any;
     value: any;
 }) => JSX.Element;
-export declare const InputField: ({ disabled, value, updateValue }: {
+export declare const arrayInputType: string[];
+export declare const InputField: ({ disabled, value, updateValue, fieldCalculation }: {
     disabled?: boolean;
     value: any;
     updateValue: any;
+    fieldCalculation: any;
 }) => JSX.Element;
 export declare const MultipleNumber: ({ disabled, value, updateValue }: {
     disabled?: boolean;

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

@@ -6,11 +6,11 @@ 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(WdDateRange, { status: disabled ? 'disabled' : 'edit', value: value ? [moment(value[0]), moment(value[1])] : null, mode: showTime ? 'datetime' : 'date', "$widget": { closest: () => { } }, events: {
+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' : 'day', "$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: {
+        }, 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' : 'day', events: {
             change: ({ value }) => {
                 updateValue({ value });
             },
@@ -27,7 +27,11 @@ export const TimePickerField = ({ disabled = false, isRange, updateValue, value
         },
     }, "$widget": { closest: () => { } }, suffixIcon: "pending", suffixType: "inner" }));
 // 文本输入框
-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 arrayInputType = ['in', 'nin', 'search_ci', 'nsearch_ci'];
+export const InputField = ({ disabled = false, value, updateValue, fieldCalculation }) => {
+    const isTagInput = arrayInputType.includes(fieldCalculation === null || fieldCalculation === void 0 ? void 0 : fieldCalculation.value);
+    return (_jsx(WdInput, { clearable: true, isTagInput: isTagInput, 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] : '';

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

@@ -57,6 +57,7 @@ export const FilterFieldItem = ({ supportManyRelated, updateFilterData, ...filte
     if (!supportManyRelated && NEW_RELATION_FORMATS.includes(filterType)) {
         return (_jsx(InputAdornment, { label: label, before: null, children: _jsx(Input, { size: "full", disabled: true, defaultValue: '该类型暂不支持表格筛选器' }) }));
     }
+    // eslint-disable-next-line complexity
     const renderFieldItem = () => {
         switch (filterType) {
             case 'datetime':
@@ -66,7 +67,7 @@ export const FilterFieldItem = ({ supportManyRelated, updateFilterData, ...filte
             case 'time':
                 return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig, isDate: true }), children: _jsx(TimePickerField, { disabled: disabled, value: value, isRange: isRange, updateValue: updateFilterConfig }) }));
             case 'string':
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(InputField, { updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(InputField, { updateValue: updateFilterConfig, value: value, disabled: disabled, fieldCalculation: fieldCalculation }) }));
             case 'number':
                 return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(NumberField, { updateValue: updateFilterConfig, value: value, isRange: isRange, disabled: disabled }) }));
             case 'boolean':
@@ -93,6 +94,8 @@ export const FilterFieldItem = ({ supportManyRelated, updateFilterData, ...filte
                 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 }) }));
+            case 'array':
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(InputField, { updateValue: updateFilterConfig, value: value, disabled: disabled, fieldCalculation: fieldCalculation }) }));
             default:
                 return (_jsx(InputAdornment, { label: label, before: null, children: _jsx(Input, { size: "full", disabled: true, defaultValue: '该类型暂不支持表格筛选器' }) }));
         }

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

@@ -8,26 +8,17 @@ export declare const fieldCalculations: {
         text: string;
         value: string;
     }[];
-    radio: {
+    array: {
+        value: string;
+        text: string;
+    }[];
+    singleSelect: {
         text: string;
         value: string;
     }[];
-    checkbox: {
+    multipleSelect: {
         text: string;
         value: string;
     }[];
 };
-/**
- * 生成筛选配置
- * 1、过滤不支持搜索的字段
- * 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;

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

@@ -1,4 +1,5 @@
 /* eslint-disable complexity */
+import { getUuid } from '../../../../utils/tool';
 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'];
@@ -24,15 +25,19 @@ export const fieldCalculations = {
         // { text: '为空', value: '$empty' },
         // { text: '不为空', value: '$nempty' },
     ],
-    radio: [
+    array: [
+        { value: 'in', text: '包含其一' },
+        { value: 'nin', text: '不包含' },
+    ],
+    singleSelect: [
         { text: '等于', value: 'eq' },
         { text: '不等于', value: 'neq' },
         // { text: '为空', value: '$empty' },
         // { text: '不为空', value: '$nempty' },
     ],
-    checkbox: [
-        { text: '等于任意一个', value: 'in' },
-        { text: '不等于任意一个', value: 'nin' },
+    multipleSelect: [
+        { text: '包含其一', value: 'in' },
+        { text: '不包含', value: 'nin' },
         // { text: '为空', value: '$empty' },
         // { text: '不为空', value: '$nempty' },
     ],
@@ -45,21 +50,39 @@ export const fieldCalculations = {
  * { filterType: 'datetime' | 'date' | 'time' | 'string' |'number' | 'x-enumObj' , isRange: boolean }
  *
  *
+ * field?.type === 'array' && field?.items?.type === 'string'&& !['x-markdown','x-location','x-music','x-json','x-video','x-file','x-image','x-rtf','function'].includes(this?.items?.format))  文本数组支持查询
  * 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'] 不支持搜索
  */
+const unsupportedSearchFieldsFormats = [
+    'x-markdown',
+    'x-location',
+    'x-music',
+    'x-json',
+    'x-video',
+    'x-file',
+    'x-image',
+    'x-rtf',
+    'function',
+];
 export const filterFieldsGenerate = (fields) => {
     var _a;
     return (_a = fields === null || fields === void 0 ? void 0 : fields.filter((field) => {
+        var _a, _b;
         // 不支持搜索的类型
         if (!field)
             return false;
+        if ((field === null || field === void 0 ? void 0 : field.type) === 'array' &&
+            ((_a = field === null || field === void 0 ? void 0 : field.items) === null || _a === void 0 ? void 0 : _a.type) === 'string' &&
+            !unsupportedSearchFieldsFormats.includes((_b = field === null || field === void 0 ? void 0 : field.items) === null || _b === void 0 ? void 0 : _b.format)) {
+            return true;
+        }
         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.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)) {
+            unsupportedSearchFieldsFormats.includes(field === null || field === void 0 ? void 0 : field.format)) {
             return false;
         }
         return true;
@@ -70,7 +93,7 @@ export const filterFieldsGenerate = (fields) => {
             ? { type: i.type, value: fieldCalculations[i.type][0].value }
             : {};
         const filterFieldItemConfig = {
-            id: i['x-id'],
+            id: getUuid(),
             name: i.name,
             value: '',
             isRange: typeof i.isRange === 'boolean' ? i.isRange : true,
@@ -86,17 +109,17 @@ export const filterFieldsGenerate = (fields) => {
                 filterFieldItemConfig.isRange = false;
             }
         }
-        if (i.type === 'boolean') {
+        else if (i.type === 'boolean') {
             filterFieldItemConfig.filterType = i.type;
             filterFieldItemConfig.options = [
                 { value: true, text: '是', label: '是' },
                 { value: false, text: '否', label: '否' },
                 { value: null, text: '空', label: '空' },
             ];
-            filterFieldItemConfig.fieldCalculation.type = 'checkbox';
+            filterFieldItemConfig.fieldCalculation.type = 'multipleSelect';
             filterFieldItemConfig.fieldCalculation.value = 'in';
         }
-        if ((_a = i['x-enumObj']) === null || _a === void 0 ? void 0 : _a.length) {
+        else if ((_a = i['x-enumObj']) === null || _a === void 0 ? void 0 : _a.length) {
             filterFieldItemConfig.filterType = 'x-enumObj';
             filterFieldItemConfig.options = i['x-enumObj'].map((enumItem) => ({
                 value: enumItem === null || enumItem === void 0 ? void 0 : enumItem.value,
@@ -105,34 +128,42 @@ export const filterFieldsGenerate = (fields) => {
             }));
             filterFieldItemConfig.options.push({ value: null, text: '空', label: '空' });
         }
-        if (i.format === 'x-enum') {
+        else if (i.format === 'x-enum') {
             filterFieldItemConfig.fieldCalculation.value = 'eq';
             filterFieldItemConfig.filterType = i.format;
             filterFieldItemConfig.xMultiSelect = i['x-multi-select'];
             filterFieldItemConfig.xOptionName = i['x-option-name'];
-            filterFieldItemConfig.fieldCalculation.type = filterFieldItemConfig.xMultiSelect ? 'checkbox' : 'radio';
+            filterFieldItemConfig.fieldCalculation.type = filterFieldItemConfig.xMultiSelect
+                ? 'multipleSelect'
+                : 'singleSelect';
             filterFieldItemConfig.fieldCalculation.value = filterFieldItemConfig.xMultiSelect ? 'in' : 'eq';
         }
-        if (NEW_SINGLE_RELATION_FORMATS.includes(i.format) || i.format === 'father-son' || i.format === 'related') {
+        else 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.type = 'singleSelect';
             filterFieldItemConfig.fieldCalculation.value = 'eq';
         }
-        if (NEW_MULTIPLE_RELATION_FORMATS.includes(i.format)) {
+        else 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.type = 'multipleSelect';
             filterFieldItemConfig.fieldCalculation.value = 'in';
         }
-        if (i.format === 'x-area-code') {
+        else 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';
         }
+        else if (i.type === 'array') {
+            filterFieldItemConfig.fieldCalculation.type = 'array';
+            filterFieldItemConfig.fieldCalculation.value = 'in';
+        }
         const fieldCalculationOption = fieldCalculations[filterFieldItemConfig.fieldCalculation.type];
         filterFieldItemConfig.fieldCalculationOption = fieldCalculationOption;
         // 用户自定义配置

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

@@ -5,6 +5,7 @@ import { dateCalculation } from '../../../../utils/date';
 import isObjectEqual from '../../../../utils/isObjectEqual';
 import { useConfig } from '../../../../utils/config-context';
 import { FilterFieldItem } from './FilterFieldItem';
+import { arrayInputType } from './Fields';
 import { filterFieldsGenerate } from './filterFieldsGenerate';
 import { WdButton } from '../../../wd-button';
 import { usePlatform } from '../../../../utils/platform';
@@ -89,7 +90,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
         });
         // 值筛选条件
         filterValues.forEach((i) => {
-            var _a, _b;
+            var _a, _b, _c;
             switch (i.fieldCalculation.value) {
                 case 'scope':
                     if (i.filterType === 'number') {
@@ -142,10 +143,19 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                 default: {
                     const searchItem = {
                         key: i.name,
-                        val: i.filterType === 'string' ? (_b = i.value) === null || _b === void 0 ? void 0 : _b.trim() : i.value,
+                        val: i.value,
                         rel: i.fieldCalculation.value,
                     };
-                    if (i.filterType === 'number') {
+                    if (i.filterType === 'string') {
+                        if (arrayInputType.includes(i.fieldCalculation.value) && ((_b = searchItem === null || searchItem === void 0 ? void 0 : searchItem.val) === null || _b === void 0 ? void 0 : _b.length)) {
+                            searchValues.push(searchItem);
+                        }
+                        else {
+                            searchItem.val = (_c = i.value) === null || _c === void 0 ? void 0 : _c.trim();
+                            searchValues.push(searchItem);
+                        }
+                    }
+                    else if (i.filterType === 'number') {
                         searchItem.val = Number(i.value);
                         searchValues.push(searchItem);
                     }
@@ -183,7 +193,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
     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: () => {
+    return (_jsxs(ConfigProvider, { classPrefix: "wedatea2td", children: [isH5 && (_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, 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,
@@ -192,7 +202,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                                                     searchHandle();
                                                     setOpenMobileFilter(false);
                                                 },
-                                            } }) })] }) })] }) }), !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: {
+                                            } }) })] }) })] }) })), !isH5 && !!filterData.length && (_jsx("form", { className: `${classPrefix}-table-wrap-filter`, onSubmit: onFormSubmit, "data-testid": "filter-form", children: _jsxs(Row, { gap: 20, verticalAlign: 'top', 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, 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,

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

@@ -13,11 +13,14 @@ export declare const getFilter: ({ wList, searchValues, searchConfig, conditionC
     relateWhere: {};
 };
 export declare const getSearchValues: (searchValues?: any[]) => {
-    commonSearchValue: {
+    commonSearchValue: ({
+        $or: any;
+    } | {
         [x: number]: {
             [x: string]: any;
         };
-    }[];
+        $or?: undefined;
+    })[];
     relatedSearchValues: any;
 };
 export declare const orderByFieldKey: (key: any, columns: any) => any;

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

@@ -182,7 +182,18 @@ export const getSearchValues = (searchValues = []) => {
     // 普通字段的直接条件
     const commonSearchValue = searchValuesList
         .filter((i) => !NEW_RELATION_FORMATS.includes(i.format))
-        .map((item) => ({ [item.key]: { [`$${item.rel}`]: item.val } }));
+        .map((item) => {
+        if (item.format === 'string' && ['search_ci', 'nsearch_ci'].includes(item.rel)) {
+            const itemVal = Array.isArray(item.val) ? item.val : [item.val];
+            if (!itemVal.length) {
+                return null;
+            }
+            const searchCondition = itemVal === null || itemVal === void 0 ? void 0 : itemVal.map((n) => ({ [item.key]: { [`$${item.rel}`]: n } }));
+            return { $or: searchCondition };
+        }
+        return { [item.key]: { [`$${item.rel}`]: item.val } };
+    })
+        .filter(Boolean);
     return {
         commonSearchValue,
         relatedSearchValues,