@nocobase/plugin-workflow 0.9.2-alpha.4 → 0.9.4-alpha.1

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

@@ -5,18 +5,26 @@ declare const _default: {
     title: string;
     type: string;
     group: string;
+    description: string;
     fieldset: {
         collection: {
             type: string;
             title: string;
             required: boolean;
-            'x-reactions': string[];
+            'x-reactions': any[];
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                placeholder: string;
+                dropdownMatchSelectWidth: boolean;
             };
         };
+        multiple: {
+            type: string;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+            description: string;
+        };
         params: {
             type: string;
             properties: {
@@ -70,7 +78,9 @@ declare const _default: {
         FilterDynamicComponent: typeof FilterDynamicComponent;
         FieldsSelect: import("react").MemoExoticComponent<import("react").FunctionComponent<Pick<any, string | number | symbol>>>;
     };
-    getOptions(config: any, types: any): import("../variable").VariableOption[];
+    useVariables({ config }: {
+        config: any;
+    }, options: any): import("../variable").VariableOption[];
     useInitializers(node: any): SchemaInitializerItemOptions | null;
     initializers: {
         CollectionFieldInitializers: typeof CollectionFieldInitializers;

package/lib/client/nodes/query.js

@@ -18,21 +18,25 @@ var _CollectionFieldInitializers = require("../components/CollectionFieldInitial
 var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
 var _variable = require("../variable");
 var _FieldsSelect = require("../components/FieldsSelect");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var _default = {
   title: `{{t("Query record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'query',
   group: 'collection',
+  description: `{{t("Query records from a collection. You can use variables from upstream nodes as query conditions.", { ns: "${_locale.NAMESPACE}" })}}`,
   fieldset: {
     collection: _collection.collection,
-    // multiple: {
-    //   type: 'boolean',
-    //   title: `{{t("Multiple records", { ns: "${NAMESPACE}" })}}`,
-    //   'x-decorator': 'FormItem',
-    //   'x-component': 'Checkbox',
-    //   'x-component-props': {
-    //     disabled: true
-    //   }
-    // },
+    multiple: {
+      type: 'boolean',
+      title: `{{t("Allow multiple records as result", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'Checkbox',
+      description: `{{t("If checked, when there are multiple records in the query result, an array will be returned as the result, which can be operated on one by one using a loop node. Otherwise, only one record will be returned.", { ns: "${_locale.NAMESPACE}" })}}`
+    },
     params: {
       type: 'object',
       properties: {
@@ -42,7 +46,7 @@ var _default = {
     },
     failOnEmpty: {
       type: 'boolean',
-      title: `{{t("Fail on no data", { ns: "${_locale.NAMESPACE}" })}}`,
+      title: `{{t("Exit when query result is null", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'Checkbox'
     }
@@ -55,13 +59,16 @@ var _default = {
     FilterDynamicComponent: _FilterDynamicComponent.FilterDynamicComponent,
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
-  getOptions(config, types) {
-    var _config$params, _config$params$append;
-    return (0, _variable.useCollectionFieldOptions)({
-      collection: config.collection,
-      types,
-      depth: ((_config$params = config.params) === null || _config$params === void 0 ? void 0 : (_config$params$append = _config$params.appends) === null || _config$params$append === void 0 ? void 0 : _config$params$append.length) ? 1 : 0
-    });
+  useVariables({
+    config
+  }, options) {
+    var _options$depth, _config$params, _config$params$append;
+    const result = (0, _variable.useCollectionFieldOptions)(_objectSpread(_objectSpread({
+      collection: config === null || config === void 0 ? void 0 : config.collection
+    }, options), {}, {
+      depth: ((_options$depth = options === null || options === void 0 ? void 0 : options.depth) !== null && _options$depth !== void 0 ? _options$depth : config === null || config === void 0 ? void 0 : (_config$params = config.params) === null || _config$params === void 0 ? void 0 : (_config$params$append = _config$params.appends) === null || _config$params$append === void 0 ? void 0 : _config$params$append.length) ? 1 : 0
+    }));
+    return (result === null || result === void 0 ? void 0 : result.length) ? result : null;
   },
   useInitializers(node) {
     var _node$title;

package/lib/client/nodes/request.d.ts

@@ -3,6 +3,7 @@ declare const _default: {
     title: string;
     type: string;
     group: string;
+    description: string;
     fieldset: {
         method: {
             type: string;

package/lib/client/nodes/request.js

@@ -24,6 +24,7 @@ var _default = {
   title: `{{t("HTTP request", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'request',
   group: 'extended',
+  description: `{{t("Send HTTP request to a URL. You can use the variables in the upstream nodes as request headers, parameters and request body.", { ns: "${_locale.NAMESPACE}" })}}`,
   fieldset: {
     method: {
       type: 'string',

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

@@ -4,16 +4,17 @@ declare const _default: {
     title: string;
     type: string;
     group: string;
+    description: string;
     fieldset: {
         collection: {
             type: string;
             title: string;
             required: boolean;
-            'x-reactions': string[];
+            'x-reactions': any[];
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                placeholder: string;
+                dropdownMatchSelectWidth: boolean;
             };
         };
         params: {

package/lib/client/nodes/update.js

@@ -26,6 +26,7 @@ var _default = {
   title: `{{t("Update record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'update',
   group: 'collection',
+  description: `{{t("Update records of a collection. You can use variables from upstream nodes as query conditions and field values.", { ns: "${_locale.NAMESPACE}" })}}`,
   fieldset: {
     collection: _collection.collection,
     params: {

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

@@ -2,11 +2,11 @@ export declare const collection: {
     type: string;
     title: string;
     required: boolean;
-    'x-reactions': string[];
+    'x-reactions': any[];
     'x-decorator': string;
     'x-component': string;
     'x-component-props': {
-        placeholder: string;
+        dropdownMatchSelectWidth: boolean;
     };
 };
 export declare const values: {

package/lib/client/schemas/collection.js

@@ -30,11 +30,11 @@ const collection = {
   type: 'string',
   title: '{{t("Collection")}}',
   required: true,
-  'x-reactions': ['{{useCollectionDataSource()}}'],
+  'x-reactions': [],
   'x-decorator': 'FormItem',
-  'x-component': 'Select',
+  'x-component': 'CollectionSelect',
   'x-component-props': {
-    placeholder: '{{t("Select collection")}}'
+    dropdownMatchSelectWidth: false
   }
 };
 exports.collection = collection;
@@ -49,7 +49,7 @@ const values = {
     `
   },
   'x-component': 'CollectionFieldset',
-  description: `{{t("Fields that are not assigned a value will be set to the default value, and those that do not have a default value are set to null.", { ns: "${_locale.NAMESPACE}" })}}`
+  description: `{{t("Unassigned fields will be set to default values, and those without default values will be set to null.", { ns: "${_locale.NAMESPACE}" })}}`
 };
 exports.values = values;
 const filter = {
@@ -77,7 +77,7 @@ exports.filter = filter;
 const appends = {
   type: 'array',
   title: `{{t("Preload associations", { ns: "${_locale.NAMESPACE}" })}}`,
-  description: `{{t("Only configured association field could be accessed in following nodes", { ns: "${_locale.NAMESPACE}" })}}`,
+  description: `{{t("Please select the associated fields that need to be accessed in subsequent nodes", { ns: "${_locale.NAMESPACE}" })}}`,
   'x-decorator': 'FormItem',
   'x-component': 'FieldsSelect',
   'x-component-props': {

package/lib/client/style.d.ts

@@ -5,6 +5,7 @@ export declare const branchClass: string;
 export declare const nodeBlockClass: string;
 export declare const nodeClass: string;
 export declare const nodeCardClass: string;
+export declare const nodeJobButtonClass: string;
 export declare const nodeHeaderClass: string;
 export declare const nodeMetaClass: string;
 export declare const nodeTitleClass: string;

package/lib/client/style.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.workflowVersionDropdownClass = exports.workflowPageClass = exports.nodeTitleClass = exports.nodeSubtreeClass = exports.nodeMetaClass = exports.nodeHeaderClass = exports.nodeClass = exports.nodeCardClass = exports.nodeBlockClass = exports.branchClass = exports.branchBlockClass = exports.addButtonClass = void 0;
+exports.workflowVersionDropdownClass = exports.workflowPageClass = exports.nodeTitleClass = exports.nodeSubtreeClass = exports.nodeMetaClass = exports.nodeJobButtonClass = exports.nodeHeaderClass = exports.nodeClass = exports.nodeCardClass = exports.nodeBlockClass = exports.branchClass = exports.branchBlockClass = exports.addButtonClass = void 0;
 function _css() {
   const data = require("@emotion/css");
   _css = function _css() {
@@ -12,12 +12,19 @@ function _css() {
   return data;
 }
 const workflowPageClass = (0, _css().css)`
+  flex-grow: 1;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+
   .workflow-toolbar {
     display: flex;
     align-items: center;
     justify-content: space-between;
+    position: relative;
     padding: 0.5rem 1rem;
     background: #fff;
+    border-bottom: 1px solid #e7e7e7;
 
     header {
       display: flex;
@@ -39,8 +46,9 @@ const workflowPageClass = (0, _css().css)`
   }
 
   .workflow-canvas {
-    width: min-content;
-    min-width: 100%;
+    flex-grow: 1;
+    overflow: auto;
+    width: 100%;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -106,11 +114,11 @@ const branchClass = (0, _css().css)`
   flex-direction: column;
   align-items: center;
   position: relative;
+  min-width: 20em;
   padding: 0 2em;
 
   .workflow-node-list {
     flex-grow: 1;
-    min-width: 20em;
   }
 
   .workflow-branch-lines {
@@ -192,12 +200,8 @@ const nodeCardClass = (0, _css().css)`
     box-shadow: 0 0.25em 1em rgba(0, 100, 200, 0.25);
   }
 
-  .workflow-node-remove-button,
-  .workflow-node-job-button {
-    position: absolute;
-  }
-
   .workflow-node-remove-button {
+    position: absolute;
     right: 0.5em;
     top: 0.5em;
     color: #999;
@@ -213,23 +217,6 @@ const nodeCardClass = (0, _css().css)`
     }
   }
 
-  .workflow-node-job-button {
-    display: flex;
-    top: 1em;
-    right: 1em;
-    width: 1.25rem;
-    height: 1.25rem;
-    min-width: 1.25rem;
-    justify-content: center;
-    align-items: center;
-    font-size: 0.8em;
-    color: #fff;
-
-    &[type='button'] {
-      border: none;
-    }
-  }
-
   .ant-input {
     font-weight: bold;
 
@@ -262,6 +249,33 @@ const nodeCardClass = (0, _css().css)`
   }
 `;
 exports.nodeCardClass = nodeCardClass;
+const nodeJobButtonClass = (0, _css().css)`
+  display: flex;
+  position: absolute;
+  top: 1.25em;
+  right: 1.25em;
+  width: 1.25rem;
+  height: 1.25rem;
+  min-width: 1.25rem;
+  justify-content: center;
+  align-items: center;
+  font-size: 0.8em;
+  color: #fff;
+
+  &[type='button'] {
+    border: none;
+  }
+
+  .ant-tag {
+    padding: 0;
+    width: 100%;
+    line-height: 18px;
+    margin-right: 0;
+    border-radius: 50%;
+    text-align: center;
+  }
+`;
+exports.nodeJobButtonClass = nodeJobButtonClass;
 const nodeHeaderClass = (0, _css().css)`
   position: relative;
 `;

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

@@ -5,22 +5,14 @@ declare const _default: {
     type: string;
     fieldset: {
         collection: {
-            "x-reactions": (string | {
-                target: string;
-                effects: string[];
-                fulfill: {
-                    state: {
-                        value: any[];
-                    };
-                };
-            })[];
+            "x-reactions": any[];
             type: string;
             title: string;
             required: boolean;
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                placeholder: string;
+                dropdownMatchSelectWidth: boolean;
             };
         };
         mode: {
@@ -29,6 +21,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 options: {
                     label: string;
                     value: number;
@@ -113,7 +106,7 @@ declare const _default: {
     components: {
         FieldsSelect: import("react").MemoExoticComponent<import("react").FunctionComponent<Pick<any, string | number | symbol>>>;
     };
-    getOptions(config: any, types: any): import("../variable").VariableOption[];
+    useVariables(config: any, options: any): import("../variable").VariableOption[];
     useInitializers(config: any): SchemaInitializerItemOptions | null;
     initializers: {
         CollectionFieldInitializers: typeof CollectionFieldInitializers;

package/lib/client/triggers/collection.js

@@ -70,6 +70,7 @@ var _default = {
       'x-decorator': 'FormItem',
       'x-component': 'Select',
       'x-component-props': {
+        dropdownMatchSelectWidth: false,
         options: collectionModeOptions,
         placeholder: `{{t("Trigger on", { ns: "${_locale.NAMESPACE}" })}}`
       },
@@ -133,8 +134,8 @@ var _default = {
   components: {
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
-  getOptions(config, types) {
-    var _config$appends;
+  useVariables(config, options) {
+    var _options$depth, _config$appends;
     const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
       t = _useWorkflowTranslati.t;
     const rootFields = [{
@@ -146,12 +147,11 @@ var _default = {
         title: t('Trigger data')
       }
     }];
-    const options = (0, _variable.useCollectionFieldOptions)({
+    const result = (0, _variable.useCollectionFieldOptions)(_objectSpread(_objectSpread({}, options), {}, {
       fields: rootFields,
-      types,
-      depth: ((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.length) ? 2 : 1
-    });
-    return options;
+      depth: (_options$depth = options === null || options === void 0 ? void 0 : options.depth) !== null && _options$depth !== void 0 ? _options$depth : ((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.length) ? 2 : 1
+    }));
+    return result;
   },
   useInitializers(config) {
     if (!config.collection) {

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

@@ -6,7 +6,7 @@ import { VariableOptions } from '../variable';
 export interface Trigger {
     title: string;
     type: string;
-    getOptions?(config: any, types: any[]): VariableOptions;
+    useVariables?(config: any, options?: any): VariableOptions;
     fieldset: {
         [key: string]: ISchema;
     };

package/lib/client/triggers/index.js

@@ -126,7 +126,7 @@ function TriggerExecution() {
       'x-component-props': {
         title: _react().default.createElement(_icons().InfoOutlined, null),
         shape: 'circle',
-        className: 'workflow-node-job-button',
+        className: (0, _css().cx)(_style.nodeJobButtonClass, 'workflow-node-job-button'),
         type: 'primary'
       },
       properties: {
@@ -187,8 +187,10 @@ const TriggerConfig = () => {
     editingConfig = _useState4[0],
     setEditingConfig = _useState4[1];
   (0, _react().useEffect)(() => {
-    var _workflow$title;
-    setEditingTitle((_workflow$title = workflow.title) !== null && _workflow$title !== void 0 ? _workflow$title : typeTitle);
+    if (workflow) {
+      var _workflow$title;
+      setEditingTitle((_workflow$title = workflow.title) !== null && _workflow$title !== void 0 ? _workflow$title : typeTitle);
+    }
   }, [workflow]);
   if (!workflow || !workflow.type) {
     return null;

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

@@ -37,7 +37,9 @@ declare const _default: {
         ScheduleConfig: () => JSX.Element;
         FieldsSelect: import("react").MemoExoticComponent<import("react").FunctionComponent<Pick<any, string | number | symbol>>>;
     };
-    getOptions(config: any, types: any): any[];
+    useVariables(config: any, { types }: {
+        types: any;
+    }): any[];
     useInitializers(config: any): SchemaInitializerItemOptions | null;
     initializers: {
         CollectionFieldInitializers: typeof CollectionFieldInitializers;

package/lib/client/triggers/schedule/index.js

@@ -51,7 +51,9 @@ var _default = {
     ScheduleConfig: _ScheduleConfig.ScheduleConfig,
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
-  getOptions(config, types) {
+  useVariables(config, {
+    types
+  }) {
     const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
       t = _useWorkflowTranslati.t;
     const options = [];
@@ -62,10 +64,10 @@ var _default = {
         label: t('Trigger time')
       });
     }
+    const fieldOptions = (0, _variable.useCollectionFieldOptions)({
+      collection: config.collection
+    });
     if (config.mode === _constants.SCHEDULE_MODE.COLLECTION_FIELD) {
-      const fieldOptions = (0, _variable.useCollectionFieldOptions)({
-        collection: config.collection
-      });
       if (fieldOptions.length) {
         options.push({
           key: 'data',

package/lib/client/variable.d.ts

@@ -5,6 +5,32 @@ export declare type VariableOption = {
     children?: VariableOptions;
 };
 export declare type VariableOptions = VariableOption[] | null;
+export declare const nodesOptions: {
+    label: string;
+    value: string;
+    useOptions(options: any): VariableOption[];
+};
+export declare const triggerOptions: {
+    label: string;
+    value: string;
+    useOptions(options: any): VariableOption[];
+};
+export declare const scopeOptions: {
+    label: string;
+    value: string;
+    useOptions(options: any): VariableOption[];
+};
+export declare const systemOptions: {
+    label: string;
+    value: string;
+    useOptions({ types }: {
+        types: any;
+    }): {
+        key: string;
+        value: string;
+        label: string;
+    }[];
+};
 export declare const BaseTypeSets: {
     boolean: Set<string>;
     number: Set<string>;
@@ -12,7 +38,7 @@ export declare const BaseTypeSets: {
     date: Set<string>;
 };
 export declare function filterTypedFields(fields: any, types: any, depth?: number): any;
-export declare function useWorkflowVariableOptions(types?: any): {
+export declare function useWorkflowVariableOptions(options?: {}): {
     label: any;
     value: any;
     key: any;