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

package/es/field/FieldHOC/index.js

@@ -1,38 +1,42 @@
-// src/field/FieldHOC/index.tsx
-import React, { useCallback, useRef, useState } from "react";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useCallback, useRef, useState } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 function FieldHOC(props) {
-  const [labelTrigger, setLabelTrigger] = useState(false);
-  const lightLabel = useRef(null);
-  const isTriggeredByLabel = useCallback(
-    (e) => {
-      var _a, _b, _c, _d, _e, _f;
-      const isLabelMouseDown = (_c = (_b = (_a = lightLabel.current) == null ? void 0 : _a.labelRef) == null ? void 0 : _b.current) == null ? void 0 : _c.contains(
-        e.target
-      );
-      const isClearMouseDown = (_f = (_e = (_d = lightLabel.current) == null ? void 0 : _d.clearRef) == null ? void 0 : _e.current) == null ? void 0 : _f.contains(
-        e.target
-      );
-      return isLabelMouseDown && !isClearMouseDown;
-    },
-    [lightLabel]
-  );
-  const handleMouseDown = (e) => {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    labelTrigger = _useState2[0],
+    setLabelTrigger = _useState2[1];
+  var lightLabel = useRef(null);
+
+  // 是label且不是label里面的clear图标触发事件
+  var isTriggeredByLabel = useCallback(function (e) {
+    var _lightLabel$current, _lightLabel$current2;
+    // 两条语句结果分别命名，可读性好点
+    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);
+    return isLabelMouseDown && !isClearMouseDown;
+  }, [lightLabel]);
+  var handleMouseDown = function handleMouseDown(e) {
     if (isTriggeredByLabel(e)) {
       setLabelTrigger(true);
     }
   };
-  const handleMouseUp = () => {
+  var handleMouseUp = function handleMouseUp() {
     setLabelTrigger(false);
   };
   if (props.isLight) {
-    return /* @__PURE__ */ React.createElement("div", { onMouseDown: handleMouseDown, onMouseUp: handleMouseUp }, React.cloneElement(props.children, {
-      labelTrigger,
-      lightLabel
-    }));
+    return /*#__PURE__*/_jsx("div", {
+      onMouseDown: handleMouseDown,
+      onMouseUp: handleMouseUp,
+      children: /*#__PURE__*/React.cloneElement(props.children, {
+        labelTrigger: labelTrigger,
+        lightLabel: lightLabel
+      })
+    });
   }
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, props.children);
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: props.children
+  });
 }
-var FieldHOC_default = FieldHOC;
-export {
-  FieldHOC_default as default
-};
+export default FieldHOC;

package/es/field/PureProField.js

@@ -1,190 +1,159 @@
-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/field/PureProField.tsx
-import dayjs from "dayjs";
-import advancedFormat from "dayjs/plugin/advancedFormat";
-import isoWeek from "dayjs/plugin/isoWeek";
-import localeData from "dayjs/plugin/localeData";
-import weekday from "dayjs/plugin/weekday";
-import weekOfYear from "dayjs/plugin/weekOfYear";
-import React, { useContext } from "react";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["text", "valueType", "mode", "onChange", "formItemRender", "value", "readonly", "fieldProps"],
+  _excluded2 = ["placeholder"];
+import dayjs from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+import isoWeek from 'dayjs/plugin/isoWeek';
+import localeData from 'dayjs/plugin/localeData';
+import weekday from 'dayjs/plugin/weekday';
+import weekOfYear from 'dayjs/plugin/weekOfYear';
+import React, { useContext } from 'react';
 import ProConfigContext from "../provider";
-import {
-  omitUndefined,
-  pickProProps,
-  useDeepCompareMemo,
-  useRefFunction
-} from "../utils";
+import { omitUndefined, pickProProps, useDeepCompareMemo, useRefFunction } from "../utils";
 import FieldText from "./components/Text";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 dayjs.extend(localeData);
 dayjs.extend(advancedFormat);
 dayjs.extend(isoWeek);
 dayjs.extend(weekOfYear);
 dayjs.extend(weekday);
