@teamix/pro 1.3.17 → 1.4.2

package/lib/table/index.js

@@ -34,8 +34,6 @@ var _Fullscreen = _interopRequireDefault(require("./components/ToolBar/Fullscree
 
 var _EmptyContent = _interopRequireDefault(require("./components/EmptyContent"));
 
-var _form = require("../form");
-
 var _actions = require("../actions");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -55,7 +53,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -95,10 +93,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-table');
-var toJS = _form.formilyReactive.toJS; // 判断是否是 root 组织
-
-var isRoot = (0, _utils.getCookie)('organizationId') === '1';
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table');
 /**
  * 处理原生传入的 columns 以便于 选择列 方便处理
  * @param columns 原生传入的 columns
@@ -106,24 +101,17 @@ var isRoot = (0, _utils.getCookie)('organizationId') === '1';
  */
 
 var processColumns = function processColumns(columns, initialColumns) {
-  var _filterColumns;
+  var _getGlobalConfig;
 
+  var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
   var filterColumns = columns.filter(function (item) {
-    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true;
-  });
+    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
+  }); // 处理只剩一列批量选择的情况下宽度错乱问题
 
-  if (isRoot) {
-    // root 组织下不显示标签管理
-    filterColumns = filterColumns.filter(function (item) {
-      return item.valueType !== 'selectGroup';
-    });
-  } // 处理只剩一列批量选择的情况下宽度错乱问题
+  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
+    var _initialColumns$;
 
-
-  if ((_filterColumns = filterColumns) === null || _filterColumns === void 0 ? void 0 : _filterColumns.length) {
-    var _filterColumns2, _initialColumns$;
-
-    if (((_filterColumns2 = filterColumns) === null || _filterColumns2 === void 0 ? void 0 : _filterColumns2.length) === 1) {
+    if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
       var _filterColumns$, _filterColumns$2;
 
       if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
@@ -225,6 +213,7 @@ var ProTable = function ProTable(props) {
       _props$size = props.size,
       propsSize = _props$size === void 0 ? 'medium' : _props$size,
       disableSelectAll = props.disableSelectAll,
+      context = props.context,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -313,7 +302,10 @@ var ProTable = function ProTable(props) {
 
     var tableDom = tableRef.current;
     var headerDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) === null || _tableDom$getElements === void 0 ? void 0 : _tableDom$getElements[0];
-    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName("".concat((0, _utils.usePrefixCls)(), "table-header-inner"))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
+    var basePrefix = (0, _utils.usePrefixCls)('', {
+      base: true
+    });
+    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName(basePrefix('table-header-inner'))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
     return new Promise(function (resolve) {
       setTimeout(function () {
         var _headerDom$offsetHeig, _tableHeaderDom$offse;
@@ -863,7 +855,7 @@ var ProTable = function ProTable(props) {
       }), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
-        columns: (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef),
+        columns: (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef, context),
         loading: getTableLoading(),
         className: (0, _classnames.default)('teamix-pro-table', tableClassName, {
           'with-row-select': rowSelection

package/lib/table/index.scss

@@ -134,4 +134,11 @@ $fullscreenPadding: 24px;
       color: var(--table-row-hover-color);
     }
   }
+}
+
+// 排序icon hover 颜色跟随主题
+.next-table-sort.next-table-header-icon {
+  a:hover {
+    color: var(--color-brand1-5);
+  }
 }

package/lib/table/typing.d.ts

@@ -6,7 +6,7 @@ import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../fi
 import { QueryFilterProps, ProFormType } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
-import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
+import { HeaderProps as ProTableHeaderProps } from '../field';
 import { Method } from 'axios';
 import React from 'react';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
@@ -139,6 +139,8 @@ export declare type ProTableProps = {
     };
     /** 禁用掉批量选择中的全选 */
     disableSelectAll?: boolean;
+    /** 接收外部传来的 context，eg: dialog-table */
+    context?: any;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;

package/lib/table/utils/columnRender.d.ts

@@ -10,4 +10,4 @@ export declare const renderColumnsTitle: (item: ProTableColumnProps, actionRef:
 /**
  * 负责单元格的具体渲染
  */
-export declare const renderCell: (value: any, item: ProTableColumnProps, index: number, record: any, actionRef: React.MutableRefObject<ProTableActionType | undefined>) => JSX.Element;
+export declare const renderCell: (value: any, item: ProTableColumnProps, index: number, record: any, actionRef: React.MutableRefObject<ProTableActionType | undefined>, context?: any) => JSX.Element;

package/lib/table/utils/columnRender.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,10 +13,14 @@ var _utils = require("@teamix/utils");
 
 var _actions = require("../../actions");
 
-var _field = _interopRequireDefault(require("../../field"));
+var _field = _interopRequireWildcard(require("../../field"));
 
 var _Filter = _interopRequireDefault(require("../components/Filter"));
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -105,7 +111,7 @@ var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
     });
   };
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_field.LabelIconTip, {
     label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon
@@ -121,7 +127,9 @@ var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
 
 exports.renderColumnsTitle = renderColumnsTitle;
 
-var renderCell = function renderCell(value, item, index, record, actionRef) {
+var renderCell = function renderCell(value, item, index, record, actionRef,
+/** 接收外部比如 dialog-table 传过来的 context，用于弹窗关闭等 */
+context) {
   var _actionSchema$actions;
 
   var _item$valueType = item.valueType,
@@ -182,12 +190,13 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
 
   if (actionSchema && ((_actionSchema$actions = actionSchema.actions) === null || _actionSchema$actions === void 0 ? void 0 : _actionSchema$actions.length)) {
     // 默认 context
-    var defaultContext = {
+    var defaultContext = _objectSpread({
       value: value,
       index: index,
       record: record,
       action: actionRef.current
-    };
+    }, context);
+
     return /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread({
       type: "text"
     }, actionSchema), {}, {

package/lib/table/utils/genProColumnToColumn.d.ts

@@ -6,4 +6,4 @@ import { ColumnProps } from '@alicloudfe/components/types/table';
  */
 export default function genProColumnToColumn(columns: ProTableColumnProps[], 
 /** 是否渲染骨架屏 */
-showSkeleton: boolean, actionRef: React.MutableRefObject<ProTableActionType | undefined>): ColumnProps[];
+showSkeleton: boolean, actionRef: React.MutableRefObject<ProTableActionType | undefined>, context?: any): ColumnProps[];

package/lib/table/utils/genProColumnToColumn.js

@@ -31,6 +31,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 function genProColumnToColumn(columns,
 /** 是否渲染骨架屏 */
 showSkeleton, actionRef) {
+  var context = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   return columns.map(function (columnProps) {
     var filters = columnProps.filters,
         dataIndex = columnProps.dataIndex,
@@ -55,7 +56,7 @@ showSkeleton, actionRef) {
       dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
       title: (0, _columnRender.renderColumnsTitle)(columnProps, actionRef),
       cell: function cell(value, index, record) {
-        return (0, _columnRender.renderCell)(value, columnProps, index, record, actionRef);
+        return (0, _columnRender.renderCell)(value, columnProps, index, record, actionRef, context);
       }
     });
   });

package/lib/table/utils/pureColumnRender.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,7 +11,11 @@ var _react = _interopRequireDefault(require("react"));
 
 var _utils = require("@teamix/utils");
 
-var _field = _interopRequireDefault(require("../../field"));
+var _field = _interopRequireWildcard(require("../../field"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -43,7 +49,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * 增加了 icon 的功能 render title
  */
 var renderColumnsTitle = function renderColumnsTitle(item) {
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_field.LabelIconTip, {
     label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon

package/lib/timeline/ProTimeLineItem/index.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _utils = require("@teamix/utils");
 
+var _field = require("../../field");
+
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _excluded = ["_comment", "_shape", "status", "image", "icon", "title", "subTitle", "time", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender"];
@@ -50,7 +52,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 
 var TimelineItem = _components.Timeline.Item;
-var cls = (0, _utils.baseClass)('teamix-pro-timeline');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-timeline');
 
 var ProTimeLineItem = function ProTimeLineItem(props) {
   var _props$_comment = props._comment,
@@ -138,7 +140,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
 
   var renderTag = function renderTag() {
     if (_typeof(tags) === 'object') {
-      return (0, _utils.renderTags)(tags, 'small');
+      return (0, _field.renderTags)(tags, 'small');
     }
 
     return tags;

package/lib/timeline/index.js

@@ -43,7 +43,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-timeline');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-timeline');
 
 var ProTimeline = function ProTimeline(props) {
   var items = props.items,

package/lib/timeline/typing.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { ProTagItem } from '@teamix/utils';
+import { ProTagItem } from '../field';
 export declare type ProTimeLineItemStatus = 'success' | 'fail' | 'process' | 'warning' | 'wait';
 export declare type FoldProps = {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.17",
+  "version": "1.4.2",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",

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

@@ -1,7 +0,0 @@
-declare const _default: ({ children, schema }: any) => any;
-/**
- * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
- * @param props ProForm 组件的 props
- * @returns schema 配置
- */
-export default _default;

package/es/form/ProForm/useFieldSchema.js

@@ -1,109 +0,0 @@
-var _excluded = ["id", "children", "reactions"],
-    _excluded2 = ["id", "children", "reactions"];
-
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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 _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; }
-
-import { getValueByValue, deepMerge, isStr } from '@teamix/utils';
-/**
- * 合并 Field 字段 props 和 ProForm schema 配置，生成完整的 Field 字段 schema
- * @param field Field 字段
- * @param extra 额外的 schema 配置（存在递归，可能是子级 schema ）
- * @param wholeExtra 完整的额外 schema 配置
- * @returns schema 配置
- */
-
-var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
-  return [].concat(field).reduce(function (prev, curr, index) {
-    var _curr$type;
-
-    var _ref = curr.props || {},
-        id = _ref.id,
-        _ref$children = _ref.children,
-        children = _ref$children === void 0 ? [] : _ref$children,
-        _ref$reactions = _ref.reactions,
-        reactions = _ref$reactions === void 0 ? [] : _ref$reactions,
-        rest = _objectWithoutProperties(_ref, _excluded);
-
-    var displayName = curr === null || curr === void 0 ? void 0 : (_curr$type = curr.type) === null || _curr$type === void 0 ? void 0 : _curr$type.displayName; // 自定义组件
-
-    var type = curr === null || curr === void 0 ? void 0 : curr.type; // 基本Dom元素
-
-    if (displayName === 'ProFormField') {
-      // 获取字段额外的 schema 配置（From ProForm）
-      var extraFieldProps = extra[index] || {};
-
-      if (id !== extraFieldProps.id) {
-        // 索引不匹配，通过 id 查找获取
-        extraFieldProps = getValueByValue(extra, id, {
-          inputKey: 'id',
-          outputKey: '__whole__'
-        }) || getValueByValue(wholeExtra, id, {
-          inputKey: 'id',
-          outputKey: '__whole__'
-        });
-
-        if (extraFieldProps) {
-          console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
-        }
-      }
-
-      var _ref2 = extraFieldProps || {},
-          extraId = _ref2.id,
-          _ref2$children = _ref2.children,
-          extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
-          _ref2$reactions = _ref2.reactions,
-          extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
-          extraRest = _objectWithoutProperties(_ref2, _excluded2);
-
-      var mergedReactions = [].concat(reactions, extraReactions);
-      var mergedChildren = children ? getMergedSchema(children, extraChildren, wholeExtra) : [];
-      prev.push(_objectSpread(_objectSpread(_objectSpread({}, deepMerge(rest, extraRest)), mergedReactions.length && {
-        reactions: mergedReactions
-      }), mergedChildren.length && {
-        children: mergedChildren
-      }));
-    } else if (isStr(type)) {
-      prev.push({
-        component: type,
-        props: curr.props
-      });
-    } else if (isStr(displayName)) {
-      prev.push({
-        decorator: displayName,
-        decoratorProps: _objectSpread({
-          id: id
-        }, rest),
-        children: children ? getMergedSchema(children, [], wholeExtra) : []
-      });
-    }
-
-    return prev;
-  }, []);
-};
-/**
- * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
- * @param props ProForm 组件的 props
- * @returns schema 配置
- */
-
-
-export default (function (_ref3) {
-  var children = _ref3.children,
-      schema = _ref3.schema;
-  var field = [].concat(children !== null && children !== void 0 ? children : []); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
-
-  if (field.length) {
-    return getMergedSchema(field, schema !== null && schema !== void 0 ? schema : [], schema !== null && schema !== void 0 ? schema : []);
-  } // 正常使用 ProForm 的 schema 渲染表单
-
-
-  return schema;
-});

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

@@ -1,7 +0,0 @@
-declare const _default: ({ children, schema }: any) => any;
-/**
- * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
- * @param props ProForm 组件的 props
- * @returns schema 配置
- */
-export default _default;

package/lib/form/ProForm/useFieldSchema.js

@@ -1,118 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _utils = require("@teamix/utils");
-
-var _excluded = ["id", "children", "reactions"],
-    _excluded2 = ["id", "children", "reactions"];
-
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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 _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; }
-
-/**
- * 合并 Field 字段 props 和 ProForm schema 配置，生成完整的 Field 字段 schema
- * @param field Field 字段
- * @param extra 额外的 schema 配置（存在递归，可能是子级 schema ）
- * @param wholeExtra 完整的额外 schema 配置
- * @returns schema 配置
- */
-var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
-  return [].concat(field).reduce(function (prev, curr, index) {
-    var _curr$type;
-
-    var _ref = curr.props || {},
-        id = _ref.id,
-        _ref$children = _ref.children,
-        children = _ref$children === void 0 ? [] : _ref$children,
-        _ref$reactions = _ref.reactions,
-        reactions = _ref$reactions === void 0 ? [] : _ref$reactions,
-        rest = _objectWithoutProperties(_ref, _excluded);
-
-    var displayName = curr === null || curr === void 0 ? void 0 : (_curr$type = curr.type) === null || _curr$type === void 0 ? void 0 : _curr$type.displayName; // 自定义组件
-
-    var type = curr === null || curr === void 0 ? void 0 : curr.type; // 基本Dom元素
-
-    if (displayName === 'ProFormField') {
-      // 获取字段额外的 schema 配置（From ProForm）
-      var extraFieldProps = extra[index] || {};
-
-      if (id !== extraFieldProps.id) {
-        // 索引不匹配，通过 id 查找获取
-        extraFieldProps = (0, _utils.getValueByValue)(extra, id, {
-          inputKey: 'id',
-          outputKey: '__whole__'
-        }) || (0, _utils.getValueByValue)(wholeExtra, id, {
-          inputKey: 'id',
-          outputKey: '__whole__'
-        });
-
-        if (extraFieldProps) {
-          console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
-        }
-      }
-
-      var _ref2 = extraFieldProps || {},
-          extraId = _ref2.id,
-          _ref2$children = _ref2.children,
-          extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
-          _ref2$reactions = _ref2.reactions,
-          extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
-          extraRest = _objectWithoutProperties(_ref2, _excluded2);
-
-      var mergedReactions = [].concat(reactions, extraReactions);
-      var mergedChildren = children ? getMergedSchema(children, extraChildren, wholeExtra) : [];
-      prev.push(_objectSpread(_objectSpread(_objectSpread({}, (0, _utils.deepMerge)(rest, extraRest)), mergedReactions.length && {
-        reactions: mergedReactions
-      }), mergedChildren.length && {
-        children: mergedChildren
-      }));
-    } else if ((0, _utils.isStr)(type)) {
-      prev.push({
-        component: type,
-        props: curr.props
-      });
-    } else if ((0, _utils.isStr)(displayName)) {
-      prev.push({
-        decorator: displayName,
-        decoratorProps: _objectSpread({
-          id: id
-        }, rest),
-        children: children ? getMergedSchema(children, [], wholeExtra) : []
-      });
-    }
-
-    return prev;
-  }, []);
-};
-/**
- * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
- * @param props ProForm 组件的 props
- * @returns schema 配置
- */
-
-
-var _default = function _default(_ref3) {
-  var children = _ref3.children,
-      schema = _ref3.schema;
-  var field = [].concat(children !== null && children !== void 0 ? children : []); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
-
-  if (field.length) {
-    return getMergedSchema(field, schema !== null && schema !== void 0 ? schema : [], schema !== null && schema !== void 0 ? schema : []);
-  } // 正常使用 ProForm 的 schema 渲染表单
-
-
-  return schema;
-};
-
-exports.default = _default;