@nocobase/plugin-workflow 0.10.1-alpha.1 → 0.11.1-alpha.1

package/lib/client/nodes/manual/WorkflowTodo.js

@@ -4,67 +4,59 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WorkflowTodo = void 0;
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
+function _css() {
+  const data = require("@emotion/css");
+  _css = function _css() {
     return data;
   };
   return data;
 }
-function _react2() {
+function _react() {
   const data = require("@formily/react");
-  _react2 = function _react2() {
-    return data;
-  };
-  return data;
-}
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+  _react = function _react() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/utils/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _moment() {
-  const data = _interopRequireDefault(require("moment"));
-  _moment = function _moment() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
+function _react2() {
+  const data = _interopRequireWildcard(require("react"));
+  _react2 = function _react2() {
     return data;
   };
   return data;
 }
 function _client2() {
-  const data = require("@nocobase/utils/client");
+  const data = require("@nocobase/client");
   _client2 = function _client2() {
     return data;
   };
   return data;
 }
+var _ = require("..");
+var _FlowContext = require("../../FlowContext");
 var _constants = require("../../constants");
 var _locale = require("../../locale");
-var _FlowContext = require("../../FlowContext");
-var _ = require("..");
 var _utils = require("../../utils");
-var _SchemaConfig = require("./SchemaConfig");
-var _FormBlockProvider = require("./FormBlockProvider");
 var _DetailsBlockProvider = require("./DetailsBlockProvider");
+var _FormBlockProvider = require("./FormBlockProvider");
+var _SchemaConfig = require("./SchemaConfig");
 const _excluded = ["nodes"],
   _excluded2 = ["node", "workflow", "execution"],
   _excluded3 = ["collections"];
-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; }
@@ -218,34 +210,33 @@ const todoCollection = {
       'x-component': 'DatePicker',
       'x-component-props': {
         showTime: true
-      },
-      'x-read-pretty': true
+      }
     }
   }]
 };
