@nocobase/plugin-workflow 0.7.4-alpha.7 → 0.7.5-alpha.1

package/lib/client/calculators.d.ts

@@ -1,13 +1,12 @@
 import React from "react";
+import { Registry } from "@nocobase/utils/client";
 declare function NullRender(): any;
-export declare const calculators: {
-    value: string;
-    title: string;
-    children: {
-        value: string;
-        name: string;
-    }[];
-}[];
+interface Calculator {
+    name: string;
+    type: 'boolean' | 'number' | 'string' | 'date' | 'unknown' | 'null' | 'array';
+    group: string;
+}
+export declare const calculators: Registry<Calculator>;
 export declare function parseStringValue(value: string, Types: any): {
     type: string;
     value: string;
@@ -97,5 +96,4 @@ export declare function VariableComponent({ value, onChange, renderSchemaCompone
     onChange: any;
     renderSchemaComponent: any;
 }): JSX.Element;
-export declare const CollectionFieldset: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
 export {};

package/lib/client/calculators.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BaseTypeSet = void 0;
 exports.Calculation = Calculation;
-exports.CollectionFieldset = void 0;
 exports.Operand = Operand;
 exports.VariableComponent = VariableComponent;
 exports.calculators = exports.VariableTypesContext = exports.VariableTypes = void 0;
@@ -22,16 +21,6 @@ function _react() {
   return data;
 }
 
-function _react2() {
-  const data = require("@formily/react");
-
-  _react2 = function _react2() {
-    return data;
-  };
-
-  return data;
-}
-
 function _antd() {
   const data = require("antd");
 
@@ -52,16 +41,6 @@ function _css() {
   return data;
 }
 
-function _icons() {
-  const data = require("@ant-design/icons");
-
-  _icons = function _icons() {
-    return data;
-  };
-
-  return data;
-}
-
 function _client() {
   const data = require("@nocobase/client");
 
@@ -88,15 +67,17 @@ function _reactI18next() {
   return data;
 }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _client2() {
+  const data = require("@nocobase/utils/client");
 
-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; }
+  _client2 = function _client2() {
+    return data;
+  };
 
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+  return data;
+}
 
-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); }
+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; }
 
@@ -120,75 +101,116 @@ function NullRender() {
   return null;
 }
 
