@teamias/rex-design 0.0.26 → 0.0.28

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

@@ -19,7 +19,9 @@ 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,
@@ -95,17 +97,29 @@ export var ProFormDateRangePickerV2 = function ProFormDateRangePickerV2(_ref) {
                 startValue = form.getFieldValue(startFieldName);
                 endValue = form.getFieldValue(endFieldName);
                 if (!(!startValue || !endValue)) {
-                  _context.next = 6;
+                  _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 6:
+              case 7:
                 setValidateStatus('');
                 setHelp('');
+                form.setFields([{
+                  name: startFieldName
+                }, {
+                  name: endFieldName
+                }]);
                 return _context.abrupt("return", Promise.resolve());
-              case 9:
+              case 11:
               case "end":
                 return _context.stop();
             }
@@ -153,23 +167,35 @@ export var ProFormDateRangePickerV2 = function ProFormDateRangePickerV2(_ref) {
             children: startValue && endValue ? "".concat(startValue, " ~ ").concat(endValue) : '-'
           });
         }
-        return /*#__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);
-          }
-        }));
+        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.js

@@ -13,11 +13,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 } from '@ant-design/pro-components';
+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 } from 'react';
+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) {
@@ -37,6 +38,16 @@ export var ProFormDigitRangeV2 = function ProFormDigitRangeV2(_ref) {
   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];
@@ -46,84 +57,56 @@ export var ProFormDigitRangeV2 = function ProFormDigitRangeV2(_ref) {
     maxFieldName = _useMemo2[1];
 
   // 生成校验规则
-  var minRules = useMemo(function () {
-    if (!required) return undefined;
-    if (requiredMode === 'both') {
-      // 两边都必填
-      return [{
-        required: true,
-        message: '请输入最小值'
-      }];
-    } else {
-      // 至少填一边
-      return [{
-        validator: function () {
-          var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, value) {
-            var maxValue;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  maxValue = form.getFieldValue(maxFieldName);
-                  if (!((value === null || value === undefined || value === '') && (maxValue === null || maxValue === undefined || maxValue === ''))) {
-                    _context.next = 3;
-                    break;
-                  }
-                  return _context.abrupt("return", Promise.reject(new Error('请至少输入一个值')));
-                case 3:
-                  return _context.abrupt("return", Promise.resolve());
-                case 4:
-                case "end":
-                  return _context.stop();
-              }
-            }, _callee);
-          }));
-          function validator(_x, _x2) {
-            return _validator.apply(this, arguments);
-          }
-          return validator;
-        }()
-      }];
-    }
-  }, [required, requiredMode, maxFieldName, form]);
-  var maxRules = useMemo(function () {
+  var validateRules = useMemo(function () {
     if (!required) return undefined;
-    if (requiredMode === 'both') {
-      // 两边都必填
-      return [{
-        required: true,
-        message: '请输入最大值'
-      }];
-    } else {
-      // 至少填一边
-      return [{
-        validator: function () {
-          var _validator2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_, value) {
-            var minValue;
-            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-              while (1) switch (_context2.prev = _context2.next) {
-                case 0:
-                  minValue = form.getFieldValue(minFieldName);
-                  if (!((value === null || value === undefined || value === '') && (minValue === null || minValue === undefined || minValue === ''))) {
-                    _context2.next = 3;
-                    break;
-                  }
-                  return _context2.abrupt("return", Promise.reject(new Error('请至少输入一个值')));
-                case 3:
-                  return _context2.abrupt("return", Promise.resolve());
-                case 4:
-                case "end":
-                  return _context2.stop();
-              }
-            }, _callee2);
-          }));
-          function validator(_x3, _x4) {
-            return _validator2.apply(this, arguments);
-          }
-          return validator;
-        }()
-      }];
-    }
-  }, [required, requiredMode, minFieldName, form]);
+    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 () {
@@ -156,11 +139,28 @@ export var ProFormDigitRangeV2 = function ProFormDigitRangeV2(_ref) {
       }
     }, 0);
   }, [autoSwap, minFieldName, maxFieldName, form]);
-  return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsxs(Form.Item, _objectSpread(_objectSpread({
     label: label,
-    required: required
+    required: required,
+    validateStatus: validateStatus,
+    help: help
   }, formItemProps), {}, {
-    children: /*#__PURE__*/_jsxs(Space.Compact, {
+    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%'
       },
@@ -168,7 +168,8 @@ export var ProFormDigitRangeV2 = function ProFormDigitRangeV2(_ref) {
         noStyle: true,
         name: minFieldName,
         initialValue: initialValue === null || initialValue === void 0 ? void 0 : initialValue[0],
-        rules: minRules,
+        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,
@@ -177,7 +178,12 @@ export var ProFormDigitRangeV2 = function ProFormDigitRangeV2(_ref) {
           style: _objectSpread({
             flex: 1
           }, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style),
-          onBlur: handleMinBlur
+          onBlur: handleMinBlur,
+          onChange: function onChange() {
+            setTimeout(function () {
+              validateRules === null || validateRules === void 0 || validateRules[0].validator().catch(function () {});
+            }, 0);
+          }
         }))
       }), formReadonly ? /*#__PURE__*/_jsx(RenderText, {
         value: "~",
@@ -199,7 +205,8 @@ export var ProFormDigitRangeV2 = function ProFormDigitRangeV2(_ref) {
         noStyle: true,
         name: maxFieldName,
         initialValue: initialValue === null || initialValue === void 0 ? void 0 : initialValue[1],
-        rules: maxRules,
+        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,
@@ -208,9 +215,14 @@ export var ProFormDigitRangeV2 = function ProFormDigitRangeV2(_ref) {
           style: _objectSpread({
             flex: 1
           }, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style),
-          onBlur: handleMaxBlur
+          onBlur: handleMaxBlur,
+          onChange: function onChange() {
+            setTimeout(function () {
+              validateRules === null || validateRules === void 0 || validateRules[0].validator().catch(function () {});
+            }, 0);
+          }
         }))
       })]
