@zat-design/sisyphus-react 3.4.5-beta.1 → 3.4.5-beta.11

package/dist/index.esm.css

@@ -686,7 +686,10 @@
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {
-  display: block !important;
+  display: -webkit-box !important;
+  display: -webkit-flex !important;
+  display: -ms-flexbox !important;
+  display: flex !important;
 }
 .pro-collapse.ant-collapse .pro-collapse-panel {
   margin-bottom: 16px;
@@ -2485,6 +2488,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   color: var(--ant-error-color);
   border-color: var(--ant-error-color);
 }
+.pro-container.pro-container-empty .ant-collapse-content {
+  display: none;
+}
 .pro-container.pro-container-diy .pro-container-content {
   display: -webkit-box;
   display: -webkit-flex;

package/dist/less.esm.css

@@ -686,7 +686,10 @@
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {
-  display: block !important;
+  display: -webkit-box !important;
+  display: -webkit-flex !important;
+  display: -ms-flexbox !important;
+  display: flex !important;
 }
 .pro-collapse.ant-collapse .pro-collapse-panel {
   margin-bottom: 16px;
@@ -2485,6 +2488,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   color: var(--ant-error-color);
   border-color: var(--ant-error-color);
 }
+.pro-container.pro-container-empty .ant-collapse-content {
+  display: none;
+}
 .pro-container.pro-container-diy .pro-container-content {
   display: -webkit-box;
   display: -webkit-flex;

package/es/ProConfigProvider/index.d.ts

@@ -2,14 +2,14 @@ import React, { FC } from 'react';
 import { FormInstance } from 'antd';
 import { PropSelectProps } from '../ProSelect/propsType';
 import { ProModalSelectPropsType } from '../ProForm/components/combination/ProModalSelect/propsType';
-import { AddressProps } from '../ProForm/components/combination/ProAddressBar/propsType';
+import { ProCascaderProps } from '../ProForm/components/combination/ProCascader/propsType';
 import { ProEnumConfig } from '../ProEnum/propsType';
 export interface ProConfigState {
     locale?: string;
     ProEnum?: Partial<ProEnumConfig>;
     ProSelect?: Partial<PropSelectProps> & Record<string, any>;
     ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
-    ProAddressBar?: Partial<AddressProps> & Record<string, any>;
+    ProAddressBar?: Partial<ProCascaderProps> & Record<string, any>;
     forms: Record<string, FormInstance | undefined>;
     [key: string]: any;
 }

package/es/ProConfigProvider/index.js

@@ -53,9 +53,6 @@ var reducer = function reducer(state, action) {
     case 'setWithLocal':
       {
         var _state = merge({}, state, action.payload);
-        var localConfigStr = localStorage.getItem('localConfig');
-        var localConfig = JSON.parse(localConfigStr || '{}');
-        localStorage.setItem('localConfig', JSON.stringify(merge(localConfig, action.payload)));
         return _state;
       }
     case 'setProEnum':

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

@@ -17,7 +17,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 /* eslint-disable prefer-const */
 import React, { useCallback, useEffect } from 'react';
 import classNames from 'classnames';
-import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
+import { cloneDeep, isEqual, debounce, omit, isFunction, isBoolean } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
 import { getNamePath, difference } from '../../utils/tools';
@@ -112,17 +112,17 @@ var RenderField = function RenderField(_ref) {
   }
   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) {
+  } else if (isBoolean((_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.disabled)) {
     _disabled = _fieldProps.disabled;
   }
+  if ((config === null || config === void 0 ? void 0 : config.disabled) === true) {
+    _disabled = column.disabled || (config === null || config === void 0 ? void 0 : config.disabled);
+  }
   if (typeof column.disabled === 'function') {
     _disabled = column.disabled(currentValue, rowData, options);
-  } else if (column.disabled === true) {
+  } else if (isBoolean(column.disabled)) {
     _disabled = column.disabled;
   }
-  if ((config === null || config === void 0 ? void 0 : config.disabled) === true) {
-    _disabled = config === null || config === void 0 ? void 0 : config.disabled;
-  }
   if (typeof rules === 'function') {
     _rules = rules(currentValue, rowData, options);
   }
@@ -266,7 +266,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':

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];

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/{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;

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

@@ -0,0 +1,255 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import "antd/es/cascader/style";
+import _Cascader from "antd/es/cascader";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/typography/style";
+import _Typography from "antd/es/typography";
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState, memo, useMemo } from 'react';
+import { tools } from '@zat-design/utils';
+import { useProConfig } from '../../../../ProConfigProvider';
+import useEnum from '../../../../ProEnum/hooks/useEnum';
+import locale from '../../../../locale';
+import ProForm from '../../..';
+var transformDataName = tools.transformDataName;
+var Text = _Typography.Text;
+var filterDataSource = function filterDataSource(dataSource, level) {
+  return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+    return _objectSpread(_objectSpread({}, item), {}, {
+      children: level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item.children, level - 1)
+    });
+  });
+};
+var getViewLabel = function getViewLabel(_ref) {
+  var dataSource = _ref.dataSource,
+    value = _ref.value;
+  var viewLabel = [];
+  // 根据dataSource得到label数组，查看模式展示需要
+  value === null || value === void 0 ? void 0 : value.forEach(function (value, index) {
+    var _dataSource;
+    var temp = (_dataSource = dataSource) === null || _dataSource === void 0 ? void 0 : _dataSource.find(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.value) === value;
+    });
+    dataSource = (temp === null || temp === void 0 ? void 0 : temp.children) || [];
+    viewLabel[index] = temp === null || temp === void 0 ? void 0 : temp.label;
+  });
+  return viewLabel;
+};
+var defaultFieldNames = {
+  label: 'name',
+  value: 'code',
+  children: 'children'
+};
+var ProCascader = function ProCascader(props) {
+  var _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _ref2 = useProConfig('ProAddressBar') || {},
+    configDetailMaxLength = _ref2.detailMaxLength,
+    configEnumCode = _ref2.enumCode,
+    configCode = _ref2.code;
+  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address';
+  var _props$className = props.className,
+    className = _props$className === void 0 ? '' : _props$className,
+    _props$hasDetail = props.hasDetail,
+    hasDetail = _props$hasDetail === void 0 ? isAddressMode ? true : undefined : _props$hasDetail,
+    _props$detailMaxLengt = props.detailMaxLength,
+    detailMaxLength = _props$detailMaxLengt === void 0 ? isAddressMode ? configDetailMaxLength || 100 : 100 : _props$detailMaxLengt,
+    _props$fieldNames = props.fieldNames,
+    fieldNames = _props$fieldNames === void 0 ? defaultFieldNames : _props$fieldNames,
+    value = props.value,
+    disabled = props.disabled,
+    dataSource = props.dataSource,
+    onChange = props.onChange,
+    useRequest = props.useRequest,
+    transformResponse = props.transformResponse,
+    _props$level = props.level,
+    level = _props$level === void 0 ? isAddressMode ? 3 : undefined : _props$level,
+    isView = props.isView,
+    _props$enumCode = props.enumCode,
+    enumCode = _props$enumCode === void 0 ? configEnumCode : _props$enumCode,
+    _props$code = props.code,
+    code = _props$code === void 0 ? configCode : _props$code,
+    tooltip = props.tooltip,
+    _props$separator = props.separator,
+    separator = _props$separator === void 0 ? '' : _props$separator,
+    otherProps = _objectWithoutProperties(props, _excluded);
+  var _ref3 = ProForm.useFieldProps() || {},
+    isViewCon = _ref3.isView;
+  var addressCode = code || enumCode;
+  var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
+  var realLevel = Math.max(2, level);
+  var detail = value === null || value === void 0 ? void 0 : value[realLevel];
+  var enumData = useEnum(addressCode);
+  var _ref4 = Array.isArray(enumData) ? enumData : [],
+    _ref5 = _slicedToArray(_ref4, 1),
+    _ref5$ = _ref5[0],
+    enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
+  var realDataSource = useMemo(function () {
+    var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
+    return isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
+  var _useRequest = _objectSpread({}, useRequest),
+    service = _useRequest.service,
+    _useRequest$defaultPa = _useRequest.defaultParams,
+    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    serviceData = _useState2[0],
+    setServiceData = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    defaultLabel = _useState4[0],
+    setDefaultLabel = _useState4[1];
+  var getFirstLevelOptions = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _yield$service, data, newData, transFormData, serviceData;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return service(defaultParams);
+          case 2:
+            _yield$service = _context.sent;
+            data = _yield$service.data;
+            newData = data;
+            if (transformResponse) {
+              newData = transformResponse(data);
+            }
+            transFormData = transformDataName(newData, {
+              label: fieldNames.label,
+              value: fieldNames.value,
+              children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+            });
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level) : transFormData;
+            setServiceData(serviceData);
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getFirstLevelOptions() {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    if (service) {
+      // 传入useRequest时，初次加载级联第一级数据源
+      getFirstLevelOptions();
+    }
+  }, [service]);
+  useEffect(function () {
+    if (realIsView && value) {
+      // 传入dataSource + 查看时初始化展示
+      if (service) {
+        setDefaultLabel(getViewLabel({
+          dataSource: serviceData,
+          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+        }));
+      } else if ((realDataSource === null || realDataSource === void 0 ? void 0 : realDataSource.length) > 0) {
+        setDefaultLabel(getViewLabel({
+          dataSource: realDataSource,
+          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+        }));
+      }
+    }
+  }, [realIsView, value, realDataSource, serviceData]);
+  var handleChange = function handleChange(changeValue, selectedOptions) {
+    if (onChange) {
+      if (isAddressMode && hasDetail && detail) {
+        // 有详情地址
+        var realValue = changeValue || [];
+        realValue[realLevel] = detail;
+        onChange(realValue, selectedOptions);
+      } else {
+        onChange(changeValue, selectedOptions);
+      }
+    }
+  };
+  // showSearch中的筛选函数
+  var handlefilter = function handlefilter(inputValue, path) {
+    return path.some(function (option) {
+      return option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
+    });
+  };
+  var handleAddressChange = function handleAddressChange(e) {
+    var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
+    if (onChange) {
+      if (!e.target.value && (cascaderValue === null || cascaderValue === void 0 ? void 0 : cascaderValue.every(function (item) {
+        return !item;
+      }))) {
+        onChange(undefined);
+      } else {
+        var realValue = value ? _toConsumableArray(value) : [];
+        realValue[realLevel] = e.target.value;
+        onChange(realValue);
+      }
+    }
+  };
+  var displayRender = function displayRender(label) {
+    return label === null || label === void 0 ? void 0 : label.filter(function (item) {
+      return !!item;
+    }).join('/');
+  };
+  var addressValue = isAddressMode ? value && ((_value$slice = value.slice(0, realLevel)) === null || _value$slice === void 0 ? void 0 : _value$slice.some(function (item) {
+    return !!item;
+  })) ? value.slice(0, realLevel) : undefined : value;
+  var viewValue = isAddressMode ? ((_ref7 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref7 === void 0 ? void 0 : (_ref7$filter = _ref7.filter(function (item) {
+    return !!item;
+  })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
+    return !!item;
+  })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
+  return realIsView ? tooltip ? _jsx(_Tooltip, {
+    className: className,
+    title: tooltip === true ? viewValue : tooltip,
+    children: _jsx(Text, {
+      ellipsis: {
+        tooltip: false
+      },
+      children: viewValue
+    })
+  }) : _jsx("span", {
+    className: className,
+    children: viewValue
+  }) : _jsxs("div", {
+    className: "pro-address ".concat(className),
+    children: [_jsx(_Cascader, _objectSpread({
+      className: hasDetail ? '' : 'no-detail',
+      placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
+      value: addressValue,
+      options: service ? serviceData : realDataSource,
+      disabled: disabled,
+      displayRender: displayRender,
+      showSearch: {
+        filter: handlefilter
+      },
+      onChange: handleChange
+    }, otherProps)), hasDetail && (tooltip && disabled && detail ? _jsx(_Tooltip, {
+      title: detail,
+      children: _jsx("span", {
+        className: "pro-address-detail",
+        children: _jsx(_Input, {
+          disabled: disabled,
+          value: detail
+        })
+      })
+    }) : _jsx(_Input, {
+      allowClear: true,
+      autoComplete: "off",
+      disabled: disabled,
+      value: detail,
+      maxLength: detailMaxLength,
+      placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder,
+      onChange: handleAddressChange
+    }))]
+  });
+};
+export default /*#__PURE__*/memo(ProCascader);

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

@@ -1,19 +1,21 @@
 import { ReactNode } from 'react';
 import { DefaultOptionType } from 'rc-select/lib/Select';
 import { Service } from 'ahooks/lib/useRequest/src/types';
-export interface AddressProps {
-    getPopupContainer?: () => ReactNode;
+export interface fieldNamesProps {
+    label: string;
+    value: string;
+    children?: string;
+}
+export interface ProCascaderProps {
     className?: string;
+    mode?: 'address' | 'default';
     isView?: boolean;
     value?: string[];
     disabled?: boolean;
     hasDetail?: boolean;
     tooltip?: boolean | ReactNode;
     detailMaxLength?: number;
-    fieldNames?: {
-        label: string;
-        value: string;
-    };
+    fieldNames?: fieldNamesProps;
     dataSource?: DefaultOptionType[];
     useRequest?: {
         loadData?: boolean;

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

@@ -341,7 +341,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 16:
             _context2.prev = 16;
             _context2.t0 = _context2["catch"](0);
-            console.log('error', _context2.t0);
+            console.warn('error', _context2.t0);
           case 19:
           case "end":
             return _context2.stop();
@@ -670,9 +670,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       labelInValue: labelInValue,
       dataSource: options,
       scrollFollowParent: false,
-      onClick: function onClick() {
-        // 没有值的时候，初始化点击默认查询前五十条
-        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
+      onFocus: function onFocus() {
+        if (useRequest) {
           var _useRequest$options9;
           var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams) || {};
           var params = withPagination ? {

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

@@ -11,8 +11,7 @@ export { default as SwitchCheckbox } from './base/SwitchCheckbox';
 export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
-export { default as ProCascader } from './base/ProCascader';
-export { default as ProAddressBar } from './combination/ProAddressBar';
+export { default as ProCascader } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

package/es/ProForm/components/index.js

@@ -12,22 +12,19 @@ export { default as SwitchCheckbox } from './base/SwitchCheckbox';
 export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
-export { default as ProCascader } from './base/ProCascader';
 // combination 组合组件
-export { default as ProAddressBar } from './combination/ProAddressBar';
+export { default as ProCascader } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';
 export { default as ProTimeLimit } from './combination/ProTimeLimit';
 export { default as ProRangeLimit } from './combination/ProRangeLimit';
 export { default as Group } from './combination/Group';
-// export { default as GroupCopy } from './combination/GroupCopy';
 export { default as ProCollapse } from './combination/Container';
 export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-// export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 // footer组件

package/es/ProForm/components/render/Render.js

@@ -226,7 +226,7 @@ var Render = function Render(props) {
     }
     _args[2].option = args[1];
     switch (type) {
-      case 'ProAddressBar':
+      case 'ProCascader':
         _args[2].selectedOptions = args[1];
         break;
       case 'DatePicker':

package/es/ProForm/components/render/propsType.d.ts

@@ -16,8 +16,7 @@ import { Props as TimePickerProps } from '../base/TimePicker';
 import { Props as SwitchProps } from '../base/Switch';
 import { Props as SwitchCheckboxProps } from '../base/SwitchCheckbox';
 import { Props as TextAreaProps } from '../base/TextArea';
-import { Props as ProCascaderProps } from '../base/ProCascader';
-import { AddressProps } from '../combination/ProAddressBar/propsType';
+import { ProCascaderProps } from '../combination/ProCascader/propsType';
 import { ProCombinationProps } from '../combination/ProCombination/propsType';
 import { ProModalSelectPropsType as ProModalSelectProps } from '../combination/ProModalSelect/propsType';
 import { ProNumberRangeProps } from '../combination/ProNumberRange/propsType';
@@ -123,8 +122,8 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     type?: 'TextArea';
     fieldProps?: FieldProps<TextAreaProps, Values, T>;
 } | {
-    type?: 'ProAddressBar';
-    fieldProps?: FieldProps<AddressProps, Values, T>;
+    type?: 'ProCascader';
+    fieldProps?: FieldProps<ProCascaderProps, Values, T>;
 } | {
     type?: 'ProCombination';
     fieldProps?: FieldProps<ProCombinationProps, Values, T>;
@@ -155,9 +154,6 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProUpload';
     fieldProps?: FieldProps<ProUploadProps, Values, T>;
-} | {
-    type?: 'ProCascader';
-    fieldProps?: FieldProps<ProCascaderProps<any, any[], any>, Values, T>;
 } | {
     type?: 'ProTree';
     fieldProps?: FieldProps<ProTreeProps, Values, T>;

package/es/ProForm/index.js

@@ -18,7 +18,7 @@ import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, isString, merge } from 'lodash';
-import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
+import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig, useContextForms } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
@@ -313,7 +313,7 @@ ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参数  -otherProps
 ProFormForward.useContextForms = useContextForms; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
-ProFormForward.ProAddressBar = ProAddressBar;
+ProFormForward.ProCascader = ProCascader;
 ProFormForward.ProCombination = ProCombination;
 ProFormForward.ProNumberRange = ProNumberRange;
 ProFormForward.ProModalSelect = ProModalSelect;

package/es/ProForm/style/index.less

@@ -4,7 +4,7 @@
 @import '../components/base/TextArea/index.less';
 @import '../components/combination/FormList/style/index.less';
 @import '../components/combination/ProTimeLimit/style/index.less';
-@import '../components/combination/ProAddressBar/style/index.less';
+@import '../components/combination/ProCascader/style/index.less';
 @import '../components/combination/ProNumberRange/style/index.less';
 @import '../components/combination/ProModalSelect/style/index.less';
 @import '../components/combination/Group/style/index.less';

package/es/ProForm/utils/index.js

@@ -43,7 +43,7 @@ export var useControlled = function useControlled(props) {
 export var isSelect = function isSelect(props) {
   var dataSource = props.dataSource,
     type = props.type;
-  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload', 'TimePicker'].includes(type);
+  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProCascader', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload', 'TimePicker'].includes(type);
 };
 /**
  * Input TextArea 移除前后空格