@teamias/rex-design 0.0.24 → 0.0.27

package/dist/components/base-form/components/ProFormDateRangePickerV2.d.ts

@@ -0,0 +1,19 @@
+import { DatePicker, Form, GetProps } from 'antd';
+import { Dayjs } from 'dayjs';
+import { FC } from 'react';
+export declare const ProFormDateRangePickerV2: FC<IProFormDateRangePickerV2Props>;
+interface IProFormDateRangePickerV2Props {
+    name?: [string | string[], string | string[]];
+    placeholder?: [string, string];
+    label?: React.ReactNode;
+    formItemProps?: GetProps<typeof Form.Item>;
+    fieldProps?: GetProps<typeof DatePicker.RangePicker>;
+    required?: boolean;
+    dataFormat?: string;
+    allowClear?: boolean;
+    initialValue?: number | [
+        string | number | Dayjs | undefined,
+        string | number | Dayjs | undefined
+    ];
+}
+export {};

package/dist/components/base-form/components/ProFormDateRangePickerV2.js

@@ -0,0 +1,202 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import ProForm, { ProFormDependency, ProFormText } from '@ant-design/pro-form';
+import { EditOrReadOnlyContext } from '@ant-design/pro-form/es/BaseForm/EditOrReadOnlyContext';
+import { DatePicker, Form } from 'antd';
+import dayjs from 'dayjs';
+import { get } from 'radash';
+import { useContext, useMemo, useState } from 'react';
+import { ResetView } from "./ResetView";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export var ProFormDateRangePickerV2 = function ProFormDateRangePickerV2(_ref) {
+  var name = _ref.name,
+    placeholder = _ref.placeholder,
+    label = _ref.label,
+    formItemProps = _ref.formItemProps,
+    fieldProps = _ref.fieldProps,
+    required = _ref.required,
+    initialValue = _ref.initialValue,
+    _ref$dataFormat = _ref.dataFormat,
+    outsideDataFormat = _ref$dataFormat === void 0 ? 'YYYY-MM-DD' : _ref$dataFormat,
+    _ref$allowClear = _ref.allowClear,
+    allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear;
+  var form = ProForm.useFormInstance();
+  var context = useContext(EditOrReadOnlyContext);
+  var formReadonly = context.mode === 'read';
+  var dataFormat = (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || outsideDataFormat;
+
+  // 校验状态
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    validateStatus = _useState2[0],
+    setValidateStatus = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    help = _useState4[0],
+    setHelp = _useState4[1];
+
+  // 获取字段名
+  var _useMemo = useMemo(function () {
+      return name || [undefined, undefined];
+    }, [name]),
+    _useMemo2 = _slicedToArray(_useMemo, 2),
+    startFieldName = _useMemo2[0],
+    endFieldName = _useMemo2[1];
+  var _useMemo3 = useMemo(function () {
+      var arr = [];
+      if (typeof initialValue === 'number') {
+        // 时间范围类型根据 initialValue 为数值的时候, 根据正负实现 当天距离之前或之后
+        var n = initialValue;
+        if (n > 0) {
+          // 今天到未来 n 天
+          arr.push(dayjs().startOf('day'), dayjs().add(n, 'day').endOf('day'));
+        } else if (n < 0) {
+          // 过去 n 天到今天
+          arr.push(dayjs().add(n, 'day').startOf('day'), dayjs().endOf('day'));
+        } else {
+          // n = 0，只有今天
+          arr.push(dayjs().startOf('day'), dayjs().endOf('day'));
+        }
+      } else if (Array.isArray(initialValue)) {
+        arr.push(initialValue[0] ? dayjs(initialValue[0]) : undefined, initialValue[1] ? dayjs(initialValue[1]) : undefined);
+      }
+      return arr.map(function (ii) {
+        return ii === null || ii === void 0 ? void 0 : ii.format(dataFormat);
+      });
+      // return arr;
+    }, [initialValue]),
+    _useMemo4 = _slicedToArray(_useMemo3, 2),
+    initialStartValue = _useMemo4[0],
+    initialEndValue = _useMemo4[1];
+
+  // 生成校验规则
+  var validateRules = useMemo(function () {
+    if (!required) return undefined;
+    return [{
+      validator: function () {
+        var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var startValue, endValue;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                startValue = form.getFieldValue(startFieldName);
+                endValue = form.getFieldValue(endFieldName);
+                if (!(!startValue || !endValue)) {
+                  _context.next = 7;
+                  break;
+                }
+                setValidateStatus('error');
+                setHelp(!startValue && !endValue ? "\u8BF7\u9009\u62E9".concat(label || '') : '');
+                form.setFields([{
+                  name: startFieldName,
+                  errors: !startValue ? ["\u8BF7\u9009\u62E9".concat(label || '')] : []
+                }, {
+                  name: endFieldName,
+                  errors: !endValue ? ["\u8BF7\u9009\u62E9".concat(label || '')] : []
+                }]);
+                return _context.abrupt("return", Promise.reject(new Error("\u8BF7\u9009\u62E9".concat(label || ''))));
+              case 7:
+                setValidateStatus('');
+                setHelp('');
+                form.setFields([{
+                  name: startFieldName
+                }, {
+                  name: endFieldName
+                }]);
+                return _context.abrupt("return", Promise.resolve());
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function validator() {
+          return _validator.apply(this, arguments);
+        }
+        return validator;
+      }()
+    }];
+  }, [required, startFieldName, endFieldName, form]);
+  var getKey = function getKey(key) {
+    if (Array.isArray(key)) {
+      return key.join('.');
+    }
+    return key || '';
+  };
+
+  // console.log(initialStartValue, initialEndValue);
+
+  return /*#__PURE__*/_jsxs(Form.Item, _objectSpread(_objectSpread({
+    label: label,
+    required: required,
+    validateStatus: validateStatus,
+    help: help
+  }, formItemProps), {}, {
+    children: [/*#__PURE__*/_jsx(ProFormText, {
+      hidden: true,
+      initialValue: initialStartValue,
+      name: startFieldName,
+      rules: validateRules
+    }), /*#__PURE__*/_jsx(ProFormText, {
+      hidden: true,
+      initialValue: initialEndValue,
+      name: endFieldName,
+      rules: validateRules
+    }), /*#__PURE__*/_jsx(ProFormDependency, {
+      name: [startFieldName, endFieldName],
+      children: function children(data) {
+        var startValue = get(data, getKey(startFieldName));
+        var endValue = get(data, getKey(endFieldName));
+        if (formReadonly) {
+          return /*#__PURE__*/_jsx("span", {
+            children: startValue && endValue ? "".concat(startValue, " ~ ").concat(endValue) : '-'
+          });
+        }
+        return /*#__PURE__*/_jsxs(_Fragment, {
+          children: [/*#__PURE__*/_jsx(ResetView, {
+            data: data,
+            onReset: function onReset() {
+              if (!form.getFieldsError([startFieldName, endFieldName]).map(function (ii) {
+                return ii.errors;
+              }).flat().length && validateStatus !== '') {
+                setValidateStatus('');
+                setHelp('');
+              }
+            }
+          }), /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread(_objectSpread({
+            placeholder: placeholder,
+            format: dataFormat,
+            allowClear: allowClear
+          }, fieldProps), {}, {
+            style: _objectSpread({
+              width: '100%'
+            }, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style),
+            value: startValue && endValue ? [dayjs(startValue), dayjs(endValue)] : undefined,
+            onChange: function onChange(dates, dateStrings) {
+              form.setFieldValue(startFieldName, dateStrings[0] || undefined);
+              form.setFieldValue(endFieldName, dateStrings[1] || undefined);
+              setTimeout(function () {
+                validateRules === null || validateRules === void 0 || validateRules[0].validator().catch(function () {});
+              }, 0);
+            }
+          }))]
+        });
+      }
+    })]
+  }));
+};

