@nocobase/plugin-workflow 0.9.0-alpha.2 → 0.9.1-alpha.2

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

@@ -1,44 +1,40 @@
-import React from 'react';
-import EjsTextArea from '../components/EjsTextArea';
+import { useWorkflowVariableOptions } from '../variable';
 declare const _default: {
     title: string;
     type: string;
     group: string;
     fieldset: {
-        'config.url': {
+        method: {
             type: string;
-            name: string;
             required: boolean;
             title: string;
             'x-decorator': string;
-            'x-decorator-props': {};
             'x-component': string;
             'x-component-props': {
-                autoSize: {
-                    minRows: number;
-                };
-                placeholder: string;
-                description: string;
+                showSearch: boolean;
+                allowClear: boolean;
             };
+            enum: {
+                label: string;
+                value: string;
+            }[];
+            default: string;
         };
-        'config.timeout': {
+        url: {
             type: string;
-            name: string;
             required: boolean;
             title: string;
             'x-decorator': string;
-            'x-decorator-props': {};
+            'x-decorator-props': {
+                className: string;
+            };
             'x-component': string;
             'x-component-props': {
-                addonAfter: string;
-                min: number;
-                step: number;
-                defaultValue: number;
+                placeholder: string;
             };
         };
-        'config.headers': {
+        headers: {
             type: string;
-            name: string;
             'x-component': string;
             'x-decorator': string;
             title: string;
@@ -63,7 +59,7 @@ declare const _default: {
                                 'x-decorator': string;
                                 'x-component': string;
                                 'x-component-props': {
-                                    placeholder: string;
+                                    scope: typeof useWorkflowVariableOptions;
                                 };
                             };
                             remove: {
@@ -83,42 +79,82 @@ declare const _default: {
                 };
             };
         };
-        'config.method': {
+        params: {
             type: string;
-            name: string;
-            required: boolean;
-            title: string;
-            'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                defaultValue: string;
-                showSearch: boolean;
-                allowClear: boolean;
+            'x-decorator': string;
+            title: string;
+            items: {
+                type: string;
+                properties: {
+                    space: {
+                        type: string;
+                        'x-component': string;
+                        properties: {
+                            name: {
+                                type: string;
+                                'x-decorator': string;
+                                'x-component': string;
+                                'x-component-props': {
+                                    placeholder: string;
+                                };
+                            };
+                            value: {
+                                type: string;
+                                'x-decorator': string;
+                                'x-component': string;
+                                'x-component-props': {
+                                    scope: typeof useWorkflowVariableOptions;
+                                };
+                            };
+                            remove: {
+                                type: string;
+                                'x-decorator': string;
+                                'x-component': string;
+                            };
+                        };
+                    };
+                };
+            };
+            properties: {
+                add: {
+                    type: string;
+                    title: string;
+                    'x-component': string;
+                };
             };
-            enum: {
-                label: string;
-                value: string;
-            }[];
         };
-        'config.data': {
+        data: {
             type: string;
-            name: string;
-            'x-hidden': boolean;
             title: string;
             'x-decorator': string;
             'x-decorator-props': {};
             'x-component': string;
             'x-component-props': {
+                scope: typeof useWorkflowVariableOptions;
                 autoSize: {
                     minRows: number;
                 };
                 placeholder: string;
-                description: string;
+                className: string;
+            };
+            description: string;
+        };
+        timeout: {
+            type: string;
+            title: string;
+            'x-decorator': string;
+            'x-decorator-props': {};
+            'x-component': string;
+            'x-component-props': {
+                addonAfter: string;
+                min: number;
+                step: number;
+                defaultValue: number;
             };
         };
-        'config.ignoreFail': {
+        ignoreFail: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;
@@ -127,12 +163,11 @@ declare const _default: {
     view: {};
     scope: {};
     components: {
-        ArrayItems: React.FC<React.HTMLAttributes<HTMLDivElement>> & import("@formily/antd").ArrayBaseMixins & {
-            Item?: React.FC<React.HTMLAttributes<HTMLDivElement> & {
+        ArrayItems: import("react").FC<import("react").HTMLAttributes<HTMLDivElement>> & import("@formily/antd").ArrayBaseMixins & {
+            Item?: import("react").FC<import("react").HTMLAttributes<HTMLDivElement> & {
                 type?: "divide" | "card";
             }>;
         };
-        EjsTextArea: typeof EjsTextArea;
     };
 };
 export default _default;

package/lib/client/nodes/request.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _locale = require("../locale");
-
 function _antd() {
   const data = require("@formily/antd");
 
@@ -17,53 +15,79 @@ function _antd() {
   return data;
 }
 
-var _EjsTextArea = _interopRequireDefault(require("../components/EjsTextArea"));
+function _css() {
+  const data = require("@emotion/css");
+
+  _css = function _css() {
+    return data;
+  };
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  return data;
+}
+
+var _locale = require("../locale");
+
+var _variable = require("../variable");
 
 var _default = {
   title: `{{t("HTTP request", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'request',
   group: 'extended',
   fieldset: {
-    'config.url': {
+    method: {
       type: 'string',
-      name: 'config.url',
       required: true,
-      title: `{{t("URL", { ns: "${_locale.NAMESPACE}" })}}`,
+      title: `{{t("HTTP method", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
-      'x-decorator-props': {},
-      'x-component': 'EjsTextArea',
+      'x-component': 'Select',
       'x-component-props': {
-        autoSize: {
-          minRows: 1
-        },
-        placeholder: 'https://xxxxxx',
-        description: `{{t("You can use the above available variables in URL.", { ns: "${_locale.NAMESPACE}" })}}`
-      }
+        showSearch: false,
+        allowClear: false
+      },
+      enum: [{
+        label: 'GET',
+        value: 'GET'
+      }, {
+        label: 'POST',
+        value: 'POST'
+      }, {
+        label: 'PUT',
+        value: 'PUT'
+      }, {
+        label: 'PATCH',
+        value: 'PATCH'
+      }, {
+        label: 'DELETE',
+        value: 'DELETE'
+      }],
+      default: 'POST'
     },
-    'config.timeout': {
-      type: 'number',
-      name: 'config.timeout',
+    url: {
+      type: 'string',
       required: true,
-      title: `{{t("Timeout config", { ns: "${_locale.NAMESPACE}" })}}`,
+      title: `{{t("URL", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
-      'x-decorator-props': {},
-      'x-component': 'InputNumber',
+      'x-decorator-props': {
+        className: (0, _css().css)`
+          .ant-formily-item-control-content-component{
+            .ant-input-affix-wrapper,
+            .ant-input{
+              width: 100%;
+            }
+          }
+        `
+      },
+      'x-component': 'Input',
       'x-component-props': {
-        addonAfter: `{{t("ms", { ns: "${_locale.NAMESPACE}" })}}`,
-        min: 1,
-        step: 1000,
-        defaultValue: 5000
+        placeholder: 'https://www.nocobase.com'
       }
     },
-    'config.headers': {
+    headers: {
       type: 'array',
-      name: 'config.headers',
       'x-component': 'ArrayItems',
       'x-decorator': 'FormItem',
-      title: `{{t("Request headers", { ns: "${_locale.NAMESPACE}" })}}`,
-      description: `{{t("Default headers is Content-Type: application/json", { ns: "${_locale.NAMESPACE}" })}}`,
+      title: `{{t("Headers", { ns: "${_locale.NAMESPACE}" })}}`,
+      description: `{{t('"Content-Type" only support "application/json", and no need to specify', { ns: "${_locale.NAMESPACE}" })}}`,
       items: {
         type: 'object',
         properties: {
@@ -76,15 +100,15 @@ var _default = {
                 'x-decorator': 'FormItem',
                 'x-component': 'Input',
                 'x-component-props': {
-                  placeholder: `{{t("Name(e.g. Content-Type)", { ns: "${_locale.NAMESPACE}" })}}`
+                  placeholder: `{{t("Name")}}`
                 }
               },
               value: {
                 type: 'string',
                 'x-decorator': 'FormItem',
-                'x-component': 'Input',
+                'x-component': 'Variable.Input',
                 'x-component-props': {
-                  placeholder: `{{t("Value(e.g. Application/json)", { ns: "${_locale.NAMESPACE}" })}}`
+                  scope: _variable.useWorkflowVariableOptions
                 }
               },
               remove: {
@@ -104,54 +128,85 @@ var _default = {
         }
       }
     },
-    'config.method': {
-      type: 'string',
-      name: 'config.method',
-      required: true,
-      title: `{{t("HTTP method", { ns: "${_locale.NAMESPACE}" })}}`,
+    params: {
+      type: 'array',
+      'x-component': 'ArrayItems',
       'x-decorator': 'FormItem',
-      'x-component': 'Select',
-      'x-component-props': {
-        defaultValue: 'POST',
-        showSearch: false,
-        allowClear: false
+      title: `{{t("Parameters", { ns: "${_locale.NAMESPACE}" })}}`,
+      items: {
+        type: 'object',
+        properties: {
+          space: {
+            type: 'void',
+            'x-component': 'Space',
+            properties: {
+              name: {
+                type: 'string',
+                'x-decorator': 'FormItem',
+                'x-component': 'Input',
+                'x-component-props': {
+                  placeholder: `{{t("Name")}}`
+                }
+              },
+              value: {
+                type: 'string',
+                'x-decorator': 'FormItem',
+                'x-component': 'Variable.Input',
+                'x-component-props': {
+                  scope: _variable.useWorkflowVariableOptions
+                }
+              },
+              remove: {
+                type: 'void',
+                'x-decorator': 'FormItem',
+                'x-component': 'ArrayItems.Remove'
+              }
+            }
+          }
+        }
       },
-      enum: [{
-        label: 'GET',
-        value: 'GET'
-      }, {
-        label: 'POST',
-        value: 'POST'
-      }, {
-        label: 'PUT',
-        value: 'PUT'
-      }, {
-        label: 'PATCH',
-        value: 'PATCH'
-      }, {
-        label: 'DELETE',
-        value: 'DELETE'
-      }]
+      properties: {
+        add: {
+          type: 'void',
+          title: `{{t("Add parameter", { ns: "${_locale.NAMESPACE}" })}}`,
+          'x-component': 'ArrayItems.Addition'
+        }
+      }
     },
-    'config.data': {
+    data: {
       type: 'string',
-      name: 'config.data',
-      'x-hidden': false,
-      title: `{{t("Request data", { ns: "${_locale.NAMESPACE}" })}}`,
+      title: `{{t("Body", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-decorator-props': {},
-      'x-component': 'EjsTextArea',
+      'x-component': 'Variable.JSON',
       'x-component-props': {
+        scope: _variable.useWorkflowVariableOptions,
         autoSize: {
-          minRows: 5
+          minRows: 10
         },
         placeholder: `{{t("Input request data", { ns: "${_locale.NAMESPACE}" })}}`,
-        description: `{{t("You can use the above available variables in request data.", { ns: "${_locale.NAMESPACE}" })}}`
+        className: (0, _css().css)`
+          font-size: 90%;
+          font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+        `
+      },
+      description: `{{t("Only support standard JSON data", { ns: "${_locale.NAMESPACE}" })}}`
+    },
+    timeout: {
+      type: 'number',
+      title: `{{t("Timeout config", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-decorator-props': {},
+      'x-component': 'InputNumber',
+      'x-component-props': {
+        addonAfter: `{{t("ms", { ns: "${_locale.NAMESPACE}" })}}`,
+        min: 1,
+        step: 1000,
+        defaultValue: 5000
       }
     },
-    'config.ignoreFail': {
+    ignoreFail: {
       type: 'boolean',
-      name: 'config.ignoreFail',
       title: `{{t("Ignore fail request and continue workflow", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'Checkbox'
@@ -160,8 +215,7 @@ var _default = {
   view: {},
   scope: {},
   components: {
-    ArrayItems: _antd().ArrayItems,
-    EjsTextArea: _EjsTextArea.default
+    ArrayItems: _antd().ArrayItems
   }
 };
 exports.default = _default;

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

@@ -1,14 +1,13 @@
 import { useCollectionDataSource } from '@nocobase/client';
-import { VariableComponent } from '../calculators';
+import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
 declare const _default: {
     title: string;
     type: string;
     group: string;
     fieldset: {
-        'config.collection': {
+        collection: {
             type: string;
             title: string;
-            name: string;
             required: boolean;
             'x-reactions': string[];
             'x-decorator': string;
@@ -17,35 +16,40 @@ declare const _default: {
                 placeholder: string;
             };
         };
-        'config.params.filter': {
-            title: string;
-            type: string;
-            name: string;
-            'x-decorator': string;
-            'x-decorator-props': {
-                labelAlign: string;
-                className: string;
-            };
-            'x-component': string;
-            'x-component-props': {
-                useProps(): {
-                    options: any[];
-                    className: string;
-                };
-                dynamicComponent: string;
-            };
-        };
-        'config.params.values': {
+        params: {
             type: string;
             title: string;
-            name: string;
             'x-decorator': string;
-            'x-decorator-props': {
-                labelAlign: string;
-                className: string;
+            properties: {
+                filter: {
+                    title: string;
+                    type: string;
+                    'x-decorator': string;
+                    'x-decorator-props': {
+                        labelAlign: string;
+                        className: string;
+                    };
+                    'x-component': string;
+                    'x-component-props': {
+                        useProps(): {
+                            options: any[];
+                            className: string;
+                        };
+                        dynamicComponent: string;
+                    };
+                };
+                values: {
+                    type: string;
+                    title: string;
+                    'x-decorator': string;
+                    'x-decorator-props': {
+                        labelAlign: string;
+                        className: string;
+                    };
+                    'x-component': string;
+                    description: string;
+                };
             };
-            'x-component': string;
-            description: string;
         };
     };
     view: {};
@@ -53,7 +57,7 @@ declare const _default: {
         useCollectionDataSource: typeof useCollectionDataSource;
     };
     components: {
-        VariableComponent: typeof VariableComponent;
+        FilterDynamicComponent: typeof FilterDynamicComponent;
         CollectionFieldset: import("react").MemoExoticComponent<import("react").FunctionComponent<Pick<any, string | number | symbol>>>;
     };
 };

package/lib/client/nodes/update.js

@@ -15,7 +15,7 @@ function _client() {
   return data;
 }
 
-var _calculators = require("../calculators");
+var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
 
 var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
 
@@ -36,18 +36,25 @@ var _default = {
   type: 'update',
   group: 'collection',
   fieldset: {
-    'config.collection': _collection.collection,
-    'config.params.filter': _objectSpread(_objectSpread({}, _collection.filter), {}, {
-      title: `{{t("Only update records matching conditions", { ns: "${_locale.NAMESPACE}" })}}`
-    }),
-    'config.params.values': _collection.values
+    collection: _collection.collection,
+    params: {
+      type: 'object',
+      title: '',
+      'x-decorator': 'FormItem',
+      properties: {
+        filter: _objectSpread(_objectSpread({}, _collection.filter), {}, {
+          title: `{{t("Only update records matching conditions", { ns: "${_locale.NAMESPACE}" })}}`
+        }),
+        values: _collection.values
+      }
+    }
   },
   view: {},
   scope: {
     useCollectionDataSource: _client().useCollectionDataSource
   },
   components: {
-    VariableComponent: _calculators.VariableComponent,
+    FilterDynamicComponent: _FilterDynamicComponent.FilterDynamicComponent,
     CollectionFieldset: _CollectionFieldset.default
   }
 };

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

@@ -1,7 +1,6 @@
 export declare const collection: {
     type: string;
     title: string;
-    name: string;
     required: boolean;
     'x-reactions': string[];
     'x-decorator': string;
@@ -13,7 +12,6 @@ export declare const collection: {
 export declare const values: {
     type: string;
     title: string;
-    name: string;
     'x-decorator': string;
     'x-decorator-props': {
         labelAlign: string;
@@ -25,7 +23,6 @@ export declare const values: {
 export declare const filter: {
     type: string;
     title: string;
-    name: string;
     'x-decorator': string;
     'x-decorator-props': {
         labelAlign: string;

package/lib/client/schemas/collection.js

@@ -40,7 +40,6 @@ var _locale = require("../locale");
 const collection = {
   type: 'string',
   title: '{{t("Collection")}}',
-  name: 'config.collection',
   required: true,
   'x-reactions': ['{{useCollectionDataSource()}}'],
   'x-decorator': 'FormItem',
@@ -53,7 +52,6 @@ exports.collection = collection;
 const values = {
   type: 'object',
   title: '{{t("Fields values")}}',
-  name: 'config.params.values',
   'x-decorator': 'FormItem',
   'x-decorator-props': {
     labelAlign: 'left',
@@ -68,7 +66,6 @@ exports.values = values;
 const filter = {
   type: 'object',
   title: '{{t("Filter")}}',
-  name: 'config.params.filter',
   'x-decorator': 'FormItem',
   'x-decorator-props': {
     labelAlign: 'left',
@@ -79,12 +76,10 @@ const filter = {
   'x-component': 'Filter',
   'x-component-props': {
     useProps() {
-      var _values$config;
-
       const _useForm = (0, _react().useForm)(),
             values = _useForm.values;
 
-      const options = (0, _client().useCollectionFilterOptions)((_values$config = values.config) === null || _values$config === void 0 ? void 0 : _values$config.collection);
+      const options = (0, _client().useCollectionFilterOptions)(values === null || values === void 0 ? void 0 : values.collection);
       return {
         options,
         className: (0, _css().css)`
@@ -94,7 +89,7 @@ const filter = {
       };
     },
 
-    dynamicComponent: 'VariableComponent'
+    dynamicComponent: 'FilterDynamicComponent'
   }
 };
 exports.filter = filter;

package/lib/client/schemas/executions.js

@@ -56,7 +56,7 @@ const executionCollection = {
       'x-read-pretty': true
     }
   }, {
-    interface: 'object',
+    interface: 'm2o',
     type: 'belongsTo',
     name: 'workflowId',
     uiSchema: {

package/lib/client/schemas/workflows.js

@@ -132,7 +132,7 @@ const workflowSchema = {
             filter: {
               current: true
             },
-            sort: ['-enabled', '-createdAt'],
+            sort: ['-createdAt'],
             except: ['config']
           }
         }