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

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

@@ -0,0 +1,255 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
+var _antd = require("antd");
+var _utils = require("@zat-design/utils");
+var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ = _interopRequireDefault(require("../../.."));
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+var transformDataName = _utils.tools.transformDataName;
+var Text = _antd.Typography.Text;
+var filterDataSource = function filterDataSource(dataSource, level) {
+  return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _ProConfigProvider.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 = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _ref3 = _.default.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 = (0, _useEnum.default)(addressCode);
+  var _ref4 = Array.isArray(enumData) ? enumData : [],
+    _ref5 = (0, _slicedToArray2.default)(_ref4, 1),
+    _ref5$ = _ref5[0],
+    enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
+  var realDataSource = (0, _react.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 = (0, _objectSpread2.default)({}, useRequest),
+    service = _useRequest.service,
+    _useRequest$defaultPa = _useRequest.defaultParams,
+    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    serviceData = _useState2[0],
+    setServiceData = _useState2[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    defaultLabel = _useState4[0],
+    setDefaultLabel = _useState4[1];
+  var getFirstLevelOptions = /*#__PURE__*/function () {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+      var _yield$service, data, newData, transFormData, serviceData;
+      return (0, _regeneratorRuntime2.default)().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);
+    };
+  }();
+  (0, _react.useEffect)(function () {
+    if (service) {
+      // 传入useRequest时，初次加载级联第一级数据源
+      getFirstLevelOptions();
+    }
+  }, [service]);
+  (0, _react.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 ? (0, _toConsumableArray2.default)(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((0, _toConsumableArray2.default)(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 ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    className: className,
+    title: tooltip === true ? viewValue : tooltip,
+    children: (0, _jsxRuntime.jsx)(Text, {
+      ellipsis: {
+        tooltip: false
+      },
+      children: viewValue
+    })
+  }) : (0, _jsxRuntime.jsx)("span", {
+    className: className,
+    children: viewValue
+  }) : (0, _jsxRuntime.jsxs)("div", {
+    className: "pro-address ".concat(className),
+    children: [(0, _jsxRuntime.jsx)(_antd.Cascader, (0, _objectSpread2.default)({
+      className: hasDetail ? '' : 'no-detail',
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar = _locale.default.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 ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: detail,
+      children: (0, _jsxRuntime.jsx)("span", {
+        className: "pro-address-detail",
+        children: (0, _jsxRuntime.jsx)(_antd.Input, {
+          disabled: disabled,
+          value: detail
+        })
+      })
+    }) : (0, _jsxRuntime.jsx)(_antd.Input, {
+      allowClear: true,
+      autoComplete: "off",
+      disabled: disabled,
+      value: detail,
+      maxLength: detailMaxLength,
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder,
+      onChange: handleAddressChange
+    }))]
+  });
+};
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(ProCascader);

package/lib/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/lib/ProForm/components/combination/ProCascader/propsType.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -15,7 +15,6 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
 var _ahooks = require("ahooks");
-var _umi = require("umi");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _reactSvg = require("react-svg");
@@ -23,7 +22,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _index = require("../../../../index");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
-var _useRequestList2 = _interopRequireDefault(require("./hooks/useRequestList"));
+var _useRequestList3 = _interopRequireDefault(require("./hooks/useRequestList"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "defaultOne"],
   _excluded2 = ["onOk"],
@@ -124,17 +123,22 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     form = _Form$useForm2[0];
   var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
   var selectedRowKeys = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || _selectedRowKeys;
-  var _useUmiRequest = (0, _umi.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+  var _useRequestList = (0, _useRequestList3.default)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
+      withPagination: withPagination,
+      transformParams: transformParams,
+      transformResponse: transformResponse
+    }, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       manual: true,
-      onSuccess: function onSuccess(data) {
-        var list = withPagination ? data === null || data === void 0 ? void 0 : data.list : data;
+      onSuccess: function onSuccess(res) {
+        var _res$data;
+        var list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
         setState({
           options: list
         });
       }
     })),
-    run = _useUmiRequest.run;
-  var _useRequestList = (0, _useRequestList2.default)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
+    run = _useRequestList.run;
+  var _useRequestList2 = (0, _useRequestList3.default)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
@@ -142,13 +146,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       manual: true,
       ready: ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne) && !readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
-    data = _useRequestList.data,
-    loading = _useRequestList.loading,
-    pagination = _useRequestList.pagination,
-    onSearch = _useRequestList.onSearch,
-    onReset = _useRequestList.onReset,
-    runAsync = _useRequestList.runAsync,
-    mutate = _useRequestList.mutate;
+    data = _useRequestList2.data,
+    loading = _useRequestList2.loading,
+    pagination = _useRequestList2.pagination,
+    onSearch = _useRequestList2.onSearch,
+    onReset = _useRequestList2.onReset,
+    runAsync = _useRequestList2.runAsync,
+    mutate = _useRequestList2.mutate;
   var defaultOptionRender = function defaultOptionRender(rowData) {
     return rowData === null || rowData === void 0 ? void 0 : rowData[labelKey];
   };
@@ -334,7 +338,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();
@@ -420,7 +424,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -449,7 +453,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
               } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
