@teamix/pro 1.3.13 → 1.3.14

package/es/table/utils/pureColumnRender.js

@@ -0,0 +1,201 @@
+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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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); 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; }
+
+/**
+ * 渲染列的逻辑函数，用于非 ProTable 比如 selectTable
+ */
+import React from 'react';
+import { getTargetValue, LabelIconTip } from '@teamix/utils';
+import ProField from '../../field';
+/**
+ * 增加了 icon 的功能 render title
+ */
+
+export var renderColumnsTitle = function renderColumnsTitle(item) {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelIconTip, {
+    label: item.title,
+    tooltip: item.tooltip,
+    icon: item.tooltipIcon
+  }));
+};
+/**
+ * 负责单元格的具体渲染
+ */
+
+export var renderCell = function renderCell(value, item, index, record) {
+  var _item$valueType = item.valueType,
+      valueType = _item$valueType === void 0 ? 'text' : _item$valueType,
+      render = item.render,
+      dataIndex = item.dataIndex,
+      format = item.format; // 如果没传 dataIndex，返回 null
+
+  if (!dataIndex) {
+    value = null;
+  } // 处理 dataIndex 为数组的情况
+
+
+  if (Array.isArray(dataIndex)) {
+    value = dataIndex.map(function (item) {
+      return getTargetValue("{{".concat(item, "}}"), _objectSpread(_objectSpread({}, record), {}, {
+        record: record
+      }));
+    });
+  }
+
+  var newRender = null;
+  var newDataSource = null;
+  var props = item.props; // 如果 render 直接传函数
+
+  if (typeof render === 'function') {
+    newRender = function newRender() {
+      return render === null || render === void 0 ? void 0 : render(value, index, record);
+    };
+  } else {
+    newRender = processBuriedPoint(processRenderFunction(render, value, index, record), record, value, index);
+
+    if (valueType === 'selectGroup') {
+      newRender = _objectSpread(_objectSpread({
+        maxShowNumber: 'auto',
+        foldText: 'more',
+        editOnClick: function editOnClick() {},
+        edit: true
+      }, newRender), {}, {
+        ellipsis: false
+      });
+      props = _objectSpread({
+        valueAlias: {
+          value: 'TagValue',
+          key: 'TagKey'
+        }
+      }, props);
+    }
+
+    if ((render === null || render === void 0 ? void 0 : render.type) === 'step') {
+      newRender = _objectSpread(_objectSpread({}, newRender), {}, {
+        ellipsis: false
+      });
+    }
+  } // dataSource可传函数
+
+
+  if (typeof item.dataSource === 'function') {
+    var _item$dataSource;
+
+    newDataSource = (_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.call(item, value, index, record);
+  } else {
+    var _item$dataSource2;
+
+    newDataSource = ((_item$dataSource2 = item.dataSource) !== null && _item$dataSource2 !== void 0 ? _item$dataSource2 : []).map(function (item) {
+      return Object.fromEntries(Object.entries(item).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+
+        return [k, getTargetValue(v, _objectSpread(_objectSpread({}, record), {}, {
+          record: record,
+          value: value,
+          index: index
+        }))];
+      }));
+    });
+  } // 渲染 ProField
+
+
+  return /*#__PURE__*/React.createElement(ProField, _objectSpread({
+    type: valueType || 'text',
+    value: value,
+    render: newRender,
+    dataSource: newDataSource,
+    format: format
+  }, props));
+};
+/**
+ * 处理 render 配置项是函数的情况
+ * @param render ProFieldRender
+ * @param value table cell value
+ * @param index table cell index
+ * @param record table cell record
+ * @returns
+ */
+
+var processRenderFunction = function processRenderFunction() {
+  var render = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var value = arguments.length > 1 ? arguments[1] : undefined;
+  var index = arguments.length > 2 ? arguments[2] : undefined;
+  var record = arguments.length > 3 ? arguments[3] : undefined;
+  // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick', 'extra', 'prefixExtra'];
+  return Object.fromEntries(Object.entries(render).map(function (_ref3) {
+    var _ref4 = _slicedToArray(_ref3, 2),
+        k = _ref4[0],
+        v = _ref4[1];
+
+    if (typeof v === 'function') {
+      var _v;
+
+      if (external.includes(k)) {
+        return [k, function () {
+          for (var _len = arguments.length, others = new Array(_len), _key = 0; _key < _len; _key++) {
+            others[_key] = arguments[_key];
+          }
+
+          return v === null || v === void 0 ? void 0 : v.apply(void 0, [value, index, record].concat(others));
+        }];
+      }
+
+      return [k, (_v = v === null || v === void 0 ? void 0 : v(value, index, record)) !== null && _v !== void 0 ? _v : ''];
+    }
+
+    return [k, v];
+  }));
+};
+/**
+ * 处理 render 数据，取出 {{xxx}} 匹配值
+ * @param render ProFieldRender
+ * @param record table cell record
+ * @returns
+ */
+
+
+var processBuriedPoint = function processBuriedPoint() {
+  var render = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var record = arguments.length > 1 ? arguments[1] : undefined;
+  var value = arguments.length > 2 ? arguments[2] : undefined;
+  var index = arguments.length > 3 ? arguments[3] : undefined;
+  return Object.fromEntries([// 默认 ellipsis、descriptionEllipsis 为 true
+  // emptyText 默认为 '-'
+  ['ellipsis', true], ['descriptionEllipsis', true], ['emptyText', '-']].concat(_toConsumableArray(Object.entries(render).map(function (_ref5) {
+    var _ref6 = _slicedToArray(_ref5, 2),
+        k = _ref6[0],
+        v = _ref6[1];
+
+    return [k, getTargetValue(v, _objectSpread(_objectSpread({}, record), {}, {
+      record: record,
+      value: value,
+      index: index
+    }))];
+  }))));
+};