package/dist/components/base-form/components/ProFormDigitRangeV2.d.ts

@@ -0,0 +1,31 @@
+import { Form, GetProps, InputNumber } from 'antd';
+import { FC } from 'react';
+export declare const ProFormDigitRangeV2: FC<IProFormDigitRangeV2Props>;
+interface IProFormDigitRangeV2Props {
+    name?: [string | string[], string | string[]];
+    placeholder?: [string, string];
+    label?: React.ReactNode;
+    formItemProps?: GetProps<typeof Form.Item>;
+    fieldProps?: GetProps<typeof InputNumber>;
+    required?: boolean;
+    initialValue?: [number | undefined, number | undefined];
+    /**
+     * 必填模式
+     * - both: 两边都必填
+     * - either: 至少填一边
+     * @default 'both'
+     */
+    requiredMode?: 'both' | 'either';
+    /**
+     * 自动交换最小值和最大值
+     * - 当最小值大于最大值时，自动交换两者的值
+     * @default true
+     */
+    autoSwap?: boolean;
+    /**
+     * 小数精度
+     * - 设置数值的小数位数
+     */
+    precision?: number;
+}
+export {};

package/dist/components/base-form/components/ProFormDigitRangeV2.js

@@ -0,0 +1,228 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { ProForm, ProFormDependency } from '@ant-design/pro-components';
+import { EditOrReadOnlyContext } from '@ant-design/pro-form/es/BaseForm/EditOrReadOnlyContext';
+import { Form, Input, InputNumber, Space } from 'antd';
+import { useCallback, useContext, useMemo, useState } from 'react';
+import { RenderText } from "./RenderText";
+import { ResetView } from "./ResetView";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export var ProFormDigitRangeV2 = function ProFormDigitRangeV2(_ref) {
+  var name = _ref.name,
+    placeholder = _ref.placeholder,
+    label = _ref.label,
+    formItemProps = _ref.formItemProps,
+    fieldProps = _ref.fieldProps,
+    _ref$autoSwap = _ref.autoSwap,
+    autoSwap = _ref$autoSwap === void 0 ? true : _ref$autoSwap,
+    precision = _ref.precision,
+    required = _ref.required,
+    _ref$requiredMode = _ref.requiredMode,
+    requiredMode = _ref$requiredMode === void 0 ? 'both' : _ref$requiredMode,
+    initialValue = _ref.initialValue;
+  var form = ProForm.useFormInstance();
+  var context = useContext(EditOrReadOnlyContext);
+  var formReadonly = context.mode === 'read';
+
+  // 校验状态
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    validateStatus = _useState2[0],
+    setValidateStatus = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    help = _useState4[0],
+    setHelp = _useState4[1];
+
+  // 获取字段名
+  var _useMemo = useMemo(function () {
+      return name || [undefined, undefined];
+    }, [name]),
+    _useMemo2 = _slicedToArray(_useMemo, 2),
+    minFieldName = _useMemo2[0],
+    maxFieldName = _useMemo2[1];
+
+  // 生成校验规则
+  var validateRules = useMemo(function () {
+    if (!required) return undefined;
+    return [{
+      validator: function () {
+        var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var minValue, maxValue;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                minValue = form.getFieldValue(minFieldName);
+                maxValue = form.getFieldValue(maxFieldName);
+                if (!(requiredMode === 'both')) {
+                  _context.next = 9;
+                  break;
+                }
+                if (!(minValue === null || minValue === undefined || minValue === '' || maxValue === null || maxValue === undefined || maxValue === '')) {
+                  _context.next = 7;
+                  break;
+                }
+                setValidateStatus('error');
+                setHelp((minValue === null || minValue === undefined || minValue === '') && (maxValue === null || maxValue === undefined || maxValue === '') ? "\u8BF7\u8F93\u5165".concat(label || '数值范围') : minValue === null || minValue === undefined || minValue === '' ? '请输入最小值' : '请输入最大值');
+                return _context.abrupt("return", Promise.reject(new Error("\u8BF7\u8F93\u5165".concat(label || '数值范围'))));
+              case 7:
+                _context.next = 13;
+                break;
+              case 9:
+                if (!((minValue === null || minValue === undefined || minValue === '') && (maxValue === null || maxValue === undefined || maxValue === ''))) {
+                  _context.next = 13;
+                  break;
+                }
+                setValidateStatus('error');
+                setHelp('请至少输入一个值');
+                return _context.abrupt("return", Promise.reject(new Error('请至少输入一个值')));
+              case 13:
+                setValidateStatus('');
+                setHelp('');
+                return _context.abrupt("return", Promise.resolve());
+              case 16:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function validator() {
+          return _validator.apply(this, arguments);
+        }
+        return validator;
+      }()
+    }];
+  }, [required, requiredMode, minFieldName, maxFieldName, form, label]);
+
+  // 处理最小值失去焦点
+  var handleMinBlur = useCallback(function () {
+    if (!autoSwap || !minFieldName || !maxFieldName) return;
+
+    // 使用 setTimeout 等待 InputNumber 完成内部的 min/max 校验
+    setTimeout(function () {
+      // 获取表单中的实际值
+      var actualMinValue = form.getFieldValue(minFieldName);
+      var maxValue = form.getFieldValue(maxFieldName);
+      if (actualMinValue !== null && actualMinValue !== undefined && maxValue !== null && maxValue !== undefined && actualMinValue > maxValue) {
+        form.setFieldValue(minFieldName, maxValue);
+        form.setFieldValue(maxFieldName, actualMinValue);
+      }
+    }, 0);
+  }, [autoSwap, minFieldName, maxFieldName, form]);
+
+  // 处理最大值失去焦点
+  var handleMaxBlur = useCallback(function () {
+    if (!autoSwap || !minFieldName || !maxFieldName) return;
+
+    // 使用 setTimeout 等待 InputNumber 完成内部的 min/max 校验
+    setTimeout(function () {
+      // 获取表单中的实际值
+      var minValue = form.getFieldValue(minFieldName);
+      var actualMaxValue = form.getFieldValue(maxFieldName);
+      if (minValue !== null && minValue !== undefined && actualMaxValue !== null && actualMaxValue !== undefined && actualMaxValue < minValue) {
+        form.setFieldValue(minFieldName, actualMaxValue);
+        form.setFieldValue(maxFieldName, minValue);
+      }
+    }, 0);
+  }, [autoSwap, minFieldName, maxFieldName, form]);
+  return /*#__PURE__*/_jsxs(Form.Item, _objectSpread(_objectSpread({
+    label: label,
+    required: required,
+    validateStatus: validateStatus,
+    help: help
+  }, formItemProps), {}, {
+    children: [/*#__PURE__*/_jsx(ProFormDependency, {
+      name: [minFieldName, maxFieldName],
+      children: function children(data) {
+        return /*#__PURE__*/_jsx(ResetView, {
+          data: data,
+          onReset: function onReset() {
+            if (!form.getFieldsError([minFieldName, maxFieldName]).map(function (ii) {
+              return ii.errors;
+            }).flat().length && validateStatus !== '') {
+              setValidateStatus('');
+              setHelp('');
+            }
+          }
+        });
+      }
+    }), /*#__PURE__*/_jsxs(Space.Compact, {
+      style: {
+        width: '100%'
+      },
+      children: [/*#__PURE__*/_jsx(Form.Item, {
+        noStyle: true,
+        name: minFieldName,
+        initialValue: initialValue === null || initialValue === void 0 ? void 0 : initialValue[0],
+        rules: validateRules,
+        validateStatus: validateStatus,
+        children: formReadonly ? /*#__PURE__*/_jsx(RenderText, {}) : /*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({
+          placeholder: (placeholder === null || placeholder === void 0 ? void 0 : placeholder[0]) || '最小值',
+          precision: precision,
+          readOnly: formReadonly
+        }, fieldProps), {}, {
+          style: _objectSpread({
+            flex: 1
+          }, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style),
+          onBlur: handleMinBlur,
+          onChange: function onChange() {
+            setTimeout(function () {
+              validateRules === null || validateRules === void 0 || validateRules[0].validator().catch(function () {});
+            }, 0);
+          }
+        }))
+      }), formReadonly ? /*#__PURE__*/_jsx(RenderText, {
+        value: "~",
+        style: {
+          padding: '0 4px'
+        }
+      }) : /*#__PURE__*/_jsx(Input, {
+        style: {
+          width: 30,
+          borderInlineStart: 0,
+          borderInlineEnd: 0,
+          pointerEvents: 'none',
+          textAlign: 'center'
+        },
+        placeholder: "~",
+        disabled: true,
+        readOnly: true
+      }), /*#__PURE__*/_jsx(Form.Item, {
+        noStyle: true,
+        name: maxFieldName,
+        initialValue: initialValue === null || initialValue === void 0 ? void 0 : initialValue[1],
+        rules: validateRules,
+        validateStatus: validateStatus,
+        children: formReadonly ? /*#__PURE__*/_jsx(RenderText, {}) : /*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({
+          placeholder: (placeholder === null || placeholder === void 0 ? void 0 : placeholder[1]) || '最大值',
+          precision: precision,
+          readOnly: formReadonly
+        }, fieldProps), {}, {
+          style: _objectSpread({
+            flex: 1
+          }, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style),
+          onBlur: handleMaxBlur,
+          onChange: function onChange() {
+            setTimeout(function () {
+              validateRules === null || validateRules === void 0 || validateRules[0].validator().catch(function () {});
+            }, 0);
+          }
+        }))
+      })]
+    })]
+  }));
+};

package/dist/components/base-form/components/RenderText.d.ts

@@ -0,0 +1,7 @@
+import { FC } from 'react';
+export declare const RenderText: FC<IRenderTextProps>;
+interface IRenderTextProps {
+    value?: any;
+    style?: React.CSSProperties;
+}
+export {};

package/dist/components/base-form/components/RenderText.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+export var RenderText = function RenderText(_ref) {
+  var value = _ref.value,
+    style = _ref.style;
+  return /*#__PURE__*/_jsx("span", {
+    style: style,
+    children: value !== null && value !== void 0 ? value : '-'
+  });
+};

package/dist/components/base-form/components/ResetView.d.ts

@@ -0,0 +1,5 @@
+import { FC } from 'react';
+export declare const ResetView: FC<{
+    data: any;
+    onReset: () => void;
+}>;

package/dist/components/base-form/components/ResetView.js

@@ -0,0 +1,15 @@
+import { useDebounceEffect } from 'ahooks';
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+export var ResetView = function ResetView(_ref) {
+  var data = _ref.data,
+    onReset = _ref.onReset;
+  useDebounceEffect(function () {
+    onReset();
+  }, [data], {
+    wait: 0,
+    trailing: true,
+    leading: false
+  });
+  return /*#__PURE__*/_jsx(_Fragment, {});
+};

package/dist/components/base-form/demo/BaseFormBasicTest.js

@@ -95,8 +95,9 @@ export default (function () {
       field: ['select-false']
     }]
   }, {
-    valueType: 'dateRange',
-    field: ['start', 'end']
+    valueType: 'dateRangeV2',
+    field: ['start', 'end'],
+    required: true
     // defaultValue: 1,
   }];
   var initialValues = dataToInitialValues({

package/dist/components/base-form/demo/BaseFormCustomContent.js

@@ -14,7 +14,10 @@ import { getFieldsDefaultValues } from "../modules/handlerData";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default (function () {
-  var t = 'hidden';
+  // const t: Exclude<
+  //   GetProps<typeof BaseForm>['fields'],
+  //   undefined
+  // >[number]['valueType'] = 'hidden';
   var _useStateData = useStateData(function () {
       return {
         fields: [{
@@ -36,8 +39,8 @@ export default (function () {
               colon: false
             }
           }, {
-            valueType: 'inputNumberRange',
-            field: ['www.multipleComponents-input', 'www.multipleComponents-input2']
+            valueType: 'inputNumberRangeV2',
+            field: ['www.multipleComponents.input', 'www.multipleComponents.input2']
           }]
         }],
         initialValues: {},

package/dist/components/base-form/demo/BaseProFormDateRangePickerV2.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => import("react/jsx-runtime").JSX.Element;
+export default _default;

package/dist/components/base-form/demo/BaseProFormDateRangePickerV2.js

@@ -0,0 +1,50 @@
+import { RexProConfigProvider } from "../../../context";
+import { ProForm, ProFormText } from '@ant-design/pro-components';
+import { createIntl } from 'react-intl';
+import { ProFormDateRangePickerV2 } from "../components/ProFormDateRangePickerV2";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export default (function () {
+  return /*#__PURE__*/_jsx(RexProConfigProvider, {
+    value: {
+      intl: createIntl({
+        locale: 'en-US',
+        messages: {}
+      })
+      // apiClient: (api, params) => {
+      //   return fetch(api, {method: 'post', body: JSON.stringify(params)}).then((res) => ({data: []}));
+      // },
+    },
+    children: /*#__PURE__*/_jsxs(ProForm, {
+      initialValues: {
+        data: {
+          // min: 2,
+          // max: 1111,
+        }
+        // testName: 'qweqwe',
+      }
+      // size="small"
+      // disabled
+      // readonly
+      ,
+      layout: "horizontal",
+      onFinish: function onFinish(values) {
+        console.log(values);
+      },
+      children: [/*#__PURE__*/_jsx(ProFormDateRangePickerV2, {
+        required: true,
+        label: "\u65E5\u671F\u8303\u56F4",
+        name: [['data', 'start'], ['data', 'end']]
+        // initialValue={-30}
+        // dataFormat="YYYY-MM-DD"
+      }), /*#__PURE__*/_jsx(ProFormText, {
+        required: true,
+        rules: [{
+          required: true
+        }],
+        label: "\u6D4B\u8BD5\u6587\u672C",
+        name: "testName"
+      })]
+    })
+  });
+});

package/dist/components/base-form/demo/BaseProFormDigitRangeV2.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => import("react/jsx-runtime").JSX.Element;
+export default _default;

package/dist/components/base-form/demo/BaseProFormDigitRangeV2.js

@@ -0,0 +1,59 @@
+import { RexProConfigProvider } from "../../../context";
+import { ProForm, ProFormText } from '@ant-design/pro-components';
+import { createIntl } from 'react-intl';
+import { ProFormDigitRangeV2 } from "../components/ProFormDigitRangeV2";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export default (function () {
+  return /*#__PURE__*/_jsx(RexProConfigProvider, {
+    value: {
+      intl: createIntl({
+        locale: 'en-US',
+        messages: {}
+      })
+      // apiClient: (api, params) => {
+      //   return fetch(api, {method: 'post', body: JSON.stringify(params)}).then((res) => ({data: []}));
+      // },
+    },
+    children: /*#__PURE__*/_jsxs(ProForm, {
+      initialValues: {
+        data: {
+          // min: 2,
+          // max: 1111,
+        },
+        testName: 'qweqwe'
+      }
+      // size="small"
+      // disabled
+      // readonly
+      ,
+      layout: "horizontal",
+      onFinish: function onFinish(values) {
+        console.log(values);
+      },
+      children: [/*#__PURE__*/_jsx(ProFormDigitRangeV2, {
+        required: true,
+        label: "\u6570\u5B57\u8303\u56F4",
+        name: [['data', 'min'], ['data', 'max']],
+        initialValue: [undefined, 3]
+        // formItemProps={{
+        //   style: {
+        //     margin: 0,
+        //   },
+        // }}
+        ,
+        fieldProps: {
+          min: 0,
+          max: 1000
+        }
+      }), /*#__PURE__*/_jsx(ProFormText, {
+        required: true,
+        rules: [{
+          required: true
+        }],
+        label: "\u6D4B\u8BD5\u6587\u672C",
+        name: "testName"
+      })]
+    })
+  });
+});

package/dist/components/base-form/demo/index.js

@@ -137,10 +137,15 @@ export default (function () {
       b: 2
     }
   }, {
-    valueType: 'dateRange',
+    valueType: 'dateRangeV2',
     field: ['dateRange-start', 'dateRange-end'],
     label: 'dateRange',
-    defaultValue: -29
+    defaultValue: -29,
+    required: true,
+    fieldProps: {
+      showTime: true,
+      format: 'YYYY/MM/DD HH:mm:ss'
+    }
   }, {
     valueType: 'cascader',
     field: 'cascader',

package/dist/components/base-form/modules/renderComponentNode.js

@@ -21,6 +21,8 @@ import { ProFormCascader, ProFormCheckbox, ProFormDatePicker, ProFormDateRangePi
 import classNames from 'classnames';
 import dayjs from 'dayjs';
 import { BaseForm } from "../base-form";
+import { ProFormDateRangePickerV2 } from "../components/ProFormDateRangePickerV2";
+import { ProFormDigitRangeV2 } from "../components/ProFormDigitRangeV2";
 import { getFieldsDefaultValues } from "./handlerData";
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -460,6 +462,20 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
         }
       });
     }
+    if (valueType === 'dateRangeV2') {
+      // const initialValues = getFieldsDefaultValues([item]);
+      return dynamicCom(ProFormDateRangePickerV2, {
+        name: [splitKeyStr(fields[0]), splitKeyStr(fields[1])],
+        placeholder: [formatMessage({
+          id: 'rex.components.base-form.placeholder.date-range.start',
+          defaultMessage: '开始时间'
+        }), formatMessage({
+          id: 'rex.components.base-form.placeholder.date-range.end',
+          defaultMessage: '结束时间'
+        })],
+        initialValue: defaultValue
+      });
+    }
     if (valueType === 'cascader') {
       return dynamicCom(ProFormCascader, {
         fieldProps: {
@@ -602,6 +618,24 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
         })]
       });
     }
+    if (valueType === 'inputNumberRangeV2') {
+      return dynamicCom(ProFormDigitRangeV2, {
+        initialValue: defaultValue,
+        // name: keyStr as [string, string],
+        name: [splitKeyStr(fields[0]), splitKeyStr(fields[1])],
+        // transform: (inrValues: Array<number | undefined>) => ({
+        //   [fields[0]]: inrValues[0],
+        //   [fields[1]]: inrValues[1],
+        // }),
+        placeholder: [formatMessage({
+          id: 'rex.components.base-form.placeholder.input-number-range.min',
+          defaultMessage: '最小值'
+        }), formatMessage({
+          id: 'rex.components.base-form.placeholder.input-number-range.max',
+          defaultMessage: '最大值'
+        })]
+      });
+    }
     if (valueType === 'textArea') {
       return dynamicCom(ProFormTextArea, {
         initialValue: defaultValue,

package/dist/components/base-form/types.d.ts

@@ -2,10 +2,12 @@ import { ProForm, ProFormCascader, ProFormCheckbox, ProFormDatePicker, ProFormDa
 import { TButtonFilterItem } from "../..";
 import { Form, GetProps } from 'antd';
 import { ReactNode } from 'react';
+import { ProFormDateRangePickerV2 } from './components/ProFormDateRangePickerV2';
+import { ProFormDigitRangeV2 } from './components/ProFormDigitRangeV2';
 /** 组件props */
 export interface IBaseFormProps {
     /** 字段配置 */
-    fields?: Array<TInputProps | TDateRangeProps | TSelectProps | TSelectInputProps | TSelectDimProps | TCustomProps | TSelectDateRangeProps | TCascaderProps | TTreeSelectProps | TCheckboxProps | TCheckboxGroupProps | TRadioGroupProps | TInputNumberProps | TInputNumberRangeProps | TTextAreaProps | TSelectRadioProps | TMultipleComponentsProps | TSwitchProps | TDatePickerProps | THiddenProps>;
+    fields?: Array<TInputProps | TDateRangeProps | TSelectProps | TSelectInputProps | TSelectDimProps | TCustomProps | TSelectDateRangeProps | TCascaderProps | TTreeSelectProps | TCheckboxProps | TCheckboxGroupProps | TRadioGroupProps | TInputNumberProps | TInputNumberRangeProps | TTextAreaProps | TSelectRadioProps | TMultipleComponentsProps | TSwitchProps | TDatePickerProps | THiddenProps | TInputNumberRangeV2Props | TDateRangeV2Props>;
     /** 字段对应的本地代码配置 */
     fieldProps?: Record<string, Exclude<IBaseFormProps['fields'], undefined>[number]>;
     /**
@@ -29,6 +31,7 @@ export type TInputProps = IBaseFormFieldItem<'input'> & Omit<GetProps<typeof Pro
 export type TSelectProps = IBaseFormFieldItem<'select'> & Omit<GetProps<typeof ProFormSelect>, TOmitComponentItemType>;
 export type TSelectDimProps = IBaseFormFieldItem<'selectDim'> & Omit<GetProps<typeof ProFormSelect>, TOmitComponentItemType>;
 export type TDateRangeProps = IBaseFormFieldItem<'dateRange'> & Omit<GetProps<typeof ProFormDateRangePicker>, TOmitComponentItemType>;
+export type TDateRangeV2Props = IBaseFormFieldItem<'dateRangeV2'> & Omit<GetProps<typeof ProFormDateRangePickerV2>, TOmitComponentItemType>;
 export type TCascaderProps = IBaseFormFieldItem<'cascader'> & Omit<GetProps<typeof ProFormCascader>, TOmitComponentItemType>;
 export type TTreeSelectProps = IBaseFormFieldItem<'treeSelect'> & Omit<GetProps<typeof ProFormTreeSelect>, TOmitComponentItemType>;
 export type TCheckboxProps = IBaseFormFieldItem<'checkbox'> & Omit<GetProps<typeof ProFormCheckbox>, TOmitComponentItemType>;
@@ -36,6 +39,7 @@ export type TCheckboxGroupProps = IBaseFormFieldItem<'checkboxGroup'> & Omit<Get
 export type TRadioGroupProps = IBaseFormFieldItem<'radioGroup'> & Omit<GetProps<typeof ProFormRadio>, TOmitComponentItemType>;
 export type TInputNumberProps = IBaseFormFieldItem<'inputNumber'> & Omit<GetProps<typeof ProFormDigit>, TOmitComponentItemType>;
 export type TInputNumberRangeProps = IBaseFormFieldItem<'inputNumberRange'> & Omit<GetProps<typeof ProFormDigitRange>, TOmitComponentItemType>;
+export type TInputNumberRangeV2Props = IBaseFormFieldItem<'inputNumberRangeV2'> & Omit<GetProps<typeof ProFormDigitRangeV2>, TOmitComponentItemType>;
 export type TTextAreaProps = IBaseFormFieldItem<'textArea'> & Omit<GetProps<typeof ProFormTextArea>, TOmitComponentItemType>;
 export type TSelectRadioProps = IBaseFormFieldItem<'selectRadio'> & Omit<GetProps<typeof ProFormSelect>, TOmitComponentItemType>;
 export type TSwitchProps = IBaseFormFieldItem<'switch'> & Omit<GetProps<typeof ProFormSwitch>, TOmitComponentItemType>;
@@ -178,5 +182,5 @@ export type TValueType = 'input'
  * @desc 下拉框+输入框
  * @deprecated 建议使用 multipleComponents 进行组合
  */
- | 'selectInput' | 'selectDim' | 'dateRange' | 'selectDateRange' | 'cascader' | 'treeSelect' | 'checkbox' | 'checkboxGroup' | 'radioGroup' | 'inputNumber' | 'inputNumberRange' | 'textArea' | 'selectRadio' | 'multipleComponents' | 'switch' | 'datePicker' | 'hidden' | 'upload' | 'table' | 'custom';
+ | 'selectInput' | 'selectDim' | 'dateRange' | 'dateRangeV2' | 'selectDateRange' | 'cascader' | 'treeSelect' | 'checkbox' | 'checkboxGroup' | 'radioGroup' | 'inputNumber' | 'inputNumberRange' | 'inputNumberRangeV2' | 'textArea' | 'selectRadio' | 'multipleComponents' | 'switch' | 'datePicker' | 'hidden' | 'upload' | 'table' | 'custom';
 export {};

package/dist/components/upload-plus/demo/index.js

@@ -5,11 +5,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { RexProConfigProvider } from "../../../context";
+import { UploadPlus } from "../../..";
 import { Card, message } from 'antd';
 import enUS from 'antd/es/calendar/locale/en_US';
 import { crush } from 'radash';
 import { createIntl } from 'react-intl';
-import { UploadPlus } from "../../..";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default (function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.0.24",
+  "version": "0.0.27",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -50,6 +50,7 @@
   "dependencies": {
     "@ant-design/icons": "^6.0.0",
     "@ant-design/pro-components": "^2.8.10",
+    "@ant-design/pro-form": "^2.32.0",
     "@iconify/react": "^6.0.0",
     "@tiptap/core": "^2.12.0",
     "@tiptap/extension-bullet-list": "2.12.0",
@@ -102,6 +103,7 @@
   "peerDependencies": {
     "@ant-design/icons": ">=5.0.0",
     "@ant-design/pro-components": ">=2.0.0",
+    "@ant-design/pro-form": ">=2.0.0",
     "antd": ">=5.0.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",