@nocobase/plugin-workflow 0.12.0-alpha.4 → 0.12.0-alpha.5

package/dist/client/index.js

@@ -2228,13 +2228,22 @@
           uiSchema: {
             title: lang("Trigger data")
           }
+        },
+        {
+          collectionName: "users",
+          name: "user",
+          type: "hasOne",
+          target: "users",
+          uiSchema: {
+            title: lang("User submitted form")
+          }
         }
       ];
       const result = getCollectionFieldOptions({
         // depth,
         ...options,
         fields: rootFields,
-        appends: ["data", ...((_a = config.appends) == null ? void 0 : _a.map((item) => `data.${item}`)) || []],
+        appends: ["data", "user", ...((_a = config.appends) == null ? void 0 : _a.map((item) => `data.${item}`)) || []],
         compile,
         getCollectionFields
       });
@@ -2949,9 +2958,10 @@
     return opts.find((item) => !(v2 % item.value));
   }
   function getRepeatTypeValue(v2) {
+    let option;
     switch (typeof v2) {
       case "number":
-        const option = getNumberOption$1(v2);
+        option = getNumberOption$1(v2);
         return option ? option.value : "none";
       case "string":
         return "cron";
@@ -2968,7 +2978,8 @@
         onChange: (v2) => onChange(v2 * option.value),
         min: 1,
         addonBefore: t("Every"),
-        addonAfter: t(option.unitText)
+        addonAfter: t(option.unitText),
+        className: "auto-width"
       }
     );
   }
@@ -2997,6 +3008,7 @@
         gap: 0.5em;
 
         .react-js-cron {
+          width: 100%;
           padding: 0.5em 0.5em 0 0.5em;
           border: 1px dashed #ccc;
 
@@ -3011,10 +3023,16 @@
               margin: 0 0.5em 0 0;
             }
           }
