@teamix/pro 1.1.32 → 1.1.36

package/lib/actions/dialog-info.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.useDialogInfoAction = useDialogInfoAction;
+
+var _dialog = _interopRequireDefault(require("./dialog"));
+
+var _ = require("..");
+
+var _excluded = ["schema"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+function useDialogInfoAction(action, context) {
+  var schema = action.schema,
+      others = _objectWithoutProperties(action, _excluded);
+
+  return (0, _dialog.default)(Object.assign({
+    component: _.ProInfo,
+    closeable: true,
+    size: 'mini',
+    schema: Object.assign({
+      backgroundColor: 'grey',
+      compacted: false
+    }, schema)
+  }, others), context);
+}
+
+var _default = useDialogInfoAction;
+exports.default = _default;

package/lib/actions/dialog.d.ts

@@ -7,6 +7,8 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     dialogType?: 'dialog' | 'drawer';
     dialogQuickShowType?: 'alert' | 'confirm';
     messageType?: 'success' | 'warning' | 'error' | 'notice' | 'help' | 'loading';
+    beforeContent?: React.ReactNode;
+    afterContent?: React.ReactNode;
 }
 export declare function useDialogAction(action: DialogAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;

package/lib/actions/dialog.js

@@ -21,7 +21,7 @@ var _base = require("./base");
 var _request = require("./request");
 
 var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent"];
 
 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); }
 
@@ -96,6 +96,8 @@ function useDialogAction(action, context) {
         beforeRequest = _getTargetValue.beforeRequest,
         onTrigger = _getTargetValue.onTrigger,
         link = _getTargetValue.link,
+        beforeContent = _getTargetValue.beforeContent,
+        afterContent = _getTargetValue.afterContent,
         dialogOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
     var dialogMethod = dialogType === 'drawer' ? _components.Drawer : _components.Dialog;
@@ -171,13 +173,18 @@ function useDialogAction(action, context) {
     var dialogContext = Object.assign({}, context, {
       hide: hide
     });
+    var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({
+      key: (0, _utils.uuid)()
+    }, componentProps)) : addContextForReactNode(content, dialogContext);
     var ret = dialogMethod.show(_objectSpread(_objectSpread({
       // @ts-ignore
       onOk: onOk,
       title: addContextForReactNode(title, dialogContext),
-      content: Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({
-        key: (0, _utils.uuid)()
-      }, componentProps)) : addContextForReactNode(content, dialogContext),
+      content: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
+        className: "teamix-pro-dialog-before-content"
+      }, beforeContent), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
+        className: "teamix-pro-dialog-after-content"
+      }, afterContent)),
       closeable: !loading
     }, dialogProps), dialogOtherProps));
     store.hide = ret.hide;

package/lib/actions/drawer-info.d.ts

@@ -0,0 +1,6 @@
+import { DialogInfoAction } from './dialog-info';
+export declare type DrawerInfoAction = DialogInfoAction;
+export declare function useDrawerInfoAction(action: DrawerInfoAction, context?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+};
+export default useDrawerInfoAction;

package/lib/actions/drawer-info.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.useDrawerInfoAction = useDrawerInfoAction;
+
+var _dialogInfo = require("./dialog-info");
+
+function useDrawerInfoAction(action, context) {
+  return (0, _dialogInfo.useDialogInfoAction)(Object.assign({
+    dialogType: 'drawer'
+  }, action), context);
+}
+
+var _default = useDrawerInfoAction;
+exports.default = _default;

package/lib/actions/index.d.ts

@@ -10,17 +10,17 @@ import { NoticeAction } from './notice';
 import { ErrorAction } from './error';
 import { DialogFormAction } from './dialog-form';
 import { DialogTableAction } from './dialog-table';
+import { DialogInfoAction } from './dialog-info';
 import { DrawerAction } from './drawer';
 import { DrawerFormAction } from './drawer-form';
 import { DrawerTableAction } from './drawer-table';
