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

package/lib/client/triggers/collection.js

@@ -4,104 +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 _core() {
-  const data = require("@formily/core");
-
-  _core = function _core() {
-    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");
-
-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; }
-
-const FieldsSelect = (0, _react2().observer)(props => {
-  var _values$config;
-
-  const compile = (0, _client().useCompile)();
-
-  const _useCollectionManager = (0, _client().useCollectionManager)(),
-        getCollectionFields = _useCollectionManager.getCollectionFields;
-
-  const _useForm = (0, _react2().useForm)(),
-        values = _useForm.values,
-        clearFormGraph = _useForm.clearFormGraph,
-        setValuesIn = _useForm.setValuesIn;
-
-  const fields = getCollectionFields(values === null || values === void 0 ? void 0 : (_values$config = values.config) === null || _values$config === void 0 ? void 0 : _values$config.collection);
-  (0, _react2().useFormEffects)(() => {
-    (0, _core().onFieldValueChange)('config.collection', field => {
-      clearFormGraph('config.changed');
-      setValuesIn('config.condition', null);
-    });
-  });
-  return _react().default.createElement(_antd().Select, _objectSpread({}, props), fields.filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : true) && !['linkTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type)).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,
@@ -125,34 +45,28 @@ var _default = {
   title: `{{t("Collection event", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'collection',
   fieldset: {
-    'config.collection': _objectSpread(_objectSpread({}, _collection.collection), {}, {
+    collection: _objectSpread(_objectSpread({}, _collection.collection), {}, {
       ['x-reactions']: [..._collection.collection['x-reactions'], {
-        target: 'config.mode',
-        fulfill: {
-          state: {
-            visible: '{{!!$self.value}}'
-          }
-        }
-      }, {
-        target: 'config.changed',
+        target: 'changed',
+        effects: ['onFieldValueChange'],
         fulfill: {
           state: {
-            visible: '{{!!$self.value}}'
+            value: []
           }
         }
       }, {
-        target: 'config.condition',
+        target: 'condition',
+        effects: ['onFieldValueChange'],
         fulfill: {
           state: {
-            visible: '{{!!$self.value}}'
+            value: null
           }
         }
       }]
     }),
-    'config.mode': {
+    mode: {
       type: 'number',
       title: `{{t("Trigger on", { ns: "${_locale.NAMESPACE}" })}}`,
-      name: 'config.mode',
       'x-decorator': 'FormItem',
       'x-component': 'Select',
       'x-component-props': {
@@ -161,69 +75,97 @@ var _default = {
       },
       required: true,
       'x-reactions': [{
-        target: 'config.changed',
+        dependencies: ['collection'],
         fulfill: {
           state: {
-            disabled: `{{!($self.value & ${COLLECTION_TRIGGER_MODE.UPDATED})}}`
+            visible: '{{!!$deps[0]}}'
           }
         }
       }]
     },
-    'config.changed': {
+    changed: {
       type: 'array',
-      name: 'changed',
       title: `{{t("Changed fields", { ns: "${_locale.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: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'FieldsSelect',
       'x-component-props': {
         mode: 'multiple',
-        placeholder: '{{t("Select Field")}}'
-      }
+        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', 'mode'],
+        fulfill: {
+          state: {
+            visible: `{{!!$deps[0] && ($deps[1] & ${COLLECTION_TRIGGER_MODE.UPDATED})}}`
+          }
+        }
+      }]
     },
-    'config.condition': _objectSpread(_objectSpread({}, _collection.filter), {}, {
-      name: 'config.condition',
-      title: `{{t("Only triggers when match conditions", { ns: "${_locale.NAMESPACE}" })}}`
+    condition: _objectSpread(_objectSpread({}, _collection.filter), {}, {
+      title: `{{t("Only triggers when match conditions", { ns: "${_locale.NAMESPACE}" })}}`,
+      '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

@@ -1,15 +1,12 @@
+import React from "react";
 import { ISchema } from "@formily/react";
 import { Registry } from "@nocobase/utils/client";
-import React from "react";
 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;
     };