-    })
+    })]
   }));
 };

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/{base-form.d.ts → core/base-form.d.ts}

@@ -1,3 +1,3 @@
 import { FC } from 'react';
-import { IBaseFormProps } from './types';
+import { IBaseFormProps } from '../types';
 export declare const BaseForm: FC<IBaseFormProps>;

package/dist/components/base-form/{base-form.js → core/base-form.js}

@@ -11,11 +11,11 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { ProForm, ProFormDependency } from '@ant-design/pro-components';
-import { handlerFilter, useRexProConfigProvider } from "../..";
+import { handlerFilter, useRexProConfigProvider } from "../../..";
 import { useRef } from 'react';
-import { processDependencyFields } from "./modules/dependencyUtils";
-import { renderComponentNode } from "./modules/renderComponentNode";
-import { BaseFormStyle } from "./style";
+import { processDependencyFields } from "../modules/dependencyUtils";
+import { renderComponentNode } from "../modules/renderComponentNode";
+import { BaseFormStyle } from "../style";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";

package/dist/components/base-form/core/descriptions-model.d.ts

@@ -0,0 +1,3 @@
+import { FC } from 'react';
+import { IBaseFormProps } from '../types';
+export declare const DescriptionsModel: FC<IBaseFormProps>;

package/dist/components/base-form/core/descriptions-model.js