+import { DrawerInfoAction } from './drawer-info';
 import './index.scss';
 export declare type ActionConfig = ({
     type: 'link';
 } & LinkAction) | ({
     type: 'request';
 } & RequestAction) | ({
-    type: 'dialog';
-} & DialogAction) | ({
     type: 'confirm';
 } & ConfirmAction) | ({
     type: 'danger-confirm';
@@ -29,16 +29,22 @@ export declare type ActionConfig = ({
 } & NoticeAction) | ({
     type: 'error';
 } & ErrorAction) | ({
+    type: 'dialog';
+} & DialogAction) | ({
     type: 'dialog-form';
 } & DialogFormAction) | ({
+    type: 'dialog-table';
+} & DialogTableAction) | ({
+    type: 'dialog-info';
+} & DialogInfoAction) | ({
     type: 'drawer';
 } & DrawerAction) | ({
     type: 'drawer-form';
 } & DrawerFormAction) | ({
-    type: 'dialog-table';
-} & DialogTableAction) | ({
     type: 'drawer-table';
-} & DrawerTableAction);
+} & DrawerTableAction) | ({
+    type: 'drawer-info';
+} & DrawerInfoAction);
 export declare function registerActionHandler(id: string, extendActionId: string, defaultConfig: any): void;
 export declare const useAction: any;
 export interface IActionButton extends ButtonProps {

package/lib/actions/index.js

@@ -37,12 +37,16 @@ var _dialogForm = require("./dialog-form");
 
 var _dialogTable = require("./dialog-table");
 
+var _dialogInfo = require("./dialog-info");
+
 var _drawer = require("./drawer");
 
 var _drawerForm = require("./drawer-form");
 
 var _drawerTable = require("./drawer-table");
 
+var _drawerInfo = require("./drawer-info");
+
 require("./index.scss");
 
 var _excluded = ["type"],
@@ -131,6 +135,10 @@ var useAction = function useAction(config, context) {
     return (0, _dialogTable.useDialogTableAction)(others, context);
   }
 
+  if (type === 'dialog-info') {
+    return (0, _dialogInfo.useDialogInfoAction)(others, context);
+  }
+
   if (type === 'drawer') {
     return (0, _drawer.useDrawerAction)(others, context);
   }
@@ -143,6 +151,10 @@ var useAction = function useAction(config, context) {
     return (0, _drawerTable.useDrawerTableAction)(others, context);
   }
 
+  if (type === 'drawer-info') {
+    return (0, _drawerInfo.useDrawerInfoAction)(others, context);
+  }
+
   var registedAction = RegistedActions.get(type);
 
   if (!registedAction) {
@@ -156,16 +168,18 @@ var useAction = function useAction(config, context) {
 
 exports.useAction = useAction;
 
-var buttonContent = function buttonContent(content, iconType, iconSize) {
+var buttonContent = function buttonContent(content, iconType, iconSize, context) {
+  var renderedContent = typeof content === 'function' ? content(context) : content;
+
   if (!iconType) {
-    return content;
+    return renderedContent;
   }
 
   return [/*#__PURE__*/_react.default.createElement(_icon.default, {
     type: iconType,
     size: iconSize,
     key: "teamix-button-icon"
-  }), content];
+  }), renderedContent];
 };
 
 var ActionButton = function ActionButton(props) {
@@ -189,39 +203,45 @@ var ActionButton = function ActionButton(props) {
   }) : _objectSpread(_objectSpread({}, actionProps), others);
   return /*#__PURE__*/_react.default.createElement(_components.Button, _objectSpread({
     type: type
-  }, buttonProps), buttonContent(children, icon, iconSize));
+  }, buttonProps), buttonContent(children, icon, iconSize, context));
 };
 
 exports.ActionButton = ActionButton;
 
 function renderMenuButtonItem(item, key, context) {
-  var menuItemActionConfig = Object.assign({}, item.config, {
+  var config = item.config,
+      btnContext = item.context,
+      _onClick2 = item.onClick,
+      children = item.children,
+      icon = item.icon,
+      disabled = item.disabled;
+  var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
 
-  var _useAction = useAction(menuItemActionConfig, item.context || context),
+  var _useAction = useAction(menuItemActionConfig, btnContext || context),
       loading = _useAction.loading,
       menuItemProps = _objectWithoutProperties(_useAction, _excluded3);
 
-  var buttonProps = item.onClick ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
+  var buttonProps = _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
     onClick: function onClick(e) {
-      return item.onClick(e, context);
+      return _onClick2(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
   return /*#__PURE__*/_react.default.createElement(_components.MenuButton.Item, _objectSpread({
-    key: key
-  }, buttonProps), buttonContent(item.children, item.icon));
+    key: key,
+    disabled: disabled
+  }, buttonProps), buttonContent(children, icon, undefined, context));
 }
 
 function renderCommonActionButtonMenuItem(action, key, context) {
-  // @ts-ignore
-  if (action.actions && action.actions.length) {
+  var menuBtn = action;
+
+  if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
     return /*#__PURE__*/_react.default.createElement(_components.Menu.SubMenu, {
       key: key,
-      label: // @ts-ignore
-      action.label || action.children
-    }, //@ts-ignore
-    action.actions.map(function (a, j) {
+      label: menuBtn.label || menuBtn.children
+    }, menuBtn.actions.map(function (a, j) {
       return renderCommonActionButtonMenuItem(a, j, context);
     }));
   }
@@ -246,8 +266,11 @@ var ActionMenuButton = function ActionMenuButton(props) {
       mode: 'popup',
       triggerType: 'hover'
     },
+    popupProps: {
+      shouldUpdatePosition: true
+    },
     type: type,
-    label: buttonContent(label || children, icon, iconSize)
+    label: buttonContent(label || children, icon, iconSize, context)
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, i, context);
   }));