-var pureRenderText = (dataValue, valueType, props, valueTypeMap) => {
-  var _a, _b, _c, _d;
-  const { mode = "read", emptyText = "-" } = props;
-  if (emptyText !== false && mode === "read" && valueType !== "option" && valueType !== "switch") {
-    if (typeof dataValue !== "boolean" && typeof dataValue !== "number" && !dataValue) {
-      const { fieldProps, render } = props;
+
+/** 默认的 Field 需要实现的功能 */
+
+/** 轻量筛选的field属性 */
+
+/** Value type by function */
+
+/**
+ * 根据不同的类型来转化数值
+ *
+ * @param dataValue
+ * @param valueType
+ */
+export var 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;
+  if (emptyText !== false && mode === 'read' && valueType !== 'option' && valueType !== 'switch') {
+    if (typeof dataValue !== 'boolean' && typeof dataValue !== 'number' && !dataValue) {
+      var fieldProps = props.fieldProps,
+        render = props.render;
       if (render) {
-        return render(dataValue, __spreadValues({ mode }, fieldProps), /* @__PURE__ */ React.createElement(React.Fragment, null, emptyText));
+        return render(dataValue, _objectSpread({
+          mode: mode
+        }, fieldProps), /*#__PURE__*/_jsx(_Fragment, {
+          children: emptyText
+        }));
       }
-      return /* @__PURE__ */ React.createElement(React.Fragment, null, emptyText);
+      return /*#__PURE__*/_jsx(_Fragment, {
+        children: emptyText
+      });
     }
   }
+
+  // eslint-disable-next-line no-param-reassign
   delete props.emptyText;
-  if (typeof valueType === "object") {
-    return pureRenderText(
-      dataValue,
-      valueType.type,
-      __spreadValues(__spreadValues({}, valueType), props),
-      valueTypeMap
-    );
+  if (_typeof(valueType) === 'object') {
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    return pureRenderText(dataValue, valueType.type, _objectSpread(_objectSpread({}, valueType), props), valueTypeMap);
   }
-  const customValueTypeConfig = valueTypeMap && valueTypeMap[valueType];
+  var customValueTypeConfig = valueTypeMap && valueTypeMap[valueType];
   if (customValueTypeConfig) {
+    // eslint-disable-next-line no-param-reassign
     delete props.ref;
-    if (mode === "read") {
-      const readDom = (_a = customValueTypeConfig.render) == null ? void 0 : _a.call(
-        customValueTypeConfig,
-        dataValue,
-        __spreadProps(__spreadValues({
+    if (mode === 'read') {
+      var _customValueTypeConfi;
+      var readDom = (_customValueTypeConfi = customValueTypeConfig.render) === null || _customValueTypeConfi === void 0 ? void 0 : _customValueTypeConfi.call(customValueTypeConfig, dataValue, _objectSpread(_objectSpread({
+        text: dataValue
+      }, props), {}, {
+        mode: mode || 'read'
+      }), /*#__PURE__*/_jsx(_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, _objectSpread({
           text: dataValue
-        }, props), {
-          mode: mode || "read"
-        }),
-        /* @__PURE__ */ React.createElement(React.Fragment, null, dataValue)
-      );
-      if (props == null ? void 0 : props.render) {
-        return (_b = props.render) == null ? void 0 : _b.call(
-          props,
-          dataValue,
-          __spreadValues({
-            text: dataValue
-          }, props),
-          readDom
-        );
+        }, props), readDom);
       }
       return readDom;
     }
-    if (mode === "update" || mode === "edit") {
-      const dom = (_c = customValueTypeConfig.formItemRender) == null ? void 0 : _c.call(
-        customValueTypeConfig,
-        dataValue,
-        __spreadValues({
+    if (mode === 'update' || mode === 'edit') {
+      var _customValueTypeConfi2;
+      var dom = (_customValueTypeConfi2 = customValueTypeConfig.formItemRender) === null || _customValueTypeConfi2 === void 0 ? void 0 : _customValueTypeConfi2.call(customValueTypeConfig, dataValue, _objectSpread({
+        text: dataValue
+      }, props), /*#__PURE__*/_jsx(_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, _objectSpread({
           text: dataValue
-        }, props),
-        /* @__PURE__ */ React.createElement(React.Fragment, null, dataValue)
-      );
-      if (props == null ? void 0 : props.formItemRender) {
-        return (_d = props.formItemRender) == null ? void 0 : _d.call(
-          props,
-          dataValue,
-          __spreadValues({
-            text: dataValue
-          }, props),
-          dom
-        );
+        }, props), dom);
       }
       return dom;
     }
   }
-  return /* @__PURE__ */ React.createElement(FieldText, __spreadValues({ text: dataValue }, props));
+  return /*#__PURE__*/_jsx(FieldText, _objectSpread({
+    text: dataValue
+  }, props));
 };
-var ProFieldComponent = (_a, ref) => {
-  var _b = _a, {
-    text,
-    valueType = "text",
-    mode = "read",
-    onChange,
-    formItemRender,
-    value,
-    readonly,
-    fieldProps: restFieldProps
-  } = _b, rest = __objRest(_b, [
-    "text",
-    "valueType",
-    "mode",
-    "onChange",
-    "formItemRender",
-    "value",
-    "readonly",
-    "fieldProps"
-  ]);
-  var _a2, _b2, _c, _d, _e;
-  const context = useContext(ProConfigContext);
-  const onChangeCallBack = useRefFunction((...restParams) => {
-    var _a3;
-    (_a3 = restFieldProps == null ? void 0 : restFieldProps.onChange) == null ? void 0 : _a3.call(restFieldProps, ...restParams);
-    onChange == null ? void 0 : onChange(...restParams);
+
+/** 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 = _objectWithoutProperties(_ref, _excluded);
+  var context = useContext(ProConfigContext);
+  var onChangeCallBack = 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);
   });
-  const fieldProps = useDeepCompareMemo(() => {
-    return (value !== void 0 || restFieldProps) && __spreadProps(__spreadValues({
-      value
-    }, omitUndefined(restFieldProps)), {
+  var fieldProps = useDeepCompareMemo(function () {
+    return (value !== undefined || restFieldProps) && _objectSpread(_objectSpread({
+      value: value
+    }, omitUndefined(restFieldProps)), {}, {
       onChange: onChangeCallBack
     });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [value, restFieldProps, onChangeCallBack]);
-  const renderedDom = pureRenderText(
-    mode === "edit" ? (_b2 = (_a2 = fieldProps == null ? void 0 : fieldProps.value) != null ? _a2 : text) != null ? _b2 : "" : (_c = text != null ? text : fieldProps == null ? void 0 : fieldProps.value) != null ? _c : "",
-    valueType || "text",
-    omitUndefined(__spreadProps(__spreadValues({
-      ref
-    }, rest), {
-      mode: readonly ? "read" : mode,
-      formItemRender: formItemRender ? (curText, props, dom) => {
-        const _a3 = props, { placeholder: _placeholder } = _a3, restProps = __objRest(_a3, ["placeholder"]);
-        const newDom = formItemRender(curText, restProps, dom);
-        if (React.isValidElement(newDom))
-          return React.cloneElement(newDom, __spreadValues(__spreadValues({}, fieldProps), newDom.props || {}));
-        return newDom;
-      } : void 0,
-      placeholder: formItemRender ? void 0 : (_d = rest == null ? void 0 : rest.placeholder) != null ? _d : fieldProps == null ? void 0 : fieldProps.placeholder,
-      fieldProps: pickProProps(
-        omitUndefined(__spreadProps(__spreadValues({}, fieldProps), {
-          placeholder: formItemRender ? void 0 : (_e = rest == null ? void 0 : rest.placeholder) != null ? _e : fieldProps == null ? void 0 : fieldProps.placeholder
-        }))
-      )
-    })),
-    context.valueTypeMap || {}
-  );
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, renderedDom);
-};
-var PureProField = React.forwardRef(
-  ProFieldComponent
-);
-export {
-  PureProField,
-  pureRenderText
+  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', omitUndefined(_objectSpread(_objectSpread({
+    ref: ref
+  }, rest), {}, {
+    mode: readonly ? 'read' : mode,
+    formItemRender: formItemRender ? function (curText, props, dom) {
+      var _placeholder = props.placeholder,
+        restProps = _objectWithoutProperties(props, _excluded2);
+      var newDom = formItemRender(curText, restProps, dom);
+      // formItemRender 之后的dom可能没有props，这里会帮忙注入一下
+      if ( /*#__PURE__*/React.isValidElement(newDom)) return /*#__PURE__*/React.cloneElement(newDom, _objectSpread(_objectSpread({}, 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: pickProProps(omitUndefined(_objectSpread(_objectSpread({}, 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 || {});
+  return /*#__PURE__*/_jsx(React.Fragment, {
+    children: renderedDom
+  });
 };
+export var PureProField = /*#__PURE__*/React.forwardRef(ProFieldComponent);