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

package/lib/client/WorkflowProvider.js

@@ -5,87 +5,58 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.WorkflowProvider = exports.WorkflowContext = void 0;
 exports.useWorkflowContext = useWorkflowContext;
-
 function _react() {
   const data = _interopRequireWildcard(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _antd() {
   const data = require("antd");
-
   _antd = function _antd() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _WorkflowPage = require("./WorkflowPage");
-
 var _ExecutionPage = require("./ExecutionPage");
-
 var _triggers = require("./triggers");
-
 var _nodes = require("./nodes");
-
 var _locale = require("./locale");
-
 var _workflows = require("./schemas/workflows");
-
 var _WorkflowLink = require("./WorkflowLink");
-
 var _ExecutionResourceProvider = require("./ExecutionResourceProvider");
-
 var _ExecutionLink = require("./ExecutionLink");
-
 var _OpenDrawer = _interopRequireDefault(require("./components/OpenDrawer"));
-
 var _WorkflowTodo = require("./nodes/manual/WorkflowTodo");
-
 var _WorkflowTodoBlockInitializer = require("./nodes/manual/WorkflowTodoBlockInitializer");
-
+var _DynamicExpression = require("./components/DynamicExpression");
+var _expression = _interopRequireDefault(require("./interfaces/expression"));
 const _excluded = ["routes", "components"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 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); }
 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; }
-
+// registerField(expressionField.group, 'expression', expressionField);
 const WorkflowContext = _react().default.createContext({});
-
 exports.WorkflowContext = WorkflowContext;
-
 function useWorkflowContext() {
   return (0, _react().useContext)(WorkflowContext);
 }
-
 function WorkflowPane() {
   return _react().default.createElement(_antd().Card, {
     bordered: false
@@ -99,17 +70,14 @@ function WorkflowPane() {
     }
   }));
 }
-
 ;
-
 const WorkflowProvider = props => {
-  const ctx = (0, _react().useContext)(_client().PluginManagerContext);
-
+  const pmCtx = (0, _react().useContext)(_client().PluginManagerContext);
+  const cmCtx = (0, _react().useContext)(_client().CollectionManagerContext);
   const _useContext = (0, _react().useContext)(_client().RouteSwitchContext),
-        routes = _useContext.routes,
-        components = _useContext.components,
-        others = _objectWithoutProperties(_useContext, _excluded);
-
+    routes = _useContext.routes,
+    components = _useContext.components,
+    others = _objectWithoutProperties(_useContext, _excluded);
   routes[1].routes.unshift({
     type: 'route',
     path: '/admin/settings/workflow/workflows/:id',
@@ -136,7 +104,7 @@ const WorkflowProvider = props => {
     }
   }, _react().default.createElement(_client().PluginManagerContext.Provider, {
     value: {
-      components: _objectSpread({}, ctx === null || ctx === void 0 ? void 0 : ctx.components)
+      components: _objectSpread({}, pmCtx === null || pmCtx === void 0 ? void 0 : pmCtx.components)
     }
   }, _react().default.createElement(_client().RouteSwitchContext.Provider, {
     value: _objectSpread(_objectSpread({
@@ -150,14 +118,23 @@ const WorkflowProvider = props => {
   }, _react().default.createElement(_client().SchemaComponentOptions, {
     components: {
       WorkflowTodo: _WorkflowTodo.WorkflowTodo,
-      WorkflowTodoBlockInitializer: _WorkflowTodoBlockInitializer.WorkflowTodoBlockInitializer
+      WorkflowTodoBlockInitializer: _WorkflowTodoBlockInitializer.WorkflowTodoBlockInitializer,
+      DynamicExpression: _DynamicExpression.DynamicExpression
+    },
+    scope: {
+      useCollectionDataSource: _client().useCollectionDataSource
     }
+  }, _react().default.createElement(_client().CollectionManagerContext.Provider, {
+    value: _objectSpread(_objectSpread({}, cmCtx), {}, {
+      interfaces: _objectSpread(_objectSpread({}, cmCtx.interfaces), {}, {
+        expression: _expression.default
+      })
+    })
   }, _react().default.createElement(WorkflowContext.Provider, {
     value: {
       triggers: _triggers.triggers,
       instructions: _nodes.instructions
     }
-  }, props.children)))));
+  }, props.children))))));
 };
-
 exports.WorkflowProvider = WorkflowProvider;

package/lib/client/WorkflowShortcut.js