+                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
               if (_data2) {
@@ -486,7 +490,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data2, _data3, nextSelectRowKeys;
+      var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -508,7 +512,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
               } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
+                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
@@ -663,11 +667,10 @@ 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 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 ? {
             pageNum: 1,
             pageSize: 50,

package/lib/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/lib/ProForm/components/index.js

@@ -71,12 +71,6 @@ Object.defineProperty(exports, "ProAddress", {
     return _ProAddress.default;
   }
 });
-Object.defineProperty(exports, "ProAddressBar", {
-  enumerable: true,
-  get: function get() {
-    return _ProAddressBar.default;
-  }
-});
 Object.defineProperty(exports, "ProCascader", {
   enumerable: true,
   get: function get() {
@@ -234,8 +228,7 @@ var _SwitchCheckbox = _interopRequireDefault(require("./base/SwitchCheckbox"));
 var _TimePicker = _interopRequireDefault(require("./base/TimePicker"));
 var _FormList = _interopRequireDefault(require("./combination/FormList"));
 var _ProEditTable = _interopRequireDefault(require("../../ProEditTable"));
-var _ProCascader = _interopRequireDefault(require("./base/ProCascader"));
-var _ProAddressBar = _interopRequireDefault(require("./combination/ProAddressBar"));
+var _ProCascader = _interopRequireDefault(require("./combination/ProCascader"));
 var _ProCombination = _interopRequireDefault(require("./combination/ProCombination"));
 var _ProNumberRange = _interopRequireDefault(require("./combination/ProNumberRange"));
 var _ProModalSelect = _interopRequireDefault(require("./combination/ProModalSelect"));

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

@@ -153,9 +153,9 @@ var Render = function Render(props) {
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
   }, internalRule, {
-    required: typeof labelRequired === 'boolean' ? labelRequired : _required || (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
+    required: typeof labelRequired === 'boolean' ? labelRequired : _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
       return item === null || item === void 0 ? void 0 : item.required;
-    }))
+    })) || false
   }, otherProps.isView && !requiredOnView ? {
     required: false
   } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
@@ -224,7 +224,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/lib/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';
@@ -52,7 +51,7 @@ interface ControlProps {
 /**
  * 扩展函数的参数
  */
-type FunctionArgs<Values, R = any> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
+export type FunctionArgs<Values, R = any> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
     form: FormInstance<Values>;
     index?: number;
     namePath?: NamePath;
@@ -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/lib/ProForm/index.js

@@ -314,7 +314,7 @@ ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
 ProFormForward.useContextForms = _ProConfigProvider.useContextForms; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
-ProFormForward.ProAddressBar = _components.ProAddressBar;
+ProFormForward.ProCascader = _components.ProCascader;
 ProFormForward.ProCombination = _components.ProCombination;
 ProFormForward.ProNumberRange = _components.ProNumberRange;
 ProFormForward.ProModalSelect = _components.ProModalSelect;

package/lib/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/lib/ProForm/utils/index.js

@@ -59,7 +59,7 @@ var useControlled = exports.useControlled = function useControlled(props) {
 var isSelect = exports.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 移除前后空格

package/lib/ProIcon/config/index.d.ts

@@ -3,3 +3,17 @@ export declare const iconMap: {
     'text-cn': string;
     'text-en': string;
 }[];
+export declare const themeMap: {
+    '#006AFF': string[];
+    '#00BC70': string[];
+    '#FF8C16': string[];
+    '#A00F20': string[];
+    '#31AF96': string[];
+};
+export declare const themeFillMap: {
+    '#006AFF': string[];
+    '#00BC70': string[];
+    '#FF8C16': string[];
+    '#A00F20': string[];
+    '#31AF96': string[];
+};

package/lib/ProIcon/config/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.iconMap = void 0;
+exports.themeMap = exports.themeFillMap = exports.iconMap = void 0;
 var iconMap = exports.iconMap = [{
   type: 'view',
   'text-cn': '查看',
@@ -260,4 +260,20 @@ var iconMap = exports.iconMap = [{
   type: 'tiaozhengxuhao',
   'text-cn': '调整序号',
   'text-en': 'adjust order'
-}];
+}];
+// 渐变色icon预设
+var themeMap = exports.themeMap = {
+  '#006AFF': ['#ADDDFF', '#5FB3D8', '#4181FF'],
+  '#00BC70': ['#FFFFFF', '#54DFA7', '#00BC70'],
+  '#FF8C16': ['#FFFFFF', '#FFA74E', '#FF8C17'],
+  '#A00F20': ['#FFFFFF', '#E47B7B', '#A00E20'],
+  '#31AF96': ['#5FD8C7', '#5FD8C7', '#31AF96']
+};
+// 双色icon预设
+var themeFillMap = exports.themeFillMap = {
+  '#006AFF': ['none', '#87F1FC', 'black', '#4181FF'],
+  '#00BC70': ['none', '#05FFEC', 'black', '#00BC70'],
+  '#FF8C16': ['none', '#FED736', 'black', '#FF8C17'],
+  '#A00F20': ['none', '#FD8357', 'black', '#A00E20'],
+  '#31AF96': ['none', '#BBF392', 'black', '#31AF96']
+};