package/es/table/utils/pureGenProColumnToColumn.d.ts

@@ -0,0 +1,7 @@
+import { ProTableColumnProps } from '../typing';
+import { ColumnProps } from '@alicloudfe/components/types/table';
+/**
+ * ProColumn => Column，去掉操作列，过滤器相关逻辑
+ * 用于非 ProTable 比如 selectTable
+ */
+export default function genProColumnToColumn(columns: ProTableColumnProps[]): ColumnProps[];

package/es/table/utils/pureGenProColumnToColumn.js

@@ -0,0 +1,36 @@
+var _excluded = ["filters", "dataIndex"];
+
+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 { renderColumnsTitle, renderCell } from './pureColumnRender';
+/**
+ * ProColumn => Column，去掉操作列，过滤器相关逻辑
+ * 用于非 ProTable 比如 selectTable
+ */
+
+export default function genProColumnToColumn(columns) {
+  return columns.map(function (columnProps) {
+    var filters = columnProps.filters,
+        dataIndex = columnProps.dataIndex,
+        others = _objectWithoutProperties(columnProps, _excluded);
+
+    return _objectSpread(_objectSpread({
+      // 金钱样式默认右对齐
+      align: columnProps.valueType === 'money' ? 'right' : 'left'
+    }, others), {}, {
+      dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
+      title: renderColumnsTitle(columnProps),
+      cell: function cell(value, index, record) {
+        return renderCell(value, columnProps, index, record);
+      }
+    });
+  });
+}

package/es/timeline/ProTimeLineItem/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["_comment", "_shape", "status", "image", "icon", "title", "subTitle", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender"];
+var _excluded = ["_comment", "_shape", "status", "image", "icon", "title", "subTitle", "time", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender"];
 
 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; }
 
@@ -43,6 +43,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
       icon = props.icon,
       title = props.title,
       subTitle = props.subTitle,
+      time = props.time,
       timeLeft = props.timeLeft,
       content = props.content,
       animation = props.animation,
@@ -54,8 +55,10 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
       onCollapse = props.onCollapse,
       dotRender = props.dotRender,
       others = _objectWithoutProperties(props, _excluded);
-  /** 内容去折叠相关 */
 
+  var timeRight = time !== null && time !== void 0 ? time : subTitle; // 兼容 subTitle
+
+  /** 内容去折叠相关 */
 
   var _useState = useState(defaultCollapsed !== undefined ? defaultCollapsed : false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -165,9 +168,9 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
       }))
     }, title), tags && /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-top-tag-info'))
-    }, renderTag()), subTitle && /*#__PURE__*/React.createElement("div", {
+    }, renderTag()), timeRight && /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-top-subTitle-info'))
-    }, formatTime(subTitle))), discription && /*#__PURE__*/React.createElement("div", {
+    }, formatTime(timeRight))), discription && /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-discribe-info'))
     }, discription), /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-content-info'))
@@ -177,7 +180,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
         'wrapper-right-content-info-open': showContent
       }))
     }, content))));
-  }, [_shape, timeLeft, image, title, tags, subTitle, discription, content, collapsible, collapsed, defaultCollapsed, onCollapseChanged]);
+  }, [_shape, timeLeft, image, title, tags, timeRight, discription, content, collapsible, collapsed, defaultCollapsed, onCollapseChanged]);
   /**
    * 重新渲染 timeline 节点
    * */

