mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 18:16:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: locale improve

Browse Source
This commit is contained in:
katherinehhh 2023-05-06 09:35:15 +08:00
parent 3901df3dfd
commit 2932ac3759
1 changed files with 69 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
View File

@ -3,7 +3,7 @@ import { connect, mapProps, RecursionField, useFieldSchema, useField, observer }
import { Button, Input } from 'antd'; import { Button, Input } from 'antd';
import _ from 'lodash'; import _ from 'lodash';
import { ActionContext } from '../action'; import { ActionContext } from '../action';
import React, { useCallback, useMemo, useState } from 'react'; import React, { memo, useCallback, useMemo, useState } from 'react';
import { useFieldTitle } from '../../hooks'; import { useFieldTitle } from '../../hooks';
import { RemoteSelect, RemoteSelectProps } from '../remote-select'; import { RemoteSelect, RemoteSelectProps } from '../remote-select';
import { defaultFieldNames } from '../select'; import { defaultFieldNames } from '../select';
@ -18,93 +18,76 @@ export type AssociationSelectProps<P = any> = RemoteSelectProps<P> & {
multiple?: boolean; multiple?: boolean;
}; };
const InternalAssociationSelect = connect( const InternalAssociationSelect = memo((props: AssociationSelectProps) => {
(props: AssociationSelectProps) => { const { fieldNames, objectValue = true } = props;
const { fieldNames, objectValue = true } = props; const field: any = useField();
const field: any = useField(); const [visibleAddNewer, setVisibleAddNewer] = useState(false);
const [visibleAddNewer, setVisibleAddNewer] = useState(false); const { getField } = useCollection();
const { getField } = useCollection(); const collectionField = getField(field.props.name);
const collectionField = getField(field.props.name); const service = fieldNames && useServiceOptions(props);
const service = useServiceOptions(props); const fieldSchema = useFieldSchema();
const fieldSchema = useFieldSchema(); const isAllowAddNew = fieldSchema['x-add-new'] !== false;
const isAllowAddNew = fieldSchema['x-add-new'] !== false; const insertAddNewer = useInsertSchema('AddNewer');
const insertAddNewer = useInsertSchema('AddNewer'); useFieldTitle();
useFieldTitle(); const normalizeValues = useCallback(
const normalizeValues = useCallback( (obj) => {
(obj) => { if (!objectValue && typeof obj === 'object') {
if (!objectValue && typeof obj === 'object') { return obj[fieldNames?.value];
return obj[fieldNames.value];
}
return obj;
},
[objectValue, fieldNames.value],
);
const value = useMemo(() => {
if (props.value === undefined || props.value === null || !Object.keys(props.value).length) {
return;
} }
return obj;
if (Array.isArray(props.value)) {
return props.value.map(normalizeValues);
} else {
return normalizeValues(props.value);
}
}, [props.value, normalizeValues]);
return (
<>
<Input.Group compact style={{ display: 'flex' }}>
<RemoteSelect
style={{ width: '100%' }}
{...props}
objectValue={objectValue}
value={value}
service={service}
></RemoteSelect>
{isAllowAddNew && !field.readPretty && (
<Button
type={'primary'}
onClick={() => {
insertAddNewer(schema.AddNewer);
setVisibleAddNewer(true);
}}
>
Add new
</Button>
)}
</Input.Group>
<ActionContext.Provider
value={{ openMode: 'drawer', visible: visibleAddNewer, setVisible: setVisibleAddNewer }}
>
<CollectionProvider name={collectionField.target}>
<RecursionField
onlyRenderProperties
basePath={field.address}
schema={fieldSchema}
filterProperties={(s) => {
return s['x-component'] === 'AssociationField.AddNewer';
}}
/>
</CollectionProvider>
</ActionContext.Provider>
</>
);
},
mapProps(
{
dataSource: 'options',
loading: true,
}, },
(props, field) => { [objectValue, fieldNames?.value],
return { );
...props,
fieldNames: { ...defaultFieldNames, ...props.fieldNames, ...field.componentProps.fieldNames }, const value = useMemo(() => {
suffixIcon: field?.['loading'] || field?.['validating'] ? <LoadingOutlined /> : props.suffixIcon, if (props.value === undefined || props.value === null || !Object.keys(props.value).length) {
}; return;
}, }
),
); if (Array.isArray(props.value)) {
return props.value.map(normalizeValues);
} else {
return normalizeValues(props.value);
}
}, [props.value, normalizeValues]);
return (
<div key={fieldSchema.name}>
<Input.Group compact style={{ display: 'flex' }}>
<RemoteSelect
style={{ width: '100%' }}
{...props}
objectValue={objectValue}
value={value}
service={service}
></RemoteSelect>
{isAllowAddNew && !field.readPretty && (
<Button
type={'primary'}
onClick={() => {
insertAddNewer(schema.AddNewer);
setVisibleAddNewer(true);
}}
>
Add new
</Button>
)}
</Input.Group>
<ActionContext.Provider value={{ openMode: 'drawer', visible: visibleAddNewer, setVisible: setVisibleAddNewer }}>
<CollectionProvider name={collectionField.target}>
<RecursionField
onlyRenderProperties
basePath={field.address}
schema={fieldSchema}
filterProperties={(s) => {
return s['x-component'] === 'AssociationField.AddNewer';
}}
/>
</CollectionProvider>
</ActionContext.Provider>
</div>
);
});
interface AssociationSelectInterface { interface AssociationSelectInterface {
(props: any): React.ReactElement; (props: any): React.ReactElement;
@ -118,7 +101,6 @@ export const AssociationSelectReadPretty = connect(
(props: any) => { (props: any) => {
if (props.fieldNames) { if (props.fieldNames) {
const service = useServiceOptions(props); const service = useServiceOptions(props);
console.log(props)
useFieldTitle(); useFieldTitle();
return <RemoteSelect.ReadPretty {...props} service={service}></RemoteSelect.ReadPretty>; return <RemoteSelect.ReadPretty {...props} service={service}></RemoteSelect.ReadPretty>;
} }