-const calculators = [{
+const calculators = new (_client2().Registry)();
+exports.calculators = calculators;
+calculators.register('equal', {
+  name: '=',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('notEqual', {
+  name: '≠',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('gt', {
+  name: '>',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('gte', {
+  name: '≥',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('lt', {
+  name: '<',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('lte', {
+  name: '≤',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('add', {
+  name: '+',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('minus', {
+  name: '-',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('multiple', {
+  name: '*',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('divide', {
+  name: '/',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('mod', {
+  name: '%',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('includes', {
+  name: '{{t("contains")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('notIncludes', {
+  name: '{{t("does not contain")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('startsWith', {
+  name: '{{t("starts with")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('notStartsWith', {
+  name: '{{t("not starts with")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('endsWith', {
+  name: '{{t("ends with")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('notEndsWith', {
+  name: '{{t("not ends with")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('concat', {
+  name: '{{t("concat")}}',
+  type: 'string',
+  group: 'string'
+});
+const calculatorGroups = [{
   value: 'boolean',
-  title: '{{t("Comparison")}}',
-  children: [{
-    value: 'equal',
-    name: '='
-  }, {
-    value: 'notEqual',
-    name: '≠'
-  }, {
-    value: 'gt',
-    name: '>'
-  }, {
-    value: 'gte',
-    name: '≥'
-  }, {
-    value: 'lt',
-    name: '<'
-  }, {
-    value: 'lte',
-    name: '≤'
-  }]
+  title: '{{t("Comparison")}}'
 }, {
   value: 'number',
-  title: '{{t("Arithmetic calculation")}}',
-  children: [{
-    value: 'add',
-    name: '+'
-  }, {
-    value: 'minus',
-    name: '-'
-  }, {
-    value: 'multiple',
-    name: '*'
-  }, {
-    value: 'divide',
-    name: '/'
-  }, {
-    value: 'mod',
-    name: '%'
-  }]
+  title: '{{t("Arithmetic calculation")}}'
 }, {
   value: 'string',
-  title: '{{t("String operation")}}',
-  children: [{
-    value: 'includes',
-    name: '{{t("contains")}}'
-  }, {
-    value: 'notIncludes',
-    name: '{{t("does not contain")}}'
-  }, {
-    value: 'startsWith',
-    name: '{{t("starts with")}}'
-  }, {
-    value: 'notStartsWith',
-    name: '{{t("not starts with")}}'
-  }, {
-    value: 'endsWith',
-    name: '{{t("ends with")}}'
-  }, {
-    value: 'notEndsWith',
-    name: '{{t("not ends with")}}'
-  }]
+  title: '{{t("String operation")}}'
 }, {
   value: 'date',
-  title: '{{t("Date")}}',
-  children: []
+  title: '{{t("Date")}}'
 }];
-exports.calculators = calculators;
+
+function getGroupCalculators(group) {
+  return Array.from(calculators.getEntities()).filter(([key, value]) => value.group === group);
+}
+
 const JT_VALUE_RE = /^\s*\{\{([\s\S]*)\}\}\s*$/;
 
 function parseStringValue(value, Types) {
@@ -577,13 +599,15 @@ function Calculation({
       calculator: v
     }),
     placeholder: t('Calculator')
-  }, calculators.map(group => _react().default.createElement(_antd().Select.OptGroup, {
+  }, calculatorGroups.map(group => _react().default.createElement(_antd().Select.OptGroup, {
     key: group.value,
     label: compile(group.title)
-  }, group.children.map(item => _react().default.createElement(_antd().Select.Option, {
-    key: item.value,
-    value: item.value
-  }, compile(item.name)))))), _react().default.createElement(Operand, {
+  }, getGroupCalculators(group.value).map(([value, {
+    name
+  }]) => _react().default.createElement(_antd().Select.Option, {
+    key: value,
+    value: value
+  }, compile(name)))))), _react().default.createElement(Operand, {
     value: operands[1],
     onChange: v => _onChange5({
       calculator,
@@ -623,117 +647,4 @@ function VariableComponent({
       }
     }
   }, operand.type === 'constant' ? renderSchemaComponent() : null));
-} // NOTE: observer for watching useProps
-
-
-const CollectionFieldset = (0, _react2().observer)(({
-  value,
-  onChange: _onChange7
-}) => {
-  var _data$config;
-
-  const _useTranslation3 = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation3.t;
-
-  const compile = (0, _client().useCompile)();
-
-  const _useCollectionManager = (0, _client().useCollectionManager)(),
-        getCollectionFields = _useCollectionManager.getCollectionFields;
-
-  const _useForm = (0, _react2().useForm)(),
-        data = _useForm.values;
-
-  const fields = getCollectionFields(data === null || data === void 0 ? void 0 : (_data$config = data.config) === null || _data$config === void 0 ? void 0 : _data$config.collection).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false));
-
-  const VTypes = _objectSpread(_objectSpread({}, VariableTypes), {}, {
-    constant: {
-      title: '{{t("Constant")}}',
-      value: 'constant',
-      options: undefined
-    }
-  });
-
-  return _react().default.createElement("fieldset", {
-    className: (0, _css().css)`
-      margin-top: .5em;
-
-      > .ant-formily-item{
-        flex-direction: column;
-
-        > .ant-formily-item-label{
-          line-height: 32px;
-        }
-      }
-    `
-  }, fields.length ? _react().default.createElement(_react().default.Fragment, null, fields.filter(field => field.name in value).map(field => {
-    var _field$uiSchema$title, _field$uiSchema;
-
-    const operand = typeof value[field.name] === 'string' ? parseStringValue(value[field.name], VTypes) : {
-      type: 'constant',
-      value: value[field.name]
-    }; // TODO: try to use <ObjectField> to replace this map
-
-    return _react().default.createElement(_antd().Form.Item, {
-      key: field.name,
-      label: compile((_field$uiSchema$title = (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) !== null && _field$uiSchema$title !== void 0 ? _field$uiSchema$title : field.name),
-      labelAlign: "left",
-      className: (0, _css().css)`
-                  .ant-form-item-control-input-content{
-                    display: flex;
-                  }
-                `
-    }, _react().default.createElement(VariableTypesContext.Provider, {
-      value: VTypes
-    }, _react().default.createElement(Operand, {
-      value: operand,
-      onChange: next => {
-        if (next.type !== operand.type && next.type === 'constant') {
-          _onChange7(_objectSpread(_objectSpread({}, value), {}, {
-            [field.name]: null
-          }));
-        } else {
-          const stringify = VTypes[next.type].stringify;
-
-          _onChange7(_objectSpread(_objectSpread({}, value), {}, {
-            [field.name]: stringify(next)
-          }));
-        }
-      }
-    }, operand.type === 'constant' ? _react().default.createElement(_client().SchemaComponent, {
-      schema: _objectSpread(_objectSpread({}, field.uiSchema), {}, {
-        name: field.name
-      })
-    }) : null), _react().default.createElement(_antd().Button, {
-      type: "link",
-      icon: _react().default.createElement(_icons().CloseCircleOutlined, null),
-      onClick: () => {
-        const _field$name = field.name,
-              _ = value[_field$name],
-              rest = _objectWithoutProperties(value, [_field$name].map(_toPropertyKey));
-
-        _onChange7(rest);
-      }
-    })));
-  }), Object.keys(value).length < fields.length ? _react().default.createElement(_antd().Dropdown, {
-    overlay: _react().default.createElement(_antd().Menu, {
-      onClick: ({
-        key
-      }) => _onChange7(_objectSpread(_objectSpread({}, value), {}, {
-        [key]: null
-      })),
-      className: (0, _css().css)`
-                    max-height: 300px;
-                    overflow-y: auto;
-                  `
-    }, fields.filter(field => !(field.name in value)).map(field => {
-      var _field$uiSchema$title2, _field$uiSchema2;
-
-      return _react().default.createElement(_antd().Menu.Item, {
-        key: field.name
-      }, compile((_field$uiSchema$title2 = (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) !== null && _field$uiSchema$title2 !== void 0 ? _field$uiSchema$title2 : field.name));
-    }))
-  }, _react().default.createElement(_antd().Button, {
-    icon: _react().default.createElement(_icons().PlusOutlined, null)
-  }, t('Add field'))) : null) : _react().default.createElement("p", null, t('Please select collection first')));
-});
-exports.CollectionFieldset = CollectionFieldset;
+}

package/lib/client/components/CollectionFieldset.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const _default: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export default _default;

package/lib/client/components/CollectionFieldset.js

@@ -0,0 +1,232 @@
+"use strict";
+
+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 _react2() {
+  const data = require("@formily/react");
+
+  _react2 = function _react2() {
+    return data;
+  };
+
+  return data;
+}
+
+function _antd() {
+  const data = require("antd");
+
+  _antd = function _antd() {
+    return data;
+  };
+
+  return data;
+}
+
+function _icons() {
+  const data = require("@ant-design/icons");
+
+  _icons = function _icons() {
+    return data;
+  };
+
+  return data;
+}
+
+function _reactI18next() {
+  const data = require("react-i18next");
+
+  _reactI18next = function _reactI18next() {
+    return data;
+  };
+
+  return data;
+}
+
+function _css() {
+  const data = require("@emotion/css");
+
+  _css = function _css() {
+    return data;
+  };
+
+  return data;
+}
+
+function _client() {
+  const data = require("@nocobase/client");
+
+  _client = function _client() {
+    return data;
+  };
+
+  return data;
+}
+
+var _calculators = require("../calculators");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
+
+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); }
+
+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; }
+
+// NOTE: observer for watching useProps
+var _default = (0, _react2().observer)(({
+  value,
+  onChange: _onChange
+}) => {
+  var _data$config, _data$config2;
+
+  const _useTranslation = (0, _reactI18next().useTranslation)(),
+        t = _useTranslation.t;
+
+  const compile = (0, _client().useCompile)();
+
+  const _useCollectionManager = (0, _client().useCollectionManager)(),
+        getCollection = _useCollectionManager.getCollection,
+        getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  const _useForm = (0, _react2().useForm)(),
+        data = _useForm.values;
+
+  const collectionName = data === null || data === void 0 ? void 0 : (_data$config = data.config) === null || _data$config === void 0 ? void 0 : _data$config.collection;
+  const fields = getCollectionFields(data === null || data === void 0 ? void 0 : (_data$config2 = data.config) === null || _data$config2 === void 0 ? void 0 : _data$config2.collection).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false) && !['linkTo', 'hasMany', 'hasOne', 'belongsToMany'].includes(field.type));
+  return _react().default.createElement("fieldset", {
+    className: (0, _css().css)`
+      margin-top: .5em;
+
+      > .ant-formily-item{
+        flex-direction: column;
+
+        > .ant-formily-item-label{
+          line-height: 32px;
+        }
+      }
+    `
+  }, fields.length ? _react().default.createElement(_client().CollectionProvider, {
+    collection: getCollection(collectionName)
+  }, fields.filter(field => field.name in value).map(field => {
+    var _field$uiSchema$title, _field$uiSchema;
+
+    const VTypes = _objectSpread({}, _calculators.VariableTypes);
+
+    let operand; // TODO: should refactor to support all types
+
+    if (field.type !== 'belongsTo') {
+      Object.assign(VTypes, {
+        constant: {
+          title: '{{t("Constant")}}',
+          value: 'constant',
+          options: undefined
+        }
+      });
+      operand = typeof value[field.name] === 'string' ? (0, _calculators.parseStringValue)(value[field.name], VTypes) : {
+        type: 'constant',
+        value: value[field.name]
+      };
+    } else {
+      delete VTypes.constant;
+      operand = typeof value[field.name] === 'string' ? (0, _calculators.parseStringValue)(value[field.name], VTypes) : {
+        type: '$context',
+        value: value[field.name]
+      };
+    } // TODO: try to use <ObjectField> to replace this map
+
+
+    return _react().default.createElement(_antd().Form.Item, {
+      key: field.name,
+      label: compile((_field$uiSchema$title = (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) !== null && _field$uiSchema$title !== void 0 ? _field$uiSchema$title : field.name),
+      labelAlign: "left",
+      className: (0, _css().css)`
+                    .ant-form-item-control-input-content{
+                      display: flex;
+                    }
+                  `
+    }, _react().default.createElement(_calculators.VariableTypesContext.Provider, {
+      value: VTypes
+    }, _react().default.createElement(_calculators.Operand, {
+      value: operand,
+      onChange: next => {
+        if (next.type !== operand.type && next.type === 'constant') {
+          _onChange(_objectSpread(_objectSpread({}, value), {}, {
+            [field.name]: null
+          }));
+        } else {
+          const stringify = VTypes[next.type].stringify;
+
+          _onChange(_objectSpread(_objectSpread({}, value), {}, {
+            [field.name]: stringify(next)
+          }));
+        }
+      }
+    }, operand.type === 'constant' ? _react().default.createElement(_client().SchemaComponent, {
+      schema: {
+        type: 'void',
+        properties: {
+          [field.name]: {
+            'x-component': 'CollectionField'
+          }
+        }
+      },
+      components: {
+        CollectionField: _client().CollectionField
+      }
+    }) // ? <SchemaComponent schema={{ ...field.uiSchema, name: field.name }} />
+    : null), _react().default.createElement(_antd().Button, {
+      type: "link",
+      icon: _react().default.createElement(_icons().CloseCircleOutlined, null),
+      onClick: () => {
+        const _field$name = field.name,
+              _ = value[_field$name],
+              rest = _objectWithoutProperties(value, [_field$name].map(_toPropertyKey));
+
+        _onChange(rest);
+      }
+    })));
+  }), Object.keys(value).length < fields.length ? _react().default.createElement(_antd().Dropdown, {
+    overlay: _react().default.createElement(_antd().Menu, {
+      onClick: ({
+        key
+      }) => _onChange(_objectSpread(_objectSpread({}, value), {}, {
+        [key]: null
+      })),
+      className: (0, _css().css)`
+                    max-height: 300px;
+                    overflow-y: auto;
+                  `
+    }, fields.filter(field => !(field.name in value)).map(field => {
+      var _field$uiSchema$title2, _field$uiSchema2;
+
+      return _react().default.createElement(_antd().Menu.Item, {
+        key: field.name
+      }, compile((_field$uiSchema$title2 = (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) !== null && _field$uiSchema$title2 !== void 0 ? _field$uiSchema$title2 : field.name));
+    }))
+  }, _react().default.createElement(_antd().Button, {
+    icon: _react().default.createElement(_icons().PlusOutlined, null)
+  }, t('Add field'))) : null) : _react().default.createElement("p", null, t('Please select collection first')));
+});
+
+exports.default = _default;

package/lib/client/index.d.ts

@@ -1,3 +1,4 @@
 export { triggers } from './triggers';
 export * from './nodes';
+export { calculators } from './calculators';
 export { WorkflowProvider as default } from './WorkflowProvider';

package/lib/client/index.js

@@ -4,8 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  triggers: true
+  triggers: true,
+  calculators: true
 };
+Object.defineProperty(exports, "calculators", {
+  enumerable: true,
+  get: function get() {
+    return _calculators.calculators;
+  }
+});
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
@@ -35,4 +42,6 @@ Object.keys(_nodes).forEach(function (key) {
   });
 });
 
+var _calculators = require("./calculators");
+
 var _WorkflowProvider = require("./WorkflowProvider");

package/lib/client/nodes/create.js

@@ -25,14 +25,14 @@ function _client() {
   return data;
 }
 
-var _calculators = require("../calculators");
-
 var _collection = require("../schemas/collection");
 
 var _WorkflowCanvas = require("../WorkflowCanvas");
 
 var _CollectionFieldSelect = _interopRequireDefault(require("../components/CollectionFieldSelect"));
 
+var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
+
 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; }
@@ -66,7 +66,7 @@ var _default = {
     useCollectionDataSource: _client().useCollectionDataSource
   },
   components: {
-    CollectionFieldset: _calculators.CollectionFieldset
+    CollectionFieldset: _CollectionFieldset.default
   },
 
   getter(props) {

package/lib/client/nodes/update.js

@@ -19,6 +19,10 @@ var _calculators = require("../calculators");
 
 var _collection = require("../schemas/collection");
 
+var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
+
+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; }
@@ -42,7 +46,7 @@ var _default = {
   },
   components: {
     VariableComponent: _calculators.VariableComponent,
-    CollectionFieldset: _calculators.CollectionFieldset
+    CollectionFieldset: _CollectionFieldset.default
   }
 };
 exports.default = _default;

package/lib/client/triggers/schedule/EndsByField.js

@@ -25,6 +25,16 @@ function _antd() {
   return data;
 }
 
+function _moment() {
+  const data = _interopRequireDefault(require("moment"));
+
+  _moment = function _moment() {
+    return data;
+  };
+
+  return data;
+}
+
 function _react() {
   const data = _interopRequireWildcard(require("react"));
 
@@ -51,6 +61,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 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."); }
@@ -96,7 +108,7 @@ function EndsByField({
     onChange: _onChange
   }) : _react().default.createElement(_antd().DatePicker, {
     showTime: true,
-    value: value,
+    value: (0, _moment().default)(value),
     onChange: _onChange
   }));
 }

package/lib/server/calculators/index.js

@@ -177,8 +177,9 @@ calculators.register('notStartsWith', notStartsWith);
 calculators.register('endsWith', endsWith);
 calculators.register('notEndsWith', notEndsWith);
 
-function before(a, b) {
-  return a < b;
+function concat(a, b) {
+  return a.concat(b);
 }
 
+calculators.register('concat', concat);
 calculators.register('now', () => new Date()); // TODO: add more common calculators

package/lib/server/instructions/index.d.ts

@@ -11,8 +11,10 @@ export interface Instruction {
     run(node: FlowNodeModel, input: any, processor: Processor): InstructionResult;
     resume?(node: FlowNodeModel, input: any, processor: Processor): InstructionResult;
 }
+declare type InstructionConstructor<T> = {
+    new (p: Plugin): T;
+};
 export default function <T extends Instruction>(plugin: any, more?: {
-    [key: string]: T | {
-        new (p: Plugin): T;
-    };
+    [key: string]: T | InstructionConstructor<T>;
 }): void;
+export {};

package/lib/server/instructions/index.js

@@ -48,15 +48,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 function _default(plugin, more = {}) {
   const instructions = plugin.instructions;
   const natives = ['calculation', 'condition', 'parallel', 'delay', 'prompt', 'query', 'create', 'update', 'destroy'].reduce((result, key) => Object.assign(result, {
-    [key]: key
+    [key]: (0, _utils().requireModule)(_path().default.isAbsolute(key) ? key : _path().default.join(__dirname, key))
   }), {});
 
   for (var _i = 0, _Object$entries = Object.entries(_objectSpread(_objectSpread({}, more), natives)); _i < _Object$entries.length; _i++) {
     const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
           name = _Object$entries$_i[0],
-          value = _Object$entries$_i[1];
+          instruction = _Object$entries$_i[1];
 
-    const instruction = typeof value === 'string' ? (0, _utils().requireModule)(_path().default.isAbsolute(value) ? value : _path().default.join(__dirname, value)) : value;
     instructions.register(name, typeof instruction === 'function' ? new instruction(plugin) : instruction);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.7.4-alpha.7",
+  "version": "0.7.5-alpha.1",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,17 +10,17 @@
     }
   ],
   "dependencies": {
-    "@nocobase/actions": "0.7.4-alpha.7",
-    "@nocobase/client": "0.7.4-alpha.7",
-    "@nocobase/database": "0.7.4-alpha.7",
-    "@nocobase/server": "0.7.4-alpha.7",
-    "@nocobase/utils": "0.7.4-alpha.7",
+    "@nocobase/actions": "0.7.5-alpha.1",
+    "@nocobase/client": "0.7.5-alpha.1",
+    "@nocobase/database": "0.7.5-alpha.1",
+    "@nocobase/server": "0.7.5-alpha.1",
+    "@nocobase/utils": "0.7.5-alpha.1",
     "cron-parser": "4.4.0",
     "json-templates": "^4.2.0",
     "react-js-cron": "^1.4.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.4-alpha.7"
+    "@nocobase/test": "0.7.5-alpha.1"
   },
-  "gitHead": "77f22e6da464d19be111835316faf4b94cd80413"
+  "gitHead": "f6eb27b68185bb0c0b4c2cfca1df84205a9b9173"
 }