@nocobase/plugin-workflow 2.1.0-alpha.3 → 2.1.0-alpha.31

package/dist/client/nodes/create.d.ts

@@ -22,6 +22,16 @@ export default class extends Instruction {
     group: string;
     description: string;
     icon: React.JSX.Element;
+    presetFieldset: {
+        collection: {
+            type: string;
+            title: string;
+            required: boolean;
+            'x-reactions': any[];
+            'x-decorator': string;
+            'x-component': string;
+        };
+    };
     fieldset: {
         collection: {
             'x-disabled': string;

package/dist/client/nodes/destroy.d.ts

@@ -16,6 +16,16 @@ export default class extends Instruction {
     group: string;
     description: string;
     icon: React.JSX.Element;
+    presetFieldset: {
+        collection: {
+            type: string;
+            title: string;
+            required: boolean;
+            'x-reactions': any[];
+            'x-decorator': string;
+            'x-component': string;
+        };
+    };
     fieldset: {
         collection: {
             'x-disabled': string;

package/dist/client/nodes/index.d.ts

@@ -107,5 +107,8 @@ export declare function Node({ data }: {
 }): React.JSX.Element;
 export declare function RemoveButton(): React.JSX.Element;
 export declare function JobButton(): React.JSX.Element;
+export declare function LogCollapse({ value }: {
+    value: any;
+}): React.JSX.Element;
 export declare function NodeDefaultView(props: any): React.JSX.Element;
 export {};

package/dist/client/nodes/query.d.ts

@@ -24,6 +24,16 @@ export default class extends Instruction {
     group: string;
     description: string;
     icon: React.JSX.Element;
+    presetFieldset: {
+        collection: {
+            type: string;
+            title: string;
+            required: boolean;
+            'x-reactions': any[];
+            'x-decorator': string;
+            'x-component': string;
+        };
+    };
     fieldset: {
         collection: {
             'x-disabled': string;
@@ -149,7 +159,10 @@ export default class extends Instruction {
                                             'x-decorator': string;
                                             'x-component': string;
                                             'x-component-props': {
-                                                useTypedConstant: string[];
+                                                nullable: boolean;
+                                                useTypedConstant: (string | {
+                                                    min: number;
+                                                })[][];
                                             };
                                             default: number;
                                         };
@@ -165,7 +178,10 @@ export default class extends Instruction {
                                             'x-decorator': string;
                                             'x-component': string;
                                             'x-component-props': {
-                                                min: number;
+                                                nullable: boolean;
+                                                useTypedConstant: (string | {
+                                                    min: number;
+                                                })[][];
                                             };
                                             default: number;
                                         };

package/dist/client/nodes/update.d.ts

@@ -18,6 +18,16 @@ export default class extends Instruction {
     group: string;
     description: string;
     icon: React.JSX.Element;
+    presetFieldset: {
+        collection: {
+            type: string;
+            title: string;
+            required: boolean;
+            'x-reactions': any[];
+            'x-decorator': string;
+            'x-component': string;
+        };
+    };
     fieldset: {
         collection: {
             'x-disabled': string;

package/dist/client/schemas/collection.d.ts

@@ -121,7 +121,10 @@ export declare const pagination: {
                             'x-decorator': string;
                             'x-component': string;
                             'x-component-props': {
-                                useTypedConstant: string[];
+                                nullable: boolean;
+                                useTypedConstant: (string | {
+                                    min: number;
+                                })[][];
                             };
                             default: number;
                         };
@@ -137,7 +140,10 @@ export declare const pagination: {
                             'x-decorator': string;
                             'x-component': string;
                             'x-component-props': {
-                                min: number;
+                                nullable: boolean;
+                                useTypedConstant: (string | {
+                                    min: number;
+                                })[][];
                             };
                             default: number;
                         };

package/dist/client/schemas/executions.d.ts

@@ -46,6 +46,28 @@ export declare const executionSchema: {
                         unique?: undefined;
                         onDelete?: undefined;
                         defaultValue?: undefined;
+                    } | {
+                        type: string;
+                        name: string;
+                        interface: string;
+                        uiSchema: {
+                            type: string;
+                            title: string;
+                            'x-component': string;
+                            'x-component-props': {
+                                fieldNames?: undefined;
+                            };
+                            'x-read-pretty': boolean;
+                            'x-decorator'?: undefined;
+                            enum?: undefined;
+                        };
+                        primaryKey?: undefined;
+                        allowNull?: undefined;
+                        target?: undefined;
+                        foreignKey?: undefined;
+                        unique?: undefined;
+                        onDelete?: undefined;
+                        defaultValue?: undefined;
                     } | {
                         type: string;
                         name: string;
@@ -139,28 +161,6 @@ export declare const executionSchema: {
                         foreignKey?: undefined;
                         unique?: undefined;
                         onDelete?: undefined;
-                    } | {
-                        type: string;
-                        name: string;
-                        interface: string;
-                        uiSchema: {
-                            type: string;
-                            title: string;
-                            'x-component': string;
-                            'x-component-props': {
-                                fieldNames?: undefined;
-                            };
-                            'x-read-pretty': boolean;
-                            'x-decorator'?: undefined;
-                            enum?: undefined;
-                        };
-                        primaryKey?: undefined;
-                        allowNull?: undefined;
-                        target?: undefined;
-                        foreignKey?: undefined;
-                        unique?: undefined;
-                        onDelete?: undefined;
-                        defaultValue?: undefined;
                     })[];
                     indexes: {
                         fields: string[];
@@ -171,7 +171,6 @@ export declare const executionSchema: {
                     resource: string;
                     action: string;
                     params: {
-                        appends: string[];
                         pageSize: number;
                         sort: string[];
                         except: string[];
@@ -189,6 +188,25 @@ export declare const executionSchema: {
                         };
                     };
                     properties: {
+                        filter: {
+                            type: string;
+                            title: string;
+                            'x-action': string;
+                            'x-component': string;
+                            'x-use-component-props': string;
+                            'x-component-props': {
+                                icon: string;
+                                nonfilterable: string[];
+                            };
+                            'x-align': string;
+                            default: {
+                                $and: {
+                                    status: {
+                                        $eq: any;
+                                    };
+                                }[];
+                            };
+                        };
                         refresher: {
                             type: string;
                             title: string;

package/dist/client/triggers/collection.d.ts

@@ -16,9 +16,22 @@ declare function useVariables(config: any, options: any): import("../variable").
 export default class extends Trigger {
     title: string;
     description: string;
+    presetFieldset: {
+        collection: {
+            'x-component-props': {
+                dataSourceFilter(item: any): any;
+            };
+            type: string;
+            title: string;
+            required: boolean;
+            'x-reactions': any[];
+            'x-decorator': string;
+            'x-component': string;
+        };
+    };
     fieldset: {
         collection: {
-            'x-disabled': string;
+            'x-disabled': boolean;
             'x-component-props': {
                 dataSourceFilter(item: any): any;
             };

package/dist/client/triggers/index.d.ts

@@ -16,6 +16,10 @@ export declare abstract class Trigger {
     description?: string;
     useVariables?(config: Record<string, any>, options?: UseVariableOptions): VariableOption[];
     fieldset: Record<string, ISchema>;
+    /**
+     * @experimental
+     */
+    presetFieldset?: Record<string, ISchema>;
     triggerFieldset?: Record<string, ISchema>;
     validate(config: Record<string, any>): boolean;
     view?: ISchema;

package/dist/client/triggers/schedule/constants.d.ts

@@ -10,3 +10,7 @@ export declare const SCHEDULE_MODE: {
     STATIC: number;
     DATE_FIELD: number;
 };
+export declare const scheduleModeOptions: {
+    value: number;
+    label: string;
+}[];

package/dist/client/triggers/schedule/index.d.ts

@@ -18,6 +18,21 @@ export default class extends Trigger {
     sync: boolean;
     title: string;
     description: string;
+    presetFieldset: {
+        mode: {
+            type: string;
+            title: string;
+            name: string;
+            'x-decorator': string;
+            'x-component': string;
+            enum: {
+                value: number;
+                label: string;
+            }[];
+            required: boolean;
+            default: number;
+        };
+    };
     fieldset: {
         config: {
             type: string;

package/dist/common/collections/executions.d.ts

@@ -35,6 +35,28 @@ declare const _default: {
         unique?: undefined;
         onDelete?: undefined;
         defaultValue?: undefined;
+    } | {
+        type: string;
+        name: string;
+        interface: string;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-component-props': {
+                fieldNames?: undefined;
+            };
+            'x-read-pretty': boolean;
+            'x-decorator'?: undefined;
+            enum?: undefined;
+        };
+        primaryKey?: undefined;
+        allowNull?: undefined;
+        target?: undefined;
+        foreignKey?: undefined;
+        unique?: undefined;
+        onDelete?: undefined;
+        defaultValue?: undefined;
     } | {
         type: string;
         name: string;
@@ -128,28 +150,6 @@ declare const _default: {
         foreignKey?: undefined;
         unique?: undefined;
         onDelete?: undefined;
-    } | {
-        type: string;
-        name: string;
-        interface: string;
-        uiSchema: {
-            type: string;
-            title: string;
-            'x-component': string;
-            'x-component-props': {
-                fieldNames?: undefined;
-            };
-            'x-read-pretty': boolean;
-            'x-decorator'?: undefined;
-            enum?: undefined;
-        };
-        primaryKey?: undefined;
-        allowNull?: undefined;
-        target?: undefined;
-        foreignKey?: undefined;
-        unique?: undefined;
-        onDelete?: undefined;
-        defaultValue?: undefined;
     })[];
     indexes: {
         fields: string[];

package/dist/common/collections/executions.js

@@ -52,6 +52,18 @@ var executions_default = {
       primaryKey: true,
       allowNull: false
     },
+    {
+      type: "bigInt",
+      name: "workflowId",
+      interface: "id",
+      uiSchema: {
+        type: "number",
+        title: `{{t("Version ID", { ns: "${import_constants.NAMESPACE}" })}}`,
+        "x-component": "InputNumber",
+        "x-component-props": {},
+        "x-read-pretty": true
+      }
+    },
     {
       type: "belongsTo",
       name: "workflow",

package/dist/common/collections/jobs.js

@@ -77,6 +77,13 @@ var jobs_default = {
     {
       type: "json",
       name: "meta"
+    },
+    /**
+     * @experimental
+     */
+    {
+      type: "text",
+      name: "log"
     }
   ]
 };

package/dist/common/collections/workflows.d.ts

@@ -12,13 +12,30 @@ declare const _default: {
     name: string;
     shared: boolean;
     repository: string;
+    createdBy: boolean;
+    updatedBy: boolean;
+    createdAt: boolean;
+    updatedAt: boolean;
     fields: ({
         name: string;
         type: string;
         primaryKey: boolean;
         allowNull: boolean;
-        interface?: undefined;
-        uiSchema?: undefined;
+        interface: string;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-component-props': {
+                multiple?: undefined;
+                fieldNames?: undefined;
+                mode?: undefined;
+            };
+            'x-read-pretty': boolean;
+            required?: undefined;
+            enum?: undefined;
+            default?: undefined;
+        };
         defaultValue?: undefined;
         required?: undefined;
         target?: undefined;
@@ -53,10 +70,10 @@ declare const _default: {
             type: string;
             'x-component': string;
             required: boolean;
-            enum?: undefined;
-            default?: undefined;
             'x-component-props'?: undefined;
             'x-read-pretty'?: undefined;
+            enum?: undefined;
+            default?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;
@@ -88,9 +105,9 @@ declare const _default: {
             })[];
             'x-component': string;
             default: boolean;
-            required?: undefined;
             'x-component-props'?: undefined;
             'x-read-pretty'?: undefined;
+            required?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;
@@ -110,11 +127,11 @@ declare const _default: {
             title: string;
             type: string;
             'x-component': string;
+            'x-component-props'?: undefined;
+            'x-read-pretty'?: undefined;
             required?: undefined;
             enum?: undefined;
             default?: undefined;
-            'x-component-props'?: undefined;
-            'x-read-pretty'?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;
@@ -138,9 +155,9 @@ declare const _default: {
             'x-component': string;
             enum: string;
             required: boolean;
-            default?: undefined;
             'x-component-props'?: undefined;
             'x-read-pretty'?: undefined;
+            default?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;
@@ -215,9 +232,9 @@ declare const _default: {
                 color: string;
             }[];
             required: boolean;
-            default?: undefined;
             'x-component-props'?: undefined;
             'x-read-pretty'?: undefined;
+            default?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;
@@ -310,6 +327,39 @@ declare const _default: {
         defaultValue?: undefined;
         required?: undefined;
         onDelete?: undefined;
+    } | {
+        type: string;
+        name: string;
+        target: string;
+        foreignKey: string;
+        interface: string;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-component-props': {
+                fieldNames: {
+                    label: string;
+                    value: string;
+                    color?: undefined;
+                };
+                multiple?: undefined;
+                mode?: undefined;
+            };
+            'x-read-pretty'?: undefined;
+            required?: undefined;
+            enum?: undefined;
+            default?: undefined;
+        };
+        primaryKey?: undefined;
+        allowNull?: undefined;
+        defaultValue?: undefined;
+        required?: undefined;
+        onDelete?: undefined;
+        sourceKey?: undefined;
+        constraints?: undefined;
+        through?: undefined;
+        otherKey?: undefined;
     })[];
     indexes: {
         unique: boolean;

package/dist/common/collections/workflows.js

@@ -36,12 +36,24 @@ var workflows_default = {
   name: "workflows",
   shared: true,
   repository: "WorkflowRepository",
+  createdBy: true,
+  updatedBy: true,
+  createdAt: true,
+  updatedAt: true,
   fields: [
     {
       name: "id",
       type: "snowflakeId",
       primaryKey: true,
-      allowNull: false
+      allowNull: false,
+      interface: "id",
+      uiSchema: {
+        type: "number",
+        title: '{{t("ID")}}',
+        "x-component": "InputNumber",
+        "x-component-props": {},
+        "x-read-pretty": true
+      }
     },
     {
       name: "key",
@@ -237,6 +249,24 @@ var workflows_default = {
         },
         "x-read-pretty": true
       }
+    },
+    {
+      type: "belongsTo",
+      name: "createdBy",
+      target: "users",
+      foreignKey: "createdById",
+      interface: "m2o",
+      uiSchema: {
+        type: "number",
+        title: `{{t("Created by")}}`,
+        "x-component": "AssociationField",
+        "x-component-props": {
+          fieldNames: {
+            label: "nickname",
+            value: "id"
+          }
+        }
+      }
     }
   ],
   // NOTE: use unique index for avoiding deadlock in mysql when setCurrent

package/dist/externalVersion.js

@@ -11,27 +11,29 @@ module.exports = {
   "react": "18.2.0",
   "@formily/core": "2.3.7",
   "@formily/react": "2.3.7",
-  "@nocobase/client": "2.1.0-alpha.3",
-  "@nocobase/utils": "2.1.0-alpha.3",
+  "@nocobase/client": "2.1.0-alpha.31",
+  "@nocobase/utils": "2.1.0-alpha.31",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "react-router-dom": "6.30.1",
   "react-i18next": "11.18.6",
-  "lodash": "4.17.21",
+  "lodash": "4.18.1",
   "@dnd-kit/core": "6.1.0",
   "@formily/shared": "2.3.7",
-  "@nocobase/flow-engine": "2.1.0-alpha.3",
-  "@nocobase/plugin-mobile": "2.1.0-alpha.3",
+  "@nocobase/flow-engine": "2.1.0-alpha.31",
+  "@nocobase/plugin-mobile": "2.1.0-alpha.31",
   "sequelize": "6.35.2",
-  "@nocobase/server": "2.1.0-alpha.3",
-  "@nocobase/database": "2.1.0-alpha.3",
-  "@nocobase/data-source-manager": "2.1.0-alpha.3",
-  "@nocobase/logger": "2.1.0-alpha.3",
-  "@nocobase/evaluators": "2.1.0-alpha.3",
+  "@nocobase/server": "2.1.0-alpha.31",
+  "@nocobase/database": "2.1.0-alpha.31",
+  "@nocobase/data-source-manager": "2.1.0-alpha.31",
+  "@nocobase/logger": "2.1.0-alpha.31",
+  "@nocobase/evaluators": "2.1.0-alpha.31",
   "@formily/antd-v5": "1.2.3",
   "@formily/reactive": "2.3.7",
-  "@nocobase/actions": "2.1.0-alpha.3",
+  "@emotion/css": "11.13.0",
+  "@formily/json-schema": "2.3.7",
+  "@nocobase/actions": "2.1.0-alpha.31",
   "dayjs": "1.11.13",
-  "@nocobase/plugin-workflow-test": "2.1.0-alpha.3",
-  "@nocobase/test": "2.1.0-alpha.3"
+  "@nocobase/plugin-workflow-test": "2.1.0-alpha.31",
+  "@nocobase/test": "2.1.0-alpha.31"
 };

package/dist/locale/zh-CN.json

@@ -89,6 +89,7 @@
   "Duplicate": "复制",
   "Duplicate to new workflow": "复制为新工作流",
   "Edit category": "编辑分类",
+  "Enabled": "启用",
   "End": "结束",
   "End as failed": "以失败结束",
   "End process": "结束流程",
@@ -223,12 +224,14 @@
   "The workflow tasks page has already been created.": "工作流待办页面已创建。",
   "This is a main version, delete it will cause the whole workflow to be deleted (including all other revisions).": "当前是主版本，删除将导致整个流程被删除（包括所有其他版本）。",
   "This node contains branches, deleting will also be preformed to them, are you sure?": "节点包含分支，将同时删除其所有分支下的子节点，确定继续？",
+  "This type of node can not be used in current type of workflow or execute mode.": "该类型的节点在当前类型的工作流或执行模式中不可用。",
   "This type of trigger has not been supported to be executed manually.": "该类型的触发器暂未支持手动执行。",
   "This will perform all the actions configured in the workflow. Are you sure you want to continue?": "将按照工作流中配置的所有操作执行，确定继续吗？",
   "Trigger": "触发器",
+  "Trigger configuration": "触发器配置",
   "Trigger data": "触发数据",
   "Trigger data context": "触发数据上下文",
-  "Trigger in executed workflow cannot be modified": "Trigger in executed workflow cannot be modified",
+  "Trigger in executed workflow cannot be modified": "已执行的工作流中的触发器无法修改",
   "Trigger mode": "触发模式",
   "Trigger on": "触发时机",
   "Trigger time": "触发时间",