From 0349edb42ce1f674e04f7831c0a25685c1b572f7 Mon Sep 17 00:00:00 2001 From: Katherine Date: Wed, 26 Mar 2025 20:03:52 +0800 Subject: [PATCH 1/2] fix: issue with date field display in data scope filtering (#6564) --- .../client/src/schema-component/antd/date-picker/DatePicker.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx index 7e9125b46b..cc1099775a 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx @@ -289,7 +289,7 @@ DatePicker.FilterWithPicker = function FilterWithPicker(props: any) { const [stateProps, setStateProps] = useState(newProps); useEffect(() => { newProps.picker = targetPicker; - const dateTimeFormat = getDateTimeFormat(targetPicker, format, showTime, timeFormat); + const dateTimeFormat = getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat); newProps.format = dateTimeFormat; setStateProps(newProps); }, [targetPicker]); From ec9dbe865a91e6ccf71f996803a8acefe3dfa852 Mon Sep 17 00:00:00 2001 From: Junyi Date: Wed, 26 Mar 2025 21:40:23 +0800 Subject: [PATCH 2/2] fix(plugin-workflow): generate workflow key (#6567) --- .../plugins/@nocobase/plugin-workflow/src/server/Plugin.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts index a9abb48bee..794b1dc158 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts +++ b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts @@ -15,7 +15,7 @@ import LRUCache from 'lru-cache'; import { Op } from '@nocobase/database'; import { Plugin } from '@nocobase/server'; -import { Registry } from '@nocobase/utils'; +import { Registry, uid } from '@nocobase/utils'; import { SequelizeCollectionManager } from '@nocobase/data-source-manager'; import { Logger, LoggerOptions } from '@nocobase/logger'; @@ -75,6 +75,10 @@ export default class PluginWorkflowServer extends Plugin { private onBeforeSave = async (instance: WorkflowModel, { transaction }) => { const Model = instance.constructor; + if (!instance.key) { + instance.set('key', uid()); + } + if (instance.enabled) { instance.set('current', true); }