@nocobase/plugin-workflow 0.10.0-alpha.5 → 0.11.0-alpha.1

package/client.d.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck
-export * from './lib/client';
-export { default } from './lib/client';
+export * from './src/client';
+export { default } from './src/client';
 

package/client.js

@@ -1,30 +1 @@
-"use strict";
-
-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; }
-
-var _index = _interopRequireWildcard(require("./lib/client"));
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {};
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _index.default;
-  }
-});
-
-Object.keys(_index).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _index[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _index[key];
-    }
-  });
-});
+module.exports = require('./lib/client/index.js');

package/lib/client/AddButton.js

@@ -11,13 +11,6 @@ function _icons() {
   };
   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() {
@@ -147,7 +140,7 @@ function AddButton({
     return null;
   }
   return _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.addButtonClass)
+    className: (0, _client().cx)(_style.addButtonClass)
   }, _react().default.createElement(_antd().Dropdown, {
     trigger: ['click'],
     menu: menu,

package/lib/client/Branch.js

@@ -4,23 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Branch = Branch;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
 }
-var _style = require("./style");
 var _AddButton = require("./AddButton");
 var _nodes = require("./nodes");
+var _style = require("./style");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function Branch({
   from = null,
@@ -33,7 +33,7 @@ function Branch({
     list.push(node);
   }
   return _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.branchClass)
+    className: (0, _client().cx)(_style.branchClass)
   }, _react().default.createElement("div", {
     className: "workflow-branch-lines"
   }), controller, _react().default.createElement(_AddButton.AddButton, {

package/lib/client/CanvasContent.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CanvasContent = CanvasContent;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
@@ -18,9 +18,9 @@ function _antd() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
@@ -40,9 +40,9 @@ function CanvasContent({
   }, _react().default.createElement(_Branch.Branch, {
     entry: entry
   })), _react().default.createElement("div", {
-    className: (0, _css().cx)('end', _style.nodeCardClass)
+    className: (0, _client().cx)('end', _style.nodeCardClass)
   }, _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeMetaClass)
+    className: (0, _client().cx)(_style.nodeMetaClass)
   }, _react().default.createElement(_antd().Tag, {
     color: "#333"
   }, (0, _locale.lang)('End')))));

package/lib/client/ExecutionCanvas.js

