@ant-design/pro-components 3.1.0-0 → 3.1.1-0

package/es/descriptions/index.js

@@ -1,10 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["valueEnum", "render", "renderText", "mode", "plain", "dataIndex", "request", "params", "editable"],
-  _excluded2 = ["request", "columns", "params", "dataSource", "onDataSourceChange", "formProps", "editable", "loading", "onLoadingChange", "actionRef", "onRequestError", "emptyText", "contentStyle"];
 import { CheckOutlined, CloseOutlined, EditOutlined } from '@ant-design/icons';
 import { get, toArray } from '@rc-component/util';
 import { ConfigProvider, Descriptions, Space } from 'antd';
@@ -42,10 +35,12 @@ import { createElement as _createElement } from "react";
  * @param item
  * @param entity
  */
-var getDataFromConfig = function getDataFromConfig(item, entity) {
-  var dataIndex = item.dataIndex;
+const getDataFromConfig = (item, entity) => {
+  const {
+    dataIndex
+  } = item;
   if (dataIndex) {
-    var data = Array.isArray(dataIndex) ? get(entity, dataIndex) : entity[dataIndex];
+    const data = Array.isArray(dataIndex) ? get(entity, dataIndex) : entity[dataIndex];
     if (data !== undefined || data !== null) {
       return data;
     }
@@ -58,107 +53,114 @@ var getDataFromConfig = function getDataFromConfig(item, entity) {
  *
  * @param props
  */
-export var FieldRender = function FieldRender(props) {
-  var _proTheme$useToken2;
-  var valueEnum = props.valueEnum,
-    action = props.action,
-    index = props.index,
-    text = props.text,
-    entity = props.entity,
-    mode = props.mode,
-    render = props.render,
-    editableUtils = props.editableUtils,
-    valueType = props.valueType,
-    plain = props.plain,
-    dataIndex = props.dataIndex,
-    request = props.request,
-    formItemRender = props.formItemRender,
-    params = props.params,
-    emptyText = props.emptyText;
-  var form = ProForm.useFormInstance();
-  var _proTheme$useToken = (_proTheme$useToken2 = proTheme.useToken) === null || _proTheme$useToken2 === void 0 ? void 0 : _proTheme$useToken2.call(proTheme),
-    token = _proTheme$useToken.token;
-  var fieldConfig = {
-    text: text,
-    valueEnum: valueEnum,
+export const FieldRender = props => {
+  const {
+    valueEnum,
+    action,
+    index,
+    text,
+    entity,
+    mode,
+    render,
+    editableUtils,
+    valueType,
+    plain,
+    dataIndex,
+    request,
+    formItemRender,
+    params,
+    emptyText
+  } = props;
+  const form = ProForm.useFormInstance();
+  const {
+    token
+  } = proTheme.useToken?.();
+  const fieldConfig = {
+    text,
+    valueEnum,
     mode: mode || 'read',
     proFieldProps: {
-      emptyText: emptyText,
-      render: render ? function (finText) {
-        return render === null || render === void 0 ? void 0 : render(finText, entity, index, action, _objectSpread(_objectSpread({}, props), {}, {
+      emptyText,
+      render: render ? finText => {
+        return render?.(finText, entity, index, action, {
+          ...props,
           type: 'descriptions'
-        }));
+        });
       } : undefined
     },
     ignoreFormItem: true,
-    valueType: valueType,
-    request: request,
-    params: params,
-    plain: plain
+    valueType,
+    request,
+    params,
+    plain
   };
 
   /** 如果是只读模式，fieldProps 的 form是空的，所以需要兜底处理 */
   if (mode === 'read' || !mode || valueType === 'option') {
-    var fieldProps = getFieldPropsOrFormItemProps(props.fieldProps, undefined, _objectSpread(_objectSpread({}, props), {}, {
+    const fieldProps = getFieldPropsOrFormItemProps(props.fieldProps, undefined, {
+      ...props,
       rowKey: dataIndex,
       isEditable: false
-    }));
-    return /*#__PURE__*/_jsx(ProFormField, _objectSpread(_objectSpread({
-      name: dataIndex
-    }, fieldConfig), {}, {
+    });
+    return /*#__PURE__*/_jsx(ProFormField, {
+      name: dataIndex,
+      ...fieldConfig,
       fieldProps: fieldProps
-    }));
+    });
   }
-  var renderDom = function renderDom() {
-    var _editableUtils$action;
-    var formItemProps = getFieldPropsOrFormItemProps(props.formItemProps, form, _objectSpread(_objectSpread({}, props), {}, {
+  const renderDom = () => {
+    const formItemProps = getFieldPropsOrFormItemProps(props.formItemProps, form, {
+      ...props,
       rowKey: dataIndex,
       isEditable: true
-    }));
-    var fieldProps = getFieldPropsOrFormItemProps(props.fieldProps, form, _objectSpread(_objectSpread({}, props), {}, {
+    });
+    const fieldProps = getFieldPropsOrFormItemProps(props.fieldProps, form, {
+      ...props,
       rowKey: dataIndex,
       isEditable: true
-    }));
+    });
     return /*#__PURE__*/_jsxs("div", {
       style: {
         display: 'flex',
         gap: token.marginXS,
         alignItems: 'baseline'
       },
-      children: [/*#__PURE__*/_jsx(InlineErrorFormItem, _objectSpread(_objectSpread({
-        name: dataIndex
-      }, formItemProps), {}, {
-        style: _objectSpread({
-          margin: 0
-        }, (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.style) || {}),
-        initialValue: text || (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.initialValue),
-        children: /*#__PURE__*/_jsx(ProFormField, _objectSpread(_objectSpread({}, fieldConfig), {}, {
-          proFieldProps: _objectSpread({}, fieldConfig.proFieldProps),
-          formItemRender: formItemRender ? function () {
-            return formItemRender === null || formItemRender === void 0 ? void 0 : formItemRender(_objectSpread(_objectSpread({}, props), {}, {
-              type: 'descriptions'
-            }), {
-              isEditable: true,
-              recordKey: dataIndex,
-              record: form.getFieldValue([dataIndex].flat(1)),
-              defaultRender: function defaultRender() {
-                return /*#__PURE__*/_jsx(ProFormField, _objectSpread(_objectSpread({}, fieldConfig), {}, {
-                  fieldProps: fieldProps
-                }));
-              },
-              type: 'descriptions'
-            }, form);
-          } : undefined,
+      children: [/*#__PURE__*/_jsx(InlineErrorFormItem, {
+        name: dataIndex,
+        ...formItemProps,
+        style: {
+          margin: 0,
+          ...(formItemProps?.style || {})
+        },
+        initialValue: text || formItemProps?.initialValue,
+        children: /*#__PURE__*/_jsx(ProFormField, {
+          ...fieldConfig,
+          proFieldProps: {
+            ...fieldConfig.proFieldProps
+          },
+          formItemRender: formItemRender ? () => formItemRender?.({
+            ...props,
+            type: 'descriptions'
+          }, {
+            isEditable: true,
+            recordKey: dataIndex,
+            record: form.getFieldValue([dataIndex].flat(1)),
+            defaultRender: () => /*#__PURE__*/_jsx(ProFormField, {
+              ...fieldConfig,
+              fieldProps: fieldProps
+            }),
+            type: 'descriptions'
+          }, form) : undefined,
           fieldProps: fieldProps
-        }))
-      })), /*#__PURE__*/_jsx("div", {
+        })
+      }), /*#__PURE__*/_jsx("div", {
         style: {
           display: 'flex',
           maxHeight: token.controlHeight,
           alignItems: 'center',
           gap: token.marginXS
         },
-        children: editableUtils === null || editableUtils === void 0 || (_editableUtils$action = editableUtils.actionRender) === null || _editableUtils$action === void 0 ? void 0 : _editableUtils$action.call(editableUtils, dataIndex || index, {
+        children: editableUtils?.actionRender?.(dataIndex || index, {
           cancelText: /*#__PURE__*/_jsx(CloseOutlined, {}),
           saveText: /*#__PURE__*/_jsx(CheckOutlined, {}),
           deleteText: false
@@ -177,52 +179,53 @@ export var FieldRender = function FieldRender(props) {
     children: renderDom()
   });
 };
-var schemaToDescriptionsItem = function schemaToDescriptionsItem(items, entity, action, editableUtils, emptyText) {
-  var _items$map;
-  var options = [];
+const schemaToDescriptionsItem = (items, entity, action, editableUtils, emptyText) => {
+  const options = [];
   // 因为 Descriptions 只是个语法糖，children 是不会执行的，所以需要这里处理一下
-  var children = items === null || items === void 0 || (_items$map = items.map) === null || _items$map === void 0 ? void 0 : _items$map.call(items, function (item, index) {
-    var _getDataFromConfig, _restItem$label;
+  const children = items?.map?.((item, index) => {
     if ( /*#__PURE__*/React.isValidElement(item)) {
       return {
         children: item
       };
     }
-    var _ref = item,
-      valueEnum = _ref.valueEnum,
-      render = _ref.render,
-      renderText = _ref.renderText,
-      mode = _ref.mode,
-      plain = _ref.plain,
-      dataIndex = _ref.dataIndex,
-      request = _ref.request,
-      params = _ref.params,
-      editable = _ref.editable,
-      restItem = _objectWithoutProperties(_ref, _excluded);
-    var defaultData = (_getDataFromConfig = getDataFromConfig(item, entity)) !== null && _getDataFromConfig !== void 0 ? _getDataFromConfig : restItem.children;
-    var text = renderText ? renderText(defaultData, entity, index, action) : defaultData;
-    var title = typeof restItem.title === 'function' ? restItem.title(item, 'descriptions', null) : restItem.title;
+    const {
+      valueEnum,
+      render,
+      renderText,
+      mode,
+      plain,
+      dataIndex,
+      request,
+      params,
+      editable,
+      ...restItem
+    } = item;
+    const defaultData = getDataFromConfig(item, entity) ?? restItem.children;
+    const text = renderText ? renderText(defaultData, entity, index, action) : defaultData;
+    const title = typeof restItem.title === 'function' ? restItem.title(item, 'descriptions', null) : restItem.title;
 
     //  dataIndex 无所谓是否存在
     // 有些时候不需要 dataIndex 可以直接 render
-    var valueType = typeof restItem.valueType === 'function' ? restItem.valueType(entity || {}, 'descriptions') : restItem.valueType;
-    var isEditable = editableUtils === null || editableUtils === void 0 ? void 0 : editableUtils.isEditable(dataIndex || index);
-    var fieldMode = mode || isEditable ? 'edit' : 'read';
-    var showEditIcon = editableUtils && fieldMode === 'read' && editable !== false && (editable === null || editable === void 0 ? void 0 : editable(text, entity, index)) !== false;
-    var Component = showEditIcon ? Space : React.Fragment;
-    var contentDom = fieldMode === 'edit' ? text : genCopyable(text, item, text);
-    var key = restItem.key || ((_restItem$label = restItem.label) === null || _restItem$label === void 0 ? void 0 : _restItem$label.toString()) || index;
-    var label = (title || restItem.label || restItem.tooltip) && /*#__PURE__*/_jsx(LabelIconTip, {
+    const valueType = typeof restItem.valueType === 'function' ? restItem.valueType(entity || {}, 'descriptions') : restItem.valueType;
+    const isEditable = editableUtils?.isEditable(dataIndex || index);
+    const fieldMode = mode || isEditable ? 'edit' : 'read';
+    const showEditIcon = editableUtils && fieldMode === 'read' && editable !== false && editable?.(text, entity, index) !== false;
+    const Component = showEditIcon ? Space : React.Fragment;
+    const contentDom = fieldMode === 'edit' ? text : genCopyable(text, item, text);
+    const key = restItem.key || restItem.label?.toString() || index;
+    const label = (title || restItem.label || restItem.tooltip) && /*#__PURE__*/_jsx(LabelIconTip, {
       label: title || restItem.label,
       tooltip: restItem.tooltip,
       ellipsis: item.ellipsis
     });
-    var field = valueType !== 'option' ? _objectSpread(_objectSpread({}, restItem), {}, {
-      key: key,
-      label: label,
+    const field = valueType !== 'option' ? {
+      ...restItem,
+      key,
+      label,
       children: /*#__PURE__*/_jsxs(Component, {
-        children: [/*#__PURE__*/_createElement(FieldRender, _objectSpread(_objectSpread({}, item), {}, {
-          key: item === null || item === void 0 ? void 0 : item.key,
+        children: [/*#__PURE__*/_createElement(FieldRender, {
+          ...item,
+          key: item?.key,
           dataIndex: item.dataIndex || index,
           mode: fieldMode,
           text: contentDom,
@@ -232,17 +235,19 @@ var schemaToDescriptionsItem = function schemaToDescriptionsItem(items, entity,
           emptyText: emptyText,
           action: action,
           editableUtils: editableUtils
-        })), showEditIcon && /*#__PURE__*/_jsx(EditOutlined, {
-          onClick: function onClick() {
-            editableUtils === null || editableUtils === void 0 || editableUtils.startEditable(dataIndex || index);
+        }), showEditIcon && /*#__PURE__*/_jsx(EditOutlined, {
+          onClick: () => {
+            editableUtils?.startEditable(dataIndex || index);
           }
         })]
       })
-    }) : /*#__PURE__*/_createElement(Descriptions.Item, _objectSpread(_objectSpread({}, restItem), {}, {
+    } : /*#__PURE__*/_createElement(Descriptions.Item, {
+      ...restItem,
       key: key,
       label: label
-    }), /*#__PURE__*/_jsxs(Component, {
-      children: [/*#__PURE__*/_jsx(FieldRender, _objectSpread(_objectSpread({}, item), {}, {
+    }, /*#__PURE__*/_jsxs(Component, {
+      children: [/*#__PURE__*/_jsx(FieldRender, {
+        ...item,
         dataIndex: item.dataIndex || index,
         mode: fieldMode,
         text: contentDom,
@@ -251,9 +256,9 @@ var schemaToDescriptionsItem = function schemaToDescriptionsItem(items, entity,
         index: index,
         action: action,
         editableUtils: editableUtils
-      })), showEditIcon && valueType !== 'option' && /*#__PURE__*/_jsx(EditOutlined, {
-        onClick: function onClick() {
-          editableUtils === null || editableUtils === void 0 || editableUtils.startEditable(dataIndex || index);
+      }), showEditIcon && valueType !== 'option' && /*#__PURE__*/_jsx(EditOutlined, {
+        onClick: () => {
+          editableUtils?.startEditable(dataIndex || index);
         }
       })]
     }));
@@ -263,94 +268,72 @@ var schemaToDescriptionsItem = function schemaToDescriptionsItem(items, entity,
       return null;
     }
     return field;
-  }).filter(function (item) {
-    return item;
-  });
+  }).filter(item => item);
   return {
     // 空数组传递还是会被判定为有值
-    options: options !== null && options !== void 0 && options.length ? options : null,
-    children: children
+    options: options?.length ? options : null,
+    children
   };
 };
-var ProDescriptionsItem = function ProDescriptionsItem(props) {
-  return /*#__PURE__*/_jsx(Descriptions.Item, _objectSpread(_objectSpread({}, props), {}, {
+const ProDescriptionsItem = props => {
+  return /*#__PURE__*/_jsx(Descriptions.Item, {
+    ...props,
     children: props.children
-  }));
+  });
 };
 ProDescriptionsItem.displayName = 'ProDescriptionsItem';
-var DefaultProDescriptionsDom = function DefaultProDescriptionsDom(dom) {
-  return dom.children;
-};
-var ProDescriptions = function ProDescriptions(props) {
-  var _props$editable;
-  var request = props.request,
-    columns = props.columns,
-    params = props.params,
-    dataSource = props.dataSource,
-    onDataSourceChange = props.onDataSourceChange,
-    formProps = props.formProps,
-    editable = props.editable,
-    loading = props.loading,
-    onLoadingChange = props.onLoadingChange,
-    actionRef = props.actionRef,
-    onRequestError = props.onRequestError,
-    emptyText = props.emptyText,
-    contentStyle = props.contentStyle,
-    rest = _objectWithoutProperties(props, _excluded2);
-  var proContext = useContext(ProConfigContext);
-  var context = useContext(ConfigProvider.ConfigContext);
-  var action = useFetchData( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var data;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          if (!request) {
-            _context.next = 6;
-            break;
-          }
-          _context.next = 3;
-          return request(params || {});
-        case 3:
-          _context.t0 = _context.sent;
-          _context.next = 7;
-          break;
-        case 6:
-          _context.t0 = {
-            data: {}
-          };
-        case 7:
-          data = _context.t0;
-          return _context.abrupt("return", data);
-        case 9:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), {
-    onRequestError: onRequestError,
+const DefaultProDescriptionsDom = dom => dom.children;
+const ProDescriptions = props => {
+  const {
+    request,
+    columns,
+    params,
+    dataSource,
+    onDataSourceChange,
+    formProps,
+    editable,
+    loading,
+    onLoadingChange,
+    actionRef,
+    onRequestError,
+    emptyText,
+    contentStyle,
+    ...rest
+  } = props;
+  const proContext = useContext(ProConfigContext);
+  const context = useContext(ConfigProvider.ConfigContext);
+  const action = useFetchData(async () => {
+    const data = request ? await request(params || {}) : {
+      data: {}
+    };
+    return data;
+  }, {
+    onRequestError,
     effects: [stringify(params)],
     manual: !request,
-    dataSource: dataSource,
-    loading: loading,
-    onLoadingChange: onLoadingChange,
-    onDataSourceChange: onDataSourceChange
+    dataSource,
+    loading,
+    onLoadingChange,
+    onDataSourceChange
   });
 
   /*
    * 可编辑行的相关配置
    */
-  var editableUtils = useEditableMap(_objectSpread(_objectSpread({}, props.editable), {}, {
+  const editableUtils = useEditableMap({
+    ...props.editable,
     childrenColumnName: undefined,
     dataSource: action.dataSource,
     setDataSource: action.setDataSource
-  }));
+  });
 
   /** 支持 reload 的功能 */
-  useEffect(function () {
+  useEffect(() => {
     if (actionRef) {
-      actionRef.current = _objectSpread({
-        reload: action.reload
-      }, editableUtils);
+      actionRef.current = {
+        reload: action.reload,
+        ...editableUtils
+      };
     }
   }, [action, actionRef, editableUtils]);
 
@@ -363,80 +346,86 @@ var ProDescriptions = function ProDescriptions(props) {
       pageHeader: false
     });
   }
-  var getColumns = function getColumns() {
+  const getColumns = () => {
     // 因为 Descriptions 只是个语法糖，children 是不会执行的，所以需要这里处理一下
-    var childrenColumns = toArray(props.children).filter(Boolean).map(function (item) {
-      var _type;
+    const childrenColumns = toArray(props.children).filter(Boolean).map(item => {
       if (! /*#__PURE__*/React.isValidElement(item)) {
         return item;
       }
-      var _ref3 = item === null || item === void 0 ? void 0 : item.props,
-        valueEnum = _ref3.valueEnum,
-        valueType = _ref3.valueType,
-        dataIndex = _ref3.dataIndex,
-        ellipsis = _ref3.ellipsis,
-        copyable = _ref3.copyable,
-        itemRequest = _ref3.request;
-      if (!valueType && !valueEnum && !dataIndex && !itemRequest && !ellipsis && !copyable && ((_type = item.type) === null || _type === void 0 ? void 0 : _type.displayName) !== 'ProDescriptionsItem') {
+      const {
+        valueEnum,
+        valueType,
+        dataIndex,
+        ellipsis,
+        copyable,
+        request: itemRequest
+      } = item?.props;
+      if (!valueType && !valueEnum && !dataIndex && !itemRequest && !ellipsis && !copyable && item.type?.displayName !== 'ProDescriptionsItem') {
         return item;
       }
-      return _objectSpread(_objectSpread({}, item === null || item === void 0 ? void 0 : item.props), {}, {
+      return {
+        ...item?.props,
         entity: dataSource
-      });
+      };
     });
-    return [].concat(_toConsumableArray(columns || []), _toConsumableArray(childrenColumns)).filter(function (item) {
+    return [...(columns || []), ...childrenColumns].filter(item => {
       if (!item) return false;
-      if (item !== null && item !== void 0 && item.valueType && ['index', 'indexBorder'].includes(item === null || item === void 0 ? void 0 : item.valueType)) {
+      if (item?.valueType && ['index', 'indexBorder'].includes(item?.valueType)) {
         return false;
       }
-      return !(item !== null && item !== void 0 && item.hideInDescriptions);
-    }).sort(function (a, b) {
+      return !item?.hideInDescriptions;
+    }).sort((a, b) => {
       if (b.order || a.order) {
         return (b.order || 0) - (a.order || 0);
       }
       return (b.index || 0) - (a.index || 0);
     });
   };
-  var _schemaToDescriptions = schemaToDescriptionsItem(getColumns(), action.dataSource || {}, (actionRef === null || actionRef === void 0 ? void 0 : actionRef.current) || action, editable ? editableUtils : undefined, props.emptyText),
-    options = _schemaToDescriptions.options,
-    children = _schemaToDescriptions.children;
+  const {
+    options,
+    children
+  } = schemaToDescriptionsItem(getColumns(), action.dataSource || {}, actionRef?.current || action, editable ? editableUtils : undefined, props.emptyText);
 
   /** 如果不是可编辑模式，没必要注入 ProForm */
-  var FormComponent = editable ? ProForm : DefaultProDescriptionsDom;
+  const FormComponent = editable ? ProForm : DefaultProDescriptionsDom;
 
   /** 即使组件返回null了, 在传递的过程中还是会被Description检测到为有值 */
-  var title = null;
+  let title = null;
   if (rest.title || rest.tooltip) {
     title = /*#__PURE__*/_jsx(LabelIconTip, {
       label: rest.title,
       tooltip: rest.tooltip
     });
   }
-  var className = context.getPrefixCls('pro-descriptions');
+  const className = context.getPrefixCls('pro-descriptions');
   return /*#__PURE__*/_jsx(ErrorBoundary, {
     children: /*#__PURE__*/_jsx(ProConfigProvider, {
-      valueTypeMap: _objectSpread(_objectSpread({}, proContext.valueTypeMap), ValueTypeToComponent),
-      children: /*#__PURE__*/_jsx(FormComponent, _objectSpread(_objectSpread({
-        form: (_props$editable = props.editable) === null || _props$editable === void 0 ? void 0 : _props$editable.form,
+      valueTypeMap: {
+        ...proContext.valueTypeMap,
+        ...ValueTypeToComponent
+      },
+      children: /*#__PURE__*/_jsx(FormComponent, {
+        form: props.editable?.form,
         component: false,
-        submitter: false
-      }, formProps), {}, {
+        submitter: false,
+        ...formProps,
         onFinish: undefined,
-        children: /*#__PURE__*/_jsx(Descriptions, _objectSpread(_objectSpread({
-          className: className
-        }, rest), {}, {
+        children: /*#__PURE__*/_jsx(Descriptions, {
+          className: className,
+          ...rest,
           styles: {
-            content: _objectSpread({
-              minWidth: 0
-            }, contentStyle || {})
+            content: {
+              minWidth: 0,
+              ...(contentStyle || {})
+            }
           },
           extra: rest.extra ? /*#__PURE__*/_jsxs(Space, {
             children: [options, rest.extra]
           }) : options,
           title: title,
           items: children
-        }))
-      }), "form")
+        })
+      }, "form")
     })
   });
 };