@@ -0,0 +1,86 @@
+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); }
+var _excluded = ["descriptionsProps", "fields"],
+  _excluded2 = ["label", "tooltip", "formItemProps"];
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { Descriptions, Form } from 'antd';
+import { useMemo } from 'react';
+import { DescriptionsStyle } from "../style";
+import { BaseForm } from "./base-form";
+import { jsx as _jsx } from "react/jsx-runtime";
+export var DescriptionsModel = function DescriptionsModel(_ref) {
+  var descriptionsProps = _ref.descriptionsProps,
+    fields = _ref.fields,
+    baseFormProps = _objectWithoutProperties(_ref, _excluded);
+  var descriptionsItems = useMemo(function () {
+    /** 检查field或其subItems是否包含rules */
+    var hasRules = function hasRules(field) {
+      if (field.rules && field.rules.length > 0) {
+        return true;
+      }
+      if ('subItems' in field && field.subItems && Array.isArray(field.subItems)) {
+        return field.subItems.some(hasRules);
+      }
+      if (field.required) return true;
+      return false;
+    };
+    return (fields === null || fields === void 0 ? void 0 : fields.map(function (field) {
+      var _formItemProps$labelC;
+      var isRequired = hasRules(field);
+
+      // 创建新的field对象，移除label属性
+      var label = field.label,
+        tooltip = field.tooltip,
+        formItemProps = field.formItemProps,
+        otherData = _objectWithoutProperties(field, _excluded2);
+      return {
+        label: /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
+          label: label,
+          tooltip: tooltip,
+          required: isRequired,
+          colon: false,
+          style: {
+            margin: 0
+          }
+        }, formItemProps), {}, {
+          labelCol: _objectSpread(_objectSpread({}, formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.labelCol), {}, {
+            style: _objectSpread({
+              padding: 0,
+              width: '100%',
+              textAlign: 'right'
+            }, formItemProps === null || formItemProps === void 0 || (_formItemProps$labelC = formItemProps.labelCol) === null || _formItemProps$labelC === void 0 ? void 0 : _formItemProps$labelC.style)
+          }),
+          wrapperCol: {
+            style: {
+              display: 'none'
+            }
+          }
+        })),
+        children: /*#__PURE__*/_jsx(BaseForm, _objectSpread(_objectSpread({}, baseFormProps), {}, {
+          itemMarginBottom: 0,
+          fields: [_objectSpread(_objectSpread({}, otherData), {}, {
+            formItemProps: {
+              wrapperCol: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.wrapperCol
+            }
+          })]
+        })),
+        span: field.span || 1
+      };
+    })) || [];
+  }, [fields]);
+  return /*#__PURE__*/_jsx(DescriptionsStyle, {
+    children: /*#__PURE__*/_jsx(Descriptions, _objectSpread(_objectSpread({
+      bordered: true,
+      styles: {
+        label: {}
+      }
+    }, descriptionsProps), {}, {
+      items: descriptionsItems
+    }))
+  });
+};

package/dist/components/base-form/core/index.d.ts

@@ -0,0 +1,4 @@
+import { BaseForm as RawBaseForm } from './base-form';
+import { DescriptionsModel as BaseDescriptionsForm } from './descriptions-model';
+declare const BaseForm: typeof RawBaseForm;
+export { BaseDescriptionsForm, BaseForm };

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

@@ -0,0 +1,16 @@
+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); }
+import { BaseForm as RawBaseForm } from "./base-form";
+import { DescriptionsModel as BaseDescriptionsForm } from "./descriptions-model";
+import { jsx as _jsx } from "react/jsx-runtime";
+var BaseForm = function BaseForm(props) {
+  if (props.type === 'descriptions') {
+    return /*#__PURE__*/_jsx(BaseDescriptionsForm, _objectSpread({}, props));
+  }
+  return /*#__PURE__*/_jsx(RawBaseForm, _objectSpread({}, props));
+};
+export { BaseDescriptionsForm, BaseForm };

package/dist/components/base-form/demo/{index.js → Base.js}

@@ -10,7 +10,7 @@ import { ProForm } from '@ant-design/pro-components';
 import { RexProConfigProvider } from "../../..";
 import { crush } from 'radash';
 import { createIntl } from 'react-intl';
