@zat-design/sisyphus-react 3.4.5-beta.2 → 3.4.5-beta.4

package/es/ProTable/utils.js

@@ -269,19 +269,22 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         'varied-cell': originalValue !== undefined,
         'empty-cell': isEmpty
       });
-      var renderValue = _jsx(ProForm.ProAddressBar, {
+      var renderValue = _jsx(ProForm.ProCascader, {
         isView: true,
+        mode: "address",
         code: code,
         value: realValue
       });
-      var originalRenderValue = _jsx(ProForm.ProAddressBar, {
+      var originalRenderValue = _jsx(ProForm.ProCascader, {
         isView: true,
+        mode: "address",
         code: code,
         value: originalRealValue
       });
-      return _jsx(ProForm.ProAddressBar, {
+      return _jsx(ProForm.ProCascader, {
         className: className,
         isView: true,
+        mode: "address",
         code: code,
         value: realValue,
         tooltip: originalValue !== undefined ? _jsxs(_Fragment, {

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

@@ -269,7 +269,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/lib/ProForm/components/combination/Container/index.js

@@ -28,10 +28,11 @@ var Container = function Container(props) {
     disabled = _ref.disabled;
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     '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 = (0, _react.useMemo)(function () {
-    var result = children.map(function (item) {
+    var result = children === null || children === void 0 ? void 0 : children.map(function (item) {
       return (0, _objectSpread2.default)({
         clearNotShow: clearNotShow,
         show: show,

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

@@ -0,0 +1,259 @@
+"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;
+  // const cascaderValue = hasDetail ? value?.slice(0, level) : 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 () {
+    console.log(enumDataSource);
+    var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
+    return realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+  }, [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,
+    _useRequest$parentKey = _useRequest.parentKey,
+    parentKey = _useRequest$parentKey === void 0 ? 'parentCode' : _useRequest$parentKey;
+  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 = 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: 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: 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 (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/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

@@ -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';
@@ -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/index.js

@@ -133,59 +133,11 @@ var ProIcon = function ProIcon(props) {
         "aria-hidden": "true",
         src: src,
         beforeInjection: function beforeInjection(svg) {
-          if (actionMap && svg) {
-            var _actionMap$themeMap, _actionMap$themeFillM, _actionMap$gradation, _actionMap$fill;
-            // 项目内置的四种主题匹配渐变色
-            var mergeThemeMap = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config2.themeMap), (_actionMap$themeMap = actionMap.themeMap) !== null && _actionMap$themeMap !== void 0 ? _actionMap$themeMap : {});
-            // 项目内置的四种双色匹配fill
-            var mergeFillThemeMap = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config2.themeFillMap), (_actionMap$themeFillM = actionMap.themeFillMap) !== null && _actionMap$themeFillM !== void 0 ? _actionMap$themeFillM : {});
-            var _gradList = mergeThemeMap[primaryColor];
-            var _fillList = mergeFillThemeMap[primaryColor];
-            // 渐变操作序列
-            var gradList = (_actionMap$gradation = actionMap === null || actionMap === void 0 ? void 0 : actionMap.gradation) !== null && _actionMap$gradation !== void 0 ? _actionMap$gradation : _gradList;
-            // 填充操作序列
-            var fillList = (_actionMap$fill = actionMap === null || actionMap === void 0 ? void 0 : actionMap.fill) !== null && _actionMap$fill !== void 0 ? _actionMap$fill : _fillList;
-            // 节点收集
-            var nodeMap = {
-              // 渐变色节点收集
-              gradation: [],
-              // 具有fill属性的节点收集
-              fill: []
-            };
-            // 目前只支持处理渐变及fill填充
-            var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
-            types.forEach(function (typeKey) {
-              (0, _utils.recurseGetNodes)(typeKey, svg, nodeMap[typeKey]);
-            });
-            if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
-              nodeMap.gradation.forEach(function (item, index) {
-                // 下一步准备替换的
-                var nextStr = gradList[index];
-                // 属性原本的值
-                var originStr = item.getAttribute('stop-color');
-                if (nextStr && originStr !== nextStr) {
-                  item.setAttribute('stop-color', nextStr);
-                }
-              });
-            }
-            if ((fillList === null || fillList === void 0 ? void 0 : fillList.length) > 0) {
-              nodeMap.fill.forEach(function (item, index) {
-                // 默认接收的
-                var receiveStr = fillList[index];
-                // 下一步准备替换的
-                var nextFillStr = receiveStr === 'theme' ? primaryColor : receiveStr;
-                // 属性原本的值
-                var originFill = item.getAttribute('fill');
-                // 如果包含url(则是内链，不作替换处理
-                if (!(originFill && originFill.includes('url(')) && nextFillStr) {
-                  // 不同才替换
-                  if (originFill !== nextFillStr) {
-                    item.setAttribute('fill', nextFillStr);
-                  }
-                }
-              });
-            }
-          }
+          (0, _utils.onBeforeInjection)({
+            svg: svg,
+            actionMap: actionMap,
+            primaryColor: primaryColor
+          });
         }
       }))
     })

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

@@ -1 +1,6 @@
 export declare const recurseGetNodes: (type: any, node: any, queue: any) => void;
+export declare const onBeforeInjection: ({ svg, actionMap, primaryColor }: {
+    svg: any;
+    actionMap: any;
+    primaryColor: any;
+}) => void;

package/lib/ProIcon/utils/index.js

@@ -1,9 +1,12 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.recurseGetNodes = void 0;
+exports.recurseGetNodes = exports.onBeforeInjection = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _config = require("../config");
 var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
@@ -26,4 +29,62 @@ var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, n
       recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
+};
+var onBeforeInjection = exports.onBeforeInjection = function onBeforeInjection(_ref) {
+  var svg = _ref.svg,
+    actionMap = _ref.actionMap,
+    primaryColor = _ref.primaryColor;
+  if (actionMap && svg) {
+    var _actionMap$themeMap, _actionMap$themeFillM, _actionMap$gradation, _actionMap$fill;
+    // 项目内置的四种主题匹配渐变色
+    var mergeThemeMap = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config.themeMap), (_actionMap$themeMap = actionMap.themeMap) !== null && _actionMap$themeMap !== void 0 ? _actionMap$themeMap : {});
+    // 项目内置的四种双色匹配fill
+    var mergeFillThemeMap = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config.themeFillMap), (_actionMap$themeFillM = actionMap.themeFillMap) !== null && _actionMap$themeFillM !== void 0 ? _actionMap$themeFillM : {});
+    var _gradList = mergeThemeMap[primaryColor];
+    var _fillList = mergeFillThemeMap[primaryColor];
+    // 渐变操作序列
+    var gradList = (_actionMap$gradation = actionMap === null || actionMap === void 0 ? void 0 : actionMap.gradation) !== null && _actionMap$gradation !== void 0 ? _actionMap$gradation : _gradList;
+    // 填充操作序列
+    var fillList = (_actionMap$fill = actionMap === null || actionMap === void 0 ? void 0 : actionMap.fill) !== null && _actionMap$fill !== void 0 ? _actionMap$fill : _fillList;
+    // 节点收集
+    var nodeMap = {
+      // 渐变色节点收集
+      gradation: [],
+      // 具有fill属性的节点收集
+      fill: []
+    };
+    // 目前只支持处理渐变及fill填充
+    var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
+    types.forEach(function (typeKey) {
+      recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
+    });
+    if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
+      nodeMap.gradation.forEach(function (item, index) {
+        // 下一步准备替换的
+        var nextStr = gradList[index];
+        // 属性原本的值
+        var originStr = item.getAttribute('stop-color');
+        if (nextStr && originStr !== nextStr) {
+          item.setAttribute('stop-color', nextStr);
+        }
+      });
+    }
+    if ((fillList === null || fillList === void 0 ? void 0 : fillList.length) > 0) {
+      nodeMap.fill.forEach(function (item, index) {
+        // 默认接收的
+        var receiveStr = fillList[index];
+        // 下一步准备替换的
+        var nextFillStr = receiveStr === 'theme' ? primaryColor : receiveStr;
+        // 属性原本的值
+        var originFill = item.getAttribute('fill');
+        // 如果包含url(则是内链，不作替换处理
+        if (!(originFill && originFill.includes('url(')) && nextFillStr) {
+          // 不同才替换
+          if (originFill !== nextFillStr) {
+            item.setAttribute('fill', nextFillStr);
+          }
+        }
+      });
+    }
+  }
 };