@cloudbase/weda-ui 3.14.4 → 3.15.0

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable @typescript-eslint/no-magic-numbers */
-import { useState, useImperativeHandle, useMemo, useEffect, useCallback } from 'react';
+import { useMemo, useImperativeHandle } from 'react';
 import { useDebouncedCallback } from '@react-hookz/web';
 import { LoadingTip } from 'tea-component';
 import { SelectUI as Select } from '../select/selectUI';
@@ -9,12 +9,11 @@ import { getTableColumns } from '../../wd-table/components/FieldRender';
 import { useAuthFields } from '../../wd-table/hooks/useAuthFields';
 import { usePlatform } from '../../../utils/platform';
 import { DataSource } from '../../../utils/datasource';
-import { EnumHoc } from '../../../utils/hooks/EnumHoc';
 import { useSyncValue } from '../../../utils/hooks/useSyncValue';
 import isObjectEqual from '../../../utils/isObjectEqual';
-import { requestEnumOption } from '../../form/select/request';
-import { convertWhere } from '../../../utils/getModelParams';
-import { useChooseList } from '../../wd-table/hooks/useChooseList';
+import { deepClone } from '../../../utils/tool';
+import { useChooseList } from '../hooks/useChooseList';
+import { getDefaultQuery } from './queryParams';
 const OptionText = ({ mode, option, selectFields, authFields, onChange, onRelationOptionJump, enableRelationOptionJump, }) => {
     const platform = usePlatform();
     const columns = useMemo(() => {
@@ -46,18 +45,18 @@ const OptionText = ({ mode, option, selectFields, authFields, onChange, onRelati
             }
         }, children: [_jsxs("div", { className: "wd-relation-select-header", children: [_jsx("p", { className: "wd-relation-select-header-text", title: (option === null || option === void 0 ? void 0 : option.label) || (option === null || option === void 0 ? void 0 : option.value), children: (option === null || option === void 0 ? void 0 : option.label) || (option === null || option === void 0 ? void 0 : option.value) }), enableRelationOptionJump && (_jsx("span", { onClick: () => {
                             onRelationOptionJump({ item: option });
-                        }, children: _jsx(WdIcon, { name: "td:jump", size: "s", type: "inner" }) }))] }), _jsxs("div", { className: "wd-relation-select-option-group", children: [_jsx("div", { className: "wd-relation-select-option-header", children: columns.map((i) => (_jsx("div", { className: "wd-relation-select-option-text", style: { width: columns.length > 1 ? i.width : 'auto' }, children: i.header }, i.key))) }), _jsx("div", { className: "wd-relation-select-option-content", children: columns.map((i) => (_jsx("div", { className: "wd-relation-select-option-text", style: { width: columns.length > 1 ? i.width : 'auto' }, children: i.render(option === null || option === void 0 ? void 0 : option.extra) }, i.key))) })] })] }));
+                        }, children: _jsx(WdIcon, { name: "td:jump", size: "s", type: "inner" }) }))] }), _jsxs("div", { className: "wd-relation-select-option-group", children: [_jsx("div", { className: "wd-relation-select-option-header", children: columns === null || columns === void 0 ? void 0 : columns.map((i) => (_jsx("div", { className: "wd-relation-select-option-text", style: { width: columns.length > 1 ? i.width : 'auto' }, children: i.header }, i.key))) }), _jsx("div", { className: "wd-relation-select-option-content", children: columns === null || columns === void 0 ? void 0 : columns.map((i) => (_jsx("div", { className: "wd-relation-select-option-text", style: { width: columns.length > 1 ? i.width : 'auto' }, children: i.render(option === null || option === void 0 ? void 0 : option.extra) }, i.key))) })] })] }));
 };
 // 每次请求数据个数
 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, } = props;
+    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, } = props;
     const selectFieldsLength = selectFieldType === 'custom' ? selectFields === null || selectFields === void 0 ? void 0 : selectFields.length : 0;
     // 设置下拉列表与下拉按钮同宽
     // 以传入为准，未传入，在自定义展示字段少于2个时设置为 true，否则设置为false，宽度设置为700，