@@ -4,9 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ExecutionCanvas = ExecutionCanvas;
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
+    return data;
+  };
+  return data;
+}
+function _client2() {
+  const data = require("@nocobase/utils/client");
+  _client2 = function _client2() {
     return data;
   };
   return data;
@@ -18,9 +25,9 @@ function _antd() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _react() {
+  const data = _interopRequireWildcard(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
@@ -32,27 +39,13 @@ function _reactRouterDom() {
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
-function _client2() {
-  const data = require("@nocobase/utils/client");
-  _client2 = function _client2() {
-    return data;
-  };
-  return data;
-}
-var _FlowContext = require("./FlowContext");
-var _style = require("./style");
+var _CanvasContent = require("./CanvasContent");
 var _constants = require("./constants");
+var _FlowContext = require("./FlowContext");
 var _locale = require("./locale");
-var _utils = require("./utils");
 var _nodes = require("./nodes");
-var _CanvasContent = require("./CanvasContent");
+var _style = require("./style");
+var _utils = require("./utils");
 const _excluded = ["nodes", "revisions"],
   _excluded2 = ["jobs", "workflow"];
 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); }
@@ -139,7 +132,7 @@ function JobModal() {
               'x-decorator': 'FormItem',
               'x-component': 'Input.JSON',
               'x-component-props': {
-                className: (0, _css().css)`
+                className: (0, _client().css)`
                       padding: 1em;
                       background-color: #eee;
                     `
@@ -168,9 +161,9 @@ function ExecutionCanvas() {
     var _data$data;
     const _ref2 = (_data$data = data === null || data === void 0 ? void 0 : data.data) !== null && _data$data !== void 0 ? _data$data : {},
       workflow = _ref2.workflow;
-    setTitle === null || setTitle === void 0 ? void 0 : setTitle(`${(workflow === null || workflow === void 0 ? void 0 : workflow.title) ? `${workflow.title} - ` : ''}${(0, _locale.lang)('Execution history')}`);
+    setTitle === null || setTitle === void 0 ? void 0 : setTitle(`${workflow !== null && workflow !== void 0 && workflow.title ? `${workflow.title} - ` : ''}${(0, _locale.lang)('Execution history')}`);
   }, [data === null || data === void 0 ? void 0 : data.data]);
-  if (!(data === null || data === void 0 ? void 0 : data.data)) {
+  if (!(data !== null && data !== void 0 && data.data)) {
     if (loading) {
       return _react().default.createElement("div", null, (0, _locale.lang)('Loading'));
     } else {

package/lib/client/ExecutionPage.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ExecutionPage = void 0;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -38,7 +31,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const ExecutionPage = () => {
   const params = (0, _reactRouterDom().useParams)();
   return _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.workflowPageClass)
+    className: (0, _client().cx)(_style.workflowPageClass)
   }, _react().default.createElement(_client().SchemaComponent, {
     schema: {
       type: 'void',

package/lib/client/WorkflowCanvas.js

@@ -11,13 +11,6 @@ function _icons() {
   };
   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() {
@@ -129,7 +122,7 @@ function WorkflowCanvas() {
       title = _ref2.title;
     setTitle === null || setTitle === void 0 ? void 0 : setTitle(`${(0, _locale.lang)('Workflow')}${title ? `: ${title}` : ''}`);
   }, [data === null || data === void 0 ? void 0 : data.data]);
-  if (!(data === null || data === void 0 ? void 0 : data.data)) {
+  if (!(data !== null && data !== void 0 && data.data)) {
     return _react().default.createElement("div", null, loading ? (0, _locale.lang)('Loading') : (0, _locale.lang)('Load failed'));
   }
   const _ref3 = (_data$data2 = data === null || data === void 0 ? void 0 : data.data) !== null && _data$data2 !== void 0 ? _data$data2 : {},
@@ -241,7 +234,7 @@ function WorkflowCanvas() {
     menu: {
       onClick: onSwitchVersion,
       defaultSelectedKeys: [`${workflow.id}`],
-      className: (0, _css().cx)(_style.workflowVersionDropdownClass),
+      className: (0, _client().cx)(_style.workflowVersionDropdownClass),
       items: revisions.sort((a, b) => b.id - a.id).map((item, index) => ({
         key: `${item.id}`,
         icon: item.current ? _react().default.createElement(_icons().RightOutlined, null) : null,
@@ -256,7 +249,7 @@ function WorkflowCanvas() {
     }
   }, _react().default.createElement(_antd().Button, {
     type: "text"
-  }, _react().default.createElement("label", null, (0, _locale.lang)('Version')), _react().default.createElement("span", null, (workflow === null || workflow === void 0 ? void 0 : workflow.id) ? `#${workflow.id}` : null), _react().default.createElement(_icons().DownOutlined, null)))), _react().default.createElement(_antd().Switch, {
+  }, _react().default.createElement("label", null, (0, _locale.lang)('Version')), _react().default.createElement("span", null, workflow !== null && workflow !== void 0 && workflow.id ? `#${workflow.id}` : null), _react().default.createElement(_icons().DownOutlined, null)))), _react().default.createElement(_antd().Switch, {
     checked: workflow.enabled,
     onChange: onToggle,
     checkedChildren: (0, _locale.lang)('On'),

package/lib/client/WorkflowPage.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WorkflowPage = void 0;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -38,7 +31,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const WorkflowPage = () => {
   const params = (0, _reactRouterDom().useParams)();
   return _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.workflowPageClass)
+    className: (0, _client().cx)(_style.workflowPageClass)
   }, _react().default.createElement(_client().SchemaComponent, {
     schema: {
       type: 'void',

package/lib/client/WorkflowProvider.js

@@ -26,21 +26,15 @@ function _react() {
   };
   return data;
 }
+var _OpenDrawer = _interopRequireDefault(require("./components/OpenDrawer"));
 var _ExecutionLink = require("./ExecutionLink");
-var _ExecutionPage = require("./ExecutionPage");
 var _ExecutionResourceProvider = require("./ExecutionResourceProvider");
-var _WorkflowLink = require("./WorkflowLink");
-var _WorkflowPage = require("./WorkflowPage");
-var _DynamicExpression = require("./components/DynamicExpression");
-var _OpenDrawer = _interopRequireDefault(require("./components/OpenDrawer"));
 var _expression = _interopRequireDefault(require("./interfaces/expression"));
 var _locale = require("./locale");
 var _nodes = require("./nodes");
-var _WorkflowTodo = require("./nodes/manual/WorkflowTodo");
-var _WorkflowTodoBlockInitializer = require("./nodes/manual/WorkflowTodoBlockInitializer");
 var _workflows = require("./schemas/workflows");
 var _triggers = require("./triggers");
-const _excluded = ["routes", "components"];
+var _WorkflowLink = require("./WorkflowLink");
 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; }
@@ -49,8 +43,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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;
@@ -73,19 +65,6 @@ function WorkflowPane() {
 const WorkflowProvider = props => {
   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[1].routes.unshift({
-    type: 'route',
-    path: '/admin/settings/workflow/workflows/:id',
-    component: 'WorkflowPage'
-  }, {
-    type: 'route',
-    path: '/admin/settings/workflow/executions/:id',
-    component: 'ExecutionPage'
-  });
   return _react().default.createElement(_client().SettingsCenterProvider, {
     settings: {
       workflow: {
@@ -105,24 +84,6 @@ const WorkflowProvider = props => {
     value: {
       components: _objectSpread({}, pmCtx === null || pmCtx === void 0 ? void 0 : pmCtx.components)
     }
-  }, _react().default.createElement(_client().RouteSwitchContext.Provider, {
-    value: _objectSpread(_objectSpread({
-      components: _objectSpread(_objectSpread({}, components), {}, {
-        WorkflowPage: _WorkflowPage.WorkflowPage,
-        ExecutionPage: _ExecutionPage.ExecutionPage
-      })
-    }, others), {}, {
-      routes
-    })
-  }, _react().default.createElement(_client().SchemaComponentOptions, {
-    components: {
-      WorkflowTodo: _WorkflowTodo.WorkflowTodo,
-      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), {}, {
@@ -134,6 +95,6 @@ const WorkflowProvider = props => {
       triggers: _triggers.triggers,
       instructions: _nodes.instructions
     }
-  }, props.children))))));
+  }, props.children))));
 };
 exports.WorkflowProvider = WorkflowProvider;

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

