@nocobase/plugin-workflow 0.9.1-alpha.1 → 0.9.2-alpha.1

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,12 +23,7 @@ export declare const values: {
 export declare const filter: {
     type: string;
     title: string;
-    name: string;
     'x-decorator': string;
-    'x-decorator-props': {
-        labelAlign: string;
-        className: string;
-    };
     'x-component': string;
     'x-component-props': {
         useProps(): {
@@ -40,3 +33,23 @@ export declare const filter: {
         dynamicComponent: string;
     };
 };
+export declare const appends: {
+    type: string;
+    title: string;
+    description: string;
+    'x-decorator': string;
+    'x-component': string;
+    'x-component-props': {
+        mode: string;
+        placeholder: string;
+        filter(field: any): boolean;
+    };
+    'x-reactions': {
+        dependencies: string[];
+        fulfill: {
+            state: {
+                visible: string;
+            };
+        };
+    }[];
+};

package/lib/client/schemas/collection.js

@@ -3,44 +3,32 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.values = exports.filter = exports.collection = void 0;
-
+exports.values = exports.filter = exports.collection = exports.appends = void 0;
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 function _react() {
   const data = require("@formily/react");
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _locale = require("../locale");
-
 const collection = {
   type: 'string',
   title: '{{t("Collection")}}',
-  name: 'config.collection',
   required: true,
   'x-reactions': ['{{useCollectionDataSource()}}'],
   'x-decorator': 'FormItem',
@@ -53,7 +41,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,23 +55,13 @@ exports.values = values;
 const filter = {
   type: 'object',
   title: '{{t("Filter")}}',
-  name: 'config.params.filter',
   'x-decorator': 'FormItem',
-  'x-decorator-props': {
-    labelAlign: 'left',
-    className: (0, _css().css)`
-      flex-direction: column;
-    `
-  },
   '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);
+        values = _useForm.values;
+      const options = (0, _client().useCollectionFilterOptions)(values === null || values === void 0 ? void 0 : values.collection);
       return {
         options,
         className: (0, _css().css)`
@@ -93,8 +70,30 @@ const filter = {
         `
       };
     },
-
     dynamicComponent: 'FilterDynamicComponent'
   }
 };
-exports.filter = filter;
+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}" })}}`,
+  'x-decorator': 'FormItem',
+  'x-component': 'FieldsSelect',
+  'x-component-props': {
+    mode: 'multiple',
+    placeholder: '{{t("Select Field")}}',
+    filter(field) {
+      return ['linkTo', 'belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type);
+    }
+  },
+  'x-reactions': [{
+    dependencies: ['collection'],
+    fulfill: {
+      state: {
+        visible: '{{!!$deps[0]}}'
+      }
+    }
+  }]
+};
+exports.appends = appends;

package/lib/client/schemas/executions.js

@@ -4,43 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.executionSchema = exports.executionCollection = void 0;
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _reactRouterDom() {
   const data = require("react-router-dom");
-
   _reactRouterDom = function _reactRouterDom() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _constants = require("../constants");
-
 var _locale = require("../locale");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const executionCollection = {
   name: 'executions',
   fields: [{
@@ -62,19 +49,16 @@ const executionCollection = {
     uiSchema: {
       type: 'number',
       title: `{{t("Version", { ns: "${_locale.NAMESPACE}" })}}`,
-
       ['x-component']({
         value
       }) {
         const _useActionContext = (0, _client().useActionContext)(),
-              setVisible = _useActionContext.setVisible;
-
+          setVisible = _useActionContext.setVisible;
         return _react().default.createElement(_reactRouterDom().Link, {
           to: `/admin/settings/workflow/workflows/${value}`,
           onClick: () => setVisible(false)
         }, `#${value}`);
       }
-
     }
   }, {
     type: 'number',
@@ -122,7 +106,8 @@ const executionSchema = {
               marginBottom: 16
             }
           },
-          properties: {// filter: {
+          properties: {
+            // filter: {
             //   type: 'object',
             //   'x-component': 'Filter',
             // }

package/lib/client/schemas/workflows.js

@@ -4,47 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.workflowSchema = void 0;
-
 function _antd() {
   const data = require("antd");
-
   _antd = function _antd() {
     return data;
   };
-
   return data;
 }
-
 function _reactI18next() {
   const data = require("react-i18next");
-
   _reactI18next = function _reactI18next() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _locale = require("../locale");
-
 var _triggers = require("../triggers");
-
 var _executions = require("./executions");
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 const collection = {
   name: 'workflows',
   fields: [{
@@ -312,9 +297,9 @@ const workflowSchema = {
                         type: 'primary'
                       },
                       properties: {
-                        modal: {
+                        drawer: {
                           type: 'void',
-                          'x-component': 'Action.Modal',
+                          'x-component': 'Action.Drawer',
                           'x-decorator': 'Form',
                           'x-decorator-props': {
                             useValues: '{{ cm.useValuesFromRecord }}'
@@ -335,7 +320,7 @@ const workflowSchema = {
                             },
                             footer: {
                               type: 'void',
-                              'x-component': 'Action.Modal.Footer',
+                              'x-component': 'Action.Drawer.Footer',
                               properties: {
                                 cancel: {
                                   title: '{{ t("Cancel") }}',
@@ -365,36 +350,29 @@ const workflowSchema = {
                       'x-component-props': {
                         useAction() {
                           const _useTranslation = (0, _reactI18next().useTranslation)(),
-                                t = _useTranslation.t;
-
+                            t = _useTranslation.t;
                           const _useResourceActionCon = (0, _client().useResourceActionContext)(),
-                                refresh = _useResourceActionCon.refresh;
-
+                            refresh = _useResourceActionCon.refresh;
                           const _useResourceContext = (0, _client().useResourceContext)(),
-                                resource = _useResourceContext.resource,
-                                targetKey = _useResourceContext.targetKey;
-
+                            resource = _useResourceContext.resource,
+                            targetKey = _useResourceContext.targetKey;
                           const _useRecord = (0, _client().useRecord)(),
-                                filterByTk = _useRecord[targetKey];
-
+                            filterByTk = _useRecord[targetKey];
                           return {
                             run() {
                               return _asyncToGenerator(function* () {
                                 yield resource.revision({
                                   filterByTk
                                 });
-
                                 _antd().message.success(t('Operation succeeded'));
-
                                 refresh();
                               })();
                             }
-
                           };
                         }
-
                       }
-                    } // delete: {
+                    }
+                    // delete: {
                     //   type: 'void',
                     //   title: '{{ t("Delete") }}',
                     //   'x-component': 'Action.Link',
@@ -406,7 +384,6 @@ const workflowSchema = {
                     //     useAction: '{{ cm.useDestroyActionAndRefreshCM }}',
                     //   },
                     // },
-
                   }
                 }
               }

package/lib/client/style.js

@@ -4,17 +4,13 @@ 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;
-
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 const workflowPageClass = (0, _css().css)`
   .workflow-toolbar{
     display: flex;
@@ -49,28 +45,19 @@ const workflowPageClass = (0, _css().css)`
     flex-direction: column;
     align-items: center;
     padding: 2em;
+
+    .end{
+      cursor: default;
+
+      &:hover{
+        box-shadow: 0 .25em .5em rgba(0, 0, 0, .1);
+      }
+    }
   }
 `;
 exports.workflowPageClass = workflowPageClass;
 const workflowVersionDropdownClass = (0, _css().css)`
   .ant-dropdown-menu-item{
-
-    strong{
-      font-weight: normal;
-    }
-
-    &.enabled{
-      strong{
-        font-weight: bold;
-      }
-    }
-
-    &.unexecuted{
-      strong{
-        font-style: italic;
-      }
-    }
-
     .ant-dropdown-menu-title-content{
       text-align: right;
 
@@ -79,6 +66,22 @@ const workflowVersionDropdownClass = (0, _css().css)`
         color: #999;
         font-size: 80%;
       }
+
+      strong{
+        font-weight: normal;
+      }
+
+      > .enabled{
+        strong{
+          font-weight: bold;
+        }
+      }
+
+      > .unexecuted{
+        strong{
+          font-style: italic;
+        }
+      }
     }
   }
 `;
@@ -172,19 +175,27 @@ const nodeClass = (0, _css().css)`
 `;
 exports.nodeClass = nodeClass;
 const nodeCardClass = (0, _css().css)`
+  position: relative;
   width: 20em;
   background: #fff;
   padding: 1em;
   box-shadow: 0 .25em .5em rgba(0, 0, 0, .1);
+  border-radius: .5em;
+  cursor: pointer;
+  transition: box-shadow .3s ease;
+
+  &.configuring{
+    box-shadow: 0 .25em 1em rgba(0, 100, 200, .25);
+  }
 
   .workflow-node-remove-button,
   .workflow-node-job-button{
     position: absolute;
-    right: -.5em;
-    top: -.5em;
   }
 
   .workflow-node-remove-button{
+    right: .5em;
+    top: .5em;
     color: #999;
     opacity: 0;
     transition: opacity .3s ease;
@@ -200,8 +211,8 @@ const nodeCardClass = (0, _css().css)`
 
   .workflow-node-job-button{
     display: flex;
-    top: 0;
-    right: 0;
+    top: 1em;
+    right: 1em;
     width: 1.25rem;
     height: 1.25rem;
     min-width: 1.25rem;
@@ -215,7 +226,32 @@ const nodeCardClass = (0, _css().css)`
     }
   }
 
+  .ant-input{
+    font-weight: bold;
+
+    &:not(:focus){
+      transition: background-color .3s ease, border-color .3s ease;
+      border-color: #f7f7f7;
+      background-color: #f7f7f7;
+
+      &:not(:disabled):hover{
+        border-color: #eee;
+        background-color: #eee;
+      }
+
+      &:disabled:hover{
+        border-color: #f7f7f7;
+      }
+    }
+  }
+
+  .workflow-node-config-button{
+    padding: 0;
+  }
+
   &:hover{
+    box-shadow: 0 .25em .5em rgba(0, 0, 0, .25);
+
     .workflow-node-remove-button{
       opacity: 1;
     }
@@ -228,13 +264,20 @@ const nodeHeaderClass = (0, _css().css)`
 exports.nodeHeaderClass = nodeHeaderClass;
 const nodeMetaClass = (0, _css().css)`
   margin-bottom: .5em;
+
+  .workflow-node-id{
+    color: #999;
+
+    &:before{
+      content: "#"
+    }
+  }
 `;
 exports.nodeMetaClass = nodeMetaClass;
 const nodeTitleClass = (0, _css().css)`
   display: flex;
   align-items: center;
   font-weight: normal;
-
   .workflow-node-id{
     color: #999;
   }
@@ -249,5 +292,11 @@ exports.nodeSubtreeClass = nodeSubtreeClass;
 const addButtonClass = (0, _css().css)`
   flex-shrink: 0;
   padding: 2em 0;
+
+  > .ant-btn{
+    &:disabled{
+      visibility: hidden;
+    }
+  }
 `;
 exports.addButtonClass = addButtonClass;

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

@@ -1,22 +1,21 @@
-import React from 'react';
 import { SchemaInitializerItemOptions, useCollectionDataSource } from '@nocobase/client';
 import { CollectionFieldInitializers } from '../components/CollectionFieldInitializers';
 declare const _default: {
     title: string;
     type: string;
     fieldset: {
-        'config.collection': {
+        collection: {
             "x-reactions": (string | {
                 target: string;
+                effects: string[];
                 fulfill: {
                     state: {
-                        visible: string;
+                        value: any[];
                     };
                 };
             })[];
             type: string;
             title: string;
-            name: string;
             required: boolean;
             'x-decorator': string;
             'x-component': string;
@@ -24,10 +23,9 @@ declare const _default: {
                 placeholder: string;
             };
         };
-        'config.mode': {
+        mode: {
             type: string;
             title: string;
-            name: string;
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
@@ -39,17 +37,16 @@ declare const _default: {
             };
             required: boolean;
             'x-reactions': {
-                target: string;
+                dependencies: string[];
                 fulfill: {
                     state: {
-                        disabled: string;
+                        visible: string;
                     };
                 };
             }[];
         };
-        'config.changed': {
+        changed: {
             type: string;
-            name: string;
             title: string;
             description: string;
             'x-decorator': string;
@@ -57,17 +54,29 @@ declare const _default: {
             'x-component-props': {
                 mode: string;
                 placeholder: string;
+                filter(field: any): boolean;
             };
+            'x-reactions': {
+                dependencies: string[];
+                fulfill: {
+                    state: {
+                        visible: string;
+                    };
+                };
+            }[];
         };
-        'config.condition': {
-            name: string;
+        condition: {
             title: string;
+            'x-reactions': {
+                dependencies: string[];
+                fulfill: {
+                    state: {
+                        visible: string;
+                    };
+                };
+            }[];
             type: string;
             'x-decorator': string;
-            'x-decorator-props': {
-                labelAlign: string;
-                className: string;
-            };
             'x-component': string;
             'x-component-props': {
                 useProps(): {
@@ -77,14 +86,34 @@ declare const _default: {
                 dynamicComponent: string;
             };
         };
+        appends: {
+            'x-reactions': {
+                dependencies: string[];
+                fulfill: {
+                    state: {
+                        visible: string;
+                    };
+                };
+            }[];
+            type: string;
+            title: string;
+            description: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-component-props': {
+                mode: string;
+                placeholder: string;
+                filter(field: any): boolean;
+            };
+        };
     };
     scope: {
         useCollectionDataSource: typeof useCollectionDataSource;
     };
     components: {
-        FieldsSelect: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+        FieldsSelect: import("react").MemoExoticComponent<import("react").FunctionComponent<Pick<any, string | number | symbol>>>;
     };
-    getOptions(config: any, types: any): any[];
+    getOptions(config: any, types: any): import("../variable").VariableOption[];
     useInitializers(config: any): SchemaInitializerItemOptions | null;
     initializers: {
         CollectionFieldInitializers: typeof CollectionFieldInitializers;