@ant-design/pro-components 3.0.0-beta.1 → 3.0.0-beta.3

package/es/form/components/FieldSet/index.js

@@ -1,151 +1,123 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-
-// src/form/components/FieldSet/index.tsx
-import { Space } from "antd";
-import toArray from "rc-util/lib/Children/toArray";
-import React, { useCallback, useImperativeHandle } from "react";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _ref3;
+var _excluded = ["children", "value", "valuePropName", "onChange", "fieldProps", "space", "type", "transform", "convertValue", "lightProps"],
+  _excluded2 = ["children", "space", "valuePropName"];
+import { toArray } from '@rc-component/util';
+import { Space } from 'antd';
+import React, { useCallback, useImperativeHandle } from 'react';
 import { runFunction, useRefFunction } from "../../../utils";
 import { useGridHelpers } from "../../helpers";
 import warpField from "../FormItem/warpField";
+import { jsx as _jsx } from "react/jsx-runtime";
 var FieldSetType = {
   space: Space,
   group: Space.Compact
 };
-function defaultGetValueFromEvent(valuePropName, ...args) {
-  const event = args[0];
+export function defaultGetValueFromEvent(valuePropName) {
+  var event = arguments.length <= 1 ? undefined : arguments[1];
   if (event && event.target && valuePropName in event.target) {
+    // @ts-ignore
     return event.target[valuePropName];
   }
   return event;
 }
-var FieldSet = (props) => {
-  const _a2 = props, {
-    children,
-    value = [],
-    valuePropName,
-    onChange,
-    fieldProps,
-    space,
-    type = "space",
-    transform,
-    convertValue,
-    lightProps
-  } = _a2, rest = __objRest(_a2, [
-    "children",
-    "value",
-    "valuePropName",
-    "onChange",
-    "fieldProps",
-    "space",
-    "type",
-    "transform",
-    "convertValue",
-    "lightProps"
-  ]);
-  const fieldSetOnChange = useRefFunction((fileValue, index) => {
-    var _a3;
-    const newValues = [...value];
-    newValues[index] = defaultGetValueFromEvent(
-      valuePropName || "value",
-      fileValue
-    );
-    onChange == null ? void 0 : onChange(newValues);
-    (_a3 = fieldProps == null ? void 0 : fieldProps.onChange) == null ? void 0 : _a3.call(fieldProps, newValues);
+var FieldSet = function FieldSet(props) {
+  var children = props.children,
+    _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    valuePropName = props.valuePropName,
+    onChange = props.onChange,
+    fieldProps = props.fieldProps,
+    space = props.space,
+    _props$type = props.type,
+    type = _props$type === void 0 ? 'space' : _props$type,
+    transform = props.transform,
+    convertValue = props.convertValue,
+    lightProps = props.lightProps,
+    rest = _objectWithoutProperties(props, _excluded);
+  /**
+   * 使用方法的引用防止闭包
+   *
+   * @param fileValue
+   * @param index
+   */
+  var fieldSetOnChange = useRefFunction(function (fileValue, index) {
+    var _fieldProps$onChange;
+    var newValues = _toConsumableArray(value);
+    newValues[index] = defaultGetValueFromEvent(valuePropName || 'value', fileValue);
+    onChange === null || onChange === void 0 || onChange(newValues);
+    fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange = fieldProps.onChange) === null || _fieldProps$onChange === void 0 || _fieldProps$onChange.call(fieldProps, newValues);
   });
-  let itemIndex = -1;
-  const list = toArray(runFunction(children, value, props)).map((item) => {
-    var _a3, _b, _c;
-    if (React.isValidElement(item)) {
+  var itemIndex = -1;
+  var list = toArray(runFunction(children, value, props)).map(function (item) {
+    if ( /*#__PURE__*/React.isValidElement(item)) {
+      var _item$type, _item$props, _item$props2;
       itemIndex += 1;
-      const index = itemIndex;
-      const isProFromItem = (
-        // @ts-ignore
-        ((_a3 = item == null ? void 0 : item.type) == null ? void 0 : _a3.displayName) === "ProFormComponent" || ((_b = item == null ? void 0 : item.props) == null ? void 0 : _b.readonly)
-      );
-      const forkProps = isProFromItem ? __spreadProps(__spreadValues({
+      var index = itemIndex;
+      var isProFromItem =
+      // @ts-ignore
+      (item === null || item === void 0 || (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.displayName) === 'ProFormComponent' || (item === null || item === void 0 || (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.readonly);
+      var forkProps = isProFromItem ? _objectSpread(_objectSpread({
         key: index,
         ignoreFormItem: true
-      }, item.props || {}), {
+      }, item.props || {}), {}, {
         // 如果不是我们自定义的组件 fieldProps 无法识别
-        fieldProps: __spreadProps(__spreadValues({}, (_c = item == null ? void 0 : item.props) == null ? void 0 : _c.fieldProps), {
-          onChange: (...restParams) => {
-            fieldSetOnChange(restParams[0], index);
+        fieldProps: _objectSpread(_objectSpread({}, item === null || item === void 0 || (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.fieldProps), {}, {
+          onChange: function onChange() {
+            fieldSetOnChange(arguments.length <= 0 ? undefined : arguments[0], index);
           }
         }),
-        value: value == null ? void 0 : value[index],
-        onChange: void 0
-      }) : __spreadProps(__spreadValues({
+        value: value === null || value === void 0 ? void 0 : value[index],
+        onChange: undefined
+      }) : _objectSpread(_objectSpread({
         key: index
-      }, item.props || {}), {
-        value: value == null ? void 0 : value[index],
-        onChange: (itemValue) => {
-          var _a4, _b2;
+      }, item.props || {}), {}, {
+        value: value === null || value === void 0 ? void 0 : value[index],
+        onChange: function onChange(itemValue) {
+          var _props$onChange, _props;
           fieldSetOnChange(itemValue, index);
-          (_b2 = (_a4 = item.props).onChange) == null ? void 0 : _b2.call(_a4, itemValue);
+          (_props$onChange = (_props = item.props).onChange) === null || _props$onChange === void 0 || _props$onChange.call(_props, itemValue);
         }
       });
-      return React.cloneElement(item, forkProps);
+      return /*#__PURE__*/React.cloneElement(item, forkProps);
     }
     return item;
   });
-  const Components = FieldSetType[type];
-  const { RowWrapper } = useGridHelpers(rest);
-  const Wrapper = useCallback(
-    ({ children: dom }) => /* @__PURE__ */ React.createElement(Components, __spreadProps(__spreadValues({}, space), { align: "start", wrap: true }), dom),
-    [Components, space]
-  );
-  return /* @__PURE__ */ React.createElement(RowWrapper, { Wrapper }, list);
+  var Components = FieldSetType[type];
+  var _useGridHelpers = useGridHelpers(rest),
+    RowWrapper = _useGridHelpers.RowWrapper;
+  var Wrapper = useCallback(function (_ref) {
+    var dom = _ref.children;
+    return /*#__PURE__*/_jsx(Components, _objectSpread(_objectSpread({}, space), {}, {
+      align: "start",
+      wrap: true,
+      children: dom
+    }));
+  }, [Components, space]);
+  return /*#__PURE__*/_jsx(RowWrapper, {
+    Wrapper: Wrapper,
+    children: list
+  });
 };
-var BaseProFormFieldSet = React.forwardRef((_a2, ref) => {
-  var _b = _a2, { children, space, valuePropName } = _b, rest = __objRest(_b, ["children", "space", "valuePropName"]);
-  useImperativeHandle(ref, () => ({}));
-  return /* @__PURE__ */ React.createElement(
-    FieldSet,
-    __spreadValues(__spreadProps(__spreadValues({
-      space,
-      valuePropName
-    }, rest.fieldProps), {
-      onChange: void 0
-    }), rest),
-    children
-  );
+var BaseProFormFieldSet = /*#__PURE__*/React.forwardRef(function (_ref2, ref) {
+  var children = _ref2.children,
+    space = _ref2.space,
+    valuePropName = _ref2.valuePropName,
+    rest = _objectWithoutProperties(_ref2, _excluded2);
+  useImperativeHandle(ref, function () {
+    return {};
+  });
+  return /*#__PURE__*/_jsx(FieldSet, _objectSpread(_objectSpread(_objectSpread({
+    space: space,
+    valuePropName: valuePropName
+  }, rest.fieldProps), {}, {
+    // 把 fieldProps 里的重置掉
+    onChange: undefined
+  }, rest), {}, {
+    children: children
+  }));
 });
-var _a;
-var ProFormFieldSet = (_a = warpField) == null ? void 0 : _a(
-  BaseProFormFieldSet
-);
-var FieldSet_default = ProFormFieldSet;
-export {
-  FieldSet_default as default,
-  defaultGetValueFromEvent
-};
+var ProFormFieldSet = (_ref3 = warpField) === null || _ref3 === void 0 ? void 0 : _ref3(BaseProFormFieldSet);
+export default ProFormFieldSet;

package/es/form/components/FormItem/FormItemRender/index.js

@@ -1,110 +1,153 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-
-// src/form/components/FormItem/FormItemRender/index.tsx
-import { Form } from "antd";
-import React from "react";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+var _excluded = ["children"],
+  _excluded2 = ["children"];
+import { Form } from 'antd';
+import React from 'react';
 import ProFormItem from "../index";
-function getControlConfigProps(props = {}) {
-  const valuePropName = props.valuePropName || "value";
-  const trigger = props.trigger || "onChange";
-  const name = props.name;
+import { jsx as _jsx } from "react/jsx-runtime";
+function getControlConfigProps() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var valuePropName = props.valuePropName || 'value';
+  var trigger = props.trigger || 'onChange';
+  var name = props.name;
   return {
-    valuePropName,
-    trigger,
-    name
+    valuePropName: valuePropName,
+    trigger: trigger,
+    name: name
   };
 }
-function useControlModel({ value, onChange }, model) {
+export function useControlModel(_ref, model) {
+  var value = _ref.value,
+    onChange = _ref.onChange;
   if (!Array.isArray(model)) {
-    const p = getControlConfigProps(model);
-    return {
-      [p.valuePropName]: value,
-      [p.trigger]: (e) => {
-        onChange == null ? void 0 : onChange((e == null ? void 0 : e.target) ? e.target[p.valuePropName] : e);
-      }
-    };
+    var p = getControlConfigProps(model);
+    return _defineProperty(_defineProperty({}, p.valuePropName, value), p.trigger, function (e) {
+      onChange === null || onChange === void 0 || onChange(e !== null && e !== void 0 && e.target ? e.target[p.valuePropName] : e);
+    });
   }
-  return model.reduce(
-    (acc, k) => {
-      const p = getControlConfigProps(k);
-      const name = p.name || k;
-      acc[name] = {
-        [p.valuePropName]: value == null ? void 0 : value[name],
-        [p.trigger]: (v) => {
-          onChange == null ? void 0 : onChange(__spreadProps(__spreadValues({}, value), {
-            [name]: (v == null ? void 0 : v.target) ? v.target[p.valuePropName] : v
-          }));
-        }
-      };
-      return acc;
-    },
-    {}
-  );
+  return model.reduce(function (acc, k) {
+    var p = getControlConfigProps(k);
+    var name = p.name || k;
+    acc[name] = _defineProperty(_defineProperty({}, p.valuePropName, value === null || value === void 0 ? void 0 : value[name]), p.trigger, function (v) {
+      onChange === null || onChange === void 0 || onChange(_objectSpread(_objectSpread({}, value), {}, _defineProperty({}, name, v !== null && v !== void 0 && v.target ? v.target[p.valuePropName] : v)));
+    });
+    return acc;
+  }, {});
 }
-function FormControlRender(props) {
-  const _a = props, { children } = _a, restProps = __objRest(_a, ["children"]);
-  const { status, errors, warnings } = Form.Item.useStatus();
-  return children(__spreadValues({
-    status,
-    errors,
-    warnings
+/**
+ * 用在 ProForm.Item 或 Form.Item 于 表单项之间的，用于劫持渲染的函数
+ * ``` tsx
+ * <Form.Item name='name' label='名称'>
+ *   <FormControlRender>
+ *   {
+ *     formItemProps => (
+ *       <div>
+ *         <span>prefix</span>
+ *         <Input {...formItemProps} />
+ *       </div>
+ *     )
+ *   }
+ *   </FormControlRender>
+ * </Form.Item>
+ * ```
+ */
+export function FormControlRender(props) {
+  var children = props.children,
+    restProps = _objectWithoutProperties(props, _excluded);
+  var _Form$Item$useStatus = Form.Item.useStatus(),
+    status = _Form$Item$useStatus.status,
+    errors = _Form$Item$useStatus.errors,
+    warnings = _Form$Item$useStatus.warnings;
+  return children(_objectSpread({
+    status: status,
+    errors: errors,
+    warnings: warnings
   }, restProps));
 }
-function pickControlProps(props) {
+
+/**
+ * 提取props中的 value 和 onChange 属性
+ */
+export function pickControlProps(props) {
   return {
     value: props.value,
-    onChange: (value) => props.onChange((value == null ? void 0 : value.target) ? value.target.value : value)
+    onChange: function onChange(value) {
+      return props.onChange(value !== null && value !== void 0 && value.target ? value.target.value : value);
+    }
   };
 }
-function pickControlPropsWithId(props) {
-  return __spreadProps(__spreadValues({}, pickControlProps(props)), {
+
+/**
+ * 提取props中的 value、onChange 和 id 属性
+ */
+export function pickControlPropsWithId(props) {
+  return _objectSpread(_objectSpread({}, pickControlProps(props)), {}, {
     id: props.id
   });
 }
-function withFormItemRender(Comp) {
-  return function(props) {
-    const _a = props, { children } = _a, restProps = __objRest(_a, ["children"]);
-    return /* @__PURE__ */ React.createElement(Comp, __spreadValues({}, restProps), /* @__PURE__ */ React.createElement(FormControlRender, null, children));
+
+/**
+ * 用于包裹ProForm.Item Form.Item，使其可以使用render props的形式
+ * @description 用法
+ * const FormItem = withFormItemRender(用于包裹ProForm.Item)
+ * ``` tsx
+ * <FormItem name='name' label='名称'>
+ *   {
+ *     formItemProps => (
+ *       <div>
+ *         <span>prefix</span>
+ *         <Input {...formItemProps} />
+ *       </div>
+ *     )
+ *   }
+ * </FormItem>
+ * ```
+ */
+export function withFormItemRender(Comp) {
+  return function (props) {
+    var children = props.children,
+      restProps = _objectWithoutProperties(props, _excluded2);
+    return /*#__PURE__*/_jsx(Comp, _objectSpread(_objectSpread({}, restProps), {}, {
+      children: /*#__PURE__*/_jsx(FormControlRender, {
+        children: children
+      })
+    }));
   };
 }
-var FormItemRender = withFormItemRender(Form.Item);
-var ProFormItemRender = withFormItemRender(ProFormItem);
-export {
-  FormControlRender,
-  FormItemRender,
-  ProFormItemRender,
-  pickControlProps,
-  pickControlPropsWithId,
-  useControlModel,
-  withFormItemRender
-};
+
+/**
+ * 用 withFormItemRender 加工Form.Item，使其拥有render props能力，同时暴露出 status 属性方便自定义组件校验使用
+ *
+ * ``` tsx
+ *   <FormItemRender name='name' label='名称'>
+ *   {
+ *     formItemProps => (
+ *       <div>
+ *         <h3>prefix</h3>
+ *         <textarea {...formItemProps} style={{ borderColor: formItemProps.status === 'error' ? 'red' : undefined }} />
+ *       </div>
+ *     )
+ *   }
+ *   </FormItemRender>
+ * ```
+ */
+export var FormItemRender = withFormItemRender(Form.Item);
+
+/**
+ * 用 withFormItemRender 加工 ProForm.Item，使其拥有render props能力，同时暴露出 status 属性方便自定义组件校验使用
+ * ``` tsx
+ *   <ProFormItemRender name='name' label='名称'>
+ *   {
+ *     formItemProps => (
+ *       <div>
+ *         <h3>prefix</h3>
+ *         <textarea {...formItemProps} style={{ borderColor: formItemProps.status === 'error' ? 'red' : undefined }} />
+ *       </div>
+ *     )
+ *   }
+ *   </ProFormItemRender>
+ * ```
+ */
+export var ProFormItemRender = withFormItemRender(ProFormItem);