@@ -1,4 +1,4 @@
 import React from 'react';
 export declare function useCollectionUIFields(collection: any): import("@nocobase/client").CollectionFieldOptions[];
-declare const CollectionFieldSet: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
+declare const CollectionFieldSet: React.MemoExoticComponent<import("@formily/react").ReactFC<Omit<any, "ref">>>;
 export default CollectionFieldSet;

package/lib/client/components/CollectionFieldset.js

@@ -12,16 +12,16 @@ function _icons() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _react() {
+  const data = require("@formily/react");
+  _react = function _react() {
     return data;
   };
   return data;
 }
-function _react() {
-  const data = require("@formily/react");
-  _react = function _react() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
@@ -47,13 +47,6 @@ function _reactI18next() {
   };
   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 _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); }
@@ -134,7 +127,7 @@ const CollectionFieldSet = (0, _react().observer)(({
     };
   }, [_onChange, unassignedFields, value]);
   return _react2().default.createElement("fieldset", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
           margin-top: 0.5em;
 
           > .ant-formily-item {
@@ -157,7 +150,7 @@ const CollectionFieldSet = (0, _react().observer)(({
       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),
       labelAlign: "left",
-      className: (0, _css().css)`
+      className: (0, _client().css)`
                       .ant-form-item-control-input-content {
                         display: flex;
                       }

package/lib/client/components/Duration.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
@@ -53,7 +53,7 @@ function _default({
   const option = getNumberOption(value);
   const quantity = Math.round(value / option.value);
   return _react().default.createElement("fieldset", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         display: flex;
         gap: 0.5em;
       `
@@ -62,7 +62,7 @@ function _default({
     value: quantity,
     onChange: v => _onChange(Math.round(v * option.value))
   }), _react().default.createElement(_antd().Select, {
-    dropdownMatchSelectWidth: false,
+    popupMatchSelectWidth: false,
     value: option.value,
     onChange: unit => _onChange(Math.round(quantity * unit))
   }, UnitOptions.map(item => _react().default.createElement(_antd().Select.Option, {

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

@@ -1,6 +1,6 @@
 import React from 'react';
-export declare const DynamicExpression: React.ForwardRefExoticComponent<Pick<Partial<Omit<{
+export declare const DynamicExpression: React.ForwardRefExoticComponent<Omit<Partial<Omit<{
     children?: React.ReactNode;
-}, string | number | symbol> & Pick<any, string | number | symbol> & {
+}, string | number | symbol> & Omit<any, "ref"> & {
     children?: React.ReactNode;
-}>, string | number | symbol> & React.RefAttributes<unknown>>;
+}>, "ref"> & React.RefAttributes<unknown>>;

package/lib/client/components/DynamicExpression.js

@@ -69,6 +69,9 @@ const InternalExpression = (0, _react().observer)(props => {
     _useState2 = _slicedToArray(_useState, 2),
     collection = _useState2[0],
     setCollection = _useState2[1];
+  const compile = (0, _client().useCompile)();
+  const _useCollectionManager = (0, _client().useCollectionManager)(),
+    getCollectionFields = _useCollectionManager.getCollectionFields;
   (0, _react().useFormEffects)(() => {
     (0, _core().onFormInitialValuesChange)(form => {
       setCollection(form.values.sourceCollection);
@@ -78,8 +81,10 @@ const InternalExpression = (0, _react().observer)(props => {
       onChange(null);
     });
   });
-  const options = (0, _variable.useCollectionFieldOptions)({
-    collection: collection
+  const options = (0, _variable.getCollectionFieldOptions)({
+    collection,
+    compile,
+    getCollectionFields
   });
   return _react2().default.createElement(_client().Variable.TextArea, _objectSpread(_objectSpread({}, props), {}, {
     scope: options
@@ -91,8 +96,13 @@ function Result(props) {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
     t = _useTranslation.t;
   const values = (0, _client().useRecord)();
-  const options = (0, _react2().useMemo)(() => (0, _variable.useCollectionFieldOptions)({
-    collection: values.sourceCollection
+  const compile = (0, _client().useCompile)();
+  const _useCollectionManager2 = (0, _client().useCollectionManager)(),
+    getCollectionFields = _useCollectionManager2.getCollectionFields;
+  const options = (0, _react2().useMemo)(() => (0, _variable.getCollectionFieldOptions)({
+    collection: values.sourceCollection,
+    compile,
+    getCollectionFields
   }), [values.sourceCollection, values.sourceCollection]);
   return props.value ? _react2().default.createElement(_client().Variable.TextArea, _objectSpread(_objectSpread({}, props), {}, {
     scope: options

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

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const FieldsSelect: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
+export declare const FieldsSelect: React.MemoExoticComponent<import("@formily/react").ReactFC<Omit<any, "ref">>>;

package/lib/client/components/FieldsSelect.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FieldsSelect = void 0;
 function _react() {
-  const data = _interopRequireDefault(require("react"));
+  const data = require("@formily/react");
   _react = function _react() {
     return data;
   };
@@ -19,7 +19,7 @@ function _antd() {
   return data;
 }
 function _react2() {
-  const data = require("@formily/react");
+  const data = _interopRequireDefault(require("react"));
   _react2 = function _react2() {
     return data;
   };
@@ -41,19 +41,19 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 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; }
-const FieldsSelect = (0, _react2().observer)(props => {
+const FieldsSelect = (0, _react().observer)(props => {
   const _props$filter = props.filter,
     filter = _props$filter === void 0 ? () => true : _props$filter,
     others = _objectWithoutProperties(props, _excluded);
   const compile = (0, _client().useCompile)();
   const _useCollectionManager = (0, _client().useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields;
-  const _useForm = (0, _react2().useForm)(),
+  const _useForm = (0, _react().useForm)(),
     values = _useForm.values;
   const fields = getCollectionFields(values === null || values === void 0 ? void 0 : values.collection);
-  return _react().default.createElement(_antd().Select, _objectSpread(_objectSpread({
+  return _react2().default.createElement(_antd().Select, _objectSpread(_objectSpread({
     className: "full-width",
-    dropdownMatchSelectWidth: false
+    popupMatchSelectWidth: false
   }, others), {}, {
     options: fields.filter(filter).map(field => {
       var _field$uiSchema;

package/lib/client/components/NodeDescription.js

@@ -4,23 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NodeDescription = NodeDescription;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
@@ -29,7 +29,7 @@ var _locale = require("../locale");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function NodeDescription(props) {
   const instruction = props.instruction;
-  const className = (0, _css().css)`
+  const className = (0, _client().css)`
     margin-bottom: 1.5em;
     padding: 1em;
     background: #f6f6f6;
@@ -54,6 +54,6 @@ function NodeDescription(props) {
     }
   `;
   return _react().default.createElement("div", {
-    className: (0, _css().cx)(className, props.className)
+    className: (0, _client().cx)(className, props.className)
   }, _react().default.createElement("dl", null, _react().default.createElement("dt", null, (0, _locale.lang)('Node type')), _react().default.createElement("dd", null, _react().default.createElement(_antd().Tag, null, instruction.title))), instruction.description ? _react().default.createElement("p", null, instruction.description) : null);
 }