@teamix/pro 1.1.4 → 1.1.8

package/lib/actions/index.js

@@ -35,10 +35,14 @@ var _error = require("./error");
 
 var _dialogForm = require("./dialog-form");
 
+var _dialogTable = require("./dialog-table");
+
 var _drawer = require("./drawer");
 
 var _drawerForm = require("./drawer-form");
 
+var _drawerTable = require("./drawer-table");
+
 require("./index.scss");
 
 var _excluded = ["type"],
@@ -123,6 +127,10 @@ var useAction = function useAction(config, context) {
     return (0, _dialogForm.useDialogFormAction)(others, context);
   }
 
+  if (type === 'dialog-table') {
+    return (0, _dialogTable.useDialogTableAction)(others, context);
+  }
+
   if (type === 'drawer') {
     return (0, _drawer.useDrawerAction)(others, context);
   }
@@ -131,6 +139,10 @@ var useAction = function useAction(config, context) {
     return (0, _drawerForm.useDrawerFormAction)(others, context);
   }
 
+  if (type === 'drawer-table') {
+    return (0, _drawerTable.useDrawerTableAction)(others, context);
+  }
+
   var registedAction = RegistedActions.get(type);
 
   if (!registedAction) {
@@ -196,9 +208,25 @@ function renderMenuButtonItem(item, key, context) {
       return item.onClick(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
-  return /*#__PURE__*/_react.default.createElement(_components.MenuButton.Item, _objectSpread(_objectSpread({}, buttonProps), {}, {
+  return /*#__PURE__*/_react.default.createElement(_components.MenuButton.Item, _objectSpread({
     key: key
-  }), buttonContent(item.children, item.icon));
+  }, buttonProps), buttonContent(item.children, item.icon));
+}
+
+function renderCommonActionButtonMenuItem(action, key, context) {
+  // @ts-ignore
+  if (action.actions && action.actions.length) {
+    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) {
+      return renderCommonActionButtonMenuItem(a, j, context);
+    }));
+  }
+
+  return renderMenuButtonItem(action, key, context);
 }
 
 var ActionMenuButton = function ActionMenuButton(props) {
@@ -214,25 +242,17 @@ var ActionMenuButton = function ActionMenuButton(props) {
 
   return /*#__PURE__*/_react.default.createElement(_components.MenuButton, _objectSpread({
     popupTriggerType: "hover",
+    menuProps: {
+      mode: 'popup',
+      triggerType: 'hover'
+    },
     type: type,
     label: buttonContent(label || children, icon, iconSize)
-  }, others), actions.map(function (child, i) {
-    // @ts-ignore
-    if (child.actions && child.actions.length) {
-      return [/*#__PURE__*/_react.default.createElement(_components.MenuButton.Divider, null),
-      /*#__PURE__*/
-      // @ts-ignore
-      _react.default.createElement(_components.MenuButton.Group, {
-        label: child.label || child.children
-      }, //@ts-ignore
-      child.actions.map(function (action, j) {
-        return renderMenuButtonItem(action, "".concat(i, "-").concat(j), context);
-      })), /*#__PURE__*/_react.default.createElement(_components.MenuButton.Divider, null), /*#__PURE__*/_react.default.createElement(_components.MenuButton.Divider, null)];
-    }
-
-    return renderMenuButtonItem(child, "".concat(i), context);
+  }, others), actions.map(function (action, i) {
+    return renderCommonActionButtonMenuItem(action, i, context);
   }));
-};
+}; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
+
 
 exports.ActionMenuButton = ActionMenuButton;
 
@@ -246,7 +266,8 @@ function formatGroupActions(actions, max, moreConfig) {
   return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({}, moreConfig), {}, {
     actions: actions.slice(MAX - 1)
   })]);
-}
+} // 渲染一个 button 或者 menu button
+
 
 function renderCommonActionButton(button, context, isTypeText) {
   var buttonContext = button.context,
@@ -352,5 +373,8 @@ function ActionGroup(props) {
   }));
 }
 
