ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(data-templates): fix filter is empty (#2193)

Browse Source
This commit is contained in:
被雨水过滤的空气-Rairn 2023-07-06 16:45:23 +08:00 committed by GitHub
parent 817646d68d
commit f44c5f3b4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/core/client/src/schema-component/antd/remote-select/RemoteSelect.tsx
View File

@ -2,7 +2,7 @@ import { LoadingOutlined } from '@ant-design/icons';
import { connect, mapProps, mapReadPretty, useField, useFieldSchema, useForm } from '@formily/react'; import { connect, mapProps, mapReadPretty, useField, useFieldSchema, useForm } from '@formily/react';
import { Divider, SelectProps, Tag } from 'antd'; import { Divider, SelectProps, Tag } from 'antd';
import flat from 'flat'; import flat from 'flat';
import { uniqBy } from 'lodash'; import _, { uniqBy } from 'lodash';
import moment from 'moment'; import moment from 'moment';
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { ResourceActionOptions, useRequest } from '../../../api-client'; import { ResourceActionOptions, useRequest } from '../../../api-client';
@ -11,7 +11,7 @@ import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
import { useCollection, useCollectionManager } from '../../../collection-manager'; import { useCollection, useCollectionManager } from '../../../collection-manager';
import { getInnermostKeyAndValue } from '../../common/utils/uitls'; import { getInnermostKeyAndValue } from '../../common/utils/uitls';
import { useCompile } from '../../hooks'; import { useCompile } from '../../hooks';
import { defaultFieldNames, Select } from '../select'; import { Select, defaultFieldNames } from '../select';
import { ReadPretty } from './ReadPretty'; import { ReadPretty } from './ReadPretty';
import { extractFilterfield, extractValuesByPattern, generatePattern, parseVariables } from './utils'; import { extractFilterfield, extractValuesByPattern, generatePattern, parseVariables } from './utils';
const EMPTY = 'N/A'; const EMPTY = 'N/A';
@ -122,7 +122,8 @@ const InternalRemoteSelect = connect(
}, },
[targetField?.uiSchema, fieldNames], [targetField?.uiSchema, fieldNames],
); );
const parseFilter = (rules) => { const parseFilter = useCallback(
(rules) => {
if (!rules) { if (!rules) {
return undefined; return undefined;
} }
@ -173,7 +174,17 @@ const InternalRemoteSelect = connect(
} }
}); });
return { [type]: results }; return { [type]: results };
}; },
[ctx.props?.collection, field.path.segments, form.values, getCollectionJoinField],
);
const filter = useMemo(() => {
const filterFromSchema = _.isString(fieldSchema?.['x-component-props']?.service?.params?.filter)
? field.componentProps?.service?.params?.filter
: fieldSchema?.['x-component-props']?.service?.params?.filter;
return mergeFilter([parseFilter(filterFromSchema) || service?.params?.filter]);
}, [field.componentProps?.service?.params?.filter, fieldSchema, parseFilter, service?.params?.filter]);
const { data, run, loading } = useRequest( const { data, run, loading } = useRequest(
{ {
@ -183,9 +194,7 @@ const InternalRemoteSelect = connect(
pageSize: 200, pageSize: 200,
...service?.params, ...service?.params,
// search needs // search needs
filter: mergeFilter([ filter,
parseFilter(fieldSchema?.['x-component-props']?.service?.params?.filter) || service?.params?.filter,
]),
}, },
}, },
{ {
@ -233,7 +242,7 @@ const InternalRemoteSelect = connect(
}, },
} }
: {}, : {},
fieldSchema?.['x-component-props']?.service?.params?.filter || service?.params?.filter, filter,
]), ]),
}); });
searchData.current = search; searchData.current = search;