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

package/lib/field/components/Digit/index.js

@@ -1,130 +1,112 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-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 __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/field/components/Digit/index.tsx
-var Digit_exports = {};
-__export(Digit_exports, {
-  default: () => Digit_default
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(Digit_exports);
-var import_antd = require("antd");
-var import_omit = __toESM(require("rc-util/lib/omit"));
-var import_react = __toESM(require("react"));
-var import_provider = require("../../../provider");
-var import_utils = require("../../../utils");
-var FieldDigit = ({ text, mode: type, render, placeholder, formItemRender, fieldProps }, ref) => {
-  var _a;
-  const intl = (0, import_provider.useIntl)();
-  const placeholderValue = placeholder || intl.getMessage("tableForm.inputPlaceholder", "请输入");
-  const proxyChange = (0, import_react.useCallback)(
-    (value) => {
-      let val = value != null ? value : void 0;
-      if (!fieldProps.stringMode && typeof val === "string") {
-        const numVal = Number(val);
-        if (isNaN(numVal)) {
-          const match = val.match(/^(\d+(?:\.\d+)?)/);
-          if (match) {
-            val = Number(match[1]);
-          } else {
-            val = void 0;
-          }
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _util = require("@rc-component/util");
+var _antd = require("antd");
+var _react = _interopRequireWildcard(require("react"));
+var _provider = require("../../../provider");
+var _utils = require("../../../utils");
+var _jsxRuntime = require("react/jsx-runtime");
+/**
+ * 数字组件
+ *
+ * @param FieldDigitProps {
+ *     text: number;
+ *     moneySymbol?: string; }
+ */
+var FieldDigit = function FieldDigit(_ref, ref) {
+  var text = _ref.text,
+    type = _ref.mode,
+    render = _ref.render,
+    placeholder = _ref.placeholder,
+    formItemRender = _ref.formItemRender,
+    fieldProps = _ref.fieldProps;
+  var intl = (0, _provider.useIntl)();
+  var placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
+  var proxyChange = (0, _react.useCallback)(function (value) {
+    var val = value !== null && value !== void 0 ? value : undefined;
+    if (!fieldProps.stringMode && typeof val === 'string') {
+      // 处理无效输入，如 '22.22.22'
+      var numVal = Number(val);
+      if (isNaN(numVal)) {
+        // 如果转换失败，尝试提取第一个有效的数字
+        var match = val.match(/^(\d+(?:\.\d+)?)/);
+        if (match) {
+          val = Number(match[1]);
         } else {
-          val = numVal;
+          val = undefined;
         }
+      } else {
+        val = numVal;
       }
-      if (typeof val === "number" && !(0, import_utils.isNil)(val) && !(0, import_utils.isNil)(fieldProps.precision)) {
-        val = Number(val.toFixed(fieldProps.precision));
-      }
-      return val;
-    },
-    [fieldProps]
-  );
-  if (type === "read") {
-    let fractionDigits = {};
-    if (fieldProps == null ? void 0 : fieldProps.precision) {
+    }
+    if (typeof val === 'number' && !(0, _utils.isNil)(val) && !(0, _utils.isNil)(fieldProps.precision)) {
+      val = Number(val.toFixed(fieldProps.precision));
+    }
+    return val;
+  }, [fieldProps]);
+  if (type === 'read') {
+    var _fieldProps$formatter;
+    var fractionDigits = {};
+    if (fieldProps !== null && fieldProps !== void 0 && fieldProps.precision) {
       fractionDigits = {
         minimumFractionDigits: Number(fieldProps.precision),
         maximumFractionDigits: Number(fieldProps.precision)
       };
     }
-    const digit = new Intl.NumberFormat(void 0, __spreadValues(__spreadValues({}, fractionDigits), (fieldProps == null ? void 0 : fieldProps.intlProps) || {})).format(Number(text));
-    const dom = !(fieldProps == null ? void 0 : fieldProps.stringMode) ? /* @__PURE__ */ import_react.default.createElement("span", { ref }, ((_a = fieldProps == null ? void 0 : fieldProps.formatter) == null ? void 0 : _a.call(fieldProps, digit)) || digit) : /* @__PURE__ */ import_react.default.createElement("span", null, text);
+    var digit = new Intl.NumberFormat(undefined, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, fractionDigits), (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.intlProps) || {})).format(Number(text));
+
+    // 如果是 string 模式，什么都不要处理了
+    var dom = !(fieldProps !== null && fieldProps !== void 0 && fieldProps.stringMode) ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      ref: ref,
+      children: (fieldProps === null || fieldProps === void 0 || (_fieldProps$formatter = fieldProps.formatter) === null || _fieldProps$formatter === void 0 ? void 0 : _fieldProps$formatter.call(fieldProps, digit)) || digit
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      children: text
+    });
     if (render) {
-      return render(text, __spreadValues({ mode: type }, fieldProps), dom);
+      return render(text, (0, _objectSpread2.default)({
+        mode: type
+      }, fieldProps), dom);
     }
     return dom;
   }
-  if (type === "edit" || type === "update") {
-    const dom = /* @__PURE__ */ import_react.default.createElement(
-      import_antd.InputNumber,
-      __spreadProps(__spreadValues({
-        ref,
-        min: 0,
-        placeholder: placeholderValue
-      }, (0, import_omit.default)(fieldProps, ["onChange", "onBlur"])), {
-        onChange: (e) => {
-          var _a2;
-          return (_a2 = fieldProps == null ? void 0 : fieldProps.onChange) == null ? void 0 : _a2.call(fieldProps, proxyChange(e));
-        },
-        onBlur: (e) => {
-          var _a2, _b;
-          const value = e.target.value;
-          const processedValue = proxyChange(value);
-          if (e.target && typeof processedValue === "number") {
-            e.target.value = processedValue.toString();
-            (_a2 = fieldProps == null ? void 0 : fieldProps.onChange) == null ? void 0 : _a2.call(fieldProps, processedValue);
-          }
-          (_b = fieldProps == null ? void 0 : fieldProps.onBlur) == null ? void 0 : _b.call(fieldProps, e);
+  if (type === 'edit' || type === 'update') {
+    var _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      ref: ref,
+      min: 0,
+      placeholder: placeholderValue
+    }, (0, _util.omit)(fieldProps, ['onChange', 'onBlur'])), {}, {
+      onChange: function onChange(e) {
+        var _fieldProps$onChange;
+        return fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange = fieldProps.onChange) === null || _fieldProps$onChange === void 0 ? void 0 : _fieldProps$onChange.call(fieldProps, proxyChange(e));
+      },
+      onBlur: function onBlur(e) {
+        var _fieldProps$onBlur;
+        var value = e.target.value;
+        var processedValue = proxyChange(value);
+        // 更新输入框的值
+        if (e.target && typeof processedValue === 'number') {
+          var _fieldProps$onChange2;
+          e.target.value = processedValue.toString();
+          // 触发 onChange 事件以更新表单值
+          fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange2 = fieldProps.onChange) === null || _fieldProps$onChange2 === void 0 || _fieldProps$onChange2.call(fieldProps, processedValue);
         }
-      })
-    );
+        fieldProps === null || fieldProps === void 0 || (_fieldProps$onBlur = fieldProps.onBlur) === null || _fieldProps$onBlur === void 0 || _fieldProps$onBlur.call(fieldProps, e);
+      }
+    }));
     if (formItemRender) {
-      return formItemRender(text, __spreadValues({ mode: type }, fieldProps), dom);
+      return formItemRender(text, (0, _objectSpread2.default)({
+        mode: type
+      }, fieldProps), _dom);
     }
-    return dom;
+    return _dom;
   }
   return null;
 };
