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

fix(client): x-uid must be unique

Browse Source
This commit is contained in:
chenos 2022-04-08 09:08:11 +08:00
parent c8b100e390
commit 1859879978
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/client/src/collection-manager/interfaces/createdBy.ts
View File

@ -1,4 +1,5 @@
import { ISchema } from '@formily/react';
import { cloneDeep } from 'lodash';
import { defaultProps, operators, recordPickerViewer } from './properties';
import { IField } from './types';
@ -46,7 +47,7 @@ export const createdBy: IField = {
},
schemaInitialize(schema: ISchema, { readPretty }) {
schema['properties'] = {
viewer: recordPickerViewer,
viewer: cloneDeep(recordPickerViewer),
};
},
};

3
packages/client/src/collection-manager/interfaces/updatedBy.ts
View File

@ -1,4 +1,5 @@
import { ISchema } from '@formily/react';
import { cloneDeep } from 'lodash';
import { defaultProps, operators, recordPickerViewer } from './properties';
import { IField } from './types';
@ -45,7 +46,7 @@ export const updatedBy: IField = {
},
schemaInitialize(schema: ISchema, { readPretty }) {
schema['properties'] = {
viewer: recordPickerViewer,
viewer: cloneDeep(recordPickerViewer),
};
},
};

8
packages/client/src/schema-component/antd/filter/useFilterActionProps.ts
View File

@ -94,9 +94,11 @@ export const useFilterActionProps = () => {
return {
options,
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 f1 = service.params?.[0]?.filter;
service.run({ ...service.params?.[0], filter: mergeFilter(f1, filter) });
service.run({ ...service.params?.[0], filter: mergeFilter(defaultFilter, filter) });
const items = filter?.$and || filter?.$or;
if (items?.length) {
field.title = t('{{count}} filter items', { count: items?.length || 0 });
@ -104,7 +106,7 @@ export const useFilterActionProps = () => {
field.title = t('Filter');
}
},
onReset(values) {
onReset() {
const filter = removeNullCondition(props.params.filter);
service.run({ ...service.params?.[0], filter });
field.title = t('Filter');