@zat-design/sisyphus-react 3.13.19-beta.1 → 3.13.19-beta.10

package/lib/ProForm/components/render/RenderFields.js

@@ -8,12 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
-var _union2 = _interopRequireDefault(require("lodash/union"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
-var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
+var _lodash = require("lodash");
 var _Render = _interopRequireDefault(require("./Render"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
 var componentMap = _interopRequireWildcard(require("../index"));
@@ -21,8 +17,9 @@ var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../../../locale"));
 var _processDependencies = _interopRequireDefault(require("../../utils/processDependencies"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization", "span"];
-var RenderFields = function RenderFields(props) {
+var RenderFields = props => {
   var isView = props.isView,
     _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
@@ -40,24 +37,26 @@ var RenderFields = function RenderFields(props) {
     diffConfig = props.diffConfig,
     globalControl = props.globalControl,
     desensitizationKey = props.desensitizationKey;
+
   // 是否包含隐藏字段
-  var hiddenData = columns.filter(function (item) {
+  var hiddenData = columns.filter(item => {
     return Array.isArray(item.hiddenNames);
   }) || [];
+
   // 创建hidden字段供表单收集
   if (hiddenData.length) {
     var hiddenArray = [];
-    hiddenData.forEach(function (item) {
+    hiddenData.forEach(item => {
       hiddenArray = hiddenArray.concat(item.hiddenNames);
     });
-    hiddenArray.forEach(function (item) {
+    hiddenArray.forEach(item => {
       columns.push({
-        name: Array.isArray(item) ? item : "".concat(item),
+        name: Array.isArray(item) ? item : `${item}`,
         hidden: true
       });
     });
   }
-  var comList = columns.flatMap(function (column, index) {
+  var comList = columns.flatMap((column, index) => {
     var _formItemProps$disabl;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
@@ -94,34 +93,37 @@ var RenderFields = function RenderFields(props) {
     var defaultProps = (0, _getDefaultProps.getDefaultProps)(column);
     // 处理dependencies，支持namesPaths格式
     var processedDeps = (0, _processDependencies.default)(column.dependencies);
+
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
     var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), formItemProps), otherFormItemProps), {}, {
       required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
-      clearNotShow: clearNotShow,
+      clearNotShow,
       dependencies: processedDeps
     });
     _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth; // 接收Form中的labelWidth
+
     if (type && component) {
       console.error('Warning: type and component are mutually exclusive. type will not take effect');
     }
     var _type = type || 'Input';
     var TargetComponent;
+
     // 查看高阶函数
-    var viewRenderHandle = function viewRenderHandle() {
+    var viewRenderHandle = () => {
       var _column$namePath;
       var value = form.getFieldValue(column.name);
       var record = form.getFieldsValue();
       var index;
       // FormList场景
-      if (Array.isArray(column === null || column === void 0 ? void 0 : column.namePath) && (column === null || column === void 0 ? void 0 : (_column$namePath = column.namePath) === null || _column$namePath === void 0 ? void 0 : _column$namePath.length)) {
+      if (Array.isArray(column === null || column === void 0 ? void 0 : column.namePath) && column !== null && column !== void 0 && (_column$namePath = column.namePath) !== null && _column$namePath !== void 0 && _column$namePath.length) {
         // @ts-ignore
-        value = form.getFieldValue((0, _union2.default)(column.namePath, (column === null || column === void 0 ? void 0 : column.name) || []));
+        value = form.getFieldValue((0, _lodash.union)(column.namePath, (column === null || column === void 0 ? void 0 : column.name) || []));
         record = form.getFieldValue(column.namePath);
         index = column === null || column === void 0 ? void 0 : column.index;
       }
       return viewRender ? viewRender(value, record, {
-        form: form,
-        index: index,
+        form,
+        index,
         namePath: column === null || column === void 0 ? void 0 : column.namePath
       }) || null : null;
     };
@@ -135,7 +137,7 @@ var RenderFields = function RenderFields(props) {
     if (component && /*#__PURE__*/_react.default.isValidElement(component)) {
       var _newComponent$props;
       var newComponent = component;
-      var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
+      var isProEditTable = (newComponent === null || newComponent === void 0 || (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
       TargetComponent = _isView ? viewRenderHandle || '' : component;
       // 可编辑表格内部支持
       if (isProEditTable) {
@@ -147,19 +149,21 @@ var RenderFields = function RenderFields(props) {
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
     var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
+
     // 当前组件是不是一个选择组件
     var _isSelect = (0, _utils.isSelect)({
-      dataSource: dataSource,
+      dataSource,
       type: _type
     });
-    var placeholderHandle = function placeholderHandle() {
-      var _label = (0, _isString2.default)(label) ? label : '';
-      var _formLabel = (0, _isString2.default)(formLabel) ? formLabel : '';
-      return placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_label || _formLabel || '');
+    var placeholderHandle = () => {
+      var _label = (0, _lodash.isString)(label) ? label : '';
+      var _formLabel = (0, _lodash.isString)(formLabel) ? formLabel : '';
+      return placeholder || `${_isSelect ? `${_locale.default.ProForm.selectPlaceHolder}` : `${_locale.default.ProForm.inputPlaceholder}`}${_label || _formLabel || ''}`;
     };
+
     // 表单组件Props 兼容2.0版本
     var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
-    if ((0, _isBoolean2.default)(formDisabled)) {
+    if ((0, _lodash.isBoolean)(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
     var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -167,66 +171,76 @@ var RenderFields = function RenderFields(props) {
     }, _fieldProps), {}, {
       disabled: comDisabled
     });
+
     // 容器组件，额外处理show的问题
     if (['ProCollapse', 'Container'].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
       componentProps.diffConfig = diffConfig;
     }
+
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';
     }
+
     // 时间范围placeholder处理
-    if (['RangePicker'].includes(_type) && !(fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder)) {
+    if (['RangePicker'].includes(_type) && !(fieldProps !== null && fieldProps !== void 0 && fieldProps.placeholder)) {
       delete componentProps.placeholder;
     }
+
     // 没有找到对应组件  不渲染
     if (!TargetComponent) {
       return [];
     }
     var _colProps = span ? {
-      span: span
+      span
     } : (0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultColProps), colProps);
+
     // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
     var otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
       disabled: comDisabled,
       isView: _isView,
-      viewEmpty: viewEmpty,
-      valueType: valueType,
-      viewType: viewType,
+      viewEmpty,
+      valueType,
+      viewType,
       names: _formItemProps.names,
-      form: form,
+      form,
       type: _type,
       hiddenNames: column.hiddenNames,
       colProps: _colProps,
       mode: componentProps.mode,
       namePath: column.namePath,
       listName: column.listName,
-      globalControl: globalControl,
-      formDisabled: formDisabled,
-      diffConfig: diffConfig,
-      desensitizationKey: desensitizationKey
+      globalControl,
+      formDisabled,
+      diffConfig,
+      desensitizationKey
     };
-    return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
       value: otherProps,
-      children: (0, _jsxRuntime.jsx)(_Render.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Render.default, {
         show: show,
         form: form,
-        disabled: column.disabled,
-        formDisabled: formDisabled,
+        disabled: column.disabled // 外层配置disabled
+        ,
+        formDisabled: formDisabled // 表单全局disabled
+        ,
         type: _type,
-        originComponent: component,
-        component: TargetComponent,
+        originComponent: component // 原始自定义component，用于动态函数场景，TargetComponent已经默认赋值Input被污染
+        ,
+        component: TargetComponent
         // @ts-ignore
+        ,
         formItemProps: _formItemProps,
         confirm: confirm,
         colProps: _colProps,
         componentProps: componentProps,
         otherProps: otherProps,
-        fieldProps: (0, _isFunction2.default)(fieldProps) ? fieldProps : null,
+        fieldProps: (0, _lodash.isFunction)(fieldProps) ? fieldProps : null // 透传fieldProps函数
+        ,
         isSelect: _isSelect,
         diffConfig: diffConfig,
         onDiff: onDiff,
@@ -235,9 +249,9 @@ var RenderFields = function RenderFields(props) {
         viewRender: viewRender,
         desensitization: desensitization
       })
-    }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
+    }, `${_formItemProps.name || _formItemProps.label}${index}`);
   });
-  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: comList
   });
 };

package/lib/ProForm/components/render/propsType.js

@@ -3,4 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var a = {};
+/**
+ * percent 百分比 permillage 千分比 amount 金额
+ */
+
+/**
+ * 扩展函数的参数
+ */
+
+// ProForm场景 转换value为可选, onChange参数修改
+
+var a = {};
+
+/**
+ * 值转换
+ */
+
+// 扩展依赖类型的ProFormColumn接口
+
+/**
+ * 表单渲染类型
+ */
+
+/**
+ * 兼容旧命名导出
+ */
+// 类型别名

package/lib/ProForm/index.js

@@ -6,26 +6,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProFormProvider = void 0;
-require("antd/es/row/style");
-var _row = _interopRequireDefault(require("antd/es/row"));
 require("antd/es/form/style");
 var _form = _interopRequireDefault(require("antd/es/form"));
+require("antd/es/row/style");
+var _row = _interopRequireDefault(require("antd/es/row"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 require("antd/es/col/style");
 var _col = _interopRequireDefault(require("antd/es/col"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 require("antd/es/space/style");
 var _space = _interopRequireDefault(require("antd/es/space"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _merge2 = _interopRequireDefault(require("lodash/merge"));
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
-var _classnames2 = _interopRequireDefault(require("classnames"));
+var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
+var _lodash = require("lodash");
 var _components = require("./components");
 var _RenderFields = _interopRequireDefault(require("./components/render/RenderFields"));
 var _ProConfigProvider = require("../ProConfigProvider");
@@ -37,8 +32,9 @@ var _locale = _interopRequireDefault(require("../locale"));
 var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
 var _FormsProvider = _interopRequireWildcard(require("../FormsProvider"));
 var _ProStep = require("../ProStep");
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "desensitizationKey", "stopOnFirstError"];
-var ProForm = function ProForm(props, ref) {
+var ProForm = (props, ref) => {
   var _localStorage, _ref3;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
@@ -96,15 +92,16 @@ var ProForm = function ProForm(props, ref) {
     _ref2$source = _ref2.source,
     stepSource = _ref2$source === void 0 ? '' : _ref2$source;
   var _useForm = (0, _useForm3.useForm)(originForm, {
-      scrollToError: scrollToError,
-      optimize: optimize,
-      formKey: formKey,
+      scrollToError,
+      optimize,
+      formKey,
       source: source || stepSource || 'ProForm'
     }),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
+
   // 保存内部配置
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (!form.__INTERNAL_CONFIG__) {
       form.__INTERNAL_CONFIG__ = {};
     }
@@ -119,43 +116,45 @@ var ProForm = function ProForm(props, ref) {
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
   var _getLayout = (0, _index.getLayout)({
-      span: span,
-      form: form
+      span,
+      form
     }),
     formProps = _getLayout.formProps,
     colProps = _getLayout.colProps,
     _onOk = _getLayout.onOk,
     _onCancel = _getLayout.onCancel;
+
   // 初始值names转换
-  var _initialValues = (0, _react.useMemo)(function () {
+  var _initialValues = (0, _react.useMemo)(() => {
     var values = (0, _index.initialValuesToNames)(initialValues, columns);
     return values;
   }, []);
+
   /**
    * 展开&收起函数
    */
-  var expandHandle = function expandHandle() {
-    setOpenState === null || setOpenState === void 0 ? void 0 : setOpenState(!openState);
+  var expandHandle = () => {
+    setOpenState === null || setOpenState === void 0 || setOpenState(!openState);
   };
-  var expandRender = function expandRender() {
-    return !!expand && columns.length > Number(expand) && (0, _jsxRuntime.jsx)("div", {
+  var expandRender = () => {
+    return !!expand && columns.length > Number(expand) && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "expand-button",
       onClick: expandHandle,
-      children: !openState ? (0, _jsxRuntime.jsxs)(_space.default, {
+      children: !openState ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
         align: "center",
-        children: [_locale.default.ProForm.unfold, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
+        children: [_locale.default.ProForm.unfold, /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
           className: "rotate-to-bottom"
         })]
-      }) : (0, _jsxRuntime.jsxs)(_space.default, {
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
         align: "center",
-        children: [_locale.default.ProForm.packUp, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
+        children: [_locale.default.ProForm.packUp, /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
           className: "rotate-to-top"
         })]
       })
     });
   };
-  var defaultFooter = function defaultFooter(footerConfig) {
-    return (0, _jsxRuntime.jsx)(_components.FormFooter, {
+  var defaultFooter = footerConfig => {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.FormFooter, {
       formId: formId,
       onOk: onOk || _onOk,
       okText: okText,
@@ -166,67 +165,70 @@ var ProForm = function ProForm(props, ref) {
       form: form
     });
   };
+
   // 暴露form出去给类组件使用
-  (0, _react.useImperativeHandle)(ref, function () {
-    return form;
-  });
+  (0, _react.useImperativeHandle)(ref, () => form);
+
   // 解决平铺后的值拿不到的问题
-  var handleValuesChange = function handleValuesChange(changedValue) {
+  var handleValuesChange = changedValue => {
     if (!onValuesChange) return;
+
     // 暂时通过'-'区分组合组件字段和普通字段
     var keys = Object.keys(changedValue);
     if (!keys.length) {
       onValuesChange((0, _index.filterInternalFields)(changedValue, optimize), form.getFieldsValue());
     } else {
-      var values = keys.map(function (key) {
+      var values = keys.map(key => {
         if (key.includes('-')) {
           var comKeys = [];
-          comKeys = key.split('-').map(function (keyStr) {
-            return keyStr.split('_');
-          });
+          comKeys = key.split('-').map(keyStr => keyStr.split('_'));
           return form.getFieldsValue(comKeys);
         }
         return {};
       });
-      onValuesChange((0, _index.filterInternalFields)(_merge2.default.apply(void 0, [changedValue].concat((0, _toConsumableArray2.default)(values))), optimize), form.getFieldsValue());
+      onValuesChange((0, _index.filterInternalFields)((0, _lodash.merge)(changedValue, ...values), optimize), form.getFieldsValue());
     }
   };
+
   // 包装一层兼容 names 改变
-  var handleFinish = function handleFinish() {
-    onFinish === null || onFinish === void 0 ? void 0 : onFinish(form.getFieldsValue());
+  var handleFinish = () => {
+    onFinish === null || onFinish === void 0 || onFinish(form.getFieldsValue());
   };
-  var cls = (0, _classnames2.default)((0, _defineProperty2.default)({
+  var cls = (0, _classnames.default)({
     'pro-form': true,
-    'pro-form-view': isView
-  }, className, className));
-  var footerCls = (0, _classnames2.default)({
+    'pro-form-view': isView,
+    [className]: className
+  });
+  var footerCls = (0, _classnames.default)({
     'pro-form-custom-footer': true
   });
-  var footerRender = function footerRender() {
+  var footerRender = () => {
     var footerEle = null;
     if (isView || disabled) {
       // 查看或禁用模式
       footerEle = null;
-    } else if (/*#__PURE__*/_react.default.isValidElement(footer)) {
+    } else if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
       // 传入组件渲染组件
       footerEle = footer;
-    } else if (footer === undefined || footer || (0, _isObject2.default)(footer)) {
+    } else if (footer === undefined || footer || (0, _lodash.isObject)(footer)) {
       // 不传或者传入对象 渲染默认
       footerEle = defaultFooter(footer);
     }
+
     // 展开折叠按钮
     var expandEle = expandRender();
     var hasElement = footerEle || expandEle;
-    return hasElement ? (0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+    return hasElement ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
       className: footerCls,
-      children: (0, _jsxRuntime.jsxs)(_space.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
         align: "center",
         children: [footerEle, expandEle]
       })
     })) : null;
   };
+
   // 国际化，非中文时默认上下布局
-  if (((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.locale) && localStorage.locale !== 'zh-CN') {
+  if ((_localStorage = localStorage) !== null && _localStorage !== void 0 && _localStorage.locale && localStorage.locale !== 'zh-CN') {
     // 一行布局时，左右布局
     if (span === 24) {
       otherProps.layout = otherProps.layout || 'horizontal';
@@ -235,8 +237,8 @@ var ProForm = function ProForm(props, ref) {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return (0, _jsxRuntime.jsxs)(_form.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    onKeyPress: function onKeyPress(event) {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_form.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    onKeyPress: event => {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
         form.submit();
@@ -244,7 +246,7 @@ var ProForm = function ProForm(props, ref) {
     },
     className: cls,
     form: form
-  }, formProps), (0, _omit2.default)(config, ['isDiffAll'])), otherProps), {}, {
+  }, formProps), (0, _lodash.omit)(config, ['isDiffAll'])), otherProps), {}, {
     labelAlign: (_ref3 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref3 !== void 0 ? _ref3 : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
@@ -253,16 +255,18 @@ var ProForm = function ProForm(props, ref) {
       block: 'center',
       behavior: 'smooth'
     },
-    children: [(0, _jsxRuntime.jsxs)(_row.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_row.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       gutter: 24
     }, rowProps), {}, {
-      children: [(0, _jsxRuntime.jsx)(_RenderFields.default, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_RenderFields.default, {
         form: form,
         isView: isView,
         columns: columns,
         disabled: disabled,
-        expand: expand,
-        openState: openState,
+        expand: expand // 展示条数
+        ,
+        openState: openState // 展开折叠状态
+        ,
         colProps: colProps,
         viewEmpty: viewEmpty,
         labelWidth: labelWidth,
@@ -276,43 +280,50 @@ var ProForm = function ProForm(props, ref) {
     })), children]
   }));
 };
+
 // @ts-ignore
 var ProFormForward = /*#__PURE__*/(0, _react.forwardRef)(ProForm);
 ProFormForward.useForm = _useForm3.useForm;
 ProFormForward.useWatch = _useWatch.default;
-var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props) {
+var ProFormProvider = props => {
   var onFormChange = props.onFormChange,
     onFormFinish = props.onFormFinish,
     children = props.children;
-  var handleFormChange = function handleFormChange(formName, info) {
+  var handleFormChange = (formName, info) => {
     var changedFields = info.changedFields;
-    var _changedFields = changedFields.flatMap(function (item) {
+    var _changedFields = changedFields.flatMap(item => {
       var _item$value = item.value,
         value = _item$value === void 0 ? [] : _item$value;
       var name = item.name;
       var namesStr = name[name.length - 1];
+
       // name中的最后一位如果包含 '-' 则是names组件
       var isNames = String(namesStr).includes('-');
       if (!isNames) return item; // 不是names组件直接返回
+
       var namesList = (0, _index.splitNameStr)(String(namesStr)); // 拆解出name列表
+
       var prefix = name.slice(0, name.length - 1);
-      return namesList.map(function (nameItem, index) {
+      return namesList.map((nameItem, index) => {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-          name: [].concat((0, _toConsumableArray2.default)(prefix), (0, _toConsumableArray2.default)(nameItem)),
+          name: [...prefix, ...nameItem],
+          // 拼接前缀 组成完整name
           value: value[index]
         });
       });
     });
     info.changedFields = _changedFields;
+
     // @ts-ignore
     onFormChange(formName, info);
   };
-  return (0, _jsxRuntime.jsx)(_form.default.Provider, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,
     onFormFinish: onFormFinish,
     children: children
   });
 };
+exports.ProFormProvider = ProFormProvider;
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
 // 表单实例共享
@@ -320,6 +331,7 @@ ProFormForward.FormsProvider = _FormsProvider.default; // 表单实例共享Prov
 ProFormForward.useForms = _FormsProvider.useForms; // 获取上下文中的共享的表单实例map
 ProFormForward.useFormInstances = _FormsProvider.useForms; // 获取上下文中的共享的表单实例map
 ProFormForward.useContextForms = _FormsProvider.useContextForms; // 获取上下文中的共享的表单实例map
+
 // 内置组合
 ProFormForward.ProCascader = _components.ProCascader;
 ProFormForward.ProCombination = _components.ProCombination;
@@ -330,6 +342,7 @@ ProFormForward.ProUpload = _components.ProUpload;
 // ProFormForward.ProTreeSelect = ProTreeSelect;
 ProFormForward.ProTreeModal = _components.ProTreeModal;
 ProFormForward.ProTree = _components.ProTree;
+
 // 待废弃
 ProFormForward.EnumSelect = _components.EnumSelect;
 ProFormForward.ProAddress = _components.ProAddress;

package/lib/ProForm/propsType.d.ts

@@ -5,7 +5,7 @@ import { StoreValue, Store } from 'rc-field-form/es/interface.d';
 import { ShouldUpdate } from 'rc-field-form/es/Field.d';
 import React, { ReactNode } from 'react';
 import type { ProFormColumnType, ViewType } from './components/render/propsType';
-import type { ProFormComponentType } from './components/index.d';
+import type { ProFormComponentType } from './components';
 export interface ButtonType extends ButtonProps {
     children?: any;
 }

package/lib/ProForm/propsType.js

@@ -4,4 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.otherKeys = void 0;
-var otherKeys = exports.otherKeys = ['isView', 'viewEmpty', 'label', 'valueType', 'viewType', 'name', 'names', 'form', 'type', 'hiddenNames'];
+var otherKeys = exports.otherKeys = ['isView', 'viewEmpty', 'label', 'valueType', 'viewType', 'name', 'names', 'form', 'type', 'hiddenNames'];
+
+/**
+ * 兼容旧命名导出
+ */