-var _default = ActionButton;
+var _default = function _default(props) {
+  return renderCommonActionButton(props);
+};
+
 exports.default = _default;

package/lib/actions/index.scss

@@ -13,7 +13,7 @@
   &.text:not(.divider) {
     & > button {
       &:not(:last-child) {
-        margin-right: var(--s-2);
+        margin-right: var(--s-4);
       }
     }
   }

package/lib/card/index.d.ts

@@ -8,22 +8,39 @@ export declare type CardContainerProps = {
 } & React.HTMLAttributes<HTMLElement>;
 export declare const CardContainer: React.FC<CardContainerProps>;
 export interface CardProps {
+    /** 内容部分 */
     children?: React.ReactNode;
+    /**卡片标题 */
     title?: React.ReactNode;
+    /**卡片副标题 */
     subTitle?: React.ReactNode;
+    /**额外信息区域，位于卡片右上角，可以配置一些常用轻量操作 */
     extra?: React.ReactNode | IActionButton[];
+    /**卡片背景图 */
     image?: string;
+    /**卡片标题下方是否有分割线 */
     divider?: boolean;
+    /**卡片是否有边框 */
     bordered?: boolean;
+    /**卡片在hovers时是否有阴影 */
     hoveredShadow?: boolean;
+    /**卡片是否为紧凑模式，紧凑模式下卡片无内边距 */
     compacted?: boolean;
+    /**卡片内容是否居中展示 */
     centered?: boolean;
+    /**加载中状态 */
     loading?: boolean;
+    /**背景色 */
     backgroundColor?: 'blue' | 'green' | 'red' | 'orange' | 'yellow' | 'grey' | 'transparent';
+    /**卡片嵌套使用的模式下，卡片占父卡片内容区域的栅格数量 */
     col?: number | string;
+    /**卡片 class */
     className?: string;
+    /**卡片样式 */
     style?: React.CSSProperties;
+    /**卡片内容 class */
     contentClassName?: string;
+    /**卡片内容样式 */
     contentStyle?: React.CSSProperties;
 }
 declare const Card: React.FC<CardProps>;

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

@@ -139,6 +139,14 @@ declare const _default: React.ForwardRefExoticComponent<(Partial<import("@teamix
     type: "search";
 } & {
     children?: React.ReactNode;
+}> | Partial<import("@teamix/pro-field/lib/components/FieldTagFilter").IProFieldTagFilter & {
+    type: "tagFilter";
+} & {
+    children?: React.ReactNode;
+}> | Partial<import("@teamix/pro-field/lib/components/FieldMenuSelect").IProFieldMenuSelect & {
+    type: "menuSelect";
+} & {
+    children?: React.ReactNode;
 }> | Pick<Partial<{
     [key: string]: any;
     type: string;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IProFormProps } from '../typing';
+import type { IFormProps } from '../typing';
 import './index.scss';
-declare const ProForm: React.FC<IProFormProps>;
+declare const ProForm: React.FC<IFormProps>;
 export default ProForm;

package/lib/form/ProForm/index.js

@@ -9,6 +9,8 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _core = require("@formily/core");
 
 var _reactive = require("@formily/reactive");
@@ -25,7 +27,7 @@ var _utils2 = require("../utils");
 
 require("./index.scss");
 
-var _excluded = ["form", "initialValues", "schema", "scope", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed"];
+var _excluded = ["form", "initialValues", "schema", "scope", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -59,11 +61,13 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       onChange = _ref.onChange,
       onSubmit = _ref.onSubmit,
       onSubmitFailed = _ref.onSubmitFailed,
+      className = _ref.className,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
   var form = (0, _react.useMemo)(function () {
     return outerForm || (0, _core.createForm)();
   }, []);
+  var prefix = 'teamix-pro-form';
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return breakpoints ? {
       breakpoints: breakpoints,
@@ -107,7 +111,11 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   return outerForm === false ?
   /*#__PURE__*/
   // 特殊表单，无需渲染form实例，例如FormDialog等
-  _react.default.createElement(_formily.FormLayout, _objectSpread(_objectSpread({}, otherProps), getTeamixLayout), formChildren) : /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({}, otherProps), getTeamixLayout), {}, {
+  _react.default.createElement(_formily.FormLayout, _objectSpread(_objectSpread({
+    className: (0, _classnames.default)(prefix, className)
+  }, otherProps), getTeamixLayout), formChildren) : /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({
+    className: (0, _classnames.default)(prefix, className)
+  }, otherProps), getTeamixLayout), {}, {
     form: form,
     onAutoSubmit: onSubmit,
     onAutoSubmitFailed: onSubmitFailed

package/lib/form/ProForm/index.scss

@@ -1,6 +1,13 @@
 @import '~@alifd/next/lib/core/index-noreset.scss';
 
 $form-item-cls: #{$css-prefix}formily-item;
+$teamix-pro-form: teamix-pro-form;
+
+.#{$teamix-pro-form} {
+  .next-affix {
+    top: auto !important; // todo 待pro-page-containe修复后移除
+  }
+}
 
 // FormItem 样式重写
 .#{$form-item-cls} {
@@ -37,9 +44,14 @@ $form-item-cls: #{$css-prefix}formily-item;
         > .teamix-pro-field-checkbox,
         .teamix-pro-field-radio,
         .teamix-pro-field-switch,
-        .teamix-pro-field-colorradio {
+        .teamix-pro-field-colorradio,
+        .teamix-pro-field-range,
+        .#{$css-prefix}btn-text {
           line-height: var(--form-element-medium-height, 32px);
         }
+        > .#{$css-prefix}btn-text {
+          width: auto;
+        }
       }
     }
   }
