@zat-design/sisyphus-react 3.0.13 → 3.0.16-beta.2

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

@@ -1,4 +1,42 @@
-.pro-modal-select {
+.pro-modal-select,
+.pro-tree-modal {
+  .ant-input-group-wrapper {
+    .close-icon {
+      display: none;
+    }
+    &:hover .close-icon {
+      display: block;
+      position: relative;
+      z-index: 3;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 12px;
+      height: 12px;
+      margin-right: var(--zaui-space-size-md, 14px);
+      margin-left: -28px;
+      color: #ffffff;
+      background-color: rgba(0, 0, 0, 0.25);
+      border: none;
+      border-radius: 50%;
+  
+      > span {
+        position: relative;
+        font-size: 8px;
+        border: none;
+        border-radius: 50%;
+      }
+  
+      &:hover {
+        background-color: rgba(0, 0, 0, 0.5);
+      }
+    }
+    &:hover {
+      .ant-input, .ant-input-group-addon {
+        border-color: var(--zaui-brand-hover, #3387ff);
+      }
+    }
+  }
   .ant-input-group {
     .ant-input {
       padding-right: 25px;
@@ -9,49 +47,20 @@
     display: inline-block;
   }
 
-  .close-icon {
-    position        : relative;
-    margin-left     : -31px;
-    margin-right    : var(--zaui-space-size-md, 14px);
-    color           : #FFFFFF;
-    height          : 12px;
-    width           : 12px;
-    display         : flex;
-    align-items     : center;
-    justify-content : center;
-    background-color: rgba(0, 0, 0, 0.25);
-    border          : none;
-    border-radius   : 50%;
-    z-index         : 3;
-
-    >span {
-      position     : relative;
-      font-size    : 8px;
-      border       : none;
-      border-radius: 50%;
-
-    }
-
-    &:hover {
-      background-color: rgba(0, 0, 0, 0.5);
-    }
-  }
-
   .viewSvg {
     height: 24px;
     cursor: pointer;
-    fill  : #C5C7CD;
+    fill: #c5c7cd;
   }
 
   .ant-input-group-addon {
-    padding         : 0px 8px;
-    background-color: var(--zaui-base-bg, #FFFFFF);
-    cursor          : pointer;
+    padding: 0px 8px;
+    background-color: var(--zaui-base-bg, #ffffff);
+    cursor: pointer;
 
     .pro-enum-input-addonAfter {
-      display    : flex;
+      display: flex;
       align-items: center;
     }
   }
-
-}
+}

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

@@ -21,15 +21,14 @@ var useControlled = function useControlled(props) {
     value = _useState2[0],
     setValue = _useState2[1];
   if ('value' in props) {
-    var _props$value, _props$value2, _props$value3;
-    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && moment(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && moment(props.value[1], props.format), ((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3[2]) === 'Y'];
+    var _props$value, _props$value2;
+    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && moment(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && moment(props.value[1], props.format)];
     var handleChange = function handleChange(value, other) {
-      var _value = _slicedToArray(value, 3),
+      var _value = _slicedToArray(value, 2),
         start = _value[0],
-        end = _value[1],
-        isForever = _value[2];
+        end = _value[1];
       if (props === null || props === void 0 ? void 0 : props.onChange) {
-        var valueStr = [start === null || start === void 0 ? void 0 : start.format(props.format), end === null || end === void 0 ? void 0 : end.format(props.format), isForever ? 'Y' : 'N'];
+        var valueStr = [start === null || start === void 0 ? void 0 : start.format(props.format), end === null || end === void 0 ? void 0 : end.format(props.format)];
         props === null || props === void 0 ? void 0 : props.onChange(valueStr, value);
       }
     };
@@ -59,10 +58,9 @@ var ProRangeLimit = function ProRangeLimit(props) {
     value = _useControlled2[0],
     onChange = _useControlled2[1];
   var _ref2 = value || [],
-    _ref3 = _slicedToArray(_ref2, 3),
+    _ref3 = _slicedToArray(_ref2, 2),
     startDate = _ref3[0],
-    endDate = _ref3[1],
-    isForever = _ref3[2];
+    endDate = _ref3[1];
   var initialConfig = useProConfig('ProTimeLimit');
   var className = classNames({
     'ant-input': true,
@@ -70,21 +68,21 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'forever-checkbox': true
   });
   var _isForever = useMemo(function () {
-    return isForever || moment(foreverDate, format).isSame(endDate);
+    return moment(foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = useMemo(function () {
     return moment(foreverDate, format);
   }, [foreverDate, format]);
   if (isView) {
-    var _props$value4, _props$value5;
-    if (isForever) {
+    var _props$value3, _props$value4;
+    if (_isForever) {
       return /*#__PURE__*/React.createElement(Container, {
         viewEmpty: viewEmpty
-      }, value === null || value === void 0 ? void 0 : value[0].format(format), "~", foreverText);
+      }, value === null || value === void 0 ? void 0 : value[0].format(format), " ~ ", foreverText);
     }
     return /*#__PURE__*/React.createElement(Container, {
       viewEmpty: viewEmpty
-    }, (_props$value4 = props.value) === null || _props$value4 === void 0 ? void 0 : _props$value4[0], "~", (_props$value5 = props.value) === null || _props$value5 === void 0 ? void 0 : _props$value5[1]);
+    }, (_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3[0], " ~ ", (_props$value4 = props.value) === null || _props$value4 === void 0 ? void 0 : _props$value4[1]);
   }
   // 时间范围change
   var handleRangeChange = function handleRangeChange(date, dateStr) {
@@ -96,7 +94,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
       _ref7 = _slicedToArray(_ref6, 2),
       startStr = _ref7[0],
       endStr = _ref7[1];
-    onChange([start, end, isForever], [startStr, endStr, (value === null || value === void 0 ? void 0 : value[2]) ? 'Y' : 'N']);
+    onChange([start, end], [startStr, endStr]);
   };
   // 长期选择框change
   var handleForeverChange = function handleForeverChange(e) {

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

@@ -15,5 +15,5 @@ export interface Props<ValueType extends DateType | string | null = DateType> ex
     otherProps?: ProFormOtherProps;
 }
 export declare const ProTimeLimit: React.FC<Props>;
-declare const LimitPick: (props: any) => JSX.Element;
+declare const LimitPick: (props: any) => React.JSX.Element;
 export default LimitPick;

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

@@ -19,6 +19,8 @@ export { default as ProRangeLimit } from './combination/ProRangeLimit';
 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 FormFooter } from './FormFooter';
 export { default as ProAddress, transferAddressInfoToRegion } from './old/ProAddress';
 export { default as EnumSelect } from './old/EnumSelect';

package/es/ProForm/components/index.js

@@ -21,6 +21,8 @@ export { default as ProRangeLimit } from './combination/ProRangeLimit';
 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';
 // footer组件
 export { default as FormFooter } from './FormFooter';
 // old 组件待移除

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import { IProps } from './propsType';
 /**
  * 证件号码 + 证件类型
@@ -7,7 +8,7 @@ import { IProps } from './propsType';
  * @returns {any}
  */
 export declare const CertNo: {
-    ({ value, onChange, dataSource, codeKey, nameKey, disabled }: IProps): JSX.Element;
+    ({ value, onChange, dataSource, codeKey, nameKey, disabled }: IProps): React.JSX.Element;
     defaultProps: {
         dataSource: any[];
         disabled: boolean;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 interface ValueProps {
     min?: any;
     max?: any;
@@ -12,5 +13,5 @@ export interface InputRangeProps {
     isPositiveInteger?: boolean;
     precision?: number;
 }
-declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
+declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => React.JSX.Element;
 export default InputRange;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import { comPropsType } from './propsTypes';
-declare const InputWithSuffix: (props: comPropsType) => JSX.Element;
+declare const InputWithSuffix: (props: comPropsType) => React.JSX.Element;
 export default InputWithSuffix;

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

@@ -1,3 +1,4 @@
+import React from "react";
 import { ProAddressPropsType } from "./propsTypes";
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {
@@ -23,5 +24,5 @@ export declare const transferAddressInfoToRegion: () => {
         };
     };
 };
-export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
+export declare function ProAddress({ ...props }: ProAddressPropsType): React.JSX.Element;
 export default ProAddress;

package/es/ProForm/components/old/ProCertValidity/index.js

@@ -5,7 +5,7 @@ import "antd/es/input/style";
 import _Input from "antd/es/input";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/date-picker/style";
-import _DatePicker from "antd/es/date-picker";
+import _DatePicker from "antd/es/date-picker"; // @ts-nocheck
 var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
 import moment from 'moment';
 import React, { forwardRef, useMemo, useRef } from 'react';

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

@@ -1,2 +1,3 @@
+import React from 'react';
 import { ProRangeBoxPropsType } from './propsType';
-export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;
+export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): React.JSX.Element;

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

@@ -11,10 +11,11 @@ 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 = ["labelWidth", "hiddenNames", "trim", "className", "rules", "required", "labelRequired", "tooltip"];
-import React, { useEffect, useMemo, useRef } from 'react';
+/* eslint-disable prefer-destructuring */
+import React, { useEffect, useMemo } from 'react';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
-import { cloneDeep, isBoolean, isFunction, isString, merge, omit } from 'lodash';
+import { cloneDeep, isBoolean, isFunction, isString, omit } from 'lodash';
 import useShouldUpdate from '../../utils/useShouldUpdate';
 import { isNullArray, isTrim, filterInternalFields } from '../../utils/index';
 import transformNames from '../../utils/transformNames';
@@ -154,7 +155,9 @@ var Render = function Render(props) {
     names: otherProps.names
   }, internalRule, labelRequired || _required ? {
     required: true
-  } : null, _objectSpread({}, isTrim(type, trim)));
+  } : null, _objectSpread({}, isTrim(type, trim)), {
+    validateFirst: true
+  });
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
   // 优先取formDisabled（全局），其次取disabled函数返回值，最后取fieldProps函数返回的disabled
@@ -163,25 +166,6 @@ var Render = function Render(props) {
   var lastComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var formRef = useRef(form);
-  var formUid = useMemo(function () {
-    if (formRef.current !== form) {
-      return Math.random().toString(36).slice(-6);
-    }
-  }, [form]);
-  if (type === 'ProSelect' && lastComponentProps.cacheData) {
-    var name = _otherFormItemProps.name;
-    var nameStr = formUid + Array.isArray(name) ? name.join('-') : name;
-    var addProps = {
-      useRequest: {
-        options: {
-          cacheKey: nameStr,
-          staleTime: lastComponentProps.cacheData === true ? -1 : lastComponentProps.cacheData
-        }
-      }
-    };
-    merge(lastComponentProps, addProps);
-  }
   var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _defineProperty(_classNames, 'label-width', labelWidth !== undefined), _classNames));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】

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

@@ -23,6 +23,7 @@ import { Props as ProTimeLimitProps } from '../combination/ProTimeLimit';
 import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import { ProEditTableProps } from '../../../ProEditTable/propsType';
+import { PropTreeSelectProps } from '../../../ProTreeSelect/propsType';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
@@ -135,6 +136,9 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProEditTable';
     fieldProps?: FieldProps<ProEditTableProps, Values, T>;
+} | {
+    type?: 'ProTreeSelect';
+    fieldProps?: FieldProps<PropTreeSelectProps, Values, T>;
 };
 interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, 'rules' | 'required'> {
     component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;

package/es/ProForm/index.js

@@ -18,7 +18,7 @@ import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useEffect } from 'react';
 import { isObject, isString, merge } from 'lodash';
 import { useProConfig } from 'zat-design-pro-component';
-import { CertNo, EnumSelect, FormFooter, InputRange, InputWithSuffix, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload } from './components';
+import { CertNo, EnumSelect, FormFooter, InputRange, InputWithSuffix, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeSelect, ProTreeModal } from './components';
 import RenderFields from './components/render/RenderFields';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
 import { useForm } from './utils/useForm';
@@ -236,6 +236,8 @@ ProFormForward.ProNumberRange = ProNumberRange;
 ProFormForward.ProModalSelect = ProModalSelect;
 ProFormForward.ProTimeLimit = ProTimeLimit;
 ProFormForward.ProUpload = ProUpload;
+ProFormForward.ProTreeSelect = ProTreeSelect;
+ProFormForward.ProTreeModal = ProTreeModal;
 // 待废弃
 ProFormForward.EnumSelect = EnumSelect;
 ProFormForward.ProAddress = ProAddress;

package/es/ProForm/style/index.less

@@ -1,5 +1,7 @@
 @import '../components/old/EnumSelect/style/index.less';
 @import '../components/base/SwitchCheckbox/style/index.less';
+@import '../components/base/FormList/style/index.less';
+@import '../components/combination/ProTimeLimit/style/index.less';
 @import '../components/combination/ProAddressBar/style/index.less';
 @import '../components/combination/ProNumberRange/style/index.less';
 @import '../components/combination/ProModalSelect/style/index.less';
@@ -21,7 +23,7 @@
     }
 
     .ant-form-item {
-      margin-bottom: 24px;
+      margin-bottom: var(--zaui-space-size-md, 16px);
     }
 
     .ant-form-item * {
@@ -30,6 +32,12 @@
       min-height : auto !important;
     }
 
+    .ant-form-item {
+      .ant-tree-icon-hide input {
+        display: none !important;
+      }
+
+    }
   }
 
   .ant-picker-range {
@@ -116,16 +124,15 @@
     }
 
     &.ant-form-item-with-help {
-      margin-bottom: 0;
       transition   : none;
+      margin-bottom: 0;
     }
 
     .ant-form-item-explain {
-      height: var(--zaui-space-size-md, 16px);
+      height: auto;
 
       .ant-form-item-explain-error {
-        font-size  : var(--zaui-font-size, 14px);
-        line-height: var(--zaui-space-size-md, 16px);
+        font-size: var(--zaui-font-size, 14px);
       }
     }
 

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

@@ -53,7 +53,10 @@ export declare const hasRowKey: (obj: any) => boolean;
  * 查询数据中是否包含rowKey
  */
 export declare const view: (obj: any) => boolean;
-export {};
 /**
- * 查看高阶render
+ * 获取小数点后的位数
+ * @param num 数字
+ * @returns 位数
  */
+export declare const getDecimalDigits: (num: number) => number;
+export {};

package/es/ProForm/utils/index.js

@@ -283,16 +283,11 @@ export var view = function view(obj) {
   });
 };
 /**
- * 查看高阶render
+ * 获取小数点后的位数
+ * @param num 数字
+ * @returns 位数
  */
