Merge branch 'main' into next

packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/schedule/mode-date-field.test.ts

@@ -10,6 +10,7 @@
 import { MockServer } from '@nocobase/test';
 import Database from '@nocobase/database';
 import { getApp, sleep } from '@nocobase/plugin-workflow-test';
+import dayjs from 'dayjs';
 
 async function sleepToEvenSecond() {
   const now = new Date();
@@ -122,6 +123,40 @@ describe('workflow > triggers > schedule > date field mode', () => {
       expect(executions.length).toBe(0);
     });
 
+    it('starts on date field without timezone', async () => {
+      const postsCollection = db.getCollection('posts');
+      postsCollection.addField('date', {
+        type: 'datetimeNoTz',
+      });
+      await db.sync();
+      const workflow = await WorkflowModel.create({
+        enabled: true,
+        type: 'schedule',
+        config: {
+          mode: 1,
+          collection: 'posts',
+          startsOn: {
+            field: 'date',
+          },
+        },
+      });
+
+      await sleepToEvenSecond();
+      const startTime = new Date();
+      startTime.setMilliseconds(0);
+
+      const post = await PostRepo.create({
+        values: { title: 't1', date: dayjs(startTime).format('YYYY-MM-DD HH:mm:ss') },
+      });
+
+      await sleep(2000);
+
+      const executions = await workflow.getExecutions();
+      expect(executions.length).toBe(1);
+      const d0 = Date.parse(executions[0].context.date);
+      expect(d0).toBe(startTime.getTime());
+    });
+
     it('starts on post.createdAt and repeat by cron', async () => {
       const workflow = await WorkflowModel.create({
         enabled: true,

packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts

@@ -57,7 +57,7 @@ function getDataOptionTime(record, on, dir = 1) {
       if (!field || !record.get(field)) {
         return null;
       }
-      const second = new Date(record.get(field).getTime());
+      const second = new Date(record.get(field));
       second.setMilliseconds(0);
       return second.getTime() + offset * unit * dir;
     }