package/es/timeline/typing.d.ts

@@ -60,8 +60,13 @@ export declare type ProTimeLineItemProps = {
     dotRender?: (index?: number, status?: string) => ReactNode;
     /**
      * 节点副标题
+     * @deprecated 弃用，请使用 `time`
      */
     subTitle?: ReactNode;
+    /**
+     * 右侧时间
+     */
+    time?: ReactNode;
     /**
      * 节点对应描述
      */

package/lib/actions/index.js

@@ -231,8 +231,18 @@ var ProActionButton = function ProActionButton(props) {
   }, tooltipProps);
 
   if (tooltip || disabledTooltip) {
-    var showToolTip = disabled ? disabledTooltip : tooltip;
-    content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+    if (tooltip && !disabledTooltip) {
+      if (!disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), tooltip);
+      }
+    } else if (!tooltip && disabledTooltip) {
+      if (disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), disabledTooltip);
+      }
+    } else if (tooltip && disabledTooltip) {
+      var showToolTip = disabled ? disabledTooltip : tooltip;
+      content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+    }
   }
 
   return content;
@@ -248,7 +258,10 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
       _onClick2 = action.onClick,
       children = action.children,
       icon = action.icon,
-      disabled = action.disabled;
+      disabled = action.disabled,
+      tooltip = action.tooltip,
+      disabledTooltip = action.disabledTooltip,
+      tooltipProps = action.tooltipProps;
   var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
@@ -262,9 +275,32 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
       return _onClick2(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
+  var content = buttonContent(children, icon, undefined, context);
+
+  var baseToolTipProps = _objectSpread({
+    triggerType: 'hover',
+    align: 't',
+    trigger: content
+  }, tooltipProps);
+
+  if (tooltip || disabledTooltip) {
+    if (tooltip && !disabledTooltip) {
+      if (!disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), tooltip);
+      }
+    } else if (!tooltip && disabledTooltip) {
+      if (disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), disabledTooltip);
+      }
+    } else if (tooltip && disabledTooltip) {
+      var showToolTip = disabled ? disabledTooltip : tooltip;
+      content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+    }
+  }
+
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
     className: (0, _classnames.default)('teamix-pro-action-menu-item', "".concat((0, _utils.usePrefixCls)(), "menu-item"), _defineProperty({}, "".concat((0, _utils.usePrefixCls)(), "disabled"), disabled))
