@teamix/pro 1.1.37 → 1.2.0

package/es/card/index.d.ts

@@ -1,13 +1,13 @@
 import React from 'react';
 import { ActionGroupProps } from '../actions';
 import './index.scss';
-export declare type CardContainerProps = {
+export declare type ProCardContainerProps = {
     direction?: 'row' | 'column' | 'row-reverse' | 'column-reverse';
     spacing?: [number, number] | number;
     wrap?: boolean;
 } & React.HTMLAttributes<HTMLElement>;
-export declare const CardContainer: React.FC<CardContainerProps>;
-export interface CardProps {
+export declare const ProCardContainer: React.FC<ProCardContainerProps>;
+export interface ProCardProps {
     /** 内容部分 */
     children?: React.ReactNode;
     /**卡片标题 */
@@ -43,5 +43,17 @@ export interface CardProps {
     /**卡片内容样式 */
     contentStyle?: React.CSSProperties;
 }
-declare const Card: React.FC<CardProps>;
-export default Card;
+declare const ProCard: React.FC<ProCardProps>;
+export default ProCard;
+/**
+ * @deprecated 建议使用 ProCardContainer 代替
+ */
+export declare const CardContainer: React.FC<ProCardContainerProps>;
+/**
+ * @deprecated 建议使用 ProCardProps 代替
+ */
+export declare type CardProps = ProCardProps;
+/**
+ * @deprecated 建议使用 ProCardContainerProps 代替
+ */
+export declare type CardContainerProps = ProCardContainerProps;

package/es/card/index.js

@@ -8,8 +8,8 @@ import React from 'react';
 import classnames from 'classnames';
 import { Card as BasicCard } from '@alicloudfe/components';
 import { baseClass } from '@teamix/utils';
-import { BaseSkeleton } from '../skeleton';
-import { ActionGroup } from '../actions';
+import { ProSkeletonRaw } from '../skeleton';
+import { ProActionGroup } from '../actions';
 import './index.scss';
 var cls = baseClass('teamix-pro-card');
 
@@ -43,7 +43,7 @@ function getColClassAndStyle(col) {
   };
 }
 
-export var CardContainer = function CardContainer(props) {
+export var ProCardContainer = function ProCardContainer(props) {
   var children = props.children,
       style = props.style,
       className = props.className,
@@ -90,7 +90,7 @@ export var CardContainer = function CardContainer(props) {
     className: classnames(className, cls('container'), cls("container-flex-".concat(direction)), _defineProperty({}, cls('container-wrap'), wrap))
   }, childrenModified);
 };
-CardContainer.defaultProps = {
+ProCardContainer.defaultProps = {
   spacing: 16,
   direction: 'column'
 };
@@ -101,7 +101,7 @@ var renderExtra = function renderExtra(extra) {
   }
 
   if (extra.actions instanceof Array) {
-    return /*#__PURE__*/React.createElement(ActionGroup, _objectSpread(_objectSpread({}, extra), {}, {
+    return /*#__PURE__*/React.createElement(ProActionGroup, _objectSpread(_objectSpread({}, extra), {}, {
       type: "text"
     }));
   }
@@ -109,7 +109,7 @@ var renderExtra = function renderExtra(extra) {
   return extra;
 };
 
-var Card = function Card(props) {
+var ProCard = function ProCard(props) {
   var children = props.children,
       title = props.title,
       subTitle = props.subTitle,
@@ -138,7 +138,7 @@ var Card = function Card(props) {
     component: "img",
     src: image
   }), (title || extra) && /*#__PURE__*/React.createElement(BasicCard.Header, {
-    title: loading ? /*#__PURE__*/React.createElement(BaseSkeleton.Card.Title, null) : title,
+    title: loading ? /*#__PURE__*/React.createElement(ProSkeletonRaw.Card.Title, null) : title,
     subTitle: !loading && subTitle,
     extra: !loading && renderExtra(extra)
   }), divider && /*#__PURE__*/React.createElement(BasicCard.Divider, null), /*#__PURE__*/React.createElement(BasicCard.Content, {
@@ -146,13 +146,18 @@ var Card = function Card(props) {
       centered: centered
     }),
     style: contentStyle
-  }, loading && /*#__PURE__*/React.createElement(BaseSkeleton.Card.Content, null), !loading && children));
+  }, loading && /*#__PURE__*/React.createElement(ProSkeletonRaw.Card.Content, null), !loading && children));
 };
 
-Card.defaultProps = {
+ProCard.defaultProps = {
   bordered: true,
   hoveredShadow: false
 }; // @ts-ignore
 
-Card.isProCard = true;
-export default Card;
+ProCard.isProCard = true;
+export default ProCard;
+/**
+ * @deprecated 建议使用 ProCardContainer 代替
+ */
+
+export var CardContainer = ProCardContainer;

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

@@ -1,162 +1,2 @@
-import React from 'react';
-declare const _default: React.ForwardRefExoticComponent<(Partial<import("@teamix/pro-field/lib/components/FieldText").IProFieldText & {
-    type: "text";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldTextArea").IProFieldTextArea & {
-    type: "textarea";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldMoney").IProFieldMoney & {
-    type: "money";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldCheckBox").IProFieldCheckBox & {
-    type: "checkbox";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldRadio").IProFieldRadio & {
-    type: "radio";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldSelect").IProFieldSelect & {
-    type: "select";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldMultipleSelect").IProFieldMultipleSelect & {
-    type: "multipleSelect";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDate & {
-    type: "date";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateWeek & {
-    type: "dateWeek";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateMonth & {
-    type: "dateMonth";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateYear & {
-    type: "dateYear";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateQuarter & {
-    type: "dateQuarter";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateRange & {
-    type: "dateRange";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateWeekRange & {
-    type: "dateWeekRange";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateMonthRange & {
-    type: "dateMonthRange";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateYearRange & {
-    type: "dateYearRange";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateQuarterRange & {
-    type: "dateQuarterRange";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateTime & {
-    type: "dateTime";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateTimeRange & {
-    type: "dateTimeRange";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldTime & {
-    type: "time";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldTimeRange & {
-    type: "timeRange";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldNumber").IProFieldNumber & {
-    type: "number";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldPercent").IProFieldPercent & {
-    type: "percent";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldCascader").IProFieldCascader & {
-    type: "cascader";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldCascader").IProFieldMultipleCascader & {
-    type: "multipleCascader";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldCascader").IProFieldArbitraryCascader & {
-    type: "arbitraryCascader";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldSwitch").IProFieldSwitch & {
-    type: "switch";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldColor").IProFieldColor & {
-    type: "color" | "colorSwatches" | "colorRadio" | "colorTwitter";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldIcon").IProFieldIcon & {
-    type: "icon";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldTreeSelect").IProFieldTreeSelect & {
-    type: "treeSelect";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldJson").IProFieldJson & {
-    type: "json";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldTransfer").IProFieldTransfer & {
-    type: "transfer";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldRange").IProFieldRange & {
-    type: "range";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldPassword").IProFieldPassword & {
-    type: "password";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldSearch").IProFieldSearch & {
-    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/FieldTagFilter").IProFieldMultipleTagFilter & {
-    type: "multipleTagPicker";
-} & {
-    children?: React.ReactNode;
-}> | Partial<import("@teamix/pro-field/lib/components/FieldMenuSelect").IProFieldMenuSelect & {
-    type: "menuSelect";
-} & {
-    children?: React.ReactNode;
-}> | Pick<Partial<{
-    [key: string]: any;
-    type: string;
-    value?: any;
-    initValue?: any;
-} & import("@teamix/pro-field").IProBaseField & {
-    children?: React.ReactNode;
-}>, string | number>) & React.RefAttributes<unknown>>;
+declare const _default: any;
 export default _default;

package/es/form/Components/ProField/index.js

@@ -1,3 +1,15 @@
+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; }
+
 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; }
@@ -5,49 +17,31 @@ 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; }
 
 import React from 'react';
-import { isVoidField } from '@formily/core';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
+import { mapSize, mapStatus, mapDataSource, mapMode } from '../../utils';
 import ProField from '../../../field';
-import { mapSize, mapStatus } from '../../utils';
-
-var patchDataSource = function patchDataSource() {
-  var dataSource = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-
-  var removeEmptyChildren = function removeEmptyChildren(data) {
-    var result = _objectSpread({}, data);
-
-    if (!result.children || result.children.length === 0) {
-      delete result.children;
-    } else {
-      result.children = result.children.map(removeEmptyChildren);
-    }
-
-    return result;
-  };
-
-  return dataSource.map(removeEmptyChildren);
+import fieldTypeMap from '../../fieldTypeMap';
+
+var componentBuilder = function componentBuilder(type) {
+  return connect(function (props) {
+    return /*#__PURE__*/React.createElement(ProField, _objectSpread(_objectSpread({}, props), {}, {
+      type: type
+    }));
+  }, mapProps(mapSize, mapStatus, mapDataSource, mapMode), mapReadPretty(function (props) {
+    return /*#__PURE__*/React.createElement(ProField, _objectSpread(_objectSpread({}, props), {}, {
+      mode: "read"
+    }));
+  }));
 };
 
-var mapDataSource = function mapDataSource(props, field) {
-  var _props$dataSource;
-
-  if (isVoidField(field)) {
-    return props;
-  }
+export default (function () {
+  var components = {};
+  Object.entries(fieldTypeMap).forEach(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+        name = _ref2[0],
+        type = _ref2[1];
 
-  return _objectSpread(_objectSpread({}, props), {}, {
-    dataSource: patchDataSource((_props$dataSource = props.dataSource) !== null && _props$dataSource !== void 0 ? _props$dataSource : field === null || field === void 0 ? void 0 : field.dataSource)
+    components[name] = componentBuilder(type);
   });
-};
-
-var mapMode = function mapMode(props, field) {
-  return _objectSpread(_objectSpread({}, props), {}, {
-    mode: (field === null || field === void 0 ? void 0 : field.readPretty) ? 'read' : 'edit'
-  });
-};
-
-export default connect(ProField, mapProps(mapSize, mapStatus, mapDataSource, mapMode), mapReadPretty(function (props) {
-  return /*#__PURE__*/React.createElement(ProField, _objectSpread(_objectSpread({}, props), {}, {
-    mode: "read"
-  }));
-}));
+  return components;
+})();

package/es/form/Filter/index.js

@@ -79,7 +79,7 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
   }, []);
   var eventProps = getEventProps(triggerType, onFilter);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "none",
+    feedbackLayout: "popover",
     breakpoints: [],
     inset: true
   }, otherProps), eventProps), {}, {
@@ -206,7 +206,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
   }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
   var eventProps = getEventProps(triggerType, onFilter);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "none"
+    feedbackLayout: "popover"
   }, props), eventProps), getTeamixLayout), {}, {
     form: form,
     className: cls(prefixCls, props.className),

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

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

package/es/form/ProForm/index.js

@@ -15,7 +15,6 @@ import cls from 'classnames';
 import { createForm, onFormValuesChange } from '@formily/core';
 import { toJS } from '@formily/reactive';
 import { Form, FormLayout } from '@teamix/formily';
-import TeamixIcon from '@teamix/icon';
 import { usePrefixCls } from '@teamix/utils';
 import SchemaForm from '../SchemaForm';
 import { mergeArrayValue } from '../utils';
@@ -109,10 +108,6 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
 });
 ProForm.defaultProps = {
   colon: false,
-  labelAlign: 'left',
-  tooltipIcon: /*#__PURE__*/React.createElement(TeamixIcon, {
-    type: "info-circle-line",
-    size: "small"
-  })
+  labelAlign: 'left'
 };
 export default ProForm;

package/es/form/ProForm/index.scss

@@ -109,6 +109,11 @@
   }
 }
 
+// Icon
+.#{$css-prefix}formily-icon {
+  transform: translate(0, -1px);
+}
+
 // 撑满模式
 .#{$form-item-cls}-fullness {
   > .#{$form-item-cls}-control {
@@ -179,10 +184,20 @@
 
 // 数组类组件添加按钮
 .#{$css-prefix}formily-array-base-addition {
-  .teamix-icon {
+  .#{$css-prefix}formily-icon {
     margin-right: 4px;
   }
 }
+// 数组类ArrayItem Icon 居中
+.#{$css-prefix}formily-array-items-item-inner {
+  > .#{$css-prefix}box {
+    > .#{$css-prefix}space-item {
+      > .#{$css-prefix}formily-icon {
+        margin-top: 9px;
+      }
+    }
+  }
+}
 
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {
@@ -248,6 +263,9 @@
 // 高级筛选
 .#{$teamix-pro-form}-filter-advanced,
 .#{$teamix-pro-form}-filter-simple {
+  .#{$form-item-cls}-feedback-layout-popover {
+    margin-bottom: 0;
+  }
   .#{$css-prefix}date-picker2-input {
     .#{$css-prefix}input {
       width: inherit;