-var Digit_default = import_react.default.forwardRef(FieldDigit);
+var _default = exports.default = /*#__PURE__*/_react.default.forwardRef(FieldDigit);

package/lib/field/components/DigitRange/index.js

@@ -1,157 +1,143 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-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 __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/field/components/DigitRange/index.tsx
-var DigitRange_exports = {};
-__export(DigitRange_exports, {
-  default: () => DigitRange_default
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(DigitRange_exports);
-var import_antd = require("antd");
-var import_useMergedState = __toESM(require("rc-util/lib/hooks/useMergedState"));
-var import_react = __toESM(require("react"));
-var import_provider = require("../../../provider");
-var FieldDigitRange = ({
-  text,
-  mode: type,
-  render,
-  placeholder,
-  formItemRender,
-  fieldProps,
-  separator = "~",
-  separatorWidth = 30
-}, ref) => {
-  const { value, defaultValue, onChange, id } = fieldProps;
-  const intl = (0, import_provider.useIntl)();
-  const { token } = import_provider.proTheme.useToken();
-  const [valuePair, setValuePair] = (0, import_useMergedState.default)(() => defaultValue, {
-    value,
-    onChange
-  });
-  const valuePairRef = (0, import_react.useRef)(valuePair);
-  if (type === "read") {
-    const getContent = (number) => {
-      var _a;
-      const digit = new Intl.NumberFormat(void 0, __spreadValues({
+exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _util = require("@rc-component/util");
+var _antd = require("antd");
+var _react = _interopRequireWildcard(require("react"));
+var _provider = require("../../../provider");
+var _jsxRuntime = require("react/jsx-runtime");
+/**
+ * 数字范围组件
+ *
+ * @param FieldDigitRangeProps
+ */
+var FieldDigitRange = function FieldDigitRange(_ref, ref) {
+  var text = _ref.text,
+    type = _ref.mode,
+    render = _ref.render,
+    placeholder = _ref.placeholder,
+    formItemRender = _ref.formItemRender,
+    fieldProps = _ref.fieldProps,
+    _ref$separator = _ref.separator,
+    separator = _ref$separator === void 0 ? '~' : _ref$separator,
+    _ref$separatorWidth = _ref.separatorWidth,
+    separatorWidth = _ref$separatorWidth === void 0 ? 30 : _ref$separatorWidth;
+  var value = fieldProps.value,
+    defaultValue = fieldProps.defaultValue,
+    onChange = fieldProps.onChange,
+    id = fieldProps.id;
+  var intl = (0, _provider.useIntl)();
+  var _proTheme$useToken = _provider.proTheme.useToken(),
+    token = _proTheme$useToken.token;
+  var _useMergedState = (0, _util.useMergedState)(function () {
+      return defaultValue;
+    }, {
+      value: value,
+      onChange: onChange
+    }),
+    _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
+    valuePair = _useMergedState2[0],
+    setValuePair = _useMergedState2[1];
+  var valuePairRef = (0, _react.useRef)(valuePair);
+  if (type === 'read') {
+    var getContent = function getContent(number) {
+      var _fieldProps$formatter;
+      var digit = new Intl.NumberFormat(undefined, (0, _objectSpread2.default)({
         minimumSignificantDigits: 2
-      }, (fieldProps == null ? void 0 : fieldProps.intlProps) || {})).format(Number(number));
-      return ((_a = fieldProps == null ? void 0 : fieldProps.formatter) == null ? void 0 : _a.call(fieldProps, digit)) || digit;
+      }, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.intlProps) || {})).format(Number(number));
+      return (fieldProps === null || fieldProps === void 0 || (_fieldProps$formatter = fieldProps.formatter) === null || _fieldProps$formatter === void 0 ? void 0 : _fieldProps$formatter.call(fieldProps, digit)) || digit;
     };
-    const dom = /* @__PURE__ */ import_react.default.createElement("span", { ref }, getContent(text[0]), " ", separator, " ", getContent(text[1]));
+    var dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+      ref: ref,
+      children: [getContent(text[0]), " ", separator, " ", getContent(text[1])]
+    });
     if (render) {
-      return render(text, __spreadValues({ mode: type }, fieldProps), dom);
+      return render(text, (0, _objectSpread2.default)({
+        mode: type
+      }, fieldProps), dom);
     }
     return dom;
   }
-  if (type === "edit" || type === "update") {
-    const handleGroupBlur = () => {
+  if (type === 'edit' || type === 'update') {
+    var handleGroupBlur = function handleGroupBlur() {
       if (Array.isArray(valuePairRef.current)) {
-        const [value0, value1] = valuePairRef.current;
-        if (typeof value0 === "number" && typeof value1 === "number" && value0 > value1) {
+        //   仅在两个值均为数字时才做比较并转换
+        var _valuePairRef$current = (0, _slicedToArray2.default)(valuePairRef.current, 2),
+          value0 = _valuePairRef$current[0],
+          value1 = _valuePairRef$current[1];
+        if (typeof value0 === 'number' && typeof value1 === 'number' && value0 > value1) {
           setValuePair([value1, value0]);
           return;
         }
-        if (value0 === void 0 && value1 === void 0) {
-          setValuePair(void 0);
+        if (value0 === undefined && value1 === undefined) {
+          // 当两个值均为undefined时将值变为undefined，方便required处理
+          setValuePair(undefined);
         }
       }
     };
-    const handleChange = (index, changedValue) => {
-      const newValuePair = [...valuePair || []];
-      newValuePair[index] = changedValue === null ? void 0 : changedValue;
+    var handleChange = function handleChange(index, changedValue) {
+      var newValuePair = (0, _toConsumableArray2.default)(valuePair || []);
+      newValuePair[index] = changedValue === null ? undefined : changedValue;
       valuePairRef.current = newValuePair;
       setValuePair(newValuePair);
     };
-    const placeholderValue = (fieldProps == null ? void 0 : fieldProps.placeholder) || placeholder || [
-      intl.getMessage("tableForm.inputPlaceholder", "请输入"),
-      intl.getMessage("tableForm.inputPlaceholder", "请输入")
-    ];
-    const getInputNumberPlaceholder = (index) => Array.isArray(placeholderValue) ? placeholderValue[index] : placeholderValue;
-    const dom = /* @__PURE__ */ import_react.default.createElement(import_antd.Space.Compact, { onBlur: handleGroupBlur }, /* @__PURE__ */ import_react.default.createElement(
-      import_antd.InputNumber,
-      __spreadProps(__spreadValues({}, fieldProps), {
+    var placeholderValue = (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder) || placeholder || [intl.getMessage('tableForm.inputPlaceholder', '请输入'), intl.getMessage('tableForm.inputPlaceholder', '请输入')];
+    var getInputNumberPlaceholder = function getInputNumberPlaceholder(index) {
+      return Array.isArray(placeholderValue) ? placeholderValue[index] : placeholderValue;
+    };
+    var _dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
+      onBlur: handleGroupBlur,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, fieldProps), {}, {
         placeholder: getInputNumberPlaceholder(0),
-        id: id != null ? id : `${id}-0`,
-        style: { width: `calc((100% - ${separatorWidth}px) / 2)` },
-        value: valuePair == null ? void 0 : valuePair[0],
-        defaultValue: defaultValue == null ? void 0 : defaultValue[0],
-        onChange: (changedValue) => handleChange(0, changedValue)
-      })
-    ), /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Input,
-      {
+        id: id !== null && id !== void 0 ? id : "".concat(id, "-0"),
+        style: {
+          width: "calc((100% - ".concat(separatorWidth, "px) / 2)")
+        },
+        value: valuePair === null || valuePair === void 0 ? void 0 : valuePair[0],
+        defaultValue: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue[0],
+        onChange: function onChange(changedValue) {
+          return handleChange(0, changedValue);
+        }
+      })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
         style: {
           width: separatorWidth,
-          textAlign: "center",
+          textAlign: 'center',
           borderInlineStart: 0,
           borderInlineEnd: 0,
-          pointerEvents: "none",
-          backgroundColor: token == null ? void 0 : token.colorBgContainer
+          pointerEvents: 'none',
+          backgroundColor: token === null || token === void 0 ? void 0 : token.colorBgContainer
         },
         placeholder: separator,
         disabled: true
-      }
-    ), /* @__PURE__ */ import_react.default.createElement(
-      import_antd.InputNumber,
-      __spreadProps(__spreadValues({}, fieldProps), {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, fieldProps), {}, {
         placeholder: getInputNumberPlaceholder(1),
-        id: id != null ? id : `${id}-1`,
+        id: id !== null && id !== void 0 ? id : "".concat(id, "-1"),
         style: {
-          width: `calc((100% - ${separatorWidth}px) / 2)`,
+          width: "calc((100% - ".concat(separatorWidth, "px) / 2)"),
           borderInlineStart: 0
         },
-        value: valuePair == null ? void 0 : valuePair[1],
-        defaultValue: defaultValue == null ? void 0 : defaultValue[1],
-        onChange: (changedValue) => handleChange(1, changedValue)
-      })
-    ));
+        value: valuePair === null || valuePair === void 0 ? void 0 : valuePair[1],
+        defaultValue: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue[1],
+        onChange: function onChange(changedValue) {
+          return handleChange(1, changedValue);
+        }
+      }))]
+    });
     if (formItemRender) {
-      return formItemRender(text, __spreadValues({ mode: type }, fieldProps), dom);
+      return formItemRender(text, (0, _objectSpread2.default)({
+        mode: type
+      }, fieldProps), _dom);
     }
-    return dom;
+    return _dom;
   }
   return null;
 };
-var DigitRange_default = import_react.default.forwardRef(FieldDigitRange);
+var _default = exports.default = /*#__PURE__*/_react.default.forwardRef(FieldDigitRange);