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

package/lib/field/FieldHOC/index.js

@@ -1,35 +1,29 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
 function FieldHOC(props) {
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    labelTrigger = _useState2[0],
-    setLabelTrigger = _useState2[1];
-  var lightLabel = (0, _react.useRef)(null);
+  const [labelTrigger, setLabelTrigger] = (0, _react.useState)(false);
+  const lightLabel = (0, _react.useRef)(null);
 
   // 是label且不是label里面的clear图标触发事件
-  var isTriggeredByLabel = (0, _react.useCallback)(function (e) {
-    var _lightLabel$current, _lightLabel$current2;
+  const isTriggeredByLabel = (0, _react.useCallback)(e => {
     // 两条语句结果分别命名，可读性好点
-    var isLabelMouseDown = (_lightLabel$current = lightLabel.current) === null || _lightLabel$current === void 0 || (_lightLabel$current = _lightLabel$current.labelRef) === null || _lightLabel$current === void 0 || (_lightLabel$current = _lightLabel$current.current) === null || _lightLabel$current === void 0 ? void 0 : _lightLabel$current.contains(e.target);
-    var isClearMouseDown = (_lightLabel$current2 = lightLabel.current) === null || _lightLabel$current2 === void 0 || (_lightLabel$current2 = _lightLabel$current2.clearRef) === null || _lightLabel$current2 === void 0 || (_lightLabel$current2 = _lightLabel$current2.current) === null || _lightLabel$current2 === void 0 ? void 0 : _lightLabel$current2.contains(e.target);
+    const isLabelMouseDown = lightLabel.current?.labelRef?.current?.contains(e.target);
+    const isClearMouseDown = lightLabel.current?.clearRef?.current?.contains(e.target);
     return isLabelMouseDown && !isClearMouseDown;
   }, [lightLabel]);
-  var handleMouseDown = function handleMouseDown(e) {
+  const handleMouseDown = e => {
     if (isTriggeredByLabel(e)) {
       setLabelTrigger(true);
     }
   };
-  var handleMouseUp = function handleMouseUp() {
+  const handleMouseUp = () => {
     setLabelTrigger(false);
   };
   if (props.isLight) {
@@ -37,8 +31,8 @@ function FieldHOC(props) {
       onMouseDown: handleMouseDown,
       onMouseUp: handleMouseUp,
       children: /*#__PURE__*/_react.default.cloneElement(props.children, {
-        labelTrigger: labelTrigger,
-        lightLabel: lightLabel
+        labelTrigger,
+        lightLabel
       })
     });
   }

package/lib/field/PureProField.js

@@ -1,14 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pureRenderText = exports.PureProField = void 0;
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _advancedFormat = _interopRequireDefault(require("dayjs/plugin/advancedFormat"));
 var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
@@ -20,8 +17,6 @@ var _provider = _interopRequireDefault(require("../provider"));
 var _utils = require("../utils");
 var _Text = _interopRequireDefault(require("./components/Text"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["text", "valueType", "mode", "onChange", "formItemRender", "value", "readonly", "fieldProps"],
-  _excluded2 = ["placeholder"];
 _dayjs.default.extend(_localeData.default);
 _dayjs.default.extend(_advancedFormat.default);
 _dayjs.default.extend(_isoWeek.default);
@@ -40,19 +35,22 @@ _dayjs.default.extend(_weekday.default);
  * @param dataValue
  * @param valueType
  */
-var pureRenderText = exports.pureRenderText = function pureRenderText(dataValue, valueType, props, valueTypeMap) {
-  var _props$mode = props.mode,
-    mode = _props$mode === void 0 ? 'read' : _props$mode,
-    _props$emptyText = props.emptyText,
-    emptyText = _props$emptyText === void 0 ? '-' : _props$emptyText;
+const pureRenderText = (dataValue, valueType, props, valueTypeMap) => {
+  const {
+    mode = 'read',
+    emptyText = '-'
+  } = props;
   if (emptyText !== false && mode === 'read' && valueType !== 'option' && valueType !== 'switch') {
     if (typeof dataValue !== 'boolean' && typeof dataValue !== 'number' && !dataValue) {
-      var fieldProps = props.fieldProps,
-        render = props.render;
+      const {
+        fieldProps,
+        render
+      } = props;
       if (render) {
-        return render(dataValue, (0, _objectSpread2.default)({
-          mode: mode
-        }, fieldProps), /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        return render(dataValue, {
+          mode,
+          ...fieldProps
+        }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
           children: emptyText
         }));
       }
@@ -64,103 +62,107 @@ var pureRenderText = exports.pureRenderText = function pureRenderText(dataValue,
 
   // eslint-disable-next-line no-param-reassign
   delete props.emptyText;
-  if ((0, _typeof2.default)(valueType) === 'object') {
+  if (typeof valueType === 'object') {
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    return pureRenderText(dataValue, valueType.type, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, valueType), props), valueTypeMap);
+    return pureRenderText(dataValue, valueType.type, {
+      ...valueType,
+      ...props
+    }, valueTypeMap);
   }
-  var customValueTypeConfig = valueTypeMap && valueTypeMap[valueType];
+  const customValueTypeConfig = valueTypeMap && valueTypeMap[valueType];
   if (customValueTypeConfig) {
     // eslint-disable-next-line no-param-reassign
     delete props.ref;
     if (mode === 'read') {
-      var _customValueTypeConfi;
-      var readDom = (_customValueTypeConfi = customValueTypeConfig.render) === null || _customValueTypeConfi === void 0 ? void 0 : _customValueTypeConfi.call(customValueTypeConfig, dataValue, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        text: dataValue
-      }, props), {}, {
+      const readDom = customValueTypeConfig.render?.(dataValue, {
+        text: dataValue,
+        ...props,
         mode: mode || 'read'
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
         children: dataValue
       }));
-      if (props !== null && props !== void 0 && props.render) {
-        var _props$render;
-        return (_props$render = props.render) === null || _props$render === void 0 ? void 0 : _props$render.call(props, dataValue, (0, _objectSpread2.default)({
-          text: dataValue
-        }, props), readDom);
+      if (props?.render) {
+        return props.render?.(dataValue, {
+          text: dataValue,
+          ...props
+        }, readDom);
       }
       return readDom;
     }
     if (mode === 'update' || mode === 'edit') {
-      var _customValueTypeConfi2;
-      var dom = (_customValueTypeConfi2 = customValueTypeConfig.formItemRender) === null || _customValueTypeConfi2 === void 0 ? void 0 : _customValueTypeConfi2.call(customValueTypeConfig, dataValue, (0, _objectSpread2.default)({
-        text: dataValue
-      }, props), /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      const dom = customValueTypeConfig.formItemRender?.(dataValue, {
+        text: dataValue,
+        ...props
+      }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
         children: dataValue
       }));
-      if (props !== null && props !== void 0 && props.formItemRender) {
-        var _props$formItemRender;
-        return (_props$formItemRender = props.formItemRender) === null || _props$formItemRender === void 0 ? void 0 : _props$formItemRender.call(props, dataValue, (0, _objectSpread2.default)({
-          text: dataValue
-        }, props), dom);
+      if (props?.formItemRender) {
+        return props.formItemRender?.(dataValue, {
+          text: dataValue,
+          ...props
+        }, dom);
       }
       return dom;
     }
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Text.default, (0, _objectSpread2.default)({
-    text: dataValue
-  }, props));
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Text.default, {
+    text: dataValue,
+    ...props
+  });
 };
 
 /** ProField 的类型 */
-
-var ProFieldComponent = function ProFieldComponent(_ref, ref) {
-  var _ref2, _fieldProps$value, _ref3, _rest$placeholder, _rest$placeholder2;
-  var text = _ref.text,
-    _ref$valueType = _ref.valueType,
-    valueType = _ref$valueType === void 0 ? 'text' : _ref$valueType,
-    _ref$mode = _ref.mode,
-    mode = _ref$mode === void 0 ? 'read' : _ref$mode,
-    onChange = _ref.onChange,
-    formItemRender = _ref.formItemRender,
-    value = _ref.value,
-    readonly = _ref.readonly,
-    restFieldProps = _ref.fieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var context = (0, _react.useContext)(_provider.default);
-  var onChangeCallBack = (0, _utils.useRefFunction)(function () {
-    var _restFieldProps$onCha;
-    for (var _len = arguments.length, restParams = new Array(_len), _key = 0; _key < _len; _key++) {
-      restParams[_key] = arguments[_key];
-    }
-    restFieldProps === null || restFieldProps === void 0 || (_restFieldProps$onCha = restFieldProps.onChange) === null || _restFieldProps$onCha === void 0 || _restFieldProps$onCha.call.apply(_restFieldProps$onCha, [restFieldProps].concat(restParams));
-    onChange === null || onChange === void 0 || onChange.apply(void 0, restParams);
+exports.pureRenderText = pureRenderText;
+const ProFieldComponent = ({
+  text,
+  valueType = 'text',
+  mode = 'read',
+  onChange,
+  formItemRender,
+  value,
+  readonly,
+  fieldProps: restFieldProps,
+  ...rest
+}, ref) => {
+  const context = (0, _react.useContext)(_provider.default);
+  const onChangeCallBack = (0, _utils.useRefFunction)((...restParams) => {
+    restFieldProps?.onChange?.(...restParams);
+    onChange?.(...restParams);
   });
-  var fieldProps = (0, _utils.useDeepCompareMemo)(function () {
-    return (value !== undefined || restFieldProps) && (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      value: value
-    }, (0, _utils.omitUndefined)(restFieldProps)), {}, {
+  const fieldProps = (0, _utils.useDeepCompareMemo)(() => {
+    return (value !== undefined || restFieldProps) && {
+      value,
+      // fieldProps 优先级更高，在类似 LightFilter 场景下需要覆盖默认的 value 和 onChange
+      ...(0, _utils.omitUndefined)(restFieldProps),
       onChange: onChangeCallBack
-    });
+    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [value, restFieldProps, onChangeCallBack]);
-  var renderedDom = pureRenderText(mode === 'edit' ? (_ref2 = (_fieldProps$value = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.value) !== null && _fieldProps$value !== void 0 ? _fieldProps$value : text) !== null && _ref2 !== void 0 ? _ref2 : '' : (_ref3 = text !== null && text !== void 0 ? text : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.value) !== null && _ref3 !== void 0 ? _ref3 : '', valueType || 'text', (0, _utils.omitUndefined)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    ref: ref
-  }, rest), {}, {
+  const renderedDom = pureRenderText(mode === 'edit' ? fieldProps?.value ?? text ?? '' : text ?? fieldProps?.value ?? '', valueType || 'text', (0, _utils.omitUndefined)({
+    ref,
+    ...rest,
     mode: readonly ? 'read' : mode,
-    formItemRender: formItemRender ? function (curText, props, dom) {
-      var _placeholder = props.placeholder,
-        restProps = (0, _objectWithoutProperties2.default)(props, _excluded2);
-      var newDom = formItemRender(curText, restProps, dom);
+    formItemRender: formItemRender ? (curText, props, dom) => {
+      const {
+        placeholder: _placeholder,
+        ...restProps
+      } = props;
+      const newDom = formItemRender(curText, restProps, dom);
       // formItemRender 之后的dom可能没有props，这里会帮忙注入一下
-      if ( /*#__PURE__*/_react.default.isValidElement(newDom)) return /*#__PURE__*/_react.default.cloneElement(newDom, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, fieldProps), newDom.props || {}));
+      if ( /*#__PURE__*/_react.default.isValidElement(newDom)) return /*#__PURE__*/_react.default.cloneElement(newDom, {
+        ...fieldProps,
+        ...(newDom.props || {})
+      });
       return newDom;
     } : undefined,
-    placeholder: formItemRender ? undefined : (_rest$placeholder = rest === null || rest === void 0 ? void 0 : rest.placeholder) !== null && _rest$placeholder !== void 0 ? _rest$placeholder : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder,
-    fieldProps: (0, _utils.pickProProps)((0, _utils.omitUndefined)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, fieldProps), {}, {
-      placeholder: formItemRender ? undefined : (_rest$placeholder2 = rest === null || rest === void 0 ? void 0 : rest.placeholder) !== null && _rest$placeholder2 !== void 0 ? _rest$placeholder2 : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder
-    })))
-  })), context.valueTypeMap || {});
+    placeholder: formItemRender ? undefined : rest?.placeholder ?? fieldProps?.placeholder,
+    fieldProps: (0, _utils.pickProProps)((0, _utils.omitUndefined)({
+      ...fieldProps,
+      placeholder: formItemRender ? undefined : rest?.placeholder ?? fieldProps?.placeholder
+    }))
+  }), context.valueTypeMap || {});
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
     children: renderedDom
   });
 };
-var PureProField = exports.PureProField = /*#__PURE__*/_react.default.forwardRef(ProFieldComponent);
+const PureProField = exports.PureProField = /*#__PURE__*/_react.default.forwardRef(ProFieldComponent);