@teamix/pro 1.3.11 → 1.3.14

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", "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,
@@ -66,6 +106,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       wrapperCol = _ref.wrapperCol,
       breakpoints = _ref.breakpoints,
       onChange = _ref.onChange,
+      onChangeType = _ref.onChangeType,
       onSubmit = _ref.onSubmit,
       onSubmitFailed = _ref.onSubmitFailed,
       onInitialComplete = _ref.onInitialComplete,
@@ -92,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支持断点下的属性更新
 
@@ -112,47 +153,62 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       labelCol: (0, _utils2.mergeArrayValue)([24], labelCol),
       wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
     };
-  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]); // 添加onChange
-
-  (0, _react.useEffect)(function () {
-    form.removeEffects('onFieldValueChange');
-    form.addEffects('onFieldValueChange', function () {
-      (0, _core.onFieldValueChange)('*', function (field, form) {
-        var _field$props;
-
-        onChange && onChange((0, _reactive.toJS)(form.values), (0, _reactive.toJS)(field.value), (_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.name);
-      });
-    });
-  }, [form, onChange]); // 配置表单默认值
-
-  (0, _react.useEffect)(function () {
+  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  var schema = (0, _useFieldSchema.default)(otherProps);
+  (0, _react.useMemo)(function () {
+    // 配置表单默认值
     if (initialValues) {
       form.setInitialValues(initialValues);
-      onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
     } else if (initialRequest) {
       (0, _useInitialRequest.default)(initialRequest).then(function (values) {
         form.setInitialValues(values);
       }).finally(function () {
         onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
       });
-    }
-  }, []); // 配置国际化
+    } // 配置国际化
+
 
-  (0, _react.useEffect)(function () {
     (0, _core.setValidateLanguage)((0, _utils.getLanguage)() || 'zh-cn');
-  }, []);
+  }, []); // 添加 onChange 事件
+
+  (0, _react.useMemo)(function () {
+    if (onChangeType === 'form') {
+      // 使用 onFormValuesChange 无法监听具体变化字段
+      form.removeEffects('onChangeByFormValuesChange');
+      form.addEffects('onChangeByFormValuesChange', function () {
+        (0, _core.onFormValuesChange)(function (form) {
+          onChange === null || onChange === void 0 ? void 0 : onChange((0, _reactive.toJS)(form.values));
+        });
+      });
+    } else {
+      // 使用 onFieldValueChange 无法监听数组类型值的增删
+      form.removeEffects('onChangeByFieldValueChange');
+      form.addEffects('onChangeByFieldValueChange', function () {
+        (0, _core.onFieldValueChange)('*', function (field, form) {
+          var _field$props;
+
+          onChange === null || onChange === void 0 ? void 0 : onChange((0, _reactive.toJS)(form.values), (0, _reactive.toJS)(field.value), (_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.name);
+        });
+      });
+    }
+  }, [onChange]);
   return /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({
     className: (0, _classnames.default)(prefixCls, className)
   }, otherProps), getTeamixLayout), {}, {
     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;

package/lib/form/ProForm/useFieldSchema.js

@@ -0,0 +1,97 @@
+"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 field.reduce(function (prev, curr, index) {
+    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); // 获取字段额外的 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);
+
+    prev.push(_objectSpread(_objectSpread({}, (0, _utils.deepMerge)(rest, extraRest)), {}, {
+      reactions: [].concat(reactions, extraReactions),
+      children: (children === null || children === void 0 ? void 0 : children.length) ? getMergedSchema(children, extraChildren, 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 : []).filter(function (item) {
+    var _item$type, _item$props;
+
+    return (item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.name) === '' && (item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.component);
+  }); // 如果 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;

package/lib/form/SchemaForm/index.js

@@ -11,20 +11,6 @@ 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"));
-
-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 _adapterType = _interopRequireDefault(require("./adapterType"));
 
 var _adapterComponent = _interopRequireDefault(require("./adapterComponent"));
@@ -109,39 +95,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-  var schemaScopeRef = (0, _react.useRef)({}); // 创建 SchemaField，添加内置组件
+  var schemaScopeRef = (0, _react.useRef)({}); // 创建 SchemaField
 
   var SchemaField = (0, _react.useMemo)(function () {
-    return (0, _react2.createSchemaField)({
-      components: _objectSpread(_objectSpread({}, _ProField.default), {}, {
-        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
-      })
-    });
+    return (0, _react2.createSchemaField)();
   }, []); // 格式化 schema
 
   var formatSchema = (0, _react.useCallback)(function (schema) {

package/lib/form/SchemaForm/initializeSelectTable.js

@@ -4,7 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["name", "title", "children"];
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _utils = require("@teamix/utils");
+
+var _pureGenProColumnToColumn = _interopRequireDefault(require("../../table/utils/pureGenProColumnToColumn"));
+
+var _excluded = ["name", "children", "props"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -16,25 +25,95 @@ 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; }
 
+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; }
+
+/**
+ * 将可被 ProForm 识别的上下文转换为仅被 ProTable 识别的上下文
+ * @param value
+ * @returns
+ */
+var adapterContext = function adapterContext(value) {
+  if ((0, _utils.isStr)(value)) {
+    var contextReg = /^\{\{.*?\}\}$/;
+
+    if (contextReg.test(value)) {
+      return "\0".concat(value, "\0");
+    }
+
+    return value;
+  }
+
+  if ((0, _utils.isPlainObj)(value)) {
+    var temp = {};
+    Object.entries(value).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          val = _ref2[1];
+
+      temp[key] = adapterContext(val);
+    });
+    return temp;
+  }
+
+  if ((0, _utils.isArr)(value)) {
+    return value.map(function (item) {
+      return adapterContext(item);
+    });
+  }
+
+  return value;
+};
+
 var initializeTableColumn = function initializeTableColumn(item) {
   var name = item.name,
-      title = item.title,
       children = item.children,
+      props = item.props,
       otherProps = _objectWithoutProperties(item, _excluded);
 
   return {
     name: name,
-    title: title,
     component: 'SelectTable.Column',
-    children: children,
-    props: _objectSpread({}, otherProps)
+    children: children === null || children === void 0 ? void 0 : children.map(function (item) {
+      return initializeTableColumn(item);
+    }),
+    props: _objectSpread(_objectSpread({}, otherProps), props)
   };
 };
 
 var initialize = function initialize(item) {
+  var _props$columns;
+
   var _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children;
+      children = _item$children === void 0 ? [] : _item$children,
+      props = item.props;
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-select-table-column-tree'
+  });
+  var columns = props === null || props === void 0 ? void 0 : (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.map(function (value, index) {
+    var column = adapterContext(value);
+
+    if ((props === null || props === void 0 ? void 0 : props.isTree) && index === 0) {
+      return _objectSpread(_objectSpread({}, column), {}, {
+        className: (0, _classnames.default)(column.className, prefixCls)
+      });
+    }
+
+    return column;
+  });
   return _objectSpread(_objectSpread({}, item), {}, {
+    props: _objectSpread(_objectSpread({}, props), {}, {
+      columns: columns && (0, _pureGenProColumnToColumn.default)(columns)
+    }),
     children: children.map(function (item) {
       return initializeTableColumn(item);
     })

package/lib/form/typing.d.ts

@@ -56,7 +56,7 @@ export interface ProFormSchemaItem {
 export declare type ProFormSchema = ProFormSchemaItem[];
 export interface ProFormProps extends IFormLayoutProps {
     form?: FormType | false;
-    schema: ProFormSchema;
+    schema?: ProFormSchema;
     scope?: any;
     context?: any;
     components?: {
@@ -67,11 +67,15 @@ export interface ProFormProps extends IFormLayoutProps {
     initialRequest?: ProFormRequestConfig;
     previewTextPlaceholder?: ReactNode;
     validateFirst?: boolean;
+    onChangeType?: 'form';
     onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
     onInitialComplete?: (form: FormType) => void;
 }
+export declare type ComposedProForm = React.FC<ProFormProps> & {
+    Field?: React.FC<any>;
+};
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;

package/lib/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.11";
+declare const version = "1.3.14";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -305,5 +305,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.3.11';
+var version = '1.3.14';
 exports.version = version;

package/lib/table/components/ToolBar/Fullscreen.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import './index.scss';
 import { ProTableActionType } from '../../typing';
 declare type ProTableFullScreenProps = {
-    children: React.ReactNode;
+    children: (isFullScreen: boolean) => React.ReactNode | React.ReactNode;
     visible: boolean;
     actionRef: React.MutableRefObject<ProTableActionType | undefined>;
 };

package/lib/table/index.js

@@ -796,12 +796,14 @@ var ProTable = function ProTable(props) {
     mode: 'inline',
     forceClear: true
   }, propsDataFilter), {}, {
-    onInit: function onInit(values) {
+    onInit: (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) || requestWhenMount ? function (values) {
+      var _propsDataFilter$onIn;
+
       // 表单初始化请求处理
-      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
+      propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$onIn = propsDataFilter.onInit) === null || _propsDataFilter$onIn === void 0 ? void 0 : _propsDataFilter$onIn.call(propsDataFilter, values);
       !fullscreenState && requestWhenMount && _request({}, false, values);
       return true;
-    },
+    } : undefined,
     onFilter: function onFilter(values) {
       var _actionRef$current6, _actionRef$current6$c;
 

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

@@ -0,0 +1,9 @@
+import { ProTableColumnProps } from '../typing';
+/**
+ * 增加了 icon 的功能 render title
+ */
+export declare const renderColumnsTitle: (item: ProTableColumnProps) => JSX.Element;
+/**
+ * 负责单元格的具体渲染
+ */
+export declare const renderCell: (value: any, item: ProTableColumnProps, index: number, record: any) => JSX.Element;