-const NodeColumn = (0, _react2().observer)(() => {
+const NodeColumn = (0, _react().observer)(() => {
   var _field$value$title, _field$value, _field$value2;
-  const field = (0, _react2().useField)();
+  const field = (0, _react().useField)();
   return (_field$value$title = field === null || field === void 0 ? void 0 : (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.title) !== null && _field$value$title !== void 0 ? _field$value$title : `#${(_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : _field$value2.id}`;
 }, {
   displayName: 'NodeColumn'
 });
-const WorkflowColumn = (0, _react2().observer)(() => {
+const WorkflowColumn = (0, _react().observer)(() => {
   var _field$value$title2, _field$value3, _field$value4;
-  const field = (0, _react2().useField)();
+  const field = (0, _react().useField)();
   return (_field$value$title2 = field === null || field === void 0 ? void 0 : (_field$value3 = field.value) === null || _field$value3 === void 0 ? void 0 : _field$value3.title) !== null && _field$value$title2 !== void 0 ? _field$value$title2 : `#${(_field$value4 = field.value) === null || _field$value4 === void 0 ? void 0 : _field$value4.id}`;
 }, {
   displayName: 'WorkflowColumn'
 });
-const UserColumn = (0, _react2().observer)(() => {
+const UserColumn = (0, _react().observer)(() => {
   var _field$value$nickname, _field$value5, _field$value6;
-  const field = (0, _react2().useField)();
+  const field = (0, _react().useField)();
   return (_field$value$nickname = field === null || field === void 0 ? void 0 : (_field$value5 = field.value) === null || _field$value5 === void 0 ? void 0 : _field$value5.nickname) !== null && _field$value$nickname !== void 0 ? _field$value$nickname : (_field$value6 = field.value) === null || _field$value6 === void 0 ? void 0 : _field$value6.id;
 }, {
   displayName: 'UserColumn'
 });
 const WorkflowTodo = () => {
-  return _react().default.createElement(_client().SchemaComponent, {
+  return _react2().default.createElement(_client2().SchemaComponent, {
     components: {
       NodeColumn,
       WorkflowColumn,
@@ -253,8 +244,6 @@ const WorkflowTodo = () => {
     },
     schema: {
       type: 'void',
-      name: (0, _client2().uid)(),
-      'x-component': 'div',
       properties: {
         actions: {
           type: 'void',
@@ -329,7 +318,7 @@ const WorkflowTodo = () => {
               'x-component': 'TableV2.Column',
               properties: {
                 createdAt: {
-                  type: 'number',
+                  type: 'string',
                   'x-component': 'CollectionField',
                   'x-read-pretty': true
                 }
@@ -353,7 +342,6 @@ const WorkflowTodo = () => {
               'x-component': 'TableV2.Column',
               properties: {
                 status: {
-                  type: 'number',
                   'x-component': 'CollectionField',
                   'x-read-pretty': true
                 }
@@ -391,14 +379,14 @@ function ActionBarProvider(props) {
   // * status is not done:
   //   1. current user: show action bar
   //   2. not current user: disabled action bar
-  const _useCurrentUserContex = (0, _client().useCurrentUserContext)(),
+  const _useCurrentUserContex = (0, _client2().useCurrentUserContext)(),
     user = _useCurrentUserContex.data;
   const _useFlowContext = (0, _FlowContext.useFlowContext)(),
     userJob = _useFlowContext.userJob;
   const status = userJob.status,
     result = userJob.result,
     userId = userJob.userId;
-  const buttonSchema = (0, _react2().useFieldSchema)();
+  const buttonSchema = (0, _react().useFieldSchema)();
   const _buttonSchema$parent$ = buttonSchema.parent.toJSON(),
     name = _buttonSchema$parent$.name;
   let content = props.children;
@@ -414,54 +402,54 @@ function ActionBarProvider(props) {
   }
   return content;
 }
-const ManualActionStatusContext = (0, _react().createContext)(null);
+const ManualActionStatusContext = (0, _react2().createContext)(null);
 function ManualActionStatusProvider({
   value,
   children
 }) {
   const _useFlowContext2 = (0, _FlowContext.useFlowContext)(),
     userJob = _useFlowContext2.userJob;
-  const button = (0, _react2().useField)();
-  (0, _react().useEffect)(() => {
+  const button = (0, _react().useField)();
+  const buttonSchema = (0, _react().useFieldSchema)();
+  (0, _react2().useEffect)(() => {
     if (userJob.status) {
       button.disabled = true;
-      button.visible = userJob.status === value;
+      button.visible = userJob.status === value && userJob.result._ === buttonSchema.name;
     }
-  }, [userJob.status, value, button]);
-  return _react().default.createElement(ManualActionStatusContext.Provider, {
+  }, [userJob, value, button]);
+  return _react2().default.createElement(ManualActionStatusContext.Provider, {
     value: value
   }, children);
 }
 function useSubmit() {
-  const api = (0, _client().useAPIClient)();
-  const _useActionContext = (0, _client().useActionContext)(),
+  const api = (0, _client2().useAPIClient)();
+  const _useActionContext = (0, _client2().useActionContext)(),
     setVisible = _useActionContext.setVisible;
-  const _useForm = (0, _react2().useForm)(),
+  const _useForm = (0, _react().useForm)(),
     values = _useForm.values,
     submit = _useForm.submit;
-  const buttonSchema = (0, _react2().useFieldSchema)();
-  const nextStatus = (0, _react().useContext)(ManualActionStatusContext);
-  const _useTableBlockContext = (0, _client().useTableBlockContext)(),
+  const buttonSchema = (0, _react().useFieldSchema)();
+  const _useTableBlockContext = (0, _client2().useTableBlockContext)(),
     service = _useTableBlockContext.service;
   const _useFlowContext3 = (0, _FlowContext.useFlowContext)(),
     userJob = _useFlowContext3.userJob;
-  const _useContext = (0, _react().useContext)(_client().FormBlockContext),
-    updateAssociationValues = _useContext.updateAssociationValues;
+  const actionKey = buttonSchema.name;
+  const formKey = buttonSchema.parent.parent.name;
   return {
     run() {
       return _asyncToGenerator(function* () {
+        if (userJob.status) {
+          return;
+        }
         yield submit();
-        const _buttonSchema$parent$2 = buttonSchema.parent.parent.toJSON(),
-          name = _buttonSchema$parent$2.name;
         yield api.resource('users_jobs').submit({
           filterByTk: userJob.id,
           values: {
-            status: nextStatus,
             result: {
-              [name]: values
+              [formKey]: values,
+              _: actionKey
             }
-          },
-          updateAssociationValues
+          }
         });
         setVisible(false);
         service.refresh();
@@ -471,18 +459,18 @@ function useSubmit() {
 }
 function FlowContextProvider(props) {
   var _node$config;
-  const api = (0, _client().useAPIClient)();
-  const _useRecord = (0, _client().useRecord)(),
+  const api = (0, _client2().useAPIClient)();
+  const _useRecord = (0, _client2().useRecord)(),
     id = _useRecord.id;
-  const _useState = (0, _react().useState)(null),
+  const _useState = (0, _react2().useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
     flowContext = _useState2[0],
     setFlowContext = _useState2[1];
-  const _useState3 = (0, _react().useState)(null),
+  const _useState3 = (0, _react2().useState)(null),
     _useState4 = _slicedToArray(_useState3, 2),
     node = _useState4[0],
     setNode = _useState4[1];
-  (0, _react().useEffect)(() => {
+  (0, _react2().useEffect)(() => {
     var _api$resource$get, _api$resource;
     if (!id) {
       return;
@@ -518,9 +506,9 @@ function FlowContextProvider(props) {
   const nodeComponents = upstreams.reduce((components, {
     type
   }) => Object.assign(components, _.instructions.get(type).components), {});
-  return node && flowContext ? _react().default.createElement(_FlowContext.FlowContext.Provider, {
+  return node && flowContext ? _react2().default.createElement(_FlowContext.FlowContext.Provider, {
     value: flowContext
-  }, _react().default.createElement(_client().SchemaComponent, {
+  }, _react2().default.createElement(_client2().SchemaComponent, {
     components: _objectSpread(_objectSpread({
       FormBlockProvider: _FormBlockProvider.FormBlockProvider,
       DetailsBlockProvider: _DetailsBlockProvider.DetailsBlockProvider,
@@ -538,19 +526,19 @@ function FlowContextProvider(props) {
       'x-component': 'Tabs',
       properties: (_node$config = node.config) === null || _node$config === void 0 ? void 0 : _node$config.schema
     }
-  })) : _react().default.createElement(_antd().Spin, null);
+  })) : _react2().default.createElement(_antd().Spin, null);
 }
 function useFormBlockProps() {
   var _user$data2;
   const _useFlowContext4 = (0, _FlowContext.useFlowContext)(),
     userJob = _useFlowContext4.userJob;
-  const record = (0, _client().useRecord)();
-  const _useCurrentUserContex2 = (0, _client().useCurrentUserContext)(),
+  const record = (0, _client2().useRecord)();
+  const _useCurrentUserContex2 = (0, _client2().useCurrentUserContext)(),
     user = _useCurrentUserContex2.data;
-  const _useFormBlockContext = (0, _client().useFormBlockContext)(),
+  const _useFormBlockContext = (0, _client2().useFormBlockContext)(),
     form = _useFormBlockContext.form;
   const pattern = userJob.status ? record ? 'readPretty' : 'disabled' : (user === null || user === void 0 ? void 0 : (_user$data2 = user.data) === null || _user$data2 === void 0 ? void 0 : _user$data2.id) !== userJob.userId ? 'disabled' : 'editable';
-  (0, _react().useEffect)(() => {
+  (0, _react2().useEffect)(() => {
     form === null || form === void 0 ? void 0 : form.setPattern(pattern);
   }, [pattern, form]);
   return {
@@ -558,51 +546,43 @@ function useFormBlockProps() {
   };
 }
 function useDetailsBlockProps() {
-  const _useFormBlockContext2 = (0, _client().useFormBlockContext)(),
+  const _useFormBlockContext2 = (0, _client2().useFormBlockContext)(),
     form = _useFormBlockContext2.form;
   return {
     form
   };
 }
-function Drawer() {
-  var _node$title;
-  const ctx = (0, _react().useContext)(_client().SchemaComponentContext);
-  const _useRecord2 = (0, _client().useRecord)(),
-    id = _useRecord2.id,
-    node = _useRecord2.node,
-    workflow = _useRecord2.workflow,
+function FooterStatus() {
+  const compile = (0, _client2().useCompile)();
+  const _useRecord2 = (0, _client2().useRecord)(),
     status = _useRecord2.status,
     updatedAt = _useRecord2.updatedAt;
   const statusOption = _constants.JobStatusOptionsMap[status];
-  const footerSchema = status ? {
-    date: {
-      type: 'void',
-      'x-component': 'time',
-      'x-component-props': {
-        className: (0, _css().css)`
-              margin-right: 0.5em;
-            `
-      },
-      'x-content': (0, _moment().default)(updatedAt).format('YYYY-MM-DD HH:mm:ss')
-    },
-    status: {
-      type: 'void',
-      'x-component': 'Tag',
-      'x-component-props': {
-        icon: statusOption.icon,
-        color: statusOption.color
-      },
-      'x-content': statusOption.label
-    }
-  } : null;
-  return _react().default.createElement(_client().SchemaComponentContext.Provider, {
+  return status ? _react2().default.createElement(_antd().Space, null, _react2().default.createElement("time", {
+    className: (0, _css().css)`
+          margin-right: 0.5em;
+        `
+  }, (0, _client().dayjs)(updatedAt).format('YYYY-MM-DD HH:mm:ss')), _react2().default.createElement(_antd().Tag, {
+    icon: statusOption.icon,
+    color: statusOption.color
+  }, compile(statusOption.label))) : null;
+}
+function Drawer() {
+  var _node$title;
+  const ctx = (0, _react2().useContext)(_client2().SchemaComponentContext);
+  const _useRecord3 = (0, _client2().useRecord)(),
+    id = _useRecord3.id,
+    node = _useRecord3.node,
+    workflow = _useRecord3.workflow,
+    status = _useRecord3.status;
+  return _react2().default.createElement(_client2().SchemaComponentContext.Provider, {
     value: _objectSpread(_objectSpread({}, ctx), {}, {
       reset() {},
       designable: false
     })
-  }, _react().default.createElement(_client().SchemaComponent, {
+  }, _react2().default.createElement(_client2().SchemaComponent, {
     components: {
-      Tag: _antd().Tag,
+      FooterStatus,
       FlowContextProvider
     },
     schema: {
@@ -621,7 +601,12 @@ function Drawer() {
         footer: {
           type: 'void',
           'x-component': 'Action.Drawer.Footer',
-          properties: footerSchema
+          properties: {
+            content: {
+              type: 'void',
+              'x-component': 'FooterStatus'
+            }
+          }
         }
       }
     }
@@ -631,7 +616,7 @@ function Decorator({
   params = {},
   children
 }) {
-  const _useCollectionManager = (0, _client().useCollectionManager)(),
+  const _useCollectionManager = (0, _client2().useCollectionManager)(),
     collections = _useCollectionManager.collections,
     cm = _objectWithoutProperties(_useCollectionManager, _excluded3);
   const blockProps = {
@@ -649,9 +634,9 @@ function Decorator({
     showIndex: true,
     dragSort: false
   };
-  return _react().default.createElement(_client().CollectionManagerProvider, _objectSpread(_objectSpread({}, cm), {}, {
+  return _react2().default.createElement(_client2().CollectionManagerProvider, _objectSpread(_objectSpread({}, cm), {}, {
     collections: [...collections, nodeCollection, workflowCollection, todoCollection]
-  }), _react().default.createElement(_client().TableBlockProvider, _objectSpread({}, blockProps), children));
+  }), _react2().default.createElement(_client2().TableBlockProvider, _objectSpread({}, blockProps), children));
 }
 WorkflowTodo.Drawer = Drawer;
 WorkflowTodo.Decorator = Decorator;

package/lib/client/nodes/manual/WorkflowTodoBlockInitializer.d.ts

@@ -1,5 +1,2 @@
-import React from 'react';
-export declare function WorkflowTodoBlockInitializer({ insert, ...props }: {
-    [x: string]: any;
-    insert: any;
-}): React.JSX.Element;
+import { FC } from 'react';
+export declare const WorkflowTodoBlockInitializer: FC<any>;

package/lib/client/nodes/manual/WorkflowTodoBlockInitializer.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WorkflowTodoBlockInitializer = WorkflowTodoBlockInitializer;
+exports.WorkflowTodoBlockInitializer = void 0;
 function _react() {
   const data = _interopRequireDefault(require("react"));
   _react = function _react() {
@@ -34,12 +34,12 @@ 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; }
-function WorkflowTodoBlockInitializer(_ref) {
+const WorkflowTodoBlockInitializer = _ref => {
   let insert = _ref.insert,
-    props = _objectWithoutProperties(_ref, _excluded);
+    rest = _objectWithoutProperties(_ref, _excluded);
   return _react().default.createElement(_client().SchemaInitializer.Item, _objectSpread(_objectSpread({
     icon: _react().default.createElement(_icons().TableOutlined, null)
-  }, props), {}, {
+  }, rest), {}, {
     onClick: () => {
       insert({
         type: 'void',
@@ -56,4 +56,5 @@ function WorkflowTodoBlockInitializer(_ref) {
       });
     }
   }));
-}
+};
+exports.WorkflowTodoBlockInitializer = WorkflowTodoBlockInitializer;

package/lib/client/nodes/manual/forms/create.js

@@ -87,7 +87,14 @@ var _default = {
         forms[formKey] = {
           type: 'create',
           title: ((_formBlock$xComponen = formBlock['x-component-props']) === null || _formBlock$xComponen === void 0 ? void 0 : _formBlock$xComponen.title) || formKey,
-          actions: (0, _utils.findSchema)(formSchema.properties.actions, item => item['x-component'] === 'Action').map(item => item['x-decorator-props'].value),
+          actions: (0, _utils.findSchema)(formSchema.properties.actions, item => item['x-component'] === 'Action').map(item => {
+            var _item$xActionSettin, _item$xActionSettin$a;
+            return {
+              status: item['x-decorator-props'].value,
+              values: (_item$xActionSettin = item['x-action-settings']) === null || _item$xActionSettin === void 0 ? void 0 : (_item$xActionSettin$a = _item$xActionSettin.assignedValues) === null || _item$xActionSettin$a === void 0 ? void 0 : _item$xActionSettin$a.values,
+              key: item.name
+            };
+          }),
           collection: formBlock['x-decorator-props'].collection
         };
       });

package/lib/client/nodes/manual/forms/custom.js

@@ -11,9 +11,9 @@ function _react() {
   };
   return data;
 }
-function _lodash() {
-  const data = require("lodash");
-  _lodash = function _lodash() {
+function _antdV() {
+  const data = require("@formily/antd-v5");
+  _antdV = function _antdV() {
     return data;
   };
   return data;
@@ -32,13 +32,6 @@ function _react2() {
   };
   return data;
 }
-function _antd() {
-  const data = require("@formily/antd");
-  _antd = function _antd() {
-    return data;
-  };
-  return data;
-}
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -150,7 +143,8 @@ function CustomFormBlockInitializer(_ref) {
                 'x-component-props': {
                   layout: 'one-column',
                   style: {
-                    marginTop: '1.5em'
+                    marginTop: '1.5em',
+                    flexWrap: 'wrap'
                   }
                 },
                 'x-initializer': 'AddActionButton',
@@ -167,8 +161,7 @@ function CustomFormBlockInitializer(_ref) {
                       type: 'primary',
                       useAction: '{{ useSubmit }}'
                     },
-                    'x-designer': 'Action.Designer',
-                    'x-action': `${_constants.JOB_STATUS.RESOLVED}`
+                    'x-designer': 'ManualActionDesigner'
                   }
                 }
               }
@@ -196,7 +189,7 @@ function getOptions(interfaces) {
     const _schema$group = schema.group,
       group = _schema$group === void 0 ? 'others' : _schema$group;
     fields[group] = fields[group] || {};
-    (0, _lodash().set)(fields, [group, type], schema);
+    _client2().lodash.set(fields, [group, type], schema);
   });
   return Object.keys(GroupLabels).filter(groupName => ['basic', 'choices', 'datetime', 'media'].includes(groupName)).map(groupName => ({
     title: GroupLabels[groupName],
@@ -247,12 +240,12 @@ function AddCustomFormField(props) {
   return _react().default.createElement(AddCustomFormFieldButtonContext.Provider, {
     value: {
       onAddField(item) {
-        const _cloneDeep = (0, _lodash().cloneDeep)(item),
-          _cloneDeep$properties = _cloneDeep.properties,
-          unique = _cloneDeep$properties.unique,
-          type = _cloneDeep$properties.type,
-          properties = _objectWithoutProperties(_cloneDeep$properties, _excluded2),
-          options = _objectWithoutProperties(_cloneDeep, _excluded3);
+        const _lodash$cloneDeep = _client2().lodash.cloneDeep(item),
+          _lodash$cloneDeep$pro = _lodash$cloneDeep.properties,
+          unique = _lodash$cloneDeep$pro.unique,
+          type = _lodash$cloneDeep$pro.type,
+          properties = _objectWithoutProperties(_lodash$cloneDeep$pro, _excluded2),
+          options = _objectWithoutProperties(_lodash$cloneDeep, _excluded3);
         delete properties.name['x-disabled'];
         setInterface(_objectSpread(_objectSpread({}, options), {}, {
           properties
@@ -356,7 +349,7 @@ function AddCustomFormField(props) {
       })
     },
     components: {
-      ArrayTable: _antd().ArrayTable
+      ArrayTable: _antdV().ArrayTable
     }
   }) : null));
 }
@@ -411,7 +404,14 @@ var _default = {
         forms[formKey] = {
           type: 'custom',
           title: ((_formBlock$xComponen = formBlock['x-component-props']) === null || _formBlock$xComponen === void 0 ? void 0 : _formBlock$xComponen.title) || formKey,
-          actions: (0, _utils.findSchema)(formSchema.properties.actions, item => item['x-component'] === 'Action').map(item => item['x-decorator-props'].value),
+          actions: (0, _utils.findSchema)(formSchema.properties.actions, item => item['x-component'] === 'Action').map(item => {
+            var _item$xActionSettin, _item$xActionSettin$a;
+            return {
+              status: item['x-decorator-props'].value,
+              values: (_item$xActionSettin = item['x-action-settings']) === null || _item$xActionSettin === void 0 ? void 0 : (_item$xActionSettin$a = _item$xActionSettin.assignedValues) === null || _item$xActionSettin$a === void 0 ? void 0 : _item$xActionSettin$a.values,
+              key: item.name
+            };
+          }),
           collection: formBlock['x-decorator-props'].collection
         };
       });

package/lib/client/nodes/manual/forms/update.js

@@ -145,7 +145,14 @@ var _default = {
         forms[formKey] = _objectSpread(_objectSpread({}, formBlock['x-decorator-props']), {}, {
           type: 'update',
           title: ((_formBlock$xComponen = formBlock['x-component-props']) === null || _formBlock$xComponen === void 0 ? void 0 : _formBlock$xComponen.title) || formKey,
-          actions: (0, _utils.findSchema)(formSchema.properties.actions, item => item['x-component'] === 'Action').map(item => item['x-decorator-props'].value)
+          actions: (0, _utils.findSchema)(formSchema.properties.actions, item => item['x-component'] === 'Action').map(item => {
+            var _item$xActionSettin, _item$xActionSettin$a;
+            return {
+              status: item['x-decorator-props'].value,
+              values: (_item$xActionSettin = item['x-action-settings']) === null || _item$xActionSettin === void 0 ? void 0 : (_item$xActionSettin$a = _item$xActionSettin.assignedValues) === null || _item$xActionSettin$a === void 0 ? void 0 : _item$xActionSettin$a.values,
+              key: item.name
+            };
+          })
         });
       });
       return forms;

package/lib/client/nodes/manual/index.d.ts

@@ -62,8 +62,13 @@ declare const _default: {
         id: any;
         title: any;
         config: any;
-    }, { types }: {
+    }, { types, fieldNames }: {
         types: any;
+        fieldNames?: {
+            readonly label: "label";
+            readonly value: "value";
+            readonly children: "children";
+        };
     }): {
         value: string;
         label: any;

package/lib/client/nodes/manual/index.js

@@ -98,7 +98,8 @@ var _default = {
     title,
     config
   }, {
-    types
+    types,
+    fieldNames = _variable.defaultFieldNames
   }) {
     var _config$forms;
     const compile = (0, _client().useCompile)();
@@ -128,9 +129,9 @@ var _default = {
       } : null;
     }).filter(Boolean);
     return options.length ? {
-      value: `${id}`,
-      label: title,
-      children: options
+      [fieldNames.value]: `${id}`,
+      [fieldNames.label]: title,
+      [fieldNames.children]: options
     } : null;
   },
   useInitializers(node) {