-    const _matchButtonWidth = (_a = props === null || props === void 0 ? void 0 : props.matchButtonWidth) !== null && _a !== void 0 ? _a : selectFieldsLength < 2;
+    const _matchButtonWidth = (_a = props === null || props === void 0 ? void 0 : props.matchButtonWidth) !== null && _a !== void 0 ? _a : selectFieldsLength < 3;
     // 以传入为准，未传入，在不与按钮同宽度的情况下，listHeight 会被设置为 400
     const _listHeight = (_b = props === null || props === void 0 ? void 0 : props.listHeight) !== null && _b !== void 0 ? _b : (_matchButtonWidth ? undefined : 400);
     const { authFields } = useAuthFields({
@@ -74,11 +73,18 @@ export function RelationSelect(props) {
     // 是否具备展示自定义字段的条件
     const isRelationSelectOption = selectFieldType === 'custom' && (selectFields === null || selectFields === void 0 ? void 0 : selectFields.length) && (authFields === null || authFields === void 0 ? void 0 : authFields.length);
     const dataSourceAPI = useMemo(() => new DataSource(dataSourceName), [dataSourceName]); // datasource 方法-模型
-    const whereList = convertWhere(props);
+    const defaultQuery = useMemo(() => getDefaultQuery({
+        queryCondition,
+        where,
+        selectFieldType,
+        selectFields,
+        supportManyRelated,
+        sorter,
+    }), [queryCondition, selectFieldType, selectFields, where, supportManyRelated, sorter]);
     const [query, setQuery] = useSyncValue({
+        ...defaultQuery,
         pageNo: defaultPage,
         pageSize: defaultSize,
-        where: whereList,
     }, isObjectEqual);
     const { result: options, total, isValidating, empty, getRelationOptions, } = useChooseList({
         dataSourceAPI,
@@ -86,7 +92,6 @@ export function RelationSelect(props) {
         queryParams: query,
         primaryColumn: primaryField,
         value,
-        isInsertSelectedValue: true,
     });
     const [isLoading, setIsLoading] = useSyncValue(isValidating, isObjectEqual);
     // 下拉选项数据
@@ -107,10 +112,10 @@ export function RelationSelect(props) {
         options,
         selectFields,
     ]);
-    const searchOptionListWithWhere = useDebouncedCallback((where = whereList) => {
+    const searchOptionListWithWhere = useDebouncedCallback((filter = defaultQuery === null || defaultQuery === void 0 ? void 0 : defaultQuery.filter) => {
         empty();
-        setQuery({ ...query, pageNo: defaultPage, where });
-    }, [empty, query, setQuery, whereList], 300);
+        setQuery({ ...query, pageNo: defaultPage, filter });
+    }, [query, defaultQuery === null || defaultQuery === void 0 ? void 0 : defaultQuery.filter, empty, setQuery], 300);
     useImperativeHandle(childRef, () => {
         return {
             refresh: async () => {
@@ -132,78 +137,29 @@ export function RelationSelect(props) {
     const searchHandle = (keyword) => {
         empty();
         setIsLoading(true);
-        let where = whereList;
-        if (keyword === null || keyword === void 0 ? void 0 : keyword.length) {
+        let filter = deepClone(defaultQuery === null || defaultQuery === void 0 ? void 0 : defaultQuery.filter);
+        if (keyword) {
+            const search = ignoreCase ? '$search_ci' : '$search';
             // 筛选面板的查询条件与数据过滤的查询条件是且的关系
-            where = {
-                $and: [...whereList, { $and: [{ [primaryField]: { $search: keyword } }] }],
+            filter = {
+                ...filter,
+                where: {
+                    $and: [filter.where, { $and: [{ [primaryField]: { [`${search}`]: keyword } }] }],
+                },
             };
         }
-        searchOptionListWithWhere(where);
-        onSearch(keyword);
-    };
-    return (_jsx(EnumHoc, { fields: authFields, children: _jsx(Select, { ...props, overlayClassName: isRelationSelectOption ? 'wd-relation-select-overlay' : '', searchable: true, listWidth: listWidth, listHeight: _listHeight, matchButtonWidth: _matchButtonWidth, placeholder: placeholder, appearance: 'button', filter: () => true, size: size, disabled: disabled, autoClearSearchValue: true, options: customOptions, value: value, onChange: onChange, onSearch: searchHandle, bottomTips: isLoading ? _jsx(LoadingTip, {}) : undefined, onScrollBottom: () => {
-                if (!isLoading && customOptions.length < total) {
-                    setQuery((query) => ({
-                        ...query,
-                        pageNo: query.pageNo + defaultPage,
-                    }));
-                }
-            }, onOpen: () => {
-                setIsLoading(true);
-                searchOptionListWithWhere();
-            }, footer: addRelationButton, mode: mode }) }));
-}
-export function EnumSelect(props) {
-    const { placeholder, size, disabled, onChange, value, onSearch, addRelationButton, childRef, dataSourceName, enumName, primaryField, format, viewId, where, setRefreshStatus, mode, } = props;
-    const [enumOption, setEnumOption] = useState([]);
-    const [isLoading, setLoading] = useState(false);
-    // 获取枚举字段类型的下拉选项
-    const getEnumOption = useCallback(async () => {
-        const params = {
-            format,
-            dataSourceName,
-            viewId,
-            where,
-            primaryField,
-            enumName,
-        };
-        setLoading(true);
-        const options = await requestEnumOption(params);
-        setEnumOption(options);
-        setLoading(false);
-    }, [dataSourceName, enumName, format, primaryField, viewId, where]);
-    useEffect(() => {
-        getEnumOption();
-    }, [getEnumOption]);
-    useImperativeHandle(childRef, () => {
-        return {
-            refresh: async () => {
-                setRefreshStatus(true);
-                await getEnumOption();
-                // eslint-disable-next-line rulesdir/no-timer
-                const timer = setTimeout(() => {
-                    setRefreshStatus(false);
-                    clearTimeout(timer);
-                }, 500);
-            },
-        };
-    }, [getEnumOption, setRefreshStatus]);
-    const searchHandle = (keyword) => {
+        searchOptionListWithWhere(filter);
         onSearch(keyword);
     };
-    return (_jsx(Select, { ...props, mode: mode, searchable: true, matchButtonWidth: true, placeholder: placeholder, appearance: 'button', size: size, disabled: disabled, autoClearSearchValue: true, options: enumOption, value: value, onChange: onChange, onSearch: searchHandle, footer: addRelationButton, bottomTips: isLoading ? _jsx(LoadingTip, {}) : undefined }));
-}
-export function CustomSelect(props) {
-    const { format, addRelationButtonText, enableAddRelationButton, events } = 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, {});
-    }
-    return isEnumType ? (_jsx(EnumSelect, { ...props, addRelationButton: addRelationButton, setRefreshStatus: setRefreshStatus })) : (_jsx(RelationSelect, { ...props, addRelationButton: addRelationButton, setRefreshStatus: setRefreshStatus }));
+    return (_jsx(Select, { ...props, overlayClassName: isRelationSelectOption ? 'wd-relation-select-overlay' : '', searchable: true, listWidth: listWidth, listHeight: _listHeight, matchButtonWidth: _matchButtonWidth, placeholder: placeholder, appearance: 'button', filter: () => true, size: size, disabled: disabled, autoClearSearchValue: true, options: customOptions, value: value, onChange: onChange, onSearch: searchHandle, bottomTips: isLoading ? _jsx(LoadingTip, {}) : undefined, onScrollBottom: () => {
+            if (!isLoading && customOptions.length < total) {
+                setQuery((query) => ({
+                    ...query,
+                    pageNo: query.pageNo + defaultPage,
+                }));
+            }
+        }, onOpen: () => {
+            setIsLoading(true);
+            searchOptionListWithWhere();
+        }, footer: addRelationButton, mode: mode }));
 }

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ConfigProvider } from 'tea-component';
-import { CustomSelect } from '../relationSelect/relationSelect';
+import { CustomSelect } from '../relationSelect/index';
 import { SelectUI as Select } from './selectUI';
 export function SelectCom(props) {
     const { isRelation } = props;

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

@@ -14,6 +14,11 @@
   display: none;
 }
 
+/* h5 */
+.wd-form-item.wd-h5-select-root .form-select-pc {
+  width: 100%;
+}
+
 /* pc */
 .wd-form-item.wd-pc-select-root .form-select-pc {
   width: 100%;
@@ -165,6 +170,9 @@
 .wd-relation-select-overlay .wedatea2td-dropdown-box .wedatea2td-list--option .wedatea2td-list__status {
   padding: 6px 8px;
 }
+.wd-relation-select-overlay .wedatea2td-dropdown-box > div:nth-child(2) {
+  min-height: 105px;
+}
 /* h5端关联下拉样式 */
 .weda-ui-custom-picker__cloumns.weda-ui-custom-picker__cloumns--select.wd-relation-select-overlay
   .weda-ui-custom-picker__cloumn-item {

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

@@ -9,9 +9,12 @@ import { useSelected } from '../../utils/hooks/use-selected';
 import { useDebouncedCallback, useSyncedRef } from '@react-hookz/web';
 import { useSetWidgetApi } from '../../utils/widget-api/use-set-widget-api';
 import { useDelayEvents } from '../../utils/hooks/use-delay-events';
+import { useSyncValue } from '../../utils/hooks/useSyncValue';
+import isObjectEqual from '../../utils/isObjectEqual';
 import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default';
 import { RelationalSetting } from './relationSelect/relationalSetting';
 import { SelectCom as Select } from './select';
+import { SelectProvider } from './contexts/selectContext';
 /**
  * 下拉单选-标准化
  */
@@ -19,7 +22,7 @@ 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, } = props;
     const childRef = useRef(null);
-    const [options, setOptions] = useState([]);
+    const [options, setOptions] = useSyncValue(range, isObjectEqual);
     const [innerHandle, setInnerHandle] = useState({});
     const traitProps = { ...props, inputRef: ref, setInnerHandle };
     const trait = useFormInputTrait(traitProps);
@@ -102,11 +105,11 @@ export const WdSelect = forwardRef(function WsSelect(props, ref) {
     }, [debouncedTriggerSearchEvent]);
     if (!visible)
         return null;
-    return (_jsx(WdFormItem, { ...formItemProps, children: _jsxs(_Fragment, { children: [_jsx(WdInputGroup, { ...inputGroupProps, children: _jsx(WdInputWrap, { ...inputWrapProps, children: _jsx(Select, { ...props, style: undefined, className: undefined, setAllOption: setOptions, onRelationTagClick: (item) => {
-                                var _a;
-                                (_a = delayEvents === null || delayEvents === void 0 ? void 0 : delayEvents.onRelationTagClick) === null || _a === void 0 ? void 0 : _a.call(delayEvents, item);
-                            }, 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: range, 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: true, searchPlaceholder: searchPlaceholder }) }) }), layout === 'horizontal' && LabelAdornment] }) }));
+    return (_jsx(SelectProvider, { options: options, setOptions: setOptions, children: _jsx(WdFormItem, { ...formItemProps, children: _jsxs(_Fragment, { children: [_jsx(WdInputGroup, { ...inputGroupProps, children: _jsx(WdInputWrap, { ...inputWrapProps, children: _jsx(Select, { ...props, style: undefined, className: undefined, onRelationTagClick: (item) => {
+                                    var _a;
+                                    (_a = delayEvents === null || delayEvents === void 0 ? void 0 : delayEvents.onRelationTagClick) === null || _a === void 0 ? void 0 : _a.call(delayEvents, item);
+                                }, 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: true, searchPlaceholder: searchPlaceholder }) }) }), layout === 'horizontal' && LabelAdornment] }) }) }));
 });

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

@@ -8,11 +8,14 @@ import { useSelected } from '../../utils/hooks/use-selected';
 import { emptyObject } from '../../utils/constant';
 import { useSetWidgetApi } from '../../utils/widget-api/use-set-widget-api';
 import { useDelayEvents } from '../../utils/hooks/use-delay-events';
+import { useSyncValue } from '../../utils/hooks/useSyncValue';
+import isObjectEqual from '../../utils/isObjectEqual';
 import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default';
 import './style';
 import { useDebouncedCallback, useSyncedRef } from '@react-hookz/web';
 import { isFormatWithRelation } from '../form/select/formats-util';
 import { RelationalSetting } from '../wd-select/relationSelect/relationalSetting';
+import { SelectProvider } from '../wd-select/contexts/selectContext';
 /**
  * 下拉多选-标准化
  */
@@ -20,7 +23,7 @@ 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, } = props;
     const childRef = useRef(null);
-    const [options, setOptions] = useState([]);
+    const [options, setOptions] = useSyncValue(range, isObjectEqual);
     const [innerHandle, setInnerHandle] = useState({});
     const traitProps = { ...props, inputRef: ref, setInnerHandle };
     const trait = useFormInputTrait(traitProps);
@@ -98,11 +101,11 @@ export const WdSelectMultiple = forwardRef(function WdSelectMultiple(props, ref)
     }, [debouncedTriggerSearchEvent]);
     if (!visible)
         return null;
-    return (_jsx(WdFormItem, { ...formItemProps, children: _jsxs(_Fragment, { children: [_jsx(WdInputGroup, { ...inputGroupProps, children: _jsx(WdInputWrap, { ...inputWrapProps, children: _jsx(SelectMultiple, { ...props, style: undefined, className: undefined, setAllOption: setOptions, onRelationTagClick: (item) => {
-                                var _a;
-                                (_a = delayEvents === null || delayEvents === void 0 ? void 0 : delayEvents.onRelationTagClick) === null || _a === void 0 ? void 0 : _a.call(delayEvents, item);
-                            }, 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: range, 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: true, searchPlaceholder: searchPlaceholder }) }) }), layout === 'horizontal' && LabelAdornment] }) }));
+    return (_jsx(SelectProvider, { options: options, setOptions: setOptions, children: _jsx(WdFormItem, { ...formItemProps, children: _jsxs(_Fragment, { children: [_jsx(WdInputGroup, { ...inputGroupProps, children: _jsx(WdInputWrap, { ...inputWrapProps, children: _jsx(SelectMultiple, { ...props, style: undefined, className: undefined, onRelationTagClick: (item) => {
+                                    var _a;
+                                    (_a = delayEvents === null || delayEvents === void 0 ? void 0 : delayEvents.onRelationTagClick) === null || _a === void 0 ? void 0 : _a.call(delayEvents, item);
+                                }, 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: true, searchPlaceholder: searchPlaceholder }) }) }), layout === 'horizontal' && LabelAdornment] }) }) }));
 });

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

@@ -782,7 +782,7 @@ export const filterCustomColumns = ({ columns, columnSets, slots, fields, isH5,
                 ? {
                     modelType: 'table-h5',
                     showTip: false,
-                    relation: record[`@${key}`],
+                    relation: record === null || record === void 0 ? void 0 : record[`@${key}`],
                     columnSet: item2,
                     rowId: record._id,
                     supportManyRelated,
@@ -791,9 +791,9 @@ export const filterCustomColumns = ({ columns, columnSets, slots, fields, isH5,
                 }
                 : {
                     modelType: 'table',
-                    relation: record[`@${key}`],
+                    relation: record === null || record === void 0 ? void 0 : record[`@${key}`],
                     columnSet: item2,
-                    rowId: record._id,
+                    rowId: record === null || record === void 0 ? void 0 : record._id,
                     supportManyRelated,
                     isH5,
                     showRelationWithTag,

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

@@ -12,7 +12,7 @@ export const fieldCalculations = {
         // { text: '不为空', value: '$nempty' },
     ],
     string: [
-        { text: '包含', value: 'search' },
+        { text: '包含', value: 'search_ci' },
         { text: '不包含', value: 'exclude' },
         { text: '等于', value: 'eq' },
         { text: '不等于', value: 'neq' },
@@ -70,8 +70,7 @@ export const filterFieldsGenerate = (fields) => {
             fieldCalculation,
             options: [],
         };
-        if (i.type === 'number' &&
-            ['time', 'date', 'datetime'].includes(i.format)) {
+        if (i.type === 'number' && ['time', 'date', 'datetime'].includes(i.format)) {
             filterFieldItemConfig.filterType = i.format;
         }
         if (i.type === 'boolean') {
@@ -97,10 +96,8 @@ export const filterFieldsGenerate = (fields) => {
             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.value =
-                filterFieldItemConfig.xMultiSelect ? 'in' : 'eq';
+            filterFieldItemConfig.fieldCalculation.type = filterFieldItemConfig.xMultiSelect ? 'checkbox' : 'radio';
+            filterFieldItemConfig.fieldCalculation.value = filterFieldItemConfig.xMultiSelect ? 'in' : 'eq';
         }
         if (i.format === 'father-son' || i.format === 'related') {
             filterFieldItemConfig.filterType = i.format;
@@ -115,18 +112,16 @@ export const filterFieldsGenerate = (fields) => {
             filterFieldItemConfig.value = ((_c = i.filterConfig) === null || _c === void 0 ? void 0 : _c.value) || '';
             // 默认计算方式
             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;
+            filterFieldItemConfig.fieldCalculation = customFieldCalculation || filterFieldItemConfig.fieldCalculation;
             // 支持的运算类型
             const customFieldCalculationOptions = fieldCalculationOption === null || fieldCalculationOption === void 0 ? void 0 : fieldCalculationOption.filter((option) => {
                 var _a;
                 const filterTypeOption = [].concat((_a = i.filterConfig) === null || _a === void 0 ? void 0 : _a.filterTypeOption);
                 return filterTypeOption === null || filterTypeOption === void 0 ? void 0 : filterTypeOption.find((j) => (option === null || option === void 0 ? void 0 : option.value) === j);
             });
-            filterFieldItemConfig.fieldCalculationOption =
-                (customFieldCalculationOptions === null || customFieldCalculationOptions === void 0 ? void 0 : customFieldCalculationOptions.length)
-                    ? customFieldCalculationOptions
-                    : fieldCalculationOption;
+            filterFieldItemConfig.fieldCalculationOption = (customFieldCalculationOptions === null || customFieldCalculationOptions === void 0 ? void 0 : customFieldCalculationOptions.length)
+                ? customFieldCalculationOptions
+                : fieldCalculationOption;
         }
         return filterFieldItemConfig;
     });

package/dist/web/utils/getModelParams.d.ts

@@ -1,8 +1,13 @@
 export function convertWhere(props: any, supportManyRelated: any): any;
+export function getFilter(wList: any): any;
+export function getSelectFields(props: any): any;
 export function getModelParams(props: any): {
     orderBy: any;
     orderType: any;
     filter: any;
-    select: {};
+    select: any;
     where: any[];
 };
+export function transformSorter(sorter?: any[]): {
+    [x: number]: any;
+}[];

package/dist/web/utils/getModelParams.js

@@ -24,7 +24,7 @@ export const convertWhere = (props, supportManyRelated) => {
 /**
  * 拼接filter参数
  */
-const getFilter = (wList) => {
+export const getFilter = (wList) => {
     var _a, _b, _c;
     let where = [];
     let filter = { where: {} };
@@ -62,19 +62,21 @@ const getFilter = (wList) => {
     }
     return getParseValue(filter);
 };
-const getSelectFields = (props) => {
-    let select = {};
+export const getSelectFields = (props) => {
+    const { selectFieldType = 'main', selectFields = [] } = props;
+    // 是否具备展示自定义字段的条件
+    const isRelationSelectOption = selectFieldType === 'custom' && Array.isArray(selectFields) && (selectFields === null || selectFields === void 0 ? void 0 : selectFields.length);
     // 支持自定义查询字段
-    if (props.selectFieldType === 'custom') {
-        const _selectFields = Array.isArray(props.selectFields) ? props.selectFields : [];
-        _selectFields.forEach((name) => {
-            select[name] = true;
-        });
-    }
-    else {
-        select = { $master: true };
+    if (isRelationSelectOption) {
+        const select = selectFields.reduce((acc, item) => {
+            if (!acc[item]) {
+                acc[item] = true;
+            }
+            return acc;
+        }, {});
+        return select;
     }
-    return select;
+    return { $master: true };
 };
 /**
  * 获取tcb查询条件
@@ -122,7 +124,8 @@ export const getModelParams = (props) => {
     }
     return params;
 };
-const transformSorter = (sorter = []) => {
+// relationalTableName,后端暂不支持按照关联关系表的字段排序（前端预埋参数）
+export const transformSorter = (sorter = []) => {
     var _a;
     return (_a = sorter === null || sorter === void 0 ? void 0 : sorter.filter((n) => (n.orderBy && n.orderType) || n.relationalTableName)) === null || _a === void 0 ? void 0 : _a.map((i) => {
         var _a, _b;

package/dist/web/utils/tcb.d.ts

@@ -42,3 +42,7 @@ export declare const appCloudGetWedaUserId: () => any;
 export declare const appCloudIsInWedaIde: () => any;
 export declare const appCloudGetWedaRelatedRoles: () => any;
 export declare function appCloudShowWedaToast(params: any): any;
+/**
+ * 设置默认上传路径
+ */
+export declare const getDefaultUploadPath: (uploadPath: any) => any;

package/dist/web/utils/tcb.js

@@ -2,13 +2,7 @@ import { isInIde } from './platform';
 import { deepClone } from './tool';
 import { errorHandler } from './error';
 // 默认使用swr的methodName
-const SWR_METHOD_DEFAULT = [
-    'wedaGetItem',
-    'wedaGetRecords',
-    'wedaGetItemV2',
-    'wedaGetRecordsV2',
-    'getApiKey',
-];
+const SWR_METHOD_DEFAULT = ['wedaGetItem', 'wedaGetRecords', 'wedaGetItemV2', 'wedaGetRecordsV2', 'getApiKey'];
 // 默认使用swr的action
 const SWR_ACTION_DEFAULT = [
     'DescribeAppCustomNav',
@@ -145,8 +139,7 @@ export const getIsExitApi = async (params) => {
     }
     catch (error) {
         const message = (_b = (_a = error === null || error === void 0 ? void 0 : error.original) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.message;
-        const status = (message === null || message === void 0 ? void 0 : message.indexOf('Action不存在')) != -1 ||
-            (message === null || message === void 0 ? void 0 : message.indexOf('接口不存在')) != -1;
+        const status = (message === null || message === void 0 ? void 0 : message.indexOf('Action不存在')) != -1 || (message === null || message === void 0 ? void 0 : message.indexOf('接口不存在')) != -1;
         errorHandler({ code: 'GetIsExitApi', error });
         return !status;
     }
@@ -191,3 +184,12 @@ export function appCloudShowWedaToast(params) {
     var _a;
     return (_a = window === null || window === void 0 ? void 0 : window.app) === null || _a === void 0 ? void 0 : _a.showToast(params);
 }
+/**
+ * 设置默认上传路径
+ */
+export const getDefaultUploadPath = (uploadPath) => {
+    var _a, _b;
+    const appName = ((_a = window === null || window === void 0 ? void 0 : window.app) === null || _a === void 0 ? void 0 : _a.name) || ((_b = window === null || window === void 0 ? void 0 : window.app) === null || _b === void 0 ? void 0 : _b.id);
+    const _uploadPath = appName ? `${uploadPath}/${appName}` : uploadPath;
+    return _uploadPath;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.14.4",
+  "version": "3.15.0",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -85,7 +85,7 @@
   "description": "腾讯云微搭低代码组件库模板",
   "dependencies": {
     "@antv/g6": "^4.8.5",
-    "@cloudbase/weda-client": "^1.1.22",
+    "@cloudbase/weda-client": "^1.1.24",
     "@codemirror/autocomplete": "^6.16.0",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
@@ -147,7 +147,7 @@
     "@babel/preset-env": "^7.22.15",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.22.15",
-    "@cloudbase/cals": "^1.2.8",
+    "@cloudbase/cals": "^1.2.10",
     "@cloudbase/lowcode-cli": "^0.22.1",
     "@cloudbase/weda-cloud-sdk": "^1.0.97",
     "@commitlint/cli": "^16.0.2",