-// export const viewRenderHandle = (values, viewRender) => {
-//   if (typeof obj !== 'object' || obj === null) {
-//     return false;
-//   }
-//   const keys = Object.keys(obj);
-//   const rowKeyExists = keys.includes('rowKey');
-//   if (rowKeyExists) {
-//     return true;
-//   }
-//   return keys.some((key) => hasRowKey(obj[key]));
-// };
+export var getDecimalDigits = function getDecimalDigits(num) {
+  var match = num.toString().match(/\.(\d+)/);
+  return match ? match[1].length : 0;
+};

package/es/ProForm/utils/transformValue.js

@@ -23,7 +23,6 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
     getValueProps: function getValueProps(value) {
       var _value = [];
       names.forEach(function (name, index) {
-        // const value = form.getFieldValue(name) || getBaseName(name, form);
         var value = form.getFieldValue(name);
         ![null, undefined].includes(value) && (_value[index] = value);
       });
@@ -34,7 +33,10 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
         cusValue = _ref.value,
         cusRest = _objectWithoutProperties(_ref, _excluded);
       if (!isEqual(value, cusValue)) {
-        form.setFieldValue(fieldName, cusValue);
+        // 延时解决表单render期间，重复渲染阻塞的问题
+        setTimeout(function () {
+          form.setFieldValue(fieldName, cusValue);
+        }, 200);
       }
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
       return _objectSpread({

package/es/ProForm/utils/useShouldUpdate.js

@@ -148,6 +148,7 @@ var useShouldUpdate = function useShouldUpdate(_ref) {
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && name) {
         if (_show === false) {
+          clearInterval(timerRef.current);
           timerRef.current = setTimeout(function () {
             form.resetFields([formItemProps.name]);
           }, 5e2);

package/es/ProForm/utils/valueType.d.ts

@@ -32,9 +32,9 @@ declare const _default: {
         normalize?: undefined;
         getValueProps?: undefined;
     } | {
-        normalize: (value: any) => number;
+        normalize: (value: any) => any;
         getValueProps: (value: any) => {
-            value: number;
+            value: any;
         };
     };
     /** 千分比 */
@@ -45,9 +45,9 @@ declare const _default: {
         normalize?: undefined;
         getValueProps?: undefined;
     } | {
-        normalize: (value: any) => number;
+        normalize: (value: any) => any;
         getValueProps: (value: any) => {
-            value: number;
+            value: any;
         };
     };
     /**  开关 YN转换 */

package/es/ProIcon/index.d.ts

@@ -1,5 +1,6 @@
 import { FC } from 'react';
 import { ProIconProps } from './propsTypes';
 import './style/index.less';
+export declare function createScriptUrlElements(scriptUrls: string[], index?: number): void;
 declare const ProIcon: FC<ProIconProps>;
 export default ProIcon;

package/es/ProIcon/index.js

@@ -10,12 +10,40 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
  */
 import React from 'react';
 import classNames from 'classnames';
+import symbolIcon from './symbolIcon';
 import './style/index.less';
+var customCache = new Set();
+function isValidCustomScriptUrl(scriptUrl) {
+  return Boolean(typeof scriptUrl === 'string' && scriptUrl.length && !customCache.has(scriptUrl));
+}
+export function createScriptUrlElements(scriptUrls) {
+  var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  var currentScriptUrl = scriptUrls[index];
+  if (isValidCustomScriptUrl(currentScriptUrl)) {
+    var script = document.createElement('script');
+    script.setAttribute('src', currentScriptUrl);
+    script.setAttribute('data-namespace', currentScriptUrl);
+    if (scriptUrls.length > index + 1) {
+      script.onload = function () {
+        createScriptUrlElements(scriptUrls, index + 1);
+      };
+      script.onerror = function () {
+        createScriptUrlElements(scriptUrls, index + 1);
+      };
+    }
+    customCache.add(currentScriptUrl);
+    document.body.appendChild(script);
+  }
+}
+// 加载内部icon
+if (symbolIcon && typeof document !== 'undefined' && typeof window !== 'undefined' && typeof document.createElement === 'function') {
+  createScriptUrlElements([symbolIcon]);
+}
 var ProIcon = function ProIcon(props) {
   var type = props.type,
     onClick = props.onClick,
     _props$size = props.size,
-    size = _props$size === void 0 ? 14 : _props$size,
+    size = _props$size === void 0 ? '1em' : _props$size,
     color = props.color,
     className = props.className,
     _props$style = props.style,
@@ -36,18 +64,20 @@ var ProIcon = function ProIcon(props) {
     'pro-icon-spin': !!spin,
     'pro-icon-with-theme': theme
   });
-  var SvgElement = /*#__PURE__*/React.createElement("svg", {
+  var SvgElement = /*#__PURE__*/React.createElement("span", {
+    className: "anticon"
+  }, /*#__PURE__*/React.createElement("svg", {
     className: proIconClassNames,
     "aria-hidden": "true",
     onClick: onClick,
     fill: "currentColor",
     style: _objectSpread(_objectSpread({
-      width: "".concat(size, "px"),
-      height: "".concat(size, "px")
+      width: size,
+      height: size
     }, rotateStyle), style)
   }, /*#__PURE__*/React.createElement("use", {
     xlinkHref: "#icon-".concat(type)
-  }));
+  })));
   if (disabled) {
     return /*#__PURE__*/React.createElement(_Button, {
       type: "text",

package/es/ProIcon/propsTypes.d.ts

@@ -29,19 +29,19 @@ export interface ProIconProps {
      */
     color?: string;
     /**
-   * @description      禁用
-   * @default           false
-   */
+     * @description      禁用
+     * @default           false
+     */
     disabled?: boolean;
     /**
-  * @description      是否跟随主题色
-  * @default           false
-  */
+     * @description      是否跟随主题色
+     * @default           false
+     */
     theme?: boolean;
     /**
-      * @description       图标的点击事件
-      * @default           ()=>{}
-      */
+     * @description       图标的点击事件
+     * @default           ()=>{}
+     */
     onClick?: React.MouseEventHandler<SVGSVGElement>;
     /**
      * @description       图标的className