@@ -295,7 +318,7 @@ function renderCommonActionButton(button, context, isTypeText) {
 function getDefaultMoreButton(type, moreText) {
   if (type === 'button') {
     return {
-      label: moreText || '更多'
+      label: moreText || (0, _utils.getMessage)('more')
     };
   }
 

package/lib/actions/index.scss

@@ -29,6 +29,14 @@
   }
 }
 
+.teamix-pro-dialog-before-content {
+  margin-bottom: var(--s-2);
+}
+
+.teamix-pro-dialog-after-content {
+  margin-top: var(--s-2);
+}
+
 .next-menu-divider + .next-menu-divider {
   display: none;
 }

package/lib/actions/link.js

@@ -17,19 +17,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 useLinkAction(action, context) {
-  var _getTargetValue = (0, _utils.getTargetValue)(action, context),
-      to = _getTargetValue.to,
-      search = _getTargetValue.search,
-      hash = _getTargetValue.hash,
-      blank = _getTargetValue.blank;
-
+  var linkAction = (0, _utils.getTargetValue)(action, context);
   return _objectSpread({}, (0, _base.eventHandler)(action, function () {
-    (0, _utils.goToLink)({
-      to: to,
-      search: search,
-      hash: hash,
-      blank: blank
-    });
+    (0, _utils.goToLink)(linkAction);
   }));
 }
 

package/lib/form/Components/ProField/index.d.ts

@@ -143,6 +143,10 @@ declare const _default: React.ForwardRefExoticComponent<(Partial<import("@teamix
     type: "tagFilter";
 } & {
     children?: React.ReactNode;
+}> | Partial<import("@teamix/pro-field/lib/components/FieldTagFilter").IProFieldMultipleTagFilter & {
+    type: "multipleTagPicker";
+} & {
+    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldMenuSelect").IProFieldMenuSelect & {
     type: "menuSelect";
 } & {

package/lib/form/ProForm/index.js

@@ -98,7 +98,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     form.addEffects('onChange', function () {
       (0, _core.onFormValuesChange)(function (form) {
         if (onChange) {
-          onChange((0, _reactive.toJS)(form.values), (0, _utils2.getDisplayValues)(form, form.values));
+          onChange((0, _reactive.toJS)(form.values));
         }
       });
     });

package/lib/form/ProForm/useFormDisplayValues.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 获取表单值的可显示值
+ * @returns 如果某字段有dataSource，则返回value对应label
+ */
+declare const useFormDisplayValues: () => any;
+export default useFormDisplayValues;

package/lib/form/ProForm/useFormDisplayValues.js

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("@formily/react");
+
+var _utils = require("@teamix/utils");
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+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 _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; }
+
+/**
+ * 获取表单值的可显示值
+ * @returns 如果某字段有dataSource，则返回value对应label
+ */
+var useFormDisplayValues = function useFormDisplayValues() {
+  var form = (0, _react.useForm)();
+  var values = form.values; // 判断值的类型，递归获取每个值在该结构中的完整路径
+
+  var getDisplayValues = function getDisplayValues(values) {
+    var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var displayValues;
+
+    if ((0, _utils.isPlainObj)(values)) {
+      displayValues = {};
+      Object.entries(values).forEach(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            key = _ref2[0],
+            value = _ref2[1];
+
+        var path = prefix ? "".concat(prefix, ".").concat(key) : "".concat(key);
+        displayValues[key] = getDisplayValues(value, path);
+      });
+    } else if ((0, _utils.isArr)(values)) {
+      displayValues = [];
+      values.map(function (value, index) {
+        var path = prefix ? "".concat(prefix, ".").concat(index) : "".concat(index);
+        displayValues[index] = getDisplayValues(value, path);
+      });
+    } else {
+      // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
+      var address = form.indexes[prefix];
+      var field = form.query(address).take();
+      displayValues = (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, values) || values;
+    }
+
+    return displayValues;
+  }; // 测试样例
+  // const example = {
+  //   a: [
+  //     [{ b: 'a.0.0.b', c: 'a.0.0.c' }, { d: 'a.0.1.d' }],
+  //     { e: [{ f: { g: [{ h: 'a.1.e.0.f.g.0.h' }] } }, 'a.1.e.1'] },
+  //   ],
+  // };
+  // console.log(getDisplayValues(example));
+
+
+  return getDisplayValues(values);
+};
+
+var _default = useFormDisplayValues;
+exports.default = _default;

package/lib/form/SchemaForm/adapterType.js