@@ -87,15 +99,20 @@ $form-item-cls: #{$css-prefix}formily-item;
   .#{$form-item-cls}-extra {
     color: var(--color-text1-8, #848484);
   }
+  .#{$form-item-cls}-error-help {
+    color: var(--color-error-5, #e84738);
+  }
 
   // 前缀 后缀
   .#{$form-item-cls}-control {
     .#{$form-item-cls}-control-content {
       .#{$form-item-cls}-addon-before {
         margin-right: 16px;
+        color: var(--color-text1-8, #848484);
       }
       .#{$form-item-cls}-addon-after {
         margin-left: 16px;
+        color: var(--color-text1-8, #848484);
       }
     }
   }
@@ -218,14 +235,16 @@ $inset-font-weight-medium: calc(
   }
 }
 
-.#{$css-prefix}formily-button-group-sticky {
-  margin-top: var(--form-element-medium-height, 32px);
-  padding: 12px 16px 12px 24px;
-  border: 0;
-  background: var(--color-fill1-1, #fff);
+.#{$teamix-pro-form}-button-affix.#{$css-prefix}affix {
+  left: 0;
+  right: 0;
+  width: 100% !important;
+  height: 56px !important;
+  padding-left: 24px;
+  background: var(--color-fill1-1, #fff) !important;
   box-shadow: 0 -1px 5px 0 rgba(38, 38, 38, 0.14);
   .#{$css-prefix}formily-button-group {
-    margin-top: 0;
+    margin-bottom: 12px;
   }
 }
 
@@ -246,3 +265,17 @@ $inset-font-weight-medium: calc(
     }
   }
 }
+
+// ArrayItems
+.#{$css-prefix}formily-array-items {
+  .#{$css-prefix}formily-grid-layout {
+    > div:last-child {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+    }
+  }
+  .#{$css-prefix}formily-array-base-remove {
+    cursor: pointer;
+  }
+}

package/lib/form/SchemaForm/adapterType.js

