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

package/lib/client/nodes/parallel.js

@@ -4,75 +4,48 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _react() {
   const data = _interopRequireWildcard(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 function _icons() {
   const data = require("@ant-design/icons");
-
   _icons = function _icons() {
     return data;
   };
-
   return data;
 }
-
 function _antd() {
   const data = require("antd");
-
   _antd = function _antd() {
     return data;
   };
-
   return data;
 }
-
 var _2 = require(".");
-
 var _Branch = require("../Branch");
-
 var _FlowContext = require("../FlowContext");
-
 var _style = require("../style");
-
 var _locale = require("../locale");
-
 var _RadioWithTooltip = require("../components/RadioWithTooltip");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var _default = {
   title: `{{t("Parallel branch", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'parallel',
@@ -102,28 +75,22 @@ var _default = {
     }
   },
   view: {},
-
   render(data) {
     const id = data.id,
-          mode = data.config.mode;
-
+      mode = data.config.mode;
     const _useFlowContext = (0, _FlowContext.useFlowContext)(),
-          workflow = _useFlowContext.workflow,
-          nodes = _useFlowContext.nodes;
-
+      workflow = _useFlowContext.workflow,
+      nodes = _useFlowContext.nodes;
     const branches = nodes.reduce((result, node) => {
       if (node.upstreamId === id && node.branchIndex != null) {
         return result.concat(node);
       }
-
       return result;
     }, []).sort((a, b) => a.branchIndex - b.branchIndex);
-
     const _useState = (0, _react().useState)(Math.max(2, branches.length)),
-          _useState2 = _slicedToArray(_useState, 2),
-          branchCount = _useState2[0],
-          setBranchCount = _useState2[1];
-
+      _useState2 = _slicedToArray(_useState, 2),
+      branchCount = _useState2[0],
+      setBranchCount = _useState2[1];
     const tempBranches = Array(Math.max(0, branchCount - branches.length)).fill(null);
     const lastBranchHead = branches[branches.length - 1];
     return _react().default.createElement(_2.NodeDefaultView, {
@@ -182,7 +149,6 @@ var _default = {
       disabled: workflow.executed
     })))));
   },
-
   components: {
     RadioWithTooltip: _RadioWithTooltip.RadioWithTooltip
   }

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

@@ -19,17 +19,11 @@ declare const _default: {
         };
         params: {
             type: string;
-            title: string;
-            'x-decorator': string;
             properties: {
                 filter: {
                     type: string;
                     title: string;
                     'x-decorator': string;
-                    'x-decorator-props': {
-                        labelAlign: string;
-                        className: string;
-                    };
                     'x-component': string;
                     'x-component-props': {
                         useProps(): {
@@ -39,8 +33,34 @@ declare const _default: {
                         dynamicComponent: string;
                     };
                 };
+                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;
+                            };
+                        };
+                    }[];
+                };
             };
         };
+        failOnEmpty: {
+            type: string;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+        };
     };
     view: {};
     scope: {
@@ -48,8 +68,9 @@ declare const _default: {
     };
     components: {
         FilterDynamicComponent: typeof FilterDynamicComponent;
+        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(node: any): SchemaInitializerItemOptions | null;
     initializers: {
         CollectionFieldInitializers: typeof CollectionFieldInitializers;

package/lib/client/nodes/query.js

@@ -4,39 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _collection = require("../schemas/collection");
-
 var _locale = require("../locale");
-
 var _CollectionBlockInitializer = require("../components/CollectionBlockInitializer");
-
 var _CollectionFieldInitializers = require("../components/CollectionFieldInitializers");
-
 var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
-
 var _variable = require("../variable");
-
+var _FieldsSelect = require("../components/FieldsSelect");
 var _default = {
   title: `{{t("Query record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'query',
   group: 'collection',
   fieldset: {
     collection: _collection.collection,
-    // 'config.multiple': {
+    // multiple: {
     //   type: 'boolean',
     //   title: `{{t("Multiple records", { ns: "${NAMESPACE}" })}}`,
-    //   name: 'config.multiple',
     //   'x-decorator': 'FormItem',
     //   'x-component': 'Checkbox',
     //   'x-component-props': {
@@ -45,11 +35,16 @@ var _default = {
     // },
     params: {
       type: 'object',
-      title: '',
-      'x-decorator': 'FormItem',
       properties: {
-        filter: _collection.filter
+        filter: _collection.filter,
+        appends: _collection.appends
       }
+    },
+    failOnEmpty: {
+      type: 'boolean',
+      title: `{{t("Fail on no data", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'Checkbox'
     }
   },
   view: {},
@@ -57,23 +52,22 @@ var _default = {
     useCollectionDataSource: _client().useCollectionDataSource
   },
   components: {
-    FilterDynamicComponent: _FilterDynamicComponent.FilterDynamicComponent
+    FilterDynamicComponent: _FilterDynamicComponent.FilterDynamicComponent,
+    FieldsSelect: _FieldsSelect.FieldsSelect
   },
-
   getOptions(config, types) {
+    var _config$params, _config$params$append;
     return (0, _variable.useCollectionFieldOptions)({
       collection: config.collection,
-      types
+      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
     });
   },
-
   useInitializers(node) {
     var _node$title;
-
     if (!node.config.collection) {
       return null;
     }
-
     return {
       type: 'item',
       title: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
@@ -82,7 +76,6 @@ var _default = {
       dataSource: `{{$jobsMapByNodeId.${node.id}}}`
     };
   },
-
   initializers: {
     CollectionFieldInitializers: _CollectionFieldInitializers.CollectionFieldInitializers
   }

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

@@ -25,12 +25,11 @@ declare const _default: {
             required: boolean;
             title: string;
             'x-decorator': string;
-            'x-decorator-props': {
-                className: string;
-            };
+            'x-decorator-props': {};
             'x-component': string;
             'x-component-props': {
                 placeholder: string;
+                className: string;
             };
         };
         headers: {

package/lib/client/nodes/request.js

@@ -4,31 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _antd() {
   const data = require("@formily/antd");
-
   _antd = function _antd() {
     return data;
   };
-
   return data;
 }
-
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 var _locale = require("../locale");
-
 var _variable = require("../variable");
-
 var _default = {
   title: `{{t("HTTP request", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'request',
@@ -67,19 +58,11 @@ var _default = {
       required: true,
       title: `{{t("URL", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
-      'x-decorator-props': {
-        className: (0, _css().css)`
-          .ant-formily-item-control-content-component{
-            .ant-input-affix-wrapper,
-            .ant-input{
-              width: 100%;
-            }
-          }
-        `
-      },
+      'x-decorator-props': {},
       'x-component': 'Input',
       'x-component-props': {
-        placeholder: 'https://www.nocobase.com'
+        placeholder: 'https://www.nocobase.com',
+        className: 'full-width'
       }
     },
     headers: {
@@ -185,10 +168,10 @@ var _default = {
           minRows: 10
         },
         placeholder: `{{t("Input request data", { ns: "${_locale.NAMESPACE}" })}}`,
-        className: (0, _css().css)`
+        className: (0, _css().cx)('full-width', (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}" })}}`
     },

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

@@ -18,17 +18,12 @@ declare const _default: {
         };
         params: {
             type: string;
-            title: string;
-            'x-decorator': string;
             properties: {
                 filter: {
                     title: string;
+                    "x-validator"(value: any): string;
                     type: string;
                     'x-decorator': string;
-                    'x-decorator-props': {
-                        labelAlign: string;
-                        className: string;
-                    };
                     'x-component': string;
                     'x-component-props': {
                         useProps(): {

package/lib/client/nodes/update.js

@@ -4,33 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
-
 var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
-
+var _utils = require("../utils");
 var _locale = require("../locale");
-
 var _collection = require("../schemas/collection");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 _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("Update record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'update',
@@ -39,11 +30,12 @@ var _default = {
     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}" })}}`
+          title: `{{t("Only update records matching conditions", { ns: "${_locale.NAMESPACE}" })}}`,
+          ['x-validator'](value) {
+            return (0, _utils.isValidFilter)(value) ? '' : `{{t("Please add at least one condition", { ns: "${_locale.NAMESPACE}" })}}`;
+          }
         }),
         values: _collection.values
       }

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

@@ -24,10 +24,6 @@ export declare const filter: {
     type: string;
     title: string;
     'x-decorator': string;
-    'x-decorator-props': {
-        labelAlign: string;
-        className: string;
-    };
     'x-component': string;
     'x-component-props': {
         useProps(): {
@@ -37,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,40 +3,29 @@
 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")}}',
@@ -67,18 +56,11 @@ const filter = {
   type: 'object',
   title: '{{t("Filter")}}',
   'x-decorator': 'FormItem',
-  'x-decorator-props': {
-    labelAlign: 'left',
-    className: (0, _css().css)`
-      flex-direction: column;
-    `
-  },
   'x-component': 'Filter',
   'x-component-props': {
     useProps() {
       const _useForm = (0, _react().useForm)(),
-            values = _useForm.values;
-
+        values = _useForm.values;
       const options = (0, _client().useCollectionFilterOptions)(values === null || values === void 0 ? void 0 : values.collection);
       return {
         options,
@@ -88,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',
             // }