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

Merge branch 'main' into next

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-07-25 02:31:39 +00:00
commit 897910e143
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/client/src/collection-manager/templates/components/PresetFields.tsx
View File

@ -169,7 +169,7 @@ export const PresetFields = observer(
];
useEffect(() => {
const config = {
autoGenId: true,
autoGenId: false,
createdAt: true,
createdBy: true,
updatedAt: true,
@ -209,7 +209,7 @@ export const PresetFields = observer(
onChange: (_, selectedRows) => {
const fields = getDefaultCollectionFields(selectedRows, form.values);
const config = {
autoGenId: !!fields.find((v) => v.name === 'id'),
autoGenId: false,
createdAt: !!fields.find((v) => v.name === 'createdAt'),
createdBy: !!fields.find((v) => v.name === 'createdBy'),
updatedAt: !!fields.find((v) => v.name === 'updatedAt'),

4
packages/plugins/@nocobase/plugin-data-source-main/src/client/__e2e__/collection-template/general2.test.ts
View File

@ -26,7 +26,7 @@ test.describe('create collection with preset fields', () => {
const postData = request.postDataJSON();
//默认提交的数据符合预期
expect(postData).toMatchObject({
autoGenId: true,
autoGenId: false,
createdAt: true,
createdBy: true,
updatedAt: true,
@ -78,7 +78,7 @@ test.describe('create collection with preset fields', () => {
const postData = request.postDataJSON();
//提交的数据符合预期
expect(postData).toMatchObject({
autoGenId: true,
autoGenId: false,
createdAt: false,
createdBy: false,
updatedAt: false,