@zat-design/sisyphus-react 3.4.5 → 3.4.6-beta.10

package/es/ProEditTable/components/RenderField/index.js

@@ -11,7 +11,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -20,16 +20,17 @@ import classNames from 'classnames';
 import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
-import { getNamePath, difference } from '../../utils/tools';
+import { getNamePath, difference, getDisabled } from '../../utils/tools';
 import * as componentMap from '../../../ProForm/components';
+import { useProConfig } from '../../../ProConfigProvider';
 import Container from '../../../ProForm/components/Container';
 import transformNames from '../../../ProForm/utils/transformNames';
 import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
 import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
-import { isSelect } from '../../../ProForm/utils';
+import { isSelect, isTrim } from '../../../ProForm/utils';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4, _componentProps;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -56,6 +57,7 @@ var RenderField = function RenderField(_ref) {
     rules = _column$rules === void 0 ? [] : _column$rules,
     equalWith = column.equalWith,
     className = column.className,
+    trim = column.trim,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -75,7 +77,8 @@ var RenderField = function RenderField(_ref) {
     formNamePath = config.namePath,
     _config$originalDiffT = config.originalDiffTip,
     originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
-    rowDisabled = config.rowDisabled;
+    rowDisabled = config.rowDisabled,
+    otherProps = config.otherProps;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -96,35 +99,41 @@ var RenderField = function RenderField(_ref) {
     form: form,
     namePath: [].concat(_toConsumableArray(namePath), [index])
   };
+  // 行参数
+  var rowParams = [currentValue, rowData, options];
   if (typeof isEditable === 'function') {
-    isEditable = isEditable(currentValue, rowData, options);
+    isEditable = isEditable.apply(void 0, rowParams);
   }
+  // 获取最终的disabled
+  _disabled = getDisabled({
+    globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+    formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
+    column: column,
+    tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+    columnFieldProps: _fieldProps,
+    params: rowParams
+  });
   // 是否只读文本
-  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || (rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record));
+  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || getDisabled({
+    globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+    formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
+    column: column,
+    tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+    columnFieldProps: _fieldProps,
+    params: rowParams,
+    rowDisabled: rowDisabled || 'empty'
+  });
   // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
   var baseName = isView ? name : namePath;
   var TargetComponent;
-  if (typeof required === 'function') {
-    _required = required(currentValue, rowData, options);
-  }
-  if (typeof fieldProps === 'function') {
-    _fieldProps = fieldProps(currentValue, rowData, options);
-  }
-  if (typeof ((_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.disabled) === 'function') {
-    _disabled = _fieldProps.disabled(currentValue, rowData, options);
-  } else if (((_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.disabled) === true) {
-    _disabled = _fieldProps.disabled;
-  }
-  if (typeof column.disabled === 'function') {
-    _disabled = column.disabled(currentValue, rowData, options);
-  } else if (column.disabled === true) {
-    _disabled = column.disabled;
+  if (isFunction(required)) {
+    _required = required.apply(void 0, rowParams);
   }
-  if ((config === null || config === void 0 ? void 0 : config.disabled) === true) {
-    _disabled = config === null || config === void 0 ? void 0 : config.disabled;
+  if (isFunction(fieldProps)) {
+    _fieldProps = fieldProps.apply(void 0, rowParams);
   }
-  if (typeof rules === 'function') {
-    _rules = rules(currentValue, rowData, options);
+  if (isFunction(rules)) {
+    _rules = rules.apply(void 0, rowParams);
   }
   // 设置校验规则
   var internalRule = useRules({
@@ -134,7 +143,7 @@ var RenderField = function RenderField(_ref) {
     required: !isView && _required,
     rules: isEditing ? _rules : [],
     isSelect: isSelect({
-      dataSource: (_fieldProps4 = _fieldProps) === null || _fieldProps4 === void 0 ? void 0 : _fieldProps4.dataSource,
+      dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type: type
     }),
     type: type
@@ -169,7 +178,7 @@ var RenderField = function RenderField(_ref) {
    * @returns {}
    */
   var valueTypeTransform = useCallback(function () {
-    var _fieldProps5;
+    var _fieldProps3;
     // 不存在valueType返回空
     if (!valueType) {
       return {};
@@ -179,7 +188,7 @@ var RenderField = function RenderField(_ref) {
       valueType = 'switch';
     }
     var params = _objectSpread(_objectSpread({}, column), {}, {
-      mode: (_fieldProps5 = _fieldProps) === null || _fieldProps5 === void 0 ? void 0 : _fieldProps5.mode
+      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
     return isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
   }, [valueType]);
@@ -224,7 +233,7 @@ var RenderField = function RenderField(_ref) {
   }
   if (isEditable && isEditing) {
     if (typeof _editRender === 'function') {
-      TargetComponent = _editRender(currentValue, rowData, options);
+      TargetComponent = _editRender.apply(void 0, rowParams);
     }
     if ( /*#__PURE__*/React.isValidElement(_editRender)) {
       TargetComponent = _editRender;
@@ -266,7 +275,7 @@ var RenderField = function RenderField(_ref) {
       case 'ProEnum':
         nextArgs[2].option = _args[1];
         break;
-      case 'ProAddressBar':
+      case 'ProCascader':
         nextArgs[2].selectedOptions = _args[1];
         break;
       case 'DatePicker':
@@ -377,13 +386,13 @@ var RenderField = function RenderField(_ref) {
   var _onblur = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
-      var rowPath,
-        row,
-        orgRow,
-        _len3,
+      var _len3,
         args,
         _key3,
         _args,
+        rowPath,
+        row,
+        orgRow,
         _Object$keys2,
         _Object$keys2$map,
         diff,
@@ -392,13 +401,13 @@ var RenderField = function RenderField(_ref) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            rowPath = [].concat(_toConsumableArray(namePath), [index]);
-            row = form.getFieldValue(rowPath);
-            orgRow = cloneDeep(row);
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
-            _args = formatArgs(args);
+            _args = formatArgs([].concat(args));
+            rowPath = [].concat(_toConsumableArray(namePath), [index]);
+            row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+            orgRow = cloneDeep(row);
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
             if (!_context2.t0) {
@@ -438,14 +447,12 @@ var RenderField = function RenderField(_ref) {
               cellNamePath: []
             });
           case 20:
-            if (virtualKey) {
-              // 单行编辑时需要 强制更新视图
-              setState({
-                forceUpdate: {
-                  d: Date.now()
-                }
-              });
-            }
+            // 单行编辑时需要 强制更新视图
+            setState({
+              forceUpdate: {
+                d: Date.now()
+              }
+            });
           case 21:
           case "end":
             return _context2.stop();
@@ -484,6 +491,7 @@ var RenderField = function RenderField(_ref) {
       form: form,
       names: names,
       name: cellName,
+      listName: cellName,
       viewEmpty: viewEmpty,
       valueType: valueType,
       isView: isView
@@ -512,7 +520,7 @@ var RenderField = function RenderField(_ref) {
   if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-  Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), valueTypeTransform()), namesTransform()));
+  Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), valueTypeTransform()), namesTransform()), isTrim(type, trim, useProConfig())));
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
   if (!isEditing) {
     delete _formItemProps.rules;

package/es/ProEditTable/index.js

@@ -66,12 +66,12 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   // 判断是否在formList内
   if (namePath === null || namePath === void 0 ? void 0 : namePath.length) {
     name = [].concat(_toConsumableArray(namePath), _toConsumableArray(name.slice(1)));
+    disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled; // formFieldProps?.disabled可能是函数？？
   }
   var tableRef = useRef(null);
   var _React$useContext = React.useContext(_ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
-  disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled;
   var _useLocalStorageState = useLocalStorageState('themeConfig'),
     _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 1),
     themeConfig = _useLocalStorageState2[0];
@@ -129,7 +129,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       return getRowKey(item) === getRowKey(record);
     }));
   };
-  var config = {
+  var config = _objectSpread({
     form: form,
     mode: mode,
     isView: isView,
@@ -162,7 +162,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalDiffTip: originalDiffTip,
     prefixCls: prefixCls,
     rowDisabled: rowDisabled
-  };
+  }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
     var isEdit = !virtualKey || editingKeys.includes(record.rowKey);

package/es/ProEditTable/style/index.less

@@ -2,6 +2,9 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-edit-table {
+  td[rowspan]{
+    vertical-align: middle !important;
+  }
   .pro-edit-table-tooltip {
     display    : inline-flex;
     align-items: center;
@@ -62,7 +65,7 @@
 
   .drag-wrapper {
     display: flex;
-    .drag-icon {
+    .anticon {
       margin-right: var(--zaui-space-size-md, 16px);
       margin-left: var(--zaui-space-size-xs, 4px);
       cursor: pointer;
@@ -87,11 +90,6 @@
     }
   }
 
-  .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th.@{ant-prefix}-table-selection-column {
-    padding-left: var(--zaui-space-size-md, 16px);
-    padding-right: var(--zaui-space-size-md, 16px);
-  }
-
   .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
     &.is-required-right {
       .pro-edit-table-title {
@@ -142,7 +140,7 @@
         .@{ant-prefix}-table-cell-fix-left,
         .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
-          
+
         }
       }
 

package/es/ProEditTable/utils/tools.d.ts

@@ -14,3 +14,15 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
     virtualKey: any;
     selectedRowKeys: any;
 }) => void;
+/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+ * 全局优先：globalControl为true时，全局控制
+ * 子级优先：globalControl为false时，子级控制
+ * @param globalControl 全局控制
+ * @param formDisabled 表单的disabled
+ * @param column 当前列
+ * @param tabledDisabled 表格的disabled
+ * @param columnFieldProps 当前列的fieldProps
+ * @param params 当前列的参数
+ * @param rowDisabled 行禁用参数
+ */
+export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled }: any) => any;

package/es/ProEditTable/utils/tools.js

@@ -1,4 +1,5 @@
-import { cloneDeep, isString, isObject, isEqual, transform } from 'lodash';
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { cloneDeep, isString, isObject, isEqual, transform, isFunction, isBoolean } from 'lodash';
 export var getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
 };
@@ -6,7 +7,8 @@ export var getRandom = function getRandom() {
 export var difference = function difference(object, base) {
   var changes = function changes(object, base) {
     return transform(object, function (result, value, key) {
-      if (key.indexOf('-') > -1) {
+      var _key$indexOf;
+      if ((key === null || key === void 0 ? void 0 : (_key$indexOf = key.indexOf) === null || _key$indexOf === void 0 ? void 0 : _key$indexOf.call(key, '-')) > -1) {
         result[key] = true;
       } else if (!isEqual(value, base[key])) {
         result[key] = isObject(value) && isObject(base[key]) ? changes(value, base[key]) : value;
@@ -74,4 +76,79 @@ export var onDelete = function onDelete(_ref) {
       form.setFieldValue(namePath, virtualList);
     }
   }
+};
+/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+ * 全局优先：globalControl为true时，全局控制
+ * 子级优先：globalControl为false时，子级控制
+ * @param globalControl 全局控制
+ * @param formDisabled 表单的disabled
+ * @param column 当前列
+ * @param tabledDisabled 表格的disabled
+ * @param columnFieldProps 当前列的fieldProps
+ * @param params 当前列的参数
+ * @param rowDisabled 行禁用参数
+ */
+export var getDisabled = function getDisabled(_ref2) {
+  var globalControl = _ref2.globalControl,
+    formDisabled = _ref2.formDisabled,
+    column = _ref2.column,
+    tabledDisabled = _ref2.tabledDisabled,
+    columnFieldProps = _ref2.columnFieldProps,
+    params = _ref2.params,
+    rowDisabled = _ref2.rowDisabled;
+  var convertToBoolean = function convertToBoolean(value) {
+    if (Array.isArray(value)) {
+      return value;
+    }
+    if (value === null || value === undefined || value === '') {
+      return false;
+    }
+    if (value === 0) {
+      return true;
+    }
+    return Boolean(value);
+  };
+  // 判断是否有column的disabled属性
+  var noColumnDisabled = function noColumnDisabled() {
+    if (isFunction(column === null || column === void 0 ? void 0 : column.disabled) || isFunction(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || isBoolean(column === null || column === void 0 ? void 0 : column.disabled) || isBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
+      return false;
+    }
+    // 判断FieldProps是否有disabled属性
+    if (isFunction(columnFieldProps)) {
+      var _columnFieldProps = columnFieldProps.apply(void 0, _toConsumableArray(params)),
+        disabled = _columnFieldProps.disabled;
+      if (isFunction(disabled) || isBoolean(disabled)) {
+        return false;
+      }
+    }
+    return true;
+  };
+  if (globalControl) {
+    return convertToBoolean(formDisabled) || convertToBoolean(tabledDisabled);
+  }
+  if (rowDisabled === 'empty') {
+    return false;
+  }
+  // 当表单含有diabled属性时，优先使用表单的disabled
+  if (isFunction(rowDisabled) && noColumnDisabled()) {
+    return rowDisabled(params[1]);
+  }
+  if (isFunction(column === null || column === void 0 ? void 0 : column.disabled)) {
+    return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled.apply(column, _toConsumableArray(params)));
+  }
+  // 表单FieldProps为函数时
+  if (isFunction(columnFieldProps)) {
+    var _columnFieldProps2 = columnFieldProps.apply(void 0, _toConsumableArray(params)),
+      disabled = _columnFieldProps2.disabled;
+    if (isFunction(disabled)) {
+      return convertToBoolean(disabled.apply(void 0, _toConsumableArray(params)));
+    }
+    if (isBoolean(disabled)) {
+      return convertToBoolean(disabled);
+    }
+  }
+  if (isFunction(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
+    return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, _toConsumableArray(params)));
+  }
+  return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || convertToBoolean(tabledDisabled);
 };

package/es/ProForm/components/base/RangePicker/index.js

@@ -25,9 +25,16 @@ var RangePicker = function RangePicker(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  var _res = _objectSpread(_objectSpread({}, rest), {}, {
+    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
+  });
+  // 字符串时间格式兼容
+  if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
+    _res.value = [moment(_res.value[0]), moment(_res.value[1])];
+  }
   if (isView) {
-    var _props$value = props.value,
-      value = _props$value === void 0 ? [] : _props$value;
+    var _res$value = _res.value,
+      value = _res$value === void 0 ? [] : _res$value;
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
@@ -49,13 +56,6 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
-  var _res = _objectSpread(_objectSpread({}, rest), {}, {
-    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
-  });
-  // 字符串时间格式兼容
-  if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
-    _res.value = [moment(_res.value[0]), moment(_res.value[1])];
-  }
   return _jsx(AntRangePicker, _objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])));
 };
 export default RangePicker;

package/es/ProForm/components/base/TextArea/index.d.ts

@@ -5,6 +5,7 @@ import './index.less';
 export interface Props extends TextAreaProps {
     otherProps?: ProFormOtherProps;
     isView?: boolean;
+    tooltip?: boolean;
 }
 declare const TextAreaDef: React.FC<Props>;
 export default TextAreaDef;

package/es/ProForm/components/base/TextArea/index.js

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
-var _excluded = ["placeholder", "otherProps", "className"];
+var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { omit } from 'lodash';
 import classnames from 'classnames';
@@ -17,6 +17,8 @@ var TextAreaDef = function TextAreaDef(props) {
   var placeholder = props.placeholder,
     otherProps = props.otherProps,
     className = props.className,
+    _props$tooltip = props.tooltip,
+    tooltip = _props$tooltip === void 0 ? true : _props$tooltip,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     label = _ref.label,
@@ -27,7 +29,7 @@ var TextAreaDef = function TextAreaDef(props) {
   if (isView) {
     return _jsx(Container, {
       nowrap: false,
-      tooltip: true,
+      tooltip: tooltip,
       viewEmpty: viewEmpty,
       children: rest.value
     });

package/es/ProForm/components/combination/Container/index.js

@@ -21,10 +21,11 @@ var Container = function Container(props) {
     disabled = _ref.disabled;
   var _className = classnames(_defineProperty({
     'pro-container': true,
-    'pro-container-diy': type === 'Container'
+    'pro-container-diy': type === 'Container',
+    'pro-container-empty': !(children === null || children === void 0 ? void 0 : children.length)
   }, "".concat(className), className));
   var _children = useMemo(function () {
-    var result = children.map(function (item) {
+    var result = children === null || children === void 0 ? void 0 : children.map(function (item) {
       return _objectSpread({
         clearNotShow: clearNotShow,
         show: show,

package/es/ProForm/components/combination/Container/style/index.less

@@ -2,7 +2,11 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-container {
-
+  &.pro-container-empty{
+    .@{ant-prefix}-collapse-content{
+      display: none;
+    }
+  }
   &.pro-container-diy {
     .pro-container-content {
       display      : flex;

package/es/ProForm/components/combination/FormList/index.js

@@ -52,6 +52,7 @@ var FormList = function FormList(props, ref) {
         }) : item.names,
         index: fieldName,
         namePath: namePath,
+        listName: [].concat(_toConsumableArray(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
       return column;

package/es/ProForm/components/combination/{ProAddressBar → ProCascader}/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import { AddressProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: AddressProps) => JSX.Element>;
+import { ProCascaderProps } from './propsType';
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
 export default _default;