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

package/README.md

@@ -0,0 +1,9 @@
+# workflow
+
+English | [中文](./README.zh-CN.md)
+
+## 安装激活
+
+内置插件无需手动安装激活。
+
+## 使用方法

package/README.zh-CN.md

@@ -0,0 +1,9 @@
+# workflow
+
+[English](./README.md) | 中文
+
+## 安装激活
+
+内置插件无需手动安装激活。
+
+## 使用方法

package/lib/client/AddButton.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 interface AddButtonProps {
     upstream: any;
-    branchIndex?: number;
+    branchIndex?: number | null;
 }
 export declare function AddButton({ upstream, branchIndex }: AddButtonProps): JSX.Element;
 export {};

package/lib/client/AddButton.js

@@ -119,8 +119,10 @@ function AddButton({
             optionKey = _keyPath[0];
 
       if (optionKey) {
-        const _instructions$get$opt = _nodes.instructions.get(type).options.find(item => item.key === optionKey),
-              value = _instructions$get$opt.value;
+        var _instructions$get$opt, _instructions$get, _instructions$get$opt2;
+
+        const _ref2 = (_instructions$get$opt = (_instructions$get = _nodes.instructions.get(type)) === null || _instructions$get === void 0 ? void 0 : (_instructions$get$opt2 = _instructions$get.options) === null || _instructions$get$opt2 === void 0 ? void 0 : _instructions$get$opt2.find(item => item.key === optionKey)) !== null && _instructions$get$opt !== void 0 ? _instructions$get$opt : {},
+              value = _ref2.value;
 
         Object.assign(config, value);
       }
@@ -146,6 +148,9 @@ function AddButton({
   }, {
     value: 'collection',
     name: `{{t("Collection operations", { ns: "${_locale.NAMESPACE}" })}}`
+  }, {
+    value: 'manual',
+    name: `{{t("Manual", { ns: "${_locale.NAMESPACE}" })}}`
   }, {
     value: 'extended',
     name: `{{t("Extended types", { ns: "${_locale.NAMESPACE}" })}}`

package/lib/client/Branch.d.ts

@@ -2,6 +2,6 @@
 export declare function Branch({ from, entry, branchIndex, controller }: {
     from?: any;
     entry?: any;
-    branchIndex?: any;
+    branchIndex?: number | null;
     controller?: any;
 }): JSX.Element;

package/lib/client/ExecutionCanvas.js

@@ -77,6 +77,8 @@ var _constants = require("./constants");
 
 var _locale = require("./locale");
 
+var _utils = require("./utils");
+
 const _excluded = ["nodes", "revisions"],
       _excluded2 = ["jobs", "workflow"];
 
@@ -94,7 +96,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 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 makeNodes(nodes, jobs = []) {
+function attachJobs(nodes, jobs = []) {
   const nodesMap = new Map();
   nodes.forEach(item => nodesMap.set(item.id, item));
   const jobsMap = new Map();
@@ -107,14 +109,6 @@ function makeNodes(nodes, jobs = []) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       let node = _step.value;
 
-      if (node.upstreamId) {
-        node.upstream = nodesMap.get(node.upstreamId);
-      }
-
-      if (node.downstreamId) {
-        node.downstream = nodesMap.get(node.downstreamId);
-      }
-
       if (jobsMap.has(node.id)) {
         node.job = jobsMap.get(node.id);
       }
@@ -167,7 +161,8 @@ function ExecutionCanvas() {
         workflow = _objectWithoutProperties(_ref2$workflow2, _excluded),
         execution = _objectWithoutProperties(_ref2, _excluded2);
 
-  makeNodes(nodes, jobs);
+  (0, _utils.linkNodes)(nodes);
+  attachJobs(nodes, jobs);
   const entry = nodes.find(item => !item.upstream);
   const statusOption = _constants.ExecutionStatusOptionsMap[execution.status];
   return _react().default.createElement(_FlowContext.FlowContext.Provider, {

package/lib/client/WorkflowCanvas.js

@@ -99,6 +99,8 @@ var _ExecutionLink = require("./ExecutionLink");
 
 var _locale = require("./locale");
 
+var _utils = require("./utils");
+
 const _excluded = ["request", "filter"],
       _excluded2 = ["nodes", "revisions"];
 
@@ -116,16 +118,14 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 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 _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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 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; }
@@ -160,32 +160,6 @@ function ExecutionResourceProvider(_ref) {
   return _react().default.createElement(_client().ResourceActionProvider, _objectSpread({}, props));
 }
 
-function makeNodes(nodes) {
-  const nodesMap = new Map();
-  nodes.forEach(item => nodesMap.set(item.id, item));
-
-  var _iterator = _createForOfIteratorHelper(nodesMap.values()),
-      _step;
-
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      let node = _step.value;
-
-      if (node.upstreamId) {
-        node.upstream = nodesMap.get(node.upstreamId);
-      }
-
-      if (node.downstreamId) {
-        node.downstream = nodesMap.get(node.downstreamId);
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-}
-
 function WorkflowCanvas() {
   var _data$data2;
 
@@ -200,8 +174,7 @@ function WorkflowCanvas() {
         loading = _useResourceActionCon.loading;
 
   const _useResourceContext = (0, _client().useResourceContext)(),
-        resource = _useResourceContext.resource,
-        targetKey = _useResourceContext.targetKey;
+        resource = _useResourceContext.resource;
 
   const _useDocumentTitle = (0, _client().useDocumentTitle)(),
         setTitle = _useDocumentTitle.setTitle;
@@ -231,7 +204,7 @@ function WorkflowCanvas() {
         revisions = _ref3$revisions === void 0 ? [] : _ref3$revisions,
         workflow = _objectWithoutProperties(_ref3, _excluded2);
 
-  makeNodes(nodes);
+  (0, _utils.linkNodes)(nodes);
   const entry = nodes.find(item => !item.upstream);
 
   function onSwitchVersion({
@@ -249,11 +222,9 @@ function WorkflowCanvas() {
   function _onToggle() {
     _onToggle = _asyncToGenerator(function* (value) {
       yield resource.update({
-        filterByTk: workflow[targetKey],
+        filterByTk: workflow.id,
         values: {
-          enabled: value,
-          // NOTE: keep `key` field to adapt for backend
-          key: workflow.key
+          enabled: value
         }
       });
       refresh();
@@ -268,7 +239,7 @@ function WorkflowCanvas() {
   function _onRevision() {
     _onRevision = _asyncToGenerator(function* () {
       const _yield$resource$revis = yield resource.revision({
-        filterByTk: workflow[targetKey],
+        filterByTk: workflow.id,
         filter: {
           key: workflow.key
         }

package/lib/client/WorkflowProvider.js

@@ -56,6 +56,10 @@ var _ExecutionLink = require("./ExecutionLink");
 
 var _OpenDrawer = _interopRequireDefault(require("./components/OpenDrawer"));
 
+var _WorkflowTodo = require("./nodes/manual/WorkflowTodo");
+
+var _WorkflowTodoBlockInitializer = require("./nodes/manual/WorkflowTodoBlockInitializer");
+
 const _excluded = ["routes", "components"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -143,12 +147,17 @@ const WorkflowProvider = props => {
     }, others), {}, {
       routes
     })
+  }, _react().default.createElement(_client().SchemaComponentOptions, {
+    components: {
+      WorkflowTodo: _WorkflowTodo.WorkflowTodo,
+      WorkflowTodoBlockInitializer: _WorkflowTodoBlockInitializer.WorkflowTodoBlockInitializer
+    }
   }, _react().default.createElement(WorkflowContext.Provider, {
     value: {
       triggers: _triggers.triggers,
       instructions: _nodes.instructions
     }
-  }, props.children))));
+  }, props.children)))));
 };
 
 exports.WorkflowProvider = WorkflowProvider;

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

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+export declare function CollectionBlockInitializer({ insert, collection, dataSource, ...props }: {
+    [x: string]: any;
+    insert: any;
+    collection: any;
+    dataSource: any;
+}): JSX.Element;

package/lib/client/components/CollectionBlockInitializer.js

@@ -0,0 +1,81 @@
+"use strict";
+
+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 _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);
+
+  const _useCollectionManager = (0, _client().useCollectionManager)(),
+        getCollection = _useCollectionManager.getCollection;
+
+  const resovledCollection = getCollection(collection);
+  return _react().default.createElement(_client().SchemaInitializer.Item, _objectSpread(_objectSpread({}, props), {}, {
+    onClick: () => {
+      insert({
+        type: 'void',
+        name: resovledCollection.name,
+        title: resovledCollection.title,
+        'x-decorator': 'CollectionProvider',
+        'x-decorator-props': {
+          collection
+        },
+        'x-component': 'CardItem',
+        'x-component-props': {// title: props.title
+        },
+        'x-designer': 'SimpleDesigner',
+        properties: {
+          grid: {
+            type: 'void',
+            'x-decorator': 'Form',
+            'x-decorator-props': {
+              useValues: '{{ useFlowRecordFromBlock }}'
+            },
+            'x-component': 'Grid',
+            'x-initializer': 'CollectionFieldInitializers',
+            'x-context-datasource': dataSource
+          }
+        }
+      });
+    }
+  }));
+}

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

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare function CollectionFieldInitializers(props: any): JSX.Element;

package/lib/client/components/CollectionFieldInitializers.js

@@ -0,0 +1,89 @@
+"use strict";
+
+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 _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);
+
+  const uiSchema = (0, _lodash().cloneDeep)(field.uiSchema);
+  delete uiSchema['x-uid'];
+  return _react().default.createElement(_client().InitializerWithSwitch, _objectSpread(_objectSpread({}, props), {}, {
+    schema: _objectSpread(_objectSpread({}, uiSchema), {}, {
+      name: field.name,
+      title: (_uiSchema$title = uiSchema.title) !== null && _uiSchema$title !== void 0 ? _uiSchema$title : field.name,
+      'x-decorator': 'FormItem',
+      'x-read-pretty': true,
+      'x-designer': 'FormItem.Designer',
+      'x-collection-field': field.name
+    }),
+    type: "x-collection-field"
+  }));
+}
+
+function CollectionFieldInitializers(props) {
+  const _useCollection = (0, _client().useCollection)(),
+        fields = _useCollection.fields;
+
+  const items = fields.filter(field => !['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type) && field.uiSchema).map(field => ({
+    key: field.name,
+    type: 'item',
+    title: field.uiSchema.title,
+    component: CollectionFieldInitializer,
+    field
+  }));
+  return _react().default.createElement(_client().SchemaInitializer.Button, _objectSpread(_objectSpread({}, props), {}, {
+    items: items,
+    title: "{{t('Configure fields')}}",
+    wrap: _client().gridRowColWrap
+  }));
+}

package/lib/client/components/CollectionFieldset.js

@@ -75,10 +75,10 @@ function _client() {
   return data;
 }
 
-var _calculators = require("../calculators");
-
 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; }
@@ -130,6 +130,7 @@ function AssociationInput(props) {
 
 var _default = (0, _react2().observer)(({
   value,
+  disabled,
   onChange: _onChange
 }) => {
   var _data$config2;
@@ -138,6 +139,7 @@ var _default = (0, _react2().observer)(({
         t = _useTranslation.t;
 
   const compile = (0, _client().useCompile)();
+  const form = (0, _react2().useForm)();
 
   const _useCollectionManager2 = (0, _client().useCollectionManager)(),
         getCollection = _useCollectionManager2.getCollection,
@@ -147,9 +149,11 @@ var _default = (0, _react2().observer)(({
         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) // && (!['linkTo', 'hasMany', 'hasOne', 'belongsToMany'].includes(field.type))
-  );
+  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)();
+  const mergedDisabled = disabled || form.disabled;
   return _react().default.createElement("fieldset", {
     className: (0, _css().css)`
       margin-top: .5em;
@@ -167,16 +171,9 @@ var _default = (0, _react2().observer)(({
   }, fields.filter(field => field.name in value).map(field => {
     var _field$uiSchema$title, _field$uiSchema;
 
-    const VTypes = _objectSpread(_objectSpread({}, ['linkTo', 'hasMany', 'belongsToMany'].includes(field.type) ? {} : _calculators.VariableTypes), {}, {
-      constant: {
-        title: `{{t("Constant", { ns: "${_locale.NAMESPACE}" })}}`,
-        value: 'constant'
-      }
-    });
-
-    const operand = (0, _calculators.parseValue)(value[field.name], VTypes); // constant for associations to use Input, others to use CollectionField
+    // constant for associations to use Input, others to use CollectionField
     // dynamic values only support belongsTo/hasOne association, other association type should disable
-    // 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,
@@ -187,30 +184,29 @@ var _default = (0, _react2().observer)(({
                       display: flex;
                     }
                   `
-    }, _react().default.createElement(_calculators.VariableTypesContext.Provider, {
-      value: VTypes
-    }, _react().default.createElement(_calculators.Operand, {
+    }, _react().default.createElement(_client().Variable.Input, {
+      scope: ['hasMany', 'belongsToMany'].includes(field.type) ? [] : scope,
       value: value[field.name],
       onChange: next => {
         _onChange(_objectSpread(_objectSpread({}, value), {}, {
           [field.name]: next
         }));
       }
-    }, operand.type === 'constant' ? _react().default.createElement(_client().SchemaComponent, {
+    }, _react().default.createElement(_client().SchemaComponent, {
       schema: {
         type: 'void',
         properties: {
           [field.name]: {
-            'x-component': ['linkTo', 'belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type) ? 'AssociationInput' : 'CollectionField'
+            'x-component': ConstantCompoent,
+
+            ['x-validator']() {
+              return '';
+            }
+
           }
         }
-      },
-      components: {
-        CollectionField: _client().CollectionField,
-        AssociationInput
       }
-    }) // ? <SchemaComponent schema={{ ...field.uiSchema, name: field.name }} />
-    : null), _react().default.createElement(_antd().Button, {
+    })), !mergedDisabled ? _react().default.createElement(_antd().Button, {
       type: "link",
       icon: _react().default.createElement(_icons().CloseCircleOutlined, null),
       onClick: () => {
@@ -220,7 +216,7 @@ var _default = (0, _react2().observer)(({
 
         _onChange(rest);
       }
-    })));
+    }) : null);
   }), unassignedFields.length ? _react().default.createElement(_antd().Dropdown, {
     overlay: _react().default.createElement(_antd().Menu, {
       onClick: ({

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

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+export declare function FilterDynamicComponent({ value, onChange, renderSchemaComponent }: {
+    value: any;
+    onChange: any;
+    renderSchemaComponent: any;
+}): JSX.Element;

package/lib/client/components/FilterDynamicComponent.js

@@ -0,0 +1,43 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FilterDynamicComponent = FilterDynamicComponent;
+
+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;
+}
+
+var _variable = require("../variable");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function FilterDynamicComponent({
+  value,
+  onChange,
+  renderSchemaComponent
+}) {
+  const scope = (0, _variable.useWorkflowVariableOptions)();
+  return _react().default.createElement(_client().Variable.Input, {
+    value: value,
+    onChange: onChange,
+    scope: scope
+  });
+}

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

@@ -0,0 +1 @@
+export declare function NullRender(): any;

package/lib/client/components/NullRender.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NullRender = NullRender;
+
+function NullRender() {
+  return null;
+}

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

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+export interface RadioWithTooltipOption {
+    value: any;
+    label: string;
+    tooltip?: string;
+}
+export declare function RadioWithTooltip(props: any): JSX.Element;