-  }, buttonProps), buttonContent(children, icon, undefined, context));
+  }, buttonProps), content);
 };
 
 function renderCommonActionButtonMenuItem(action, key, context) {

package/lib/form/Filter/LightFilter.js

@@ -35,13 +35,9 @@ 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 lightFilterObs = (0, _reactive.observable)({
-  onFilter: function onFilter() {}
-});
 /**
  * 轻量筛选
  */
-
 var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _schema$;
 
@@ -54,10 +50,15 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var filterValue = (0, _react.useRef)(defaultFilterValue || ((_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
+  var filterValue = (0, _react.useRef)(defaultFilterValue || (schema === null || schema === void 0 ? void 0 : (_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter-light'
   });
+  var lightFilterObs = (0, _react.useMemo)(function () {
+    return (0, _reactive.observable)({
+      onFilter: function onFilter() {}
+    });
+  }, []);
   (0, _react.useEffect)(function () {
     if (activeFilterValueRef) {
       activeFilterValueRef.current = filterValue.current;
@@ -108,7 +109,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [schema, onFilterChange, defaultFilterValue]);
   (0, _react.useEffect)(function () {
     lightFilterObs.onFilter = onFilter;
-  }, [onChange]);
+  }, [onFilter]);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     scope: _objectSpread(_objectSpread({}, otherProps === null || otherProps === void 0 ? void 0 : otherProps.scope), {}, {
       lightFilterObs: lightFilterObs

package/lib/form/Filter/index.js

@@ -349,7 +349,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         debounceFun(onSimpleFilter, values);
       }
     }
-  }, [onChange]); // 轻量搜索Filter
+  }, [onChange, onSimpleFilter]); // 轻量搜索Filter
 
   var onLightFilter = (0, _react.useCallback)(function (values) {
     var _Object$keys;
@@ -374,7 +374,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         debounceFun(onLightFilter, values);
       }
     }
-  }, [onChange]); // 高级搜索Filter
+  }, [onChange, onLightFilter]); // 高级搜索Filter
 
   var onAdvancedFilter = (0, _react.useCallback)(function (values) {
     setCurrentForm('advanced');

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

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

package/lib/form/ProForm/index.js

@@ -11,13 +11,25 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _utils = require("@teamix/utils");
+
 var _core = require("@formily/core");
 
 var _reactive = require("@formily/reactive");
 
 var _formily = require("@teamix/formily");
 
-var _utils = require("@teamix/utils");
+var _components = require("@alicloudfe/components");
+
+var _ProField = _interopRequireDefault(require("../Components/ProField"));
+
+var _Editable = require("../Components/Editable");
+
+var _FormGroup = _interopRequireDefault(require("../Components/FormGroup"));
+
+var _LightFilter = _interopRequireDefault(require("../Components/LightFilter"));
+
+var _index = _interopRequireDefault(require("../Components/Text/index"));
 
 var _SchemaForm = _interopRequireDefault(require("../SchemaForm"));
 
@@ -27,11 +39,13 @@ var _useAutoSubmit = _interopRequireDefault(require("./useAutoSubmit"));
 
 var _useInitialRequest = _interopRequireDefault(require("./useInitialRequest"));
 
+var _useFieldSchema = _interopRequireDefault(require("./useFieldSchema"));
+
 var _validate = _interopRequireDefault(require("../locales/validate"));
 
 require("./index.scss");
 
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
+var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -50,15 +64,41 @@ 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; }
 
 (0, _core.registerValidateLocale)(_validate.default);
+var formilyComponents = {
+  FormLayout: _formily.FormLayout,
+  FormItem: _formily.FormItem,
+  ArrayCollapse: _formily.ArrayCollapse,
+  ArrayCards: _formily.ArrayCards,
+  ArrayItems: _formily.ArrayItems,
+  ArrayTable: _formily.ArrayTable,
+  Space: _formily.Space,
+  FormGrid: _formily.FormGrid,
+  FormTab: _formily.FormTab,
+  FormCollapse: _formily.FormCollapse,
+  FormStep: _formily.FormStep,
+  Editable: _formily.Editable,
+  FormDialogFooter: _formily.FormDialog.Footer,
+  FormDrawerFooter: _formily.FormDrawer.Footer,
+  FormButtonGroup: _formily.FormButtonGroup,
+  Submit: _formily.Submit,
+  Reset: _formily.Reset,
+  EditableDialog: _Editable.EditableDialog,
+  EditableDrawer: _Editable.EditableDrawer,
+  EditablePopover: _Editable.EditablePopover,
+  FormGroup: _FormGroup.default,
+  Upload: _formily.Upload,
+  SelectTable: _formily.SelectTable,
+  Affix: _components.Affix,
+  LightFilter: _LightFilter.default,
+  Text: _index.default
+};
 var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var outerForm = _ref.form,
       initialValues = _ref.initialValues,
       initialRequest = _ref.initialRequest,
-      schema = _ref.schema,
       scope = _ref.scope,
       context = _ref.context,
       components = _ref.components,
-      children = _ref.children,
       layout = _ref.layout,
       labelAlign = _ref.labelAlign,
       wrapperAlign = _ref.wrapperAlign,
@@ -93,7 +133,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }); // context需要实名不能解构
 
 
-  var mergedComponents = _objectSpread(_objectSpread({}, globalComponents), components);
+  var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), _ProField.default);
 
   var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit); // todo 需要formily支持断点下的属性更新
 
@@ -114,6 +154,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
     };
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  var schema = (0, _useFieldSchema.default)(otherProps);
   (0, _react.useMemo)(function () {
     // 配置表单默认值
     if (initialValues) {
@@ -157,12 +198,17 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     form: form,
     onAutoSubmit: onAutoSubmit,
     onAutoSubmitFailed: onSubmitFailed
-  }), /*#__PURE__*/_react.default.createElement(_SchemaForm.default, {
+  }), schema ? /*#__PURE__*/_react.default.createElement(_SchemaForm.default, {
     schema: schema,
     scope: mergedScope,
     components: mergedComponents
-  }), children);
+  }) : null, otherProps === null || otherProps === void 0 ? void 0 : otherProps.children);
 });
+
+ProForm.Field = function () {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+};
+
 ProForm.defaultProps = {
   colon: false,
   labelAlign: 'left',

package/lib/form/ProForm/index.scss

@@ -317,6 +317,13 @@
   }
 }
 
+// SelectTable
+.#{$teamix-pro-form}-select-table-column-tree
+  > .#{$css-prefix}table-cell-wrapper {
+  display: flex;
+  align-items: center;
+}
+
 /* hack todo remove */
 .#{$form-item-cls}-control-content-component {
   .#{$teamix-pro-field}-tooltip.#{$teamix-pro-field}-checkbox {

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

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