+
+          .react-js-cron-week-days {
+            > span {
+              min-width: 2em;
+            }
+          }
         }
       `,
         children: [
-          /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Select, { value: typeValue, onChange: onTypeChange, children: RepeatOptions.map((item) => /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Select.Option, { value: item.value, children: t(item.text) }, item.value)) }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Select, { value: typeValue, onChange: onTypeChange, className: "auto-width", children: RepeatOptions.map((item) => /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Select.Option, { value: item.value, children: t(item.text) }, item.value)) }),
           typeof typeValue === "number" ? /* @__PURE__ */ jsxRuntimeExports.jsx(CommonRepeatField, { value, onChange }) : null,
           typeValue === "cron" ? /* @__PURE__ */ jsxRuntimeExports.jsx(
             J,
@@ -3223,7 +3241,8 @@
                 "x-component-props": {
                   className: client.css`
                     .ant-input-number {
-                      width: 4em;
+                      width: auto;
+                      min-width: 6em;
                     }
 
                     .ant-picker {
@@ -4891,7 +4910,7 @@
       const scope = useWorkflowVariableOptions();
       const { values: config } = form;
       const collectionName = config == null ? void 0 : config.collection;
-      const collectionFields = getCollectionFields(collectionName);
+      const collectionFields = getCollectionFields(collectionName).filter((field) => field.uiSchema);
       const fields = filter2 ? collectionFields.filter(filter2.bind(config)) : collectionFields;
       const unassignedFields = React.useMemo(() => fields.filter((field) => !value || !(field.name in value)), [fields, value]);
       const mergedDisabled = disabled || form.disabled;
@@ -8671,13 +8690,14 @@
       type: "object",
       "x-component": "fieldset",
       properties: {
-        useTransaction: {
-          type: "boolean",
-          title: `{{ t("Use transaction", { ns: "${NAMESPACE}" }) }}`,
-          description: `{{ t("Data operation nodes in workflow will run in a same transaction until any interruption. Any failure will cause data rollback, and will also rollback the history of the execution.", { ns: "${NAMESPACE}" }) }}`,
-          "x-decorator": "FormItem",
-          "x-component": "Checkbox"
-        },
+        // NOTE: not to expose this option for now, because hard to track errors
+        // useTransaction: {
+        //   type: 'boolean',
+        //   title: `{{ t("Use transaction", { ns: "${NAMESPACE}" }) }}`,
+        //   description: `{{ t("Data operation nodes in workflow will run in a same transaction until any interruption. Any failure will cause data rollback, and will also rollback the history of the execution.", { ns: "${NAMESPACE}" }) }}`,
+        //   'x-decorator': 'FormItem',
+        //   'x-component': 'Checkbox',
+        // },
         deleteExecutionOnStatus: {
           type: "array",
           title: `{{ t("Auto delete history when execution is on end status", { ns: "${NAMESPACE}" }) }}`,
@@ -8745,7 +8765,10 @@
                     },
                     title: '{{t("Add new")}}',
                     properties: {
-                      ...workflowFieldset,
+                      title: workflowFieldset.title,
+                      type: workflowFieldset.type,
+                      description: workflowFieldset.description,
+                      options: workflowFieldset.options,
                       footer: {
                         type: "void",
                         "x-component": "Action.Drawer.Footer",
@@ -8906,7 +8929,10 @@
                             },
                             title: '{{ t("Edit") }}',
                             properties: {
-                              ...workflowFieldset,
+                              title: workflowFieldset.title,
+                              enabled: workflowFieldset.enabled,
+                              description: workflowFieldset.description,
+                              options: workflowFieldset.options,
                               footer: {
                                 type: "void",
                                 "x-component": "Action.Drawer.Footer",

package/dist/locale/zh-CN.d.ts

@@ -30,6 +30,7 @@ declare const _default: {
     'Form data model': string;
     'Use a collection to match form data.': string;
     'Associations to use': string;
+    'User submitted form': string;
     'Bind workflows': string;
     'Workflow will be triggered after submitting succeeded.': string;
     'Workflow will be triggered after saving succeeded.': string;

package/dist/locale/zh-CN.js

@@ -32,6 +32,7 @@ var zh_CN_default = {
   "Form data model": "\u8868\u5355\u6570\u636E\u6A21\u578B",
   "Use a collection to match form data.": "\u4F7F\u7528\u4E00\u4E2A\u6570\u636E\u8868\u6765\u5339\u914D\u8868\u5355\u6570\u636E\u3002",
   "Associations to use": "\u5F85\u4F7F\u7528\u7684\u5173\u7CFB\u6570\u636E",
+  "User submitted form": "\u63D0\u4EA4\u8868\u5355\u7684\u7528\u6237",
   "Bind workflows": "\u7ED1\u5B9A\u5DE5\u4F5C\u6D41",
   "Workflow will be triggered after submitting succeeded.": "\u63D0\u4EA4\u6210\u529F\u540E\u89E6\u53D1\u5DE5\u4F5C\u6D41\u3002",
   "Workflow will be triggered after saving succeeded.": "\u4FDD\u5B58\u6210\u529F\u540E\u89E6\u53D1\u5DE5\u4F5C\u6D41\u3002",

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2023-08-15T04:39:36.240Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2023-08-18T08:41:04.503Z"}

package/dist/node_modules/lru-cache/package.json

@@ -1 +1 @@
-{"type":"commonjs","_lastModified":"2023-08-15T04:39:35.782Z"}
+{"type":"commonjs","_lastModified":"2023-08-18T08:41:03.882Z"}

package/dist/server/triggers/form.js

@@ -34,6 +34,7 @@ class FormTrigger extends _.Trigger {
     if (!triggerWorkflows) {
       return;
     }
+    const { currentUser } = context.state;
     const triggers = triggerWorkflows.split(",").map((trigger) => trigger.split("!"));
     const workflowRepo = this.plugin.db.getRepository("workflows");
     const workflows = await workflowRepo.find({
@@ -73,10 +74,14 @@ class FormTrigger extends _.Trigger {
               appends
             });
           }
-          this.plugin.trigger(workflow, { data: payload });
+          this.plugin.trigger(workflow, { data: payload, user: currentUser });
         });
       } else {
-        this.plugin.trigger(workflow, { data: trigger[1] ? lodash.get(values, trigger[1]) : values });
+        const data = trigger[1] ? lodash.get(values, trigger[1]) : values;
+        this.plugin.trigger(workflow, {
+          data,
+          user: currentUser
+        });
       }
     });
   }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful workflow plugin designed to support business process management and automation.",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.12.0-alpha.4",
+  "version": "0.12.0-alpha.5",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -40,5 +40,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "215dc3b2437c501ca903b56cc378ab5e81c8a11c"
+  "gitHead": "689cc16e83361c4d0b91907e0deac30bdb907692"
 }