Users
diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
index bb5f4ac1aa..d55ec37a5a 100644
--- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
+++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
@@ -37,6 +37,15 @@ const formItemWrapCss = css`
.ant-description-textarea img {
max-width: 100%;
}
+ &.ant-formily-item-layout-vertical .ant-formily-item-label {
+ display: inline;
+ .ant-formily-item-label-tooltip-icon {
+ display: inline;
+ }
+ .ant-formily-item-label-content {
+ display: inline;
+ }
+ }
`;
const formItemLabelCss = css`
@@ -44,7 +53,7 @@ const formItemLabelCss = css`
padding: 0px !important;
}
> .ant-formily-item-label {
- display: none;
+ display: none !important;
}
`;
@@ -83,7 +92,7 @@ export const FormItem: any = withDynamicSchemaProps(
[formItemLabelCss]: showTitle === false,
});
}, [showTitle]);
-
+ console.log(className);
// 联动规则中的“隐藏保留值”的效果
if (field.data?.hidden) {
return null;
diff --git a/packages/core/database/src/__tests__/fields/text-field.test.ts b/packages/core/database/src/__tests__/fields/text-field.test.ts
index 3060520ddc..ba500a8185 100644
--- a/packages/core/database/src/__tests__/fields/text-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/text-field.test.ts
@@ -55,4 +55,18 @@ describe('text field', () => {
});
await Test.sync();
});
+
+ it('trim', async () => {
+ const collection = db.collection({
+ name: 'tests',
+ fields: [{ type: 'text', name: 'name', trim: true }],
+ });
+ await db.sync();
+ const model = await collection.model.create({
+ name: ' n1\n ',
+ });
+ expect(model.toJSON()).toMatchObject({
+ name: 'n1',
+ });
+ });
});
diff --git a/packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts
index 78793cc356..2cd0dd6bb7 100644
--- a/packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts
+++ b/packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts
@@ -159,6 +159,7 @@ describe('has many repository', () => {
name: 'posts',
fields: [
{ type: 'string', name: 'title' },
+ { type: 'belongsTo', name: 'user' },
{ type: 'belongsToMany', name: 'tags', through: 'posts_tags' },
{ type: 'hasMany', name: 'comments' },
{ type: 'string', name: 'status' },
@@ -480,6 +481,51 @@ describe('has many repository', () => {
).not.toBeNull();
});
+ test('destroy by pk and filter with association', async () => {
+ const u1 = await User.repository.create({
+ values: { name: 'u1' },
+ });
+
+ const UserPostRepository = new HasManyRepository(User, 'posts', u1.id);
+
+ const p1 = await UserPostRepository.create({
+ values: {
+ title: 't1',
+ status: 'published',
+ user: u1,
+ },
+ });
+
+ const p2 = await UserPostRepository.create({
+ values: {
+ title: 't2',
+ status: 'draft',
+ user: u1,
+ },
+ });
+
+ await UserPostRepository.destroy({
+ filterByTk: p1.id,
+ filter: {
+ user: {
+ id: u1.id,
+ },
+ },
+ });
+
+ expect(
+ await UserPostRepository.findOne({
+ filterByTk: p1.id,
+ }),
+ ).toBeNull();
+
+ expect(
+ await UserPostRepository.findOne({
+ filterByTk: p2.id,
+ }),
+ ).not.toBeNull();
+ });
+
test('destroy by pk', async () => {
const u1 = await User.repository.create({
values: { name: 'u1' },
diff --git a/packages/core/database/src/fields/datetime-no-tz-field.ts b/packages/core/database/src/fields/datetime-no-tz-field.ts
index 695ace4813..676ac778a2 100644
--- a/packages/core/database/src/fields/datetime-no-tz-field.ts
+++ b/packages/core/database/src/fields/datetime-no-tz-field.ts
@@ -29,26 +29,24 @@ export class DatetimeNoTzField extends Field {
return DatetimeNoTzTypeMySQL;
}
- return DataTypes.STRING;
+ return DataTypes.DATE;
}
- init() {
+ beforeSave = async (instance, options) => {
const { name, defaultToCurrentTime, onUpdateToCurrentTime } = this.options;
- this.beforeSave = async (instance, options) => {
- const value = instance.get(name);
+ const value = instance.get(name);
- if (!value && instance.isNewRecord && defaultToCurrentTime) {
- instance.set(name, new Date());
- return;
- }
+ if (!value && instance.isNewRecord && defaultToCurrentTime) {
+ instance.set(name, new Date());
+ return;
+ }
- if (onUpdateToCurrentTime) {
- instance.set(name, new Date());
- return;
- }
- };
- }
+ if (onUpdateToCurrentTime) {
+ instance.set(name, new Date());
+ return;
+ }
+ };
additionalSequelizeOptions(): {} {
const { name } = this.options;
@@ -57,17 +55,14 @@ export class DatetimeNoTzField extends Field {
const timezone = this.database.options.rawTimezone || '+00:00';
const isPg = this.database.inDialect('postgres');
+ const isMySQLCompatibleDialect = this.database.isMySQLCompatibleDialect();
return {
get() {
const val = this.getDataValue(name);
if (val instanceof Date) {
- if (isPg) {
- return moment(val).format('YYYY-MM-DD HH:mm:ss');
- }
- // format to YYYY-MM-DD HH:mm:ss
- const momentVal = moment(val).utcOffset(timezone);
+ const momentVal = moment(val);
return momentVal.format('YYYY-MM-DD HH:mm:ss');
}
@@ -75,18 +70,24 @@ export class DatetimeNoTzField extends Field {
},
set(val) {
- if (typeof val === 'string' && isIso8601(val)) {
- const momentVal = moment(val).utcOffset(timezone);
- val = momentVal.format('YYYY-MM-DD HH:mm:ss');
+ if (val == null) {
+ return this.setDataValue(name, null);
}
- if (val && val instanceof Date) {
- // format to YYYY-MM-DD HH:mm:ss
- const momentVal = moment(val).utcOffset(timezone);
- val = momentVal.format('YYYY-MM-DD HH:mm:ss');
+ const dateOffset = new Date().getTimezoneOffset();
+ const momentVal = moment(val);
+ if ((typeof val === 'string' && isIso8601(val)) || val instanceof Date) {
+ momentVal.utcOffset(timezone);
+ momentVal.utcOffset(-dateOffset, true);
}
- return this.setDataValue(name, val);
+ if (isMySQLCompatibleDialect) {
+ momentVal.millisecond(0);
+ }
+
+ const date = momentVal.toDate();
+
+ return this.setDataValue(name, date);
},
};
}
diff --git a/packages/core/database/src/fields/text-field.ts b/packages/core/database/src/fields/text-field.ts
index 74ca88da9b..39f1ef4670 100644
--- a/packages/core/database/src/fields/text-field.ts
+++ b/packages/core/database/src/fields/text-field.ts
@@ -23,9 +23,20 @@ export class TextField extends Field {
this.options.defaultValue = null;
}
}
+
+ additionalSequelizeOptions() {
+ const { name, trim } = this.options;
+
+ return {
+ set(value) {
+ this.setDataValue(name, trim ? value?.trim() : value);
+ },
+ };
+ }
}
export interface TextFieldOptions extends BaseColumnFieldOptions {
type: 'text';
length?: 'tiny' | 'medium' | 'long';
+ trim?: boolean;
}
diff --git a/packages/core/database/src/relation-repository/hasmany-repository.ts b/packages/core/database/src/relation-repository/hasmany-repository.ts
index f831166d67..4720a6fa59 100644
--- a/packages/core/database/src/relation-repository/hasmany-repository.ts
+++ b/packages/core/database/src/relation-repository/hasmany-repository.ts
@@ -72,7 +72,13 @@ export class HasManyRepository extends MultipleRelationRepository {
const filterResult = this.parseFilter(options['filter'], options);
if (filterResult.include && filterResult.include.length > 0) {
- return await this.destroyByFilter(options['filter'], transaction);
+ return await this.destroyByFilter(
+ {
+ filter: options['filter'],
+ filterByTk: options['filterByTk'],
+ },
+ transaction,
+ );
}
where.push(filterResult.where);
diff --git a/packages/core/database/src/relation-repository/multiple-relation-repository.ts b/packages/core/database/src/relation-repository/multiple-relation-repository.ts
index af3ed91525..9a649fa97c 100644
--- a/packages/core/database/src/relation-repository/multiple-relation-repository.ts
+++ b/packages/core/database/src/relation-repository/multiple-relation-repository.ts
@@ -179,9 +179,15 @@ export abstract class MultipleRelationRepository extends RelationRepository {
return false;
}
- protected async destroyByFilter(filter: Filter, transaction?: Transaction) {
+ protected async destroyByFilter(
+ options: {
+ filter?: Filter;
+ filterByTk?: TargetKey | TargetKey[];
+ },
+ transaction?: Transaction,
+ ) {
const instances = await this.find({
- filter: filter,
+ ...options,
transaction,
});
diff --git a/packages/core/server/src/aes-encryptor.tsx b/packages/core/server/src/aes-encryptor.ts
similarity index 100%
rename from packages/core/server/src/aes-encryptor.tsx
rename to packages/core/server/src/aes-encryptor.ts
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
index bf66f7624a..20e248f469 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
@@ -21,6 +21,7 @@ export default defineCollection({
type: 'string',
name: 'title',
translation: true,
+ trim: true,
},
{
title: '英文标识',
@@ -28,6 +29,7 @@ export default defineCollection({
type: 'uid',
name: 'name',
unique: true,
+ trim: true,
},
{
comment: '类型标识，如 local/ali-oss 等',
@@ -51,12 +53,14 @@ export default defineCollection({
type: 'text',
name: 'path',
defaultValue: '',
+ trim: true,
},
{
comment: '访问地址前缀',
type: 'string',
name: 'baseUrl',
defaultValue: '',
+ trim: true,
},
// TODO(feature): 需要使用一个实现了可设置默认值的字段
{
diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
index a9fe6f7ee5..b62b6e8b29 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
+++ b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
@@ -147,6 +147,7 @@ export function AdminPublicFormPage() {
}}
>
{t('Public forms', { ns: NAMESPACE })},
diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
index 3e8635b3dd..f9af7fba98 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
+++ b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
@@ -33,7 +33,7 @@ import {
import { Input, Modal, Spin } from 'antd';
import { useTranslation } from 'react-i18next';
import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
-import { isDesktop } from 'react-device-detect';
+import { isDesktop, isMobile } from 'react-device-detect';
import { useParams } from 'react-router';
import { usePublicSubmitActionProps } from '../hooks';
import { UnEnabledFormPlaceholder, UnFoundFormPlaceholder } from './UnEnabledFormPlaceholder';
@@ -129,9 +129,6 @@ const PublicFormMessageProvider = ({ children }) => {
);
};
-function isMobile() {
- return window.matchMedia('(max-width: 768px)').matches;
-}
const AssociationFieldMobile = (props) => {
return ;
@@ -165,7 +162,6 @@ const mobileComponents = {
function InternalPublicForm() {
const params = useParams();
const apiClient = useAPIClient();
- const isMobileMedia = isMobile();
const { error, data, loading, run } = useRequest(
{
url: `publicForms:getMeta/${params.name}`,
@@ -243,7 +239,7 @@ function InternalPublicForm() {
if (!data?.data) {
return ;
}
- const components = isMobileMedia ? mobileComponents : {};
+ const components = isMobile ? mobileComponents : {};
return (
diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
index 54bf5bcff4..c5611799f3 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
@@ -172,7 +172,7 @@ export class PluginPublicFormsServer extends Plugin {
skip: true,
};
} else if (
- (actionName === 'list' && ctx.PublicForm['targetCollections'].includes(resourceName)) ||
+ (['list', 'get'].includes(actionName) && ctx.PublicForm['targetCollections'].includes(resourceName)) ||
(collection?.options.template === 'file' && actionName === 'create') ||
(resourceName === 'storages' && ['getBasicInfo', 'createPresignedUrl'].includes(actionName)) ||
(resourceName === 'vditor' && ['check'].includes(actionName)) ||
diff --git a/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts b/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
index 07a2a20e4f..dfe589300b 100644
--- a/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
@@ -189,7 +189,7 @@ export class ApprovalPassthroughModeNode {
this.detailsConfigureFieldsButton = page.getByLabel(
`schema-initializer-Grid-details:configureFields-${collectionName}`,
);
- this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' }).getByRole('switch');
+ this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' });
this.actionsConfigureFieldsButton = page.getByLabel('schema-initializer-Grid-FormItemInitializers-approvalRecords');
this.actionsConfigureActionsButton = page.getByLabel(
'schema-initializer-ActionBar-ApprovalProcessAddActionButton-',
@@ -262,7 +262,7 @@ export class ApprovalBranchModeNode {
this.detailsConfigureFieldsButton = page.getByLabel(
`schema-initializer-Grid-details:configureFields-${collectionName}`,
);
- this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' }).getByRole('switch');
+ this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' });
this.actionsConfigureFieldsButton = page.getByLabel('schema-initializer-Grid-FormItemInitializers-approvalRecords');
this.actionsConfigureActionsButton = page.getByLabel('schema-initializer-ActionBar-');
this.addApproveButton = page.getByRole('menuitem', { name: 'Approve' }).getByRole('switch');
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
index f67b7a84e4..cff13e5d64 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
@@ -359,6 +359,50 @@ describe('workflow > triggers > collection', () => {
const executions = await workflow.getExecutions();
expect(executions.length).toBe(1);
});
+
+ it('datetime field not changed', async () => {
+ const workflow = await WorkflowModel.create({
+ enabled: true,
+ sync: true,
+ type: 'collection',
+ config: {
+ mode: 2,
+ collection: 'posts',
+ changed: ['createdAt'],
+ },
+ });
+
+ const post = await PostRepo.create({ values: { title: 't1' } });
+ await PostRepo.update({ filterByTk: post.id, values: { ...post.get(), title: 't2' } });
+
+ const executions = await workflow.getExecutions();
+ expect(executions.length).toBe(0);
+ });
+
+ it('datetimeNoTz field not changed', async () => {
+ db.getCollection('posts').addField('dateOnly', {
+ type: 'datetimeNoTz',
+ });
+
+ await db.sync();
+
+ const workflow = await WorkflowModel.create({
+ enabled: true,
+ sync: true,
+ type: 'collection',
+ config: {
+ mode: 2,
+ collection: 'posts',
+ changed: ['dateOnly'],
+ },
+ });
+
+ const post = await PostRepo.create({ values: { title: 't1', dateOnly: '2020-01-01 00:00:00' } });
+ await PostRepo.update({ filterByTk: post.id, values: { ...post.get(), title: 't2' } });
+
+ const executions = await workflow.getExecutions();
+ expect(executions.length).toBe(0);
+ });
});
describe('config.condition', () => {