@@ -4,51 +4,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WorkflowShortcut = void 0;
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _icons() {
   const data = require("@ant-design/icons");
-
   _icons = function _icons() {
     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 _locale = require("./locale");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const WorkflowShortcut = () => {
   const history = (0, _reactRouterDom().useHistory)();
   return _react().default.createElement(_client().PluginManager.Toolbar.Item, {
@@ -60,5 +45,4 @@ const WorkflowShortcut = () => {
     }
   });
 };
-
 exports.WorkflowShortcut = WorkflowShortcut;

package/lib/client/components/CollectionBlockInitializer.js

@@ -4,50 +4,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CollectionBlockInitializer = CollectionBlockInitializer;
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 const _excluded = ["insert", "collection", "dataSource"];
-
 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); }
 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 CollectionBlockInitializer(_ref) {
   let insert = _ref.insert,
-      collection = _ref.collection,
-      dataSource = _ref.dataSource,
-      props = _objectWithoutProperties(_ref, _excluded);
-
+    collection = _ref.collection,
+    dataSource = _ref.dataSource,
+    props = _objectWithoutProperties(_ref, _excluded);
   const _useCollectionManager = (0, _client().useCollectionManager)(),
-        getCollection = _useCollectionManager.getCollection;
-
+    getCollection = _useCollectionManager.getCollection;
   const resovledCollection = getCollection(collection);
   return _react().default.createElement(_client().SchemaInitializer.Item, _objectSpread(_objectSpread({}, props), {}, {
     onClick: () => {
@@ -60,9 +46,13 @@ function CollectionBlockInitializer(_ref) {
           collection
         },
         'x-component': 'CardItem',
-        'x-component-props': {// title: props.title
+        'x-component-props': {
+          // title: props.title
         },
         'x-designer': 'SimpleDesigner',
+        'x-designer-props': {
+          type: 'record'
+        },
         properties: {
           grid: {
             type: 'void',

package/lib/client/components/CollectionFieldInitializers.js

@@ -4,57 +4,40 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CollectionFieldInitializers = CollectionFieldInitializers;
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _lodash() {
   const data = require("lodash");
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 const _excluded = ["field"];
-
 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); }
 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 CollectionFieldInitializer(_ref) {
   var _uiSchema$title;
-
   let field = _ref.field,
-      props = _objectWithoutProperties(_ref, _excluded);
-
+    props = _objectWithoutProperties(_ref, _excluded);
   const uiSchema = (0, _lodash().cloneDeep)(field.uiSchema);
   delete uiSchema['x-uid'];
   return _react().default.createElement(_client().InitializerWithSwitch, _objectSpread(_objectSpread({}, props), {}, {
@@ -69,11 +52,9 @@ function CollectionFieldInitializer(_ref) {
     type: "x-collection-field"
   }));
 }
-
 function CollectionFieldInitializers(props) {
   const _useCollection = (0, _client().useCollection)(),
-        fields = _useCollection.fields;
-
+    fields = _useCollection.fields;
   const items = fields.filter(field => !['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type) && field.uiSchema).map(field => ({
     key: field.name,
     type: 'item',

package/lib/client/components/CollectionFieldset.js

@@ -4,152 +4,104 @@ 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 _locale = require("../locale");
-
 var _variable = require("../variable");
-
 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; }
-
+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); }
 function AssociationInput(props) {
-  var _data$config;
-
   const _useCollectionManager = (0, _client().useCollectionManager)(),
-        getCollectionFields = _useCollectionManager.getCollectionFields;
-
+    getCollectionFields = _useCollectionManager.getCollectionFields;
   const _useField = (0, _react2().useField)(),
-        path = _useField.path;
-
+    path = _useField.path;
   const fieldName = path.segments[path.segments.length - 1];
-
   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);
-
+    config = _useForm.values;
+  const fields = getCollectionFields(config === null || config === void 0 ? void 0 : config.collection);
   const _fields$find = fields.find(item => item.name === fieldName),
-        type = _fields$find.type;
-
+    type = _fields$find.type;
   const value = Array.isArray(props.value) ? props.value.join(',') : props.value;
-
   function onChange(ev) {
     const trimed = ev.target.value.trim();
     props.onChange(['belongsTo', 'hasOne'].includes(type) ? trimed : trimed.split(/[,\s]+/));
   }
-
   return _react().default.createElement(_antd().Input, _objectSpread(_objectSpread({}, props), {}, {
     value: value,
     onChange: onChange
   }));
-} // NOTE: observer for watching useProps
-
-
+}
+// NOTE: observer for watching useProps
 var _default = (0, _react2().observer)(({
   value,
   disabled,
   onChange: _onChange
 }) => {
-  var _data$config2;
-
   const _useTranslation = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation.t;
-
+    t = _useTranslation.t;
   const compile = (0, _client().useCompile)();
   const form = (0, _react2().useForm)();
-
   const _useCollectionManager2 = (0, _client().useCollectionManager)(),
-        getCollection = _useCollectionManager2.getCollection,
-        getCollectionFields = _useCollectionManager2.getCollectionFields;
-
+    getCollection = _useCollectionManager2.getCollection,
+    getCollectionFields = _useCollectionManager2.getCollectionFields;
   const _useForm2 = (0, _react2().useForm)(),
-        data = _useForm2.values;
-
-  const collectionName = data === null || data === void 0 ? void 0 : (_data$config2 = data.config) === null || _data$config2 === void 0 ? void 0 : _data$config2.collection;
-  const fields = getCollectionFields(collectionName).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false) // TODO: should use some field option but not type to control this
+    config = _useForm2.values;
+  const collectionName = config === null || config === void 0 ? void 0 : config.collection;
+  const fields = getCollectionFields(collectionName).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false)
+  // TODO: should use some field option but not type to control this
   && !['formula'].includes(field.type));
   const unassignedFields = fields.filter(field => !(field.name in value));
   const scope = (0, _variable.useWorkflowVariableOptions)();
@@ -170,11 +122,10 @@ var _default = (0, _react2().observer)(({
     collection: getCollection(collectionName)
   }, fields.filter(field => field.name in value).map(field => {
     var _field$uiSchema$title, _field$uiSchema;
-
     // constant for associations to use Input, others to use CollectionField
     // dynamic values only support belongsTo/hasOne association, other association type should disable
-    const ConstantCompoent = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type) ? AssociationInput : _client().CollectionField; // TODO: try to use <ObjectField> to replace this map
-
+    const ConstantCompoent = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type) ? AssociationInput : _client().CollectionField;
+    // 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),
@@ -185,7 +136,7 @@ var _default = (0, _react2().observer)(({
                     }
                   `
     }, _react().default.createElement(_client().Variable.Input, {
-      scope: ['hasMany', 'belongsToMany'].includes(field.type) ? [] : scope,
+      scope: scope,
       value: value[field.name],
       onChange: next => {
         _onChange(_objectSpread(_objectSpread({}, value), {}, {
@@ -198,11 +149,9 @@ var _default = (0, _react2().observer)(({
         properties: {
           [field.name]: {
             'x-component': ConstantCompoent,
-
             ['x-validator']() {
               return '';
             }
-
           }
         }
       }
@@ -211,33 +160,32 @@ var _default = (0, _react2().observer)(({
       icon: _react().default.createElement(_icons().CloseCircleOutlined, null),
       onClick: () => {
         const _field$name = field.name,
-              _ = value[_field$name],
-              rest = _objectWithoutProperties(value, [_field$name].map(_toPropertyKey));
-
+          _ = value[_field$name],
+          rest = _objectWithoutProperties(value, [_field$name].map(_toPropertyKey));
         _onChange(rest);
       }
     }) : null);
   }), unassignedFields.length ? _react().default.createElement(_antd().Dropdown, {
     overlay: _react().default.createElement(_antd().Menu, {
+      items: unassignedFields.map(field => {
+        var _field$uiSchema$title2, _field$uiSchema2;
+        return {
+          key: field.name,
+          label: 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)
+        };
+      }),
       onClick: ({
         key
       }) => _onChange(_objectSpread(_objectSpread({}, value), {}, {
         [key]: null
       })),
       className: (0, _css().css)`
-                    max-height: 300px;
-                    overflow-y: auto;
-                  `
-    }, unassignedFields.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));
-    }))
+                      max-height: 300px;
+                      overflow-y: auto;
+                    `
+    })
   }, _react().default.createElement(_antd().Button, {
     icon: _react().default.createElement(_icons().PlusOutlined, null)
   }, t('Add field'))) : null) : _react().default.createElement("p", null, (0, _locale.lang)('Please select collection first')));
 });
-
 exports.default = _default;

package/lib/client/components/Duration.js

@@ -4,41 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 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 _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 var _locale = require("../locale");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const UnitOptions = [{
   value: 1000,
   label: 'Seconds'
@@ -55,11 +43,9 @@ const UnitOptions = [{
   value: 604800000,
   label: 'Weeks'
 }];
-
 function getNumberOption(v) {
   return UnitOptions.slice().reverse().find(item => !(v % item.value));
 }
-
 function _default({
   value = 60000,
   onChange: _onChange