package/es/form/ProForm/useFieldRequest.d.ts

@@ -0,0 +1,5 @@
+declare const _default: () => {
+    refresh: () => void;
+    field: any;
+};
+export default _default;

package/es/form/ProForm/useFieldRequest.js

@@ -0,0 +1,26 @@
+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; }
+
+import { useField } from '@formily/react';
+import { isPlainObj } from '@teamix/utils';
+export default (function () {
+  var field = useField();
+
+  var refresh = function refresh() {
+    if (!isPlainObj(field.data)) {
+      field.data = {
+        refresh: {}
+      };
+    } else {
+      field.data.refresh = _objectSpread({}, field.data.refresh);
+    }
+  };
+
+  return {
+    refresh: refresh,
+    field: field
+  };
+});

package/es/form/SchemaForm/adapterDecorator.js

@@ -14,13 +14,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
  * 优先使用配置，即非 undefined
  * 未配置则按默认规则为基础组件和某些聚合组件添加FormItem
  */
-import { proFieldTypeMap } from './initializeProField';
+import fieldTypeMap from '../fieldTypeMap';
 export default (function (decorator, component) {
   if (decorator !== undefined) {
     return decorator;
   }
 
-  if ([].concat(_toConsumableArray(Object.keys(proFieldTypeMap)), ['Upload', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
+  if ([].concat(_toConsumableArray(Object.keys(fieldTypeMap)), ['Upload', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
     return 'FormItem';
   }
 

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

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

package/es/form/SchemaForm/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["component", "type", "name", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request"];
+var _excluded = ["component", "type", "name", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request", "data"];
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -34,9 +34,8 @@ import React, { memo, useCallback, useMemo } from 'react';
 import { createSchemaField } from '@formily/react';
 import { Affix } from '@alicloudfe/components';
 import { Upload, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
-import ProField from '../Components/ProField';
+import ProFieldComponents from '../Components/ProField';
 import { EditableDialog, EditableDrawer, EditablePopover } from '../Components/Editable';
-import Search from '../Components/Search';
 import FormGroup from '../Components/FormGroup';
 import QueryFilter from '../Components/QueryFilter';
 import Text from '../Components/Text/index';
@@ -47,7 +46,6 @@ import initializeRequest from './initializeRequest';
 import initializeReactions from './initializeReactions';
 import initializeDataSource from './initializeDataSource';
 import initializeRules from './initializeRules';
-import initializeProField, { proFieldTypeMap } from './initializeProField';
 import initializeArrayCards from './initializeArrayCards';
 import initializeArrayCollapse from './initializeArrayCollapse';
 import initializeArrayTable from './initializeArrayTable';
@@ -57,7 +55,7 @@ import initializeFormGroup from './initializeFormGroup';
 import initializeFormStep from './initializeFormStep';
 import initializeFormTab from './initializeFormTab';
 import initializeFormCollapse from './initializeFormCollapse';
-import initializeArrayIcon from './initializeArrayIcon';
+import fieldTypeMap from '../fieldTypeMap';
 import { getRandomName, mapSchemaName } from '../utils';
 import warning from '../warning';
 export default /*#__PURE__*/memo(function (_ref) {
@@ -66,8 +64,7 @@ export default /*#__PURE__*/memo(function (_ref) {
       components = _ref.components;
   var SchemaField = useMemo(function () {
     return createSchemaField({
-      components: {
-        ProField: ProField,
+      components: _objectSpread(_objectSpread({}, ProFieldComponents), {}, {
         FormLayout: FormLayout,
         FormItem: FormItem,
         ArrayCollapse: ArrayCollapse,
@@ -89,12 +86,11 @@ export default /*#__PURE__*/memo(function (_ref) {
         EditableDrawer: EditableDrawer,
         EditablePopover: EditablePopover,
         FormGroup: FormGroup,
-        Search: Search,
         QueryFilter: QueryFilter,
         Upload: Upload,
         Affix: Affix,
         Text: Text
-      }
+      })
     });
   }, []); // 合并schema中request的scope
 
@@ -110,9 +106,7 @@ export default /*#__PURE__*/memo(function (_ref) {
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
 
       if (originalComponent) {
-        if (Object.keys(proFieldTypeMap).includes(originalComponent)) {
-          // ProField接管组件
-          newItem = initializeProField(newItem);
+        if (Object.keys(fieldTypeMap).includes(originalComponent)) {// ProField接管组件
         } else {
           // 未接管组件，判断是否为Formily组件别名
           newItem = _objectSpread(_objectSpread({}, newItem), {}, {
@@ -163,11 +157,6 @@ export default /*#__PURE__*/memo(function (_ref) {
 
         if (['FormCollapse'].includes(originalComponent)) {
           newItem = initializeFormCollapse(newItem);
-        } // Array组件的Icon替换
-
-
-        if (/\.(Addition|Remove|MoveUp|MoveDown|SortHandle){1}$/g.test(originalComponent)) {
-          newItem = initializeArrayIcon(newItem);
         }
       }
 
@@ -185,6 +174,7 @@ export default /*#__PURE__*/memo(function (_ref) {
           items = _newItem2.items,
           tooltip = _newItem2.tooltip,
           request = _newItem2.request,
+          data = _newItem2.data,
           otherProps = _objectWithoutProperties(_newItem2, _excluded); // 默认类型
 
 
@@ -231,7 +221,8 @@ export default /*#__PURE__*/memo(function (_ref) {
         decoratorProps: defaultDecoratorProps,
         rules: defaultRules,
         reactions: defaultReactions,
-        dataSource: defaultDataSource
+        dataSource: defaultDataSource,
+        data: data
       })); // 递归子组件
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
@@ -250,11 +241,11 @@ export default /*#__PURE__*/memo(function (_ref) {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [formatSchema, schema]); // console.log(schemaPro);
+  }, []); // console.log(schemaPro);
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SchemaField, {
+  return /*#__PURE__*/React.createElement(SchemaField, {
     schema: schemaPro,
     components: components,
     scope: mergedScope
-  }));
+  });
 });

package/es/form/SchemaForm/initializeArrayCards.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;

package/es/form/SchemaForm/initializeArrayCollapse.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;

package/es/form/SchemaForm/initializeArrayItems.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;

package/es/form/SchemaForm/initializeArrayTable.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;