fix(client): x-uid must be unique
This commit is contained in:
parent
c8b100e390
commit
1859879978
@ -1,4 +1,5 @@
|
|||||||
import { ISchema } from '@formily/react';
|
import { ISchema } from '@formily/react';
|
||||||
|
import { cloneDeep } from 'lodash';
|
||||||
import { defaultProps, operators, recordPickerViewer } from './properties';
|
import { defaultProps, operators, recordPickerViewer } from './properties';
|
||||||
import { IField } from './types';
|
import { IField } from './types';
|
||||||
|
|
||||||
@ -46,7 +47,7 @@ export const createdBy: IField = {
|
|||||||
},
|
},
|
||||||
schemaInitialize(schema: ISchema, { readPretty }) {
|
schemaInitialize(schema: ISchema, { readPretty }) {
|
||||||
schema['properties'] = {
|
schema['properties'] = {
|
||||||
viewer: recordPickerViewer,
|
viewer: cloneDeep(recordPickerViewer),
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import { ISchema } from '@formily/react';
|
import { ISchema } from '@formily/react';
|
||||||
|
import { cloneDeep } from 'lodash';
|
||||||
import { defaultProps, operators, recordPickerViewer } from './properties';
|
import { defaultProps, operators, recordPickerViewer } from './properties';
|
||||||
import { IField } from './types';
|
import { IField } from './types';
|
||||||
|
|
||||||
@ -45,7 +46,7 @@ export const updatedBy: IField = {
|
|||||||
},
|
},
|
||||||
schemaInitialize(schema: ISchema, { readPretty }) {
|
schemaInitialize(schema: ISchema, { readPretty }) {
|
||||||
schema['properties'] = {
|
schema['properties'] = {
|
||||||
viewer: recordPickerViewer,
|
viewer: cloneDeep(recordPickerViewer),
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -94,9 +94,11 @@ export const useFilterActionProps = () => {
|
|||||||
return {
|
return {
|
||||||
options,
|
options,
|
||||||
onSubmit(values) {
|
onSubmit(values) {
|
||||||
|
// filter parameter for the block
|
||||||
|
const defaultFilter = removeNullCondition(props.params.filter);
|
||||||
|
// filter parameter for the filter action
|
||||||
const filter = removeNullCondition(values?.filter);
|
const filter = removeNullCondition(values?.filter);
|
||||||
const f1 = service.params?.[0]?.filter;
|
service.run({ ...service.params?.[0], filter: mergeFilter(defaultFilter, filter) });
|
||||||
service.run({ ...service.params?.[0], filter: mergeFilter(f1, filter) });
|
|
||||||
const items = filter?.$and || filter?.$or;
|
const items = filter?.$and || filter?.$or;
|
||||||
if (items?.length) {
|
if (items?.length) {
|
||||||
field.title = t('{{count}} filter items', { count: items?.length || 0 });
|
field.title = t('{{count}} filter items', { count: items?.length || 0 });
|
||||||
@ -104,7 +106,7 @@ export const useFilterActionProps = () => {
|
|||||||
field.title = t('Filter');
|
field.title = t('Filter');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onReset(values) {
|
onReset() {
|
||||||
const filter = removeNullCondition(props.params.filter);
|
const filter = removeNullCondition(props.params.filter);
|
||||||
service.run({ ...service.params?.[0], filter });
|
service.run({ ...service.params?.[0], filter });
|
||||||
field.title = t('Filter');
|
field.title = t('Filter');
|
||||||
|
Loading…
Reference in New Issue
Block a user