@@ -36,7 +36,7 @@ var typeMap = (_typeMap = {
   YearPicker: 'string',
   QuarterPicker: 'string',
   DateRangePicker: 'array',
-  // TimeRangePicker: 'array',
+  TimeRangePicker: 'array',
   DateTimeRangePicker: 'array',
   WeekRangePicker: 'array',
   MonthRangePicker: 'array',
@@ -46,10 +46,10 @@ var typeMap = (_typeMap = {
   Upload: 'object',
   ColorPicker: 'string',
   ColorRadio: 'string',
-  ColorSwatches: 'string',
-  ColorTwitter: 'string',
   IconPicker: 'string',
   JsonInput: 'object',
+  TagPicker: 'array',
+  Range: 'string',
   Search: 'array',
   ArrayCollapse: 'array',
   ArrayCards: 'array',

package/lib/form/SchemaForm/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import type { IProFormProps } from '../typing';
-declare const _default: React.MemoExoticComponent<({ schema, scope, components }: IProFormProps) => JSX.Element>;
+import type { IFormProps } from '../typing';
+declare const _default: React.MemoExoticComponent<({ schema, scope, components }: IFormProps) => JSX.Element>;
 export default _default;

package/lib/form/SchemaForm/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _react2 = require("@formily/react");
 
+var _components = require("@alicloudfe/components");
+
 var _formily = require("@teamix/formily");
 
 var _ProField = _interopRequireDefault(require("../Components/ProField"));
@@ -96,7 +98,6 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var SchemaField = (0, _react.useMemo)(function () {
     return (0, _react2.createSchemaField)({
       components: {
-        Upload: _formily.Upload,
         ProField: _ProField.default,
         FormLayout: _formily.FormLayout,
         FormItem: _formily.FormItem,
@@ -120,7 +121,9 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         EditablePopover: _Editable.EditablePopover,
         FormGroup: _FormGroup.default,
         Search: _Search.default,
-        QueryFilter: _QueryFilter.default
+        QueryFilter: _QueryFilter.default,
+        Upload: _formily.Upload,
+        Affix: _components.Affix
       }
     });
   }, []); // 合并schema中request的scope
@@ -277,9 +280,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
         properties: formatSchema(children)
-      } : {}; // 递归items（类似子组件）
+      } : {}; // 递归items（类似子组件，会先由各initialize方法格式化为固定形式，type不同不统一处理）
+      // 例如：[{ name: 'items', type: 'object', children: items }]
 
-      var recursiveItems = items ? formatSchema(items) : {}; // 配置组件属性
+      var recursiveItems = items ? formatSchema([items]) : {}; // 配置组件属性
 
       schemaProperties[name] = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, otherProps), formatParam), recursiveProperties), recursiveItems);
     });
@@ -290,7 +294,8 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [formatSchema, schema]);
+  }, [formatSchema, schema]); // console.log(schemaPro);
+
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(SchemaField, {
     schema: schemaPro,
     components: components,

package/lib/form/SchemaForm/initializeArrayCards.js

@@ -4,12 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["props", "children", "items"],
-    _excluded2 = ["itemType"];
-
-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 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; }
 
@@ -17,58 +11,20 @@ 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; }
 