@@ -48,7 +48,8 @@ var typeMap = (_typeMap = {
   ColorRadio: 'string',
   IconPicker: 'string',
   JsonInput: 'object',
-  TagPicker: 'array',
+  TagPicker: 'string',
+  MultipleTagPicker: 'array',
   Range: 'string',
   Search: 'array',
   ArrayCollapse: 'array',

package/lib/form/SchemaForm/initializeProField.js

@@ -52,6 +52,7 @@ var proFieldTypeMap = {
   IconPicker: 'icon',
   JsonInput: 'json',
   TagPicker: 'tagPicker',
+  MultipleTagPicker: 'multipleTagPicker',
   Range: 'range',
   Search: 'search' // Upload: 'upload',
 

package/lib/form/SchemaForm/initializeReactions.js

@@ -5,16 +5,96 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _utils = require("../utils");
+var _utils = require("@teamix/utils");
 
-var initializeReactions = function initializeReactions(reactions, innerReactions) {
-  if (reactions && innerReactions.length) {
-    return (0, _utils.mergeArrayValue)(innerReactions, reactions);
-  } else if (innerReactions.length) {
-    return innerReactions;
+var _utils2 = require("../utils");
+
+var _schemaNameMap = _interopRequireDefault(require("../schemaNameMap"));
+
+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); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+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 _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; }
+
+var mapSchemaName = function mapSchemaName(schema) {
+  if ((0, _utils.isPlainObj)(schema)) {
+    var newSchema = {};
+    Object.entries(schema).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          value = _ref2[1];
+
+      var _key$split = key.split('.'),
+          _key$split2 = _toArray(_key$split),
+          firstKey = _key$split2[0],
+          otherKey = _key$split2.slice(1);
+
+      var newFirstKey = (0, _utils.getValueByValue)(_schemaNameMap.default, firstKey, {
+        inputKey: 'proForm',
+        outputKey: 'formily'
+      }) || firstKey;
+      var newKey = [newFirstKey].concat(_toConsumableArray(otherKey)).join('.');
+      newSchema[newKey] = value;
+    });
+    return newSchema;
   }
 
-  return reactions;
+  return schema;
+};
+
+var initializeReactions = function initializeReactions(reactions, innerReactions) {
+  var temp = innerReactions; // 合并reactions
+
+  if (reactions) {
+    temp = (0, _utils2.mergeArrayValue)(innerReactions, reactions);
+  } // schema名称映射，由ProFormSchema映射为formilySchema
+
+
+  temp = temp.map(function (item) {
+    var _item$fulfill, _item$otherwise;
+
+    var fulfillSchema = mapSchemaName(item === null || item === void 0 ? void 0 : (_item$fulfill = item.fulfill) === null || _item$fulfill === void 0 ? void 0 : _item$fulfill.schema);
+    var otherwiseSchema = mapSchemaName(item === null || item === void 0 ? void 0 : (_item$otherwise = item.otherwise) === null || _item$otherwise === void 0 ? void 0 : _item$otherwise.schema);
+
+    if (fulfillSchema || otherwiseSchema) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        fulfill: _objectSpread(_objectSpread({}, item === null || item === void 0 ? void 0 : item.fulfill), {}, {
+          schema: fulfillSchema
+        }),
+        otherwise: _objectSpread(_objectSpread({}, item === null || item === void 0 ? void 0 : item.otherwise), {}, {
+          schema: otherwiseSchema
+        })
+      });
+    }
+
+    return item;
+  });
+  return temp;
 };
 
 var _default = initializeReactions;

package/lib/form/SchemaForm/reactions.js

@@ -16,6 +16,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // 配置请求
 var useRequest = function useRequest(requestConfig) {
   return function (field) {
+    var _field$form;
+
     var beforeRequest = requestConfig.beforeRequest,
         onSuccess = requestConfig.onSuccess;
     var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field) : {};
@@ -29,8 +31,8 @@ var useRequest = function useRequest(requestConfig) {
       } : onSuccess
     }), {
       $self: field,
-      $form: field.form,
-      $values: field.form.values
+      $form: field === null || field === void 0 ? void 0 : field.form,
+      $values: field === null || field === void 0 ? void 0 : (_field$form = field.form) === null || _field$form === void 0 ? void 0 : _field$form.values
     });
   };
 }; // 配置校验

package/lib/form/index.d.ts

@@ -13,10 +13,10 @@ export * as formilyTeamix from '@teamix/formily';
  * 导出常用formily内容，需谨慎限制
  */
 import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
-import { FormConsumer } from '@formily/react';
+import { FormConsumer, useForm } from '@formily/react';
 import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
-import { getDisplayValues } from './utils';
-export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, getDisplayValues, };
+import useFormDisplayValues from './ProForm/useFormDisplayValues';
+export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, useForm, useFormDisplayValues, };
 /**
  * 导出 Filter 组件
  */