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

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;
+        }
+      }
     }
   }
 `;

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import { SchemaInitializerItemOptions, useCollectionDataSource } from '@nocobase/client';
 import { CollectionFieldInitializers } from '../components/CollectionFieldInitializers';
 declare const _default: {
@@ -37,25 +36,14 @@ declare const _default: {
                 placeholder: string;
             };
             required: boolean;
-            'x-reactions': ({
+            'x-reactions': {
                 dependencies: string[];
                 fulfill: {
                     state: {
                         visible: string;
-                        disabled?: undefined;
                     };
                 };
-                target?: undefined;
-            } | {
-                target: string;
-                fulfill: {
-                    state: {
-                        disabled: string;
-                        visible?: undefined;
-                    };
-                };
-                dependencies?: undefined;
-            })[];
+            }[];
         };
         changed: {
             type: string;
@@ -89,10 +77,6 @@ declare const _default: {
             }[];
             type: string;
             'x-decorator': string;
-            'x-decorator-props': {
-                labelAlign: string;
-                className: string;
-            };
             'x-component': string;
             'x-component-props': {
                 useProps(): {
@@ -102,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<Pick<any, string | number | symbol>>>;
+        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;

package/lib/client/triggers/collection.js

@@ -4,94 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _antd() {
-  const data = require("antd");
-
-  _antd = function _antd() {
-    return data;
-  };
-
-  return data;
-}
-
-function _react2() {
-  const data = require("@formily/react");
-
-  _react2 = function _react2() {
-    return data;
-  };
-
-  return data;
-}
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _collection = require("../schemas/collection");
-
 var _variable = require("../variable");
-
 var _CollectionBlockInitializer = require("../components/CollectionBlockInitializer");
-
 var _CollectionFieldInitializers = require("../components/CollectionFieldInitializers");
-
 var _locale = require("../locale");
-
-const _excluded = ["filter"];
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-const FieldsSelect = (0, _react2().observer)(props => {
-  const _props$filter = props.filter,
-        filter = _props$filter === void 0 ? () => true : _props$filter,
-        others = _objectWithoutProperties(props, _excluded);
-
-  const compile = (0, _client().useCompile)();
-
-  const _useCollectionManager = (0, _client().useCollectionManager)(),
-        getCollectionFields = _useCollectionManager.getCollectionFields;
-
-  const _useForm = (0, _react2().useForm)(),
-        values = _useForm.values;
-
-  const fields = getCollectionFields(values === null || values === void 0 ? void 0 : values.collection);
-  return _react().default.createElement(_antd().Select, _objectSpread({}, others), fields.filter(filter).map(field => {
-    var _field$uiSchema;
-
-    return _react().default.createElement(_antd().Select.Option, {
-      key: field.name,
-      value: field.name
-    }, compile((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title));
-  }));
-});
+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); }
 const COLLECTION_TRIGGER_MODE = {
   CREATED: 1,
   UPDATED: 2,
@@ -151,13 +81,6 @@ var _default = {
             visible: '{{!!$deps[0]}}'
           }
         }
-      }, {
-        target: 'changed',
-        fulfill: {
-          state: {
-            disabled: `{{!($self.value & ${COLLECTION_TRIGGER_MODE.UPDATED})}}`
-          }
-        }
       }]
     },
     changed: {
@@ -169,17 +92,15 @@ var _default = {
       'x-component-props': {
         mode: 'multiple',
         placeholder: '{{t("Select Field")}}',
-
         filter(field) {
           return !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : true) && !['linkTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type);
         }
-
       },
       'x-reactions': [{
-        dependencies: ['collection'],
+        dependencies: ['collection', 'mode'],
         fulfill: {
           state: {
-            visible: '{{!!$deps[0]}}'
+            visible: `{{!!$deps[0] && ($deps[1] & ${COLLECTION_TRIGGER_MODE.UPDATED})}}`
           }
         }
       }]
@@ -194,67 +115,57 @@ var _default = {
           }
         }
       }]
-    }) // appends: {
-    //   type: 'array',
-    //   title: `{{t("Prefetch fields", { ns: "${NAMESPACE}" })}}`,
-    //   description: `{{t("Triggered only if one of the selected fields changes. If unselected, it means that it will be triggered when any field changes. When record is added or deleted, any field is considered to have been changed.", { ns: "${NAMESPACE}" })}}`,
-    //   'x-decorator': 'FormItem',
-    //   'x-component': 'FieldsSelect',
-    //   'x-component-props': {
-    //     mode: 'multiple',
-    //     placeholder: '{{t("Select Field")}}'
-    //   },
-    //   'x-reactions': [
-    //     {
-    //       dependencies: ['collection'],
-    //       fulfill: {
-    //         state: {
-    //           visible: '{{!!$deps[0]}}',
-    //         },
-    //       }
-    //     },
-    //   ]
-    // },
-
+    }),
+    appends: _objectSpread(_objectSpread({}, _collection.appends), {}, {
+      'x-reactions': [..._collection.appends['x-reactions'], {
+        dependencies: ['mode'],
+        fulfill: {
+          state: {
+            visible: `{{!($deps[0] & ${COLLECTION_TRIGGER_MODE.DELETED})}}`
+          }
+        }
+      }]
+    })
   },
   scope: {
     useCollectionDataSource: _client().useCollectionDataSource
   },
   components: {
-    FieldsSelect
+    FieldsSelect: _FieldsSelect.FieldsSelect
   },
-
   getOptions(config, types) {
+    var _config$appends;
     const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
-          t = _useWorkflowTranslati.t;
-
-    const fieldOptions = (0, _variable.useCollectionFieldOptions)({
-      collection: config.collection,
-      types
+      t = _useWorkflowTranslati.t;
+    const rootFields = [{
+      collectionName: config.collection,
+      name: 'data',
+      type: 'hasOne',
+      target: config.collection,
+      uiSchema: {
+        title: t('Trigger data')
+      }
+    }];
+    const options = (0, _variable.useCollectionFieldOptions)({
+      fields: rootFields,
+      types,
+      depth: ((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.length) ? 2 : 1
     });
-    const options = [...((fieldOptions === null || fieldOptions === void 0 ? void 0 : fieldOptions.length) ? [{
-      label: t('Trigger data'),
-      key: 'data',
-      value: 'data',
-      children: fieldOptions
-    }] : [])];
     return options;
   },
-
   useInitializers(config) {
     if (!config.collection) {
       return null;
     }
-
     return {
       type: 'item',
+      key: 'triggerData',
       title: `{{t("Trigger data", { ns: "${_locale.NAMESPACE}" })}}`,
       component: _CollectionBlockInitializer.CollectionBlockInitializer,
       collection: config.collection,
       dataSource: '{{$context.data}}'
     };
   },
-
   initializers: {
     CollectionFieldInitializers: _CollectionFieldInitializers.CollectionFieldInitializers
   }

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

@@ -2,14 +2,11 @@ import React from "react";
 import { ISchema } from "@formily/react";
 import { Registry } from "@nocobase/utils/client";
 import { SchemaInitializerItemOptions } from '@nocobase/client';
+import { VariableOptions } from "../variable";
 export interface Trigger {
     title: string;
     type: string;
-    getOptions?(config: any, types: any[]): {
-        label: string;
-        value: any;
-        key: string;
-    }[];
+    getOptions?(config: any, types: any[]): VariableOptions;
     fieldset: {
         [key: string]: ISchema;
     };