-var initializeChildren = function initializeChildren(item) {
-  return item;
-};
-
-var initializeAddition = function initializeAddition(item) {
-  return _objectSpread(_objectSpread({}, item), {}, {
-    component: 'ArrayCards.Addition'
-  });
-};
-
-var initializeString = function initializeString(items) {
-  return [{
-    name: 'items',
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
-};
+var initializeItems = function initializeItems(items) {
+  if (items) {
+    return _objectSpread(_objectSpread({}, items), {}, {
+      name: 'items'
+    });
+  }
 
-var initializeObject = function initializeObject(items) {
-  return [{
-    name: 'items',
-    type: 'object',
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
+  return items;
 };
 
 var initialize = function initialize(item) {
-  var _item$props = item.props,
-      props = _item$props === void 0 ? {} : _item$props,
-      _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children,
-      _item$items = item.items,
-      items = _item$items === void 0 ? [] : _item$items,
-      other = _objectWithoutProperties(item, _excluded);
-
-  var _props$itemType = props.itemType,
-      itemType = _props$itemType === void 0 ? 'string' : _props$itemType,
-      otherProps = _objectWithoutProperties(props, _excluded2);
-
-  var renderItemsMap = {
-    string: initializeString(items),
-    object: initializeObject(items)
-  };
-  return _objectSpread(_objectSpread({}, other), {}, {
-    props: otherProps,
-    children: children.map(function (item) {
-      return initializeAddition(item);
-    }),
-    items: renderItemsMap[itemType]
+  var items = item.items;
+  return _objectSpread(_objectSpread({}, item), {}, {
+    items: items ? initializeItems(items) : {}
   });
 };
 

package/lib/form/SchemaForm/initializeArrayCollapse.js

@@ -4,12 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["props", "children", "items"],
-    _excluded2 = ["itemType", "title"];
-
-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 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; }
 
@@ -17,67 +11,20 @@ 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; }
 
-var initializeChildren = function initializeChildren(item) {
-  return item;
-};
-
-var initializeAddition = function initializeAddition(item) {
-  return _objectSpread(_objectSpread({}, item), {}, {
-    component: 'ArrayCollapse.Addition'
-  });
-};
-
-var initializeString = function initializeString(items, props) {
-  return [{
-    name: 'items',
-    component: 'ArrayCollapse.CollapsePanel',
-    props: props,
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
-};
+var initializeItems = function initializeItems(items) {
+  if (items) {
+    return _objectSpread(_objectSpread({}, items), {}, {
+      name: 'items'
+    });
+  }
 
-var initializeObject = function initializeObject(items, props) {
-  return [{
-    type: 'object',
-    name: 'items',
-    component: 'ArrayCollapse.CollapsePanel',
-    props: props,
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
+  return items;
 };
 
 var initialize = function initialize(item) {
-  var _item$props = item.props,
-      props = _item$props === void 0 ? {} : _item$props,
-      _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children,
-      _item$items = item.items,
-      items = _item$items === void 0 ? [] : _item$items,
-      other = _objectWithoutProperties(item, _excluded);
-
-  var _props$itemType = props.itemType,
-      itemType = _props$itemType === void 0 ? 'string' : _props$itemType,
-      title = props.title,
-      otherProps = _objectWithoutProperties(props, _excluded2);
-
-  var renderItemsMap = {
-    string: initializeString(items, {
-      title: title
-    }),
-    object: initializeObject(items, {
-      title: title
-    })
-  };
-  return _objectSpread(_objectSpread({}, other), {}, {
-    props: otherProps,
-    children: children.map(function (item) {
-      return initializeAddition(item);
-    }),
-    items: renderItemsMap[itemType]
+  var items = item.items;
+  return _objectSpread(_objectSpread({}, item), {}, {
+    items: items ? initializeItems(items) : {}
   });
 };
 

package/lib/form/SchemaForm/initializeArrayIcon.js

@@ -9,7 +9,9 @@ var _react = _interopRequireDefault(require("react"));
 
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 
-var _excluded = ["component", "props"];
+var _excluded = ["component", "props"],
+    _excluded2 = ["icon"],
+    _excluded3 = ["text", "type"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -25,12 +27,18 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var initialize = function initialize(item) {
   var component = item.component,
-      props = item.props,
+      _item$props = item.props,
+      props = _item$props === void 0 ? {} : _item$props,
       other = _objectWithoutProperties(item, _excluded);
 
+  var icon = props.icon,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
   var iconType = '';
 
-  if (component) {
+  if (icon) {
+    iconType = icon;
+  } else if (component) {
     if (/Addition/.test(component)) {
       iconType = 'add-line';
     } else if (/Remove/.test(component)) {
@@ -47,13 +55,17 @@ var initialize = function initialize(item) {
   return _objectSpread(_objectSpread({}, other), {}, {
     component: component,
     props: _objectSpread({
-      icon: function icon(props) {
-        return /*#__PURE__*/_react.default.createElement(_icon.default, _objectSpread({
+      icon: function icon(_ref) {
+        var text = _ref.text,
+            type = _ref.type,
+            props = _objectWithoutProperties(_ref, _excluded3);
+
+        return /*#__PURE__*/_react.default.createElement(_icon.default, _objectSpread(_objectSpread({}, props), {}, {
           type: iconType,
           size: "small"
-        }, props));
+        }));
       }
-    }, props)
+    }, otherProps)
   });
 };