@nocobase/plugin-workflow 0.9.4-alpha.2 → 0.10.0-alpha.2

package/lib/client/AddButton.d.ts

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

package/lib/client/Branch.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
+import React from 'react';
 export declare function Branch({ from, entry, branchIndex, controller, }: {
     from?: any;
     entry?: any;
     branchIndex?: number | null;
     controller?: any;
-}): JSX.Element;
+}): React.JSX.Element;

package/lib/client/CanvasContent.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 export declare function CanvasContent({ entry }: {
     entry: any;
-}): JSX.Element;
+}): React.JSX.Element;

package/lib/client/ExecutionCanvas.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function ExecutionCanvas(): JSX.Element;
+import React from 'react';
+export declare function ExecutionCanvas(): React.JSX.Element;

package/lib/client/ExecutionCanvas.js

@@ -93,7 +93,7 @@ function JobModal() {
     _ref$node = _ref.node,
     node = _ref$node === void 0 ? {} : _ref$node;
   const instruction = _nodes.instructions.get(node.type);
-  return _react().default.createElement(_client().ActionContext.Provider, {
+  return _react().default.createElement(_client().ActionContextProvider, {
     value: {
       visible: Boolean(job),
       setVisible: setViewJob

package/lib/client/ExecutionLink.d.ts

@@ -1 +1,2 @@
-export declare const ExecutionLink: () => JSX.Element;
+import React from 'react';
+export declare const ExecutionLink: () => React.JSX.Element;

package/lib/client/ExecutionPage.d.ts

@@ -1 +1,2 @@
-export declare const ExecutionPage: () => JSX.Element;
+import React from 'react';
+export declare const ExecutionPage: () => React.JSX.Element;

package/lib/client/ExecutionPage.js

@@ -4,40 +4,39 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ExecutionPage = void 0;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+function _css() {
+  const data = require("@emotion/css");
+  _css = function _css() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _reactRouterDom() {
-  const data = require("react-router-dom");
-  _reactRouterDom = function _reactRouterDom() {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
+function _reactRouterDom() {
+  const data = require("react-router-dom");
+  _reactRouterDom = function _reactRouterDom() {
     return data;
   };
   return data;
 }
-var _style = require("./style");
 var _ExecutionCanvas = require("./ExecutionCanvas");
+var _style = require("./style");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const ExecutionPage = () => {
-  const _useRouteMatch = (0, _reactRouterDom().useRouteMatch)(),
-    params = _useRouteMatch.params;
+  const params = (0, _reactRouterDom().useParams)();
   return _react().default.createElement("div", {
     className: (0, _css().cx)(_style.workflowPageClass)
   }, _react().default.createElement(_client().SchemaComponent, {

package/lib/client/ExecutionResourceProvider.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 export declare const ExecutionResourceProvider: ({ request, filter, ...others }: {
     [x: string]: any;
     request: any;
     filter?: {};
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/client/WorkflowCanvas.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function WorkflowCanvas(): JSX.Element;
+import React from 'react';
+export declare function WorkflowCanvas(): React.JSX.Element;

package/lib/client/WorkflowCanvas.js

@@ -4,44 +4,44 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WorkflowCanvas = WorkflowCanvas;
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
+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() {
+function _css() {
+  const data = require("@emotion/css");
+  _css = function _css() {
     return data;
   };
   return data;
 }
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _icons() {
-  const data = require("@ant-design/icons");
-  _icons = function _icons() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _classnames() {
+  const data = _interopRequireDefault(require("classnames"));
+  _classnames = function _classnames() {
     return data;
   };
   return data;
 }
-function _classnames() {
-  const data = _interopRequireDefault(require("classnames"));
-  _classnames = function _classnames() {
+function _react() {
+  const data = _interopRequireWildcard(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
@@ -53,25 +53,25 @@ function _reactI18next() {
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
+function _reactRouterDom() {
+  const data = require("react-router-dom");
+  _reactRouterDom = function _reactRouterDom() {
     return data;
   };
   return data;
 }
-var _FlowContext = require("./FlowContext");
-var _style = require("./style");
-var _executions = require("./schemas/executions");
+var _CanvasContent = require("./CanvasContent");
 var _ExecutionLink = require("./ExecutionLink");
+var _FlowContext = require("./FlowContext");
 var _locale = require("./locale");
+var _executions = require("./schemas/executions");
+var _style = require("./style");
 var _utils = require("./utils");
-var _CanvasContent = require("./CanvasContent");
 const _excluded = ["request", "filter"],
   _excluded2 = ["nodes", "revisions"];
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -108,7 +108,7 @@ function ExecutionResourceProvider(_ref) {
 }
 function WorkflowCanvas() {
   var _data$data2;
-  const history = (0, _reactRouterDom().useHistory)();
+  const navigate = (0, _reactRouterDom().useNavigate)();
   const _useTranslation = (0, _reactI18next().useTranslation)(),
     t = _useTranslation.t;
   const _useResourceActionCon = (0, _client().useResourceActionContext)(),
@@ -144,7 +144,7 @@ function WorkflowCanvas() {
     key
   }) {
     if (key != workflow.id) {
-      history.push(key);
+      navigate(`/admin/settings/workflow/workflows/${key}`);
     }
   }
   function onToggle(_x2) {
@@ -175,7 +175,7 @@ function WorkflowCanvas() {
         }),
         revision = _yield$resource$revis.data.data;
       _antd().message.success(t('Operation succeeded'));
-      history.push(`${revision.id}`);
+      navigate(`/admin/settings/workflow/workflows/${revision.id}`);
     });
     return _onRevision.apply(this, arguments);
   }
@@ -195,7 +195,7 @@ function WorkflowCanvas() {
               filterByTk: workflow.id
             });
             _antd().message.success(t('Operation succeeded'));
-            history.push(workflow.current ? '..' : `${(_revisions$find = revisions.find(item => item.current)) === null || _revisions$find === void 0 ? void 0 : _revisions$find.id}`);
+            navigate(workflow.current ? '/admin/settings/workflow/workflows' : `/admin/settings/workflow/workflows/${(_revisions$find = revisions.find(item => item.current)) === null || _revisions$find === void 0 ? void 0 : _revisions$find.id}`);
           })();
         }
       });
@@ -280,7 +280,7 @@ function WorkflowCanvas() {
   }, _react().default.createElement(_antd().Button, {
     type: "text",
     icon: _react().default.createElement(_icons().EllipsisOutlined, null)
-  })), _react().default.createElement(_client().ActionContext.Provider, {
+  })), _react().default.createElement(_client().ActionContextProvider, {
     value: {
       visible,
       setVisible

package/lib/client/WorkflowLink.d.ts

@@ -1 +1,2 @@
-export declare const WorkflowLink: () => JSX.Element;
+import React from 'react';
+export declare const WorkflowLink: () => React.JSX.Element;

package/lib/client/WorkflowPage.d.ts

@@ -1 +1,2 @@
-export declare const WorkflowPage: () => JSX.Element;
+import React from 'react';
+export declare const WorkflowPage: () => React.JSX.Element;

package/lib/client/WorkflowPage.js

@@ -11,6 +11,13 @@ function _css() {
   };
   return data;
 }
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
+    return data;
+  };
+  return data;
+}
 function _react() {
   const data = _interopRequireDefault(require("react"));
   _react = function _react() {
@@ -25,19 +32,11 @@ function _reactRouterDom() {
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
 var _style = require("./style");
 var _WorkflowCanvas = require("./WorkflowCanvas");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const WorkflowPage = () => {
-  const _useRouteMatch = (0, _reactRouterDom().useRouteMatch)(),
-    params = _useRouteMatch.params;
+  const params = (0, _reactRouterDom().useParams)();
   return _react().default.createElement("div", {
     className: (0, _css().cx)(_style.workflowPageClass)
   }, _react().default.createElement(_client().SchemaComponent, {
@@ -57,7 +56,9 @@ const WorkflowPage = () => {
               resource: 'workflows',
               action: 'get',
               params: {
-                filter: params,
+                filter: {
+                  id: params.id
+                },
                 appends: ['nodes', 'revisions.id', 'revisions.createdAt', 'revisions.current', 'revisions.executed', 'revisions.enabled']
               }
             }

package/lib/client/WorkflowProvider.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 export declare const WorkflowContext: React.Context<{}>;
 export declare function useWorkflowContext(): {};
-export declare const WorkflowProvider: (props: any) => JSX.Element;
+export declare const WorkflowProvider: (props: any) => React.JSX.Element;

package/lib/client/WorkflowProvider.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.WorkflowProvider = exports.WorkflowContext = void 0;
 exports.useWorkflowContext = useWorkflowContext;
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
@@ -19,27 +19,27 @@ function _antd() {
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
+function _react() {
+  const data = _interopRequireWildcard(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
 }
-var _WorkflowPage = require("./WorkflowPage");
+var _ExecutionLink = require("./ExecutionLink");
 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 _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 _DynamicExpression = require("./components/DynamicExpression");
-var _expression = _interopRequireDefault(require("./interfaces/expression"));
+var _workflows = require("./schemas/workflows");
+var _triggers = require("./triggers");
 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); }

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

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

package/lib/client/components/CollectionBlockInitializer.js

@@ -18,6 +18,7 @@ function _client() {
   };
   return data;
 }
+var _utils = require("../nodes/manual/utils");
 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; }
@@ -25,47 +26,78 @@ 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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) {
+function InnerCollectionBlockInitializer(_ref) {
   let insert = _ref.insert,
     collection = _ref.collection,
     dataSource = _ref.dataSource,
     props = _objectWithoutProperties(_ref, _excluded);
+  const _useSchemaTemplateMan = (0, _client().useSchemaTemplateManager)(),
+    getTemplateSchemaByMode = _useSchemaTemplateMan.getTemplateSchemaByMode;
   const _useCollectionManager = (0, _client().useCollectionManager)(),
     getCollection = _useCollectionManager.getCollection;
+  const items = (0, _client().useRecordCollectionDataSourceItems)('FormItem');
   const resovledCollection = getCollection(collection);
-  return _react().default.createElement(_client().SchemaInitializer.Item, _objectSpread(_objectSpread({}, props), {}, {
-    onClick: () => {
-      insert({
+  function onConfirm(_x) {
+    return _onConfirm.apply(this, arguments);
+  }
+  function _onConfirm() {
+    _onConfirm = _asyncToGenerator(function* ({
+      item
+    }) {
+      const template = item.template ? yield getTemplateSchemaByMode(item) : null;
+      const result = {
         type: 'void',
         name: resovledCollection.name,
         title: resovledCollection.title,
-        'x-decorator': 'CollectionProvider',
+        'x-decorator': 'DetailsBlockProvider',
         'x-decorator-props': {
-          collection
+          collection,
+          dataSource
         },
         'x-component': 'CardItem',
         'x-component-props': {
-          // title: props.title
+          title: props.title
         },
         'x-designer': 'SimpleDesigner',
-        'x-designer-props': {
-          type: 'record'
-        },
         properties: {
           grid: {
             type: 'void',
-            'x-decorator': 'Form',
-            'x-decorator-props': {
-              useValues: '{{ useFlowRecordFromBlock }}'
+            'x-component': 'FormV2',
+            'x-component-props': {
+              useProps: '{{useDetailsBlockProps}}'
             },
-            'x-component': 'Grid',
-            'x-initializer': 'CollectionFieldInitializers',
-            'x-context-datasource': dataSource
+            'x-read-pretty': true,
+            properties: {
+              grid: template || {
+                type: 'void',
+                'x-component': 'Grid',
+                'x-initializer': 'ReadPrettyFormItemInitializers',
+                properties: {}
+              }
+            }
           }
         }
+      };
+      (0, _utils.traverseSchema)(result, node => {
+        if (node['x-uid']) {
+          delete node['x-uid'];
+        }
       });
-    }
+      insert(result);
+    });
+    return _onConfirm.apply(this, arguments);
+  }
+  return _react().default.createElement(_client().SchemaInitializer.Item, _objectSpread(_objectSpread({}, props), {}, {
+    onClick: onConfirm,
+    items: items
   }));
+}
+function CollectionBlockInitializer(props) {
+  return _react().default.createElement(_client().CollectionProvider, {
+    collection: props.collection
+  }, _react().default.createElement(InnerCollectionBlockInitializer, _objectSpread({}, props)));
 }

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

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
-export default _default;
+declare const CollectionFieldSet: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
+export default CollectionFieldSet;

package/lib/client/components/CollectionFieldset.js

@@ -85,7 +85,7 @@ function AssociationInput(props) {
   }));
 }
 // NOTE: observer for watching useProps
-var _default = (0, _react2().observer)(({
+const CollectionFieldSet = (0, _react2().observer)(({
   value,
   disabled,
   onChange: _onChange
@@ -108,16 +108,16 @@ var _default = (0, _react2().observer)(({
   const mergedDisabled = disabled || form.disabled;
   return _react().default.createElement("fieldset", {
     className: (0, _css().css)`
-        margin-top: 0.5em;
+          margin-top: 0.5em;
 
-        > .ant-formily-item {
-          flex-direction: column;
+          > .ant-formily-item {
+            flex-direction: column;
 
-          > .ant-formily-item-label {
-            line-height: 32px;
+            > .ant-formily-item-label {
+              line-height: 32px;
+            }
           }
-        }
-      `
+        `
   }, fields.length ? _react().default.createElement(_client().CollectionProvider, {
     collection: getCollection(collectionName)
   }, fields.filter(field => value && field.name in value).map(field => {
@@ -131,10 +131,10 @@ var _default = (0, _react2().observer)(({
       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;
-                    }
-                  `
+                      .ant-form-item-control-input-content {
+                        display: flex;
+                      }
+                    `
     }, _react().default.createElement(_client().Variable.Input, {
       scope: scope,
       value: value[field.name],
@@ -180,12 +180,15 @@ var _default = (0, _react2().observer)(({
         [key]: null
       })),
       className: (0, _css().css)`
-                    max-height: 300px;
-                    overflow-y: auto;
-                  `
+                      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')));
+}, {
+  displayName: 'CollectionFieldSet'
 });
+var _default = CollectionFieldSet;
 exports.default = _default;

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from 'react';
 export default function ({ value, onChange }: {
     value?: number;
     onChange: any;
-}): JSX.Element;
+}): React.JSX.Element;

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

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

package/lib/client/components/DynamicExpression.js

@@ -84,6 +84,8 @@ const InternalExpression = (0, _react().observer)(props => {
   return _react2().default.createElement(_client().Variable.TextArea, _objectSpread(_objectSpread({}, props), {}, {
     scope: options
   }));
+}, {
+  displayName: 'InternalExpression'
 });
 function Result(props) {
   const _useTranslation = (0, _reactI18next().useTranslation)(),

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

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

package/lib/client/components/FieldsSelect.js

@@ -63,5 +63,7 @@ const FieldsSelect = (0, _react2().observer)(props => {
       };
     })
   }));
+}, {
+  displayName: 'FieldsSelect'
 });
 exports.FieldsSelect = FieldsSelect;

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

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

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

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function NodeDescription(props: any): JSX.Element;
+import React from 'react';
+export declare function NodeDescription(props: any): React.JSX.Element;