-import { BaseForm } from "../base-form";
+import { BaseForm } from "../core";
 import { getFieldsDefaultValues } from "../modules/handlerData";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default (function () {

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

@@ -12,7 +12,7 @@ import { ProForm } from '@ant-design/pro-components';
 import { RexProConfigProvider } from "../../..";
 import { crush } from 'radash';
 import { createIntl } from 'react-intl';
-import { BaseForm } from "../base-form";
+import { BaseForm } from "../core";
 import { getFieldsDefaultValues } from "../modules/handlerData";
 import { jsx as _jsx } from "react/jsx-runtime";
 var s1 = function s1(params) {

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

@@ -15,7 +15,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { ProForm, ProFormDependency, ProFormSelect } from '@ant-design/pro-components';
 import { Button, Card } from 'antd';
-import { BaseForm } from "../base-form";
+import { BaseForm } from "../core";
 import { dataToInitialValues } from "../modules/handlerData";
 import { valuesToFields } from "../modules/valuesToFields";
 import { jsx as _jsx } from "react/jsx-runtime";

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

@@ -9,7 +9,7 @@ import { ProForm } from '@ant-design/pro-components';
 import { RexProConfigProvider, useStateData } from "../../..";
 import { crush } from 'radash';
 import { createIntl } from 'react-intl';
-import { BaseForm } from "../base-form";
+import { BaseForm } from "../core";
 import { getFieldsDefaultValues } from "../modules/handlerData";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";

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

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

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

@@ -0,0 +1,63 @@
+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); }
+import enUS from "../../../locales/en-US.json";
+import { ProForm } from '@ant-design/pro-components';
+import { RexProConfigProvider } from "../../..";
+import { Input } from 'antd';
+import { crush } from 'radash';
+import { createIntl } from 'react-intl';
+import { BaseForm } from "../core";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+export default (function () {
+  return /*#__PURE__*/_jsx(RexProConfigProvider, {
+    value: {
+      intl: createIntl({
+        locale: 'en-US',
+        messages: _objectSpread({}, crush(enUS))
+      })
+    },
+    children: /*#__PURE__*/_jsx(ProForm, {
+      initialValues: {
+        a: 1
+      },
+      onFinish: function onFinish(values) {
+        console.log(values);
+      },
+      children: /*#__PURE__*/_jsx(BaseForm, {
+        fields: [{
+          valueType: 'input',
+          label: '普通输入框',
+          field: 'a',
+          readonly: true
+        }, {
+          field: 'customFormItem',
+          label: '自定义渲染表单项',
+          valueType: 'custom',
+          required: true,
+          formItemProps: {
+            rules: [{
+              required: true,
+              message: '这是必填项'
+            }]
+          },
+          render: function render(props, form) {
+            // console.log(props);
+
+            return /*#__PURE__*/_jsx(_Fragment, {
+              children: /*#__PURE__*/_jsx(Input, {
+                value: props.value,
+                onChange: props.onChange
+              })
+            });
+          }
+        }],
+        itemWidth: "50%"
+      })
+    })
+  });
+});

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

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

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

@@ -0,0 +1,244 @@
+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); }
+import enUS from "../../../locales/en-US.json";
+import { UserOutlined } from '@ant-design/icons';
+import { ProForm } from '@ant-design/pro-components';
+import { RexProConfigProvider } from "../../..";
+import { crush } from 'radash';
+import { createIntl } from 'react-intl';
+import { BaseForm } from "../core";
+import { getFieldsDefaultValues } from "../modules/handlerData";
+import { jsx as _jsx } from "react/jsx-runtime";
+export default (function () {
+  var fields = [{
+    label: '成本区间',
+    valueType: 'multipleComponents',
+    compact: true,
+    subItems: [{
+      valueType: 'select',
+      field: 'avg_cost',
+      defaultValue: 'avg_cost',
+      itemWidth: '150px',
+      fieldProps: {
+        allowClear: false,
+        popupMatchSelectWidth: false,
+        maxTagCount: 1
+      },
+      hidden: false,
+      options: [{
+        label: '成本区间',
+        value: 'avg_cost'
+      }]
+    }, {
+      field: ['avg_cost_min', 'avg_cost_max'],
+      valueType: 'inputNumberRangeV2'
+    }],
+    hidden: false
+  }, {
+    valueType: 'multipleComponents',
+    label: 'multipleComponents',
+    compact: true,
+    tooltip: 'multipleComponents 示例',
+    subItems: [{
+      valueType: 'input',
+      field: 'multipleComponents-input',
+      labelWidth: '100px',
+      // itemWidth: '20%',
+      defaultValue: '2025-05-05',
+      fieldProps: {
+        prefix: /*#__PURE__*/_jsx(UserOutlined, {}),
+        disabled: true
+      }
+    }, {
+      valueType: 'treeSelect',
+      field: 'multipleComponents-treeSelect',
+      // itemWidth: '80%',
+      defaultValue: 'light',
+      options: [{
+        label: 'Light',
+        value: 'light'
+      }, {
+        label: 'Light2',
+        value: 'light2'
+      }]
+    }, {
+      valueType: 'datePicker',
+      field: 'multipleComponents-datePicker',
+      defaultValue: '2025-05-05'
+    }, {
+      valueType: 'treeSelect',
+      field: 'multipleComponents-treeSelect2',
+      options: [{
+        label: 'Light123',
+        value: 'light123'
+      }, {
+        label: 'Light456',
+        value: 'light456'
+      }],
+      fieldProps: {
+        disabled: true
+      }
+    }
+    // {
+    //   valueType: 'inputNumberRange',
+    //   field: ['multipleComponents-min', 'multipleComponents-max'],
+    //   defaultValue: [2, 5],
+    // },
+    // {
+    //   valueType: 'select',
+    //   field: 'multipleComponents-select',
+    //   defaultValue: 'light',
+    //   options: [
+    //     {label: 'Light', value: 'light'},
+    //     {label: 'Light2', value: 'light2'},
+    //   ],
+    // },
+    // {
+    //   valueType: 'dateRange',
+    //   field: ['multipleComponents-start', 'multipleComponents-end'],
+    // },
+    ],
+    span: 3
+  }, {
+    valueType: 'input',
+    field: 'input',
+    label: 'input',
+    defaultValue: 'input',
+    hidden: false,
+    rules: [{
+      required: true,
+      message: '这是必填项'
+    }]
+  }, {
+    valueType: 'select',
+    field: 'select',
+    label: 'select',
+    defaultValue: 'light',
+    options: [{
+      label: 'Light',
+      value: 'light'
+    }, {
+      label: 'Light2',
+      value: 'light2'
+    }]
+  }, {
+    valueType: 'selectDim',
+    field: 'selectDim',
+    label: 'selectDim',
+    api: '/selectData',
+    defaultParams: {
+      a: 1,
+      b: 2
+    }
+  }, {
+    valueType: 'dateRangeV2',
+    field: ['dateRange-start', 'dateRange-end'],
+    label: 'dateRange',
+    defaultValue: -29,
+    required: true,
+    fieldProps: {
+      showTime: true,
+      format: 'YYYY/MM/DD HH:mm:ss'
+    }
+  }, {
+    valueType: 'cascader',
+    field: 'cascader',
+    label: 'cascader',
+    options: [{
+      label: 'Light',
+      value: 'light'
+    }, {
+      label: 'Light2',
+      value: 'light2'
+    }]
+  }, {
+    valueType: 'treeSelect',
+    field: 'treeSelect',
+    label: 'treeSelect',
+    options: [{
+      label: 'Light',
+      value: 'light'
+    }, {
+      label: 'Light2',
+      value: 'light2'
+    }],
+    fieldProps: {
+      disabled: true
+    }
+  }, {
+    valueType: 'checkboxGroup',
+    field: 'checkboxGroup',
+    label: 'checkboxGroup',
+    options: [{
+      label: 'Light',
+      value: 'light'
+    }, {
+      label: 'Light2',
+      value: 'light2'
+    }]
+  }, {
+    valueType: 'radioGroup',
+    field: 'radioGroup',
+    label: 'radioGroup',
+    defaultValue: 'light',
+    options: [{
+      label: 'Light',
+      value: 'light'
+    }, {
+      label: 'Light2',
+      value: 'light2'
+    }]
+  }, {
+    valueType: 'inputNumber',
+    field: 'inputNumber',
+    label: 'inputNumber',
+    defaultValue: 2
+  }, {
+    valueType: 'inputNumberRange',
+    field: ['inputNumberRange-min', 'inputNumberRange-max'],
+    label: 'inputNumberRange',
+    defaultValue: [2, 5]
+  }, {
+    valueType: 'textArea',
+    field: 'textArea',
+    label: 'textArea',
+    defaultValue: 'qweqwe'
+  }, {
+    valueType: 'switch',
+    field: 'switch',
+    label: 'switch'
+  }, {
+    valueType: 'datePicker',
+    field: 'datePicker',
+    label: 'datePicker',
+    defaultValue: '2025-05-05'
+  }];
+  var initialValues = getFieldsDefaultValues(fields);
+  // console.log(initialValues);
+
+  return /*#__PURE__*/_jsx(RexProConfigProvider, {
+    value: {
+      intl: createIntl({
+        locale: 'en-US',
+        messages: _objectSpread({}, crush(enUS))
+      })
+    },
+    children: /*#__PURE__*/_jsx(ProForm, {
+      initialValues: initialValues
+      // size="small"
+      // readonly
+      ,
+      onFinish: function onFinish(values) {
+        console.log(values);
+      },
+      children: /*#__PURE__*/_jsx(BaseForm, {
+        fields: fields,
+        type: "descriptions"
+      })
+    })
+  });
+});

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

@@ -20,8 +20,8 @@ export default (function () {
         data: {
           // min: 2,
           // max: 1111,
-        },
-        testName: 'qweqwe'
+        }
+        // testName: 'qweqwe',
       }
       // size="small"
       // disabled
@@ -32,10 +32,10 @@ export default (function () {
         console.log(values);
       },
       children: [/*#__PURE__*/_jsx(ProFormDateRangePickerV2, {
-        required: false,
+        required: true,
         label: "\u65E5\u671F\u8303\u56F4",
-        name: [['data', 'start'], ['data', 'end']],
-        initialValue: -30
+        name: [['data', 'start'], ['data', 'end']]
+        // initialValue={-30}
         // dataFormat="YYYY-MM-DD"
       }), /*#__PURE__*/_jsx(ProFormText, {
         required: true,

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

@@ -35,12 +35,13 @@ export default (function () {
         required: true,
         label: "\u6570\u5B57\u8303\u56F4",
         name: [['data', 'min'], ['data', 'max']],
-        initialValue: [undefined, 3],
-        formItemProps: {
-          style: {
-            margin: 0
-          }
-        },
+        initialValue: [undefined, 3]
+        // formItemProps={{
+        //   style: {
+        //     margin: 0,
+        //   },
+        // }}
+        ,
         fieldProps: {
           min: 0,
           max: 1000

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

@@ -1,4 +1,4 @@
-export * from './base-form';
+export * from './core';
 export * from './modules/handlerData';
 export * from './modules/valuesToFields';
 export * from './types';

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

@@ -1,4 +1,4 @@
-export * from "./base-form";
+export * from "./core";
 export * from "./modules/handlerData";
 export * from "./modules/valuesToFields";
 export * from "./types";

package/dist/components/base-form/modules/dependencyUtils.d.ts

@@ -1,6 +1,6 @@
-import { TDependencyAction } from '../types';
+import { IBaseFormFieldItem } from '../types';
 type Dependency = {
-    action: TDependencyAction;
+    action: NonNullable<IBaseFormFieldItem['dependencies']>[number]['action'];
     field: string | string[];
 };
 export declare const processDependencyFields: (dependencies: Dependency[]) => {

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

@@ -20,9 +20,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { ProFormCascader, ProFormCheckbox, ProFormDatePicker, ProFormDateRangePicker, ProFormDependency, ProFormDigit, ProFormDigitRange, ProFormFieldSet, ProFormItem, ProFormItemRender, ProFormRadio, ProFormSelect, ProFormSwitch, ProFormText, ProFormTextArea, ProFormTreeSelect } from '@ant-design/pro-components';
 import classNames from 'classnames';
 import dayjs from 'dayjs';
-import { BaseForm } from "../base-form";
 import { ProFormDateRangePickerV2 } from "../components/ProFormDateRangePickerV2";
 import { ProFormDigitRangeV2 } from "../components/ProFormDigitRangeV2";
+import { BaseForm } from "../core/base-form";
 import { getFieldsDefaultValues } from "./handlerData";
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";

package/dist/components/base-form/style/index.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 export declare const BaseFormStyle: import("react").NamedExoticComponent<import("styled-components").ExecutionProps & object>;
-export declare const SetingtabsStyle: import("react").NamedExoticComponent<import("styled-components").ExecutionProps & object>;
+export declare const DescriptionsStyle: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;

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

@@ -1,8 +1,11 @@
-import { createGlobalStyle } from 'styled-components';
+import styled, { createGlobalStyle } from 'styled-components';
 var compactArr = ['ant-input-outlined', 'ant-select-selector', 'ant-picker', 'ant-input-number-outlined'];
 export var BaseFormStyle = createGlobalStyle([".base-form-field-group{display:flex !important;}.base-form-field-multiple-group{display:flex;width:100%;gap:8px;}.base-form-field-multiple-group.compact{gap:0;", "{border-top-left-radius:0;border-bottom-left-radius:0;border-left-color:transparent;}", "{border-top-right-radius:0;border-bottom-right-radius:0;}}.base-form-item{width:var(--item-width);.ant-form-item-label:has(label[title]){width:var(--label-width);}.ant-picker{width:100%;}.ant-space-compact{width:100%;}}"], compactArr.map(function (str) {
   return "> div:not(:first-child) .".concat(str);
 }).join(','), compactArr.map(function (str) {
   return "> div:not(:last-child) .".concat(str);
 }).join(','));
-export var SetingtabsStyle = createGlobalStyle([".ant-tabs-content-holder{height:600px;overflow:auto;}.setting-container{padding:16px;}::-webkit-scrollbar{width:6px;background-color:#f5f5f5;}::-webkit-scrollbar-thumb{background-color:#888;border-radius:3px;}"]);
+export var DescriptionsStyle = styled.div.withConfig({
+  displayName: "DescriptionsStyle",
+  componentId: "rex-design-aaf4__sc-1e1tacy-0"
+})([".ant-descriptions-view{overflow:auto;}.ant-form-item-additional{position:absolute;}"]);

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

@@ -0,0 +1,30 @@
+import { Descriptions, GetProps } from 'antd';
+import { IBaseFormFieldItem, TFields } from './field-type';
+/** 组件props */
+export interface IBaseFormProps {
+    /** 字段配置 */
+    fields?: TFields;
+    /** 字段对应的本地代码配置 */
+    fieldProps?: Record<string, Exclude<IBaseFormProps['fields'], undefined>[number]>;
+    /**
+     * 每个表单项宽度
+     * @default 20%
+     */
+    itemWidth?: number | string;
+    itemMarginBottom?: number | string;
+    /** 每个 label 宽度 */
+    labelWidth?: string;
+    /**
+     * 数据请求器
+     * - 不传的情况下用注入的请求器
+     */
+    requestOptions?: (api: string, params: Record<string, unknown>, rawItem: IBaseFormFieldItem) => Promise<Exclude<IBaseFormFieldItem['options'], undefined>>;
+    /** label 显示到输入框内 */
+    inlineLabel?: boolean;
+    /** 表单 展示类型 */
+    type?: 'form' | 'descriptions';
+    /**
+     * Descriptions 组件属性
+     */
+    descriptionsProps?: Omit<GetProps<typeof Descriptions>, 'items'>;
+}

package/dist/components/base-form/{types.d.ts → types/field-type.d.ts}

@@ -1,32 +1,12 @@
 import { ProForm, ProFormCascader, ProFormCheckbox, ProFormDatePicker, ProFormDateRangePicker, ProFormDigit, ProFormDigitRange, ProFormItemRender, ProFormRadio, ProFormSelect, ProFormSwitch, ProFormText, ProFormTextArea, ProFormTreeSelect } from '@ant-design/pro-components';
-import { TButtonFilterItem } from "../..";
+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 | TInputNumberRangeV2Props | TDateRangeV2Props>;
-    /** 字段对应的本地代码配置 */
-    fieldProps?: Record<string, Exclude<IBaseFormProps['fields'], undefined>[number]>;
-    /**
-     * 每个表单项宽度
-     * @default 20%
-     */
-    itemWidth?: number | string;
-    itemMarginBottom?: number | string;
-    /** 每个 label 宽度 */
-    labelWidth?: string;
-    /**
-     * 数据请求器
-     * - 不传的情况下用注入的请求器
-     */
-    requestOptions?: (api: string, params: Record<string, unknown>, rawItem: IBaseFormFieldItem) => Promise<Exclude<IBaseFormFieldItem['options'], undefined>>;
-    /** label 显示到输入框内 */
-    inlineLabel?: boolean;
-}
-type TOmitComponentItemType = 'width';
+import { ProFormDateRangePickerV2 } from '../components/ProFormDateRangePickerV2';
+import { ProFormDigitRangeV2 } from '../components/ProFormDigitRangeV2';
+import { TValueType } from './value-type';
+/** 聚合的表单项类型 */
+export type TFields = Array<TInputProps | TDateRangeProps | TSelectProps | TSelectInputProps | TSelectDimProps | TCustomProps | TSelectDateRangeProps | TCascaderProps | TTreeSelectProps | TCheckboxProps | TCheckboxGroupProps | TRadioGroupProps | TInputNumberProps | TInputNumberRangeProps | TTextAreaProps | TSelectRadioProps | TMultipleComponentsProps | TSwitchProps | TDatePickerProps | THiddenProps | TInputNumberRangeV2Props | TDateRangeV2Props>;
 export type TInputProps = IBaseFormFieldItem<'input'> & Omit<GetProps<typeof ProFormText>, TOmitComponentItemType>;
 export type TSelectProps = IBaseFormFieldItem<'select'> & Omit<GetProps<typeof ProFormSelect>, TOmitComponentItemType>;
 export type TSelectDimProps = IBaseFormFieldItem<'selectDim'> & Omit<GetProps<typeof ProFormSelect>, TOmitComponentItemType>;
@@ -49,7 +29,7 @@ export type TSelectInputProps = IBaseFormFieldItem<'selectInput'> & Omit<GetProp
 export type TSelectDateRangeProps = IBaseFormFieldItem<'selectDateRange'> & Omit<GetProps<typeof ProFormDateRangePicker>, TOmitComponentItemType>;
 export type TMultipleComponentsProps = IBaseFormFieldItem<'multipleComponents'> & GetProps<typeof Form.Item> & {
     /** 组合项 */
-    subItems: IBaseFormProps['fields'];
+    subItems: TFields;
     /** 组合模式,紧凑型 */
     compact?: boolean;
     formItemProps?: GetProps<typeof Form.Item>;
@@ -58,9 +38,7 @@ export type TCustomProps = IBaseFormFieldItem<'custom'> & GetProps<typeof Form.I
     render: (props: Parameters<GetProps<typeof ProFormItemRender>['children']>[0], form?: ReturnType<typeof ProForm.useForm>[0]) => ReactNode;
     formItemProps?: GetProps<typeof Form.Item>;
 };
-/** 后续可继续添加新类型 */
-export type TDependencyAction = 'value' | 'search' | 'visible' | 'disabled';
-/** 组件 fields 具体类型 */
+/** 组件 基础fields 类型 */
 export interface IBaseFormFieldItem<T extends TValueType = TValueType> {
     /** 组件类型 */
     valueType: T;
@@ -83,6 +61,7 @@ export interface IBaseFormFieldItem<T extends TValueType = TValueType> {
      */
     field?: string | string[];
     /**
+     * @deprecated 使用 dependenciesV2 替代
      * value 的情况只允许依赖单字段
      * search 的情况只允许依赖多字段
      * visible 的情况只允许依赖多字段
@@ -90,10 +69,10 @@ export interface IBaseFormFieldItem<T extends TValueType = TValueType> {
      */
     dependencies?: Array<{
         field: string;
-        action: Extract<TDependencyAction, 'value'>;
+        action: Extract<'value' | 'search' | 'visible' | 'disabled', 'value'>;
     } | {
         field: string[];
-        action: Extract<TDependencyAction, 'search' | 'visible' | 'disabled'>;
+        action: Extract<'value' | 'search' | 'visible' | 'disabled', 'search' | 'visible' | 'disabled'>;
     }>;
     dependenciesV2?: IDependenciesV2[];
     /** 选择项 */
@@ -152,12 +131,22 @@ export interface IBaseFormFieldItem<T extends TValueType = TValueType> {
     hidden?: boolean;
     /** 权限key */
     permissionKey?: string;
+    /**
+     * 栅格占位格数
+     * - Descriptions 组件使用
+     * - [文档](https://ant.design/components/descriptions-cn)
+     */
+    span?: number;
 }
+/** 统一 options 类型 */
 type TOption = {
     label: string;
     value: string | number;
     children?: TOption[];
 };
+/** 统一排除属性 */
+type TOmitComponentItemType = 'width';
+/** 依赖项 */
 export interface IDependenciesV2 extends Partial<Omit<TButtonFilterItem, 'original'>> {
     /** 依赖字段 */
     field: string;
@@ -174,13 +163,4 @@ export interface IDependenciesV2 extends Partial<Omit<TButtonFilterItem, 'origin
      */
     isTouched?: boolean;
 }
-/** 控件类型 */
-export type TValueType = 'input'
-/** 一次性拉所有 或 配置options */
- | 'select'
-/**
- * @desc 下拉框+输入框
- * @deprecated 建议使用 multipleComponents 进行组合
- */
- | '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/base-form/types/field-type.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,3 @@
+export * from './base-form';
+export * from './field-type';
+export * from './value-type';

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

@@ -0,0 +1,3 @@
+export * from "./base-form";
+export * from "./field-type";
+export * from "./value-type";

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

@@ -0,0 +1,9 @@
+/** 控件类型 */
+export type TValueType = 'input'
+/** 一次性拉所有 或 配置options */
+ | 'select'
+/**
+ * @desc 下拉框+输入框
+ * @deprecated 建议使用 multipleComponents 进行组合
+ */
+ | 'selectInput' | 'selectDim' | 'dateRange' | 'dateRangeV2' | 'selectDateRange' | 'cascader' | 'treeSelect' | 'checkbox' | 'checkboxGroup' | 'radioGroup' | 'inputNumber' | 'inputNumberRange' | 'inputNumberRangeV2' | 'textArea' | 'selectRadio' | 'multipleComponents' | 'switch' | 'datePicker' | 'hidden' | 'upload' | 'table' | 'custom';

package/dist/components/base-form/types/value-type.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",