Merge branch 'next' into develop

packages/plugins/@nocobase/plugin-workflow-action-trigger/src/server/ActionTrigger.ts

@@ -233,16 +233,16 @@ export default class extends Trigger {
     );
   }
 
-  validateConfig(values) {
+  validateContext(values) {
     if (!values.data) {
       return {
-        data: 'Data property is required',
+        data: 'Data is required',
       };
     }
 
     if (!values.userId) {
       return {
-        userId: 'UserId property is required',
+        userId: 'UserId is required',
       };
     }
 

packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowCanvas.tsx

@@ -96,9 +96,9 @@ function useExecuteConfirmAction() {
   const ctx = useActionContext();
   const navigate = useNavigateNoUpdate();
   const { message: messageApi } = App.useApp();
-  const { autoRevision, ...values } = form.values;
   return {
     async run() {
+      const { autoRevision, ...values } = form.values;
       // Not executed, could choose to create new version (by default)
       // Executed, stay in current version, and refresh
       await form.submit();

packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/ScheduleModes.tsx

@@ -83,7 +83,14 @@ export const ScheduleModes = {
           nullable: false,
           changeOnSelect: true,
           render(props) {
-            return <DatePicker showTime placeholder={lang('Current time')} {...props} value={dayjs(props.value)} />;
+            return (
+              <DatePicker
+                showTime
+                placeholder={lang('Current time')}
+                {...props}
+                value={dayjs(props.value || new Date())}
+              />
+            );
           },
         },
       },

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

@@ -236,10 +236,10 @@ export default class CollectionTrigger extends Trigger {
     });
   }
 
-  validateConfig(values) {
+  validateContext(values) {
     if (!values.data) {
       return {
-        data: 'Data property is required',
+        data: 'Data is required',
       };
     }
 

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

@@ -437,4 +437,13 @@ export default class DateFieldScheduleTrigger {
 
     return this.workflow.trigger(workflow, { ...values, data, date: values?.date ?? new Date() }, options);
   }
+
+  validateContext(values) {
+    if (!values?.data) {
+      return {
+        data: 'Data is required',
+      };
+    }
+    return null;
+  }
 }

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

@@ -67,25 +67,19 @@ export default class ScheduleTrigger extends Trigger {
   //   return !existed.length;
   // }
 
-  validateConfig(values) {
+  validateContext(values) {
-    if (!values.mode) {
+    if (!values?.mode) {
       return {
-        mode: 'Mode property is required',
+        mode: 'Mode is required',
+      };
+    }
+    const trigger = this.getTrigger(values.mode);
+    if (!trigger) {
+      return {
+        mode: 'Mode in invalid',
       };
     }
 
-    if (!values.startsOn) {
+    return trigger.validateContext?.(values);
-      return {
-        startsOn: 'StartsOn property is required',
-      };
-    }
-
-    if (values.mode === SCHEDULE_MODE.DATE_FIELD && !values.collection) {
-      return {
-        collection: 'Collection property is required',
-      };
-    }
-
-    return null;
   }
 }

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

@@ -20,7 +20,7 @@ export abstract class Trigger {
     return true;
   }
   duplicateConfig?(workflow: WorkflowModel, options: Transactionable): object | Promise<object>;
-  validateConfig?(values: any): null | void | { [key: string]: string };
+  validateContext?(values: any): null | void | { [key: string]: string };
   sync?: boolean;
   execute?(
     workflow: WorkflowModel,