@zat-design/sisyphus-react 3.4.13-beta.9 → 3.5.0

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

@@ -17,6 +17,7 @@ var formatAmount = tools.formatAmount,
   formatPercent = tools.formatPercent,
   formatPerMill = tools.formatPerMill;
 var ProNumberRange = function ProNumberRange(props) {
+  var _valueProps, _valueProps2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -134,8 +135,26 @@ var ProNumberRange = function ProNumberRange(props) {
           }
         };
         break;
+      // 百分比
+      case 'percentage':
+        valueProps = {
+          min: 0,
+          max: 100,
+          step: 1
+        };
+        break;
+      // 千分比
+      case 'permillage':
+        valueProps = {
+          min: 0,
+          max: 1000,
+          step: 1
+        };
+        break;
       default:
-        valueProps = {};
+        valueProps = {
+          max: 999999999999
+        };
     }
   }
   /**
@@ -157,15 +176,16 @@ var ProNumberRange = function ProNumberRange(props) {
       className: "range-left",
       value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
       placeholder: "".concat(locale.ProForm.inputPlaceholder),
-      min: min,
-      max: (value === null || value === void 0 ? void 0 : value[1]) || max || range[1],
       precision: precision,
       disabled: getDisabled(disabled, 0),
       onChange: function onChange(e) {
         firstHandleChange(e);
       },
       addonBefore: addonBefore
-    }, valueProps), childProps === null || childProps === void 0 ? void 0 : childProps[0])), _jsx(_Input, {
+    }, valueProps), {}, {
+      min: min || ((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min),
+      max: (value === null || value === void 0 ? void 0 : value[1]) || range[1] || max || ((_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max)
+    }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), _jsx(_Input, {
       className: classnames({
         'range-split': true,
         'range-split-disabled': !!disabled
@@ -176,15 +196,16 @@ var ProNumberRange = function ProNumberRange(props) {
       className: "range-right",
       value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
       placeholder: "".concat(locale.ProForm.inputPlaceholder),
-      min: (value === null || value === void 0 ? void 0 : value[0]) || min || range[0],
-      max: max,
       precision: precision,
       disabled: getDisabled(disabled, 1),
       onChange: function onChange(e) {
         lastHandleChange(e);
       },
       addonAfter: addonAfter
-    }, valueProps), childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
+    }, valueProps), {}, {
+      max: max || ((_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.max),
+      min: (value === null || value === void 0 ? void 0 : value[0]) || range[0] || min || ((_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.min)
+    }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
   });
 };
 export default ProNumberRange;

package/es/ProForm/components/combination/ProNumberRange/propsType.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
-export type ValueTypeEnum = 'percentage' | 'permillage' | 'thousandth';
 export interface ProNumberRangeProps {
     /**
      * @description       组件的值,[最小值，最大值]
@@ -46,7 +45,7 @@ export interface ProNumberRangeProps {
      * @description       值类型，回显时区分金额与百分比
      * @default           '-'
      */
-    valueType?: ValueTypeEnum;
+    valueType?: 'percentage' | 'permillage' | 'thousandth';
     /**
      * @description       空值查看时默认展示内容
      * @default           '-'

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

@@ -34,9 +34,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;
@@ -47,9 +44,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;

package/es/ProForm/utils/valueType.js

@@ -1,5 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import Big from 'big.js';
+import { isEqual } from 'lodash';
 import { transforms } from '@zat-design/utils';
 var transformDate = transforms.transformDate,
   transformSwitch = transforms.transformSwitch;
@@ -13,8 +14,35 @@ var transformRatio = function transformRatio(_ref) {
     precision = _ref$precision === void 0 ? 2 : _ref$precision,
     valueType = _ref.valueType;
   if (type === 'ProNumberRange' && ['permillage', 'percentage'].includes(valueType)) {
-    console.error('Warning: ProNumberRange valueType can only be set to [thousandth]');
-    return {};
+    var ref = null;
+    return {
+      normalize: function normalize(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {};
+        }
+        return [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).div(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).div(Math.pow(10, precision)).toNumber() : null];
+      },
+      getValueProps: function getValueProps(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {
+            value: []
+          };
+        }
+        if (isEqual(ref, value)) {
+          return {
+            value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+          };
+        }
+        ref = value;
+        return {
+          value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+        };
+      }
+    };
   }
   return {
     normalize: function normalize(value) {

package/es/ProLayout/index.js

@@ -25,7 +25,8 @@ var ProLayout = function ProLayout(props) {
     headerNotice = props.headerNotice,
     noticeIn = props.notice,
     dataSource = props.dataSource,
-    theme = props.theme;
+    theme = props.theme,
+    onCollapsedChange = props.onCollapsedChange;
   var _useSetState = useSetState({
       notice: headerNotice || noticeIn,
       menus: [],
@@ -86,7 +87,10 @@ var ProLayout = function ProLayout(props) {
         dataSource: menus,
         notice: notice,
         collapsed: collapsed,
-        onToggle: toggle
+        onToggle: function onToggle() {
+          toggle();
+          onCollapsedChange && onCollapsedChange(!collapsed);
+        }
       })), _jsx("div", {
         className: "pro-layout-content",
         style: _objectSpread(_objectSpread({}, contentStyle), {}, {

package/es/ProLayout/propTypes.d.ts

@@ -51,6 +51,10 @@ export interface ProLayoutProps {
     contentStyle?: CSSProperties;
     waterMarkProps?: ProWaterMarkProps;
     theme?: themeEnum;
+    /**
+  *  折叠回调事件
+  */
+    onCollapsedChange?: (collapsed: any) => void;
     [key: string]: any;
 }
 export interface ProLayoutStates {

package/es/ProTreeModal/index.js

@@ -259,10 +259,16 @@ var ProTreeModal = function ProTreeModal(props) {
       }
       onChange === null || onChange === void 0 ? void 0 : onChange(values);
     }
-    setState({
-      open: false
-    });
-    openChange === null || openChange === void 0 ? void 0 : openChange(false);
+    // fix: 当有 openChange 时候、点击确定应该由关闭 openChange 控制
+    if (!openChange || open === undefined) {
+      setState({
+        open: false
+      });
+      openChange === null || openChange === void 0 ? void 0 : openChange(false);
+    }
+    if (openChange && open !== undefined) {
+      openChange === null || openChange === void 0 ? void 0 : openChange(true);
+    }
   };
   /**
    * clear all checked

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

@@ -21,6 +21,7 @@ var formatAmount = _utils.tools.formatAmount,
   formatPercent = _utils.tools.formatPercent,
   formatPerMill = _utils.tools.formatPerMill;
 var ProNumberRange = function ProNumberRange(props) {
+  var _valueProps, _valueProps2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -138,8 +139,26 @@ var ProNumberRange = function ProNumberRange(props) {
           }
         };
         break;
+      // 百分比
+      case 'percentage':
+        valueProps = {
+          min: 0,
+          max: 100,
+          step: 1
+        };
+        break;
+      // 千分比
+      case 'permillage':
+        valueProps = {
+          min: 0,
+          max: 1000,
+          step: 1
+        };
+        break;
       default:
-        valueProps = {};
+        valueProps = {
+          max: 999999999999
+        };
     }
   }
   /**
@@ -161,15 +180,16 @@ var ProNumberRange = function ProNumberRange(props) {
       className: "range-left",
       value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
       placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
-      min: min,
-      max: (value === null || value === void 0 ? void 0 : value[1]) || max || range[1],
       precision: precision,
       disabled: getDisabled(disabled, 0),
       onChange: function onChange(e) {
         firstHandleChange(e);
       },
       addonBefore: addonBefore
-    }, valueProps), childProps === null || childProps === void 0 ? void 0 : childProps[0])), (0, _jsxRuntime.jsx)(_antd.Input, {
+    }, valueProps), {}, {
+      min: min || ((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min),
+      max: (value === null || value === void 0 ? void 0 : value[1]) || range[1] || max || ((_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max)
+    }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), (0, _jsxRuntime.jsx)(_antd.Input, {
       className: (0, _classnames.default)({
         'range-split': true,
         'range-split-disabled': !!disabled
@@ -180,15 +200,16 @@ var ProNumberRange = function ProNumberRange(props) {
       className: "range-right",
       value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
       placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
-      min: (value === null || value === void 0 ? void 0 : value[0]) || min || range[0],
-      max: max,
       precision: precision,
       disabled: getDisabled(disabled, 1),
       onChange: function onChange(e) {
         lastHandleChange(e);
       },
       addonAfter: addonAfter
-    }, valueProps), childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
+    }, valueProps), {}, {
+      max: max || ((_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.max),
+      min: (value === null || value === void 0 ? void 0 : value[0]) || range[0] || min || ((_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.min)
+    }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
   });
 };
 var _default = exports.default = ProNumberRange;

package/lib/ProForm/components/combination/ProNumberRange/propsType.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
-export type ValueTypeEnum = 'percentage' | 'permillage' | 'thousandth';
 export interface ProNumberRangeProps {
     /**
      * @description       组件的值,[最小值，最大值]
@@ -46,7 +45,7 @@ export interface ProNumberRangeProps {
      * @description       值类型，回显时区分金额与百分比
      * @default           '-'
      */
-    valueType?: ValueTypeEnum;
+    valueType?: 'percentage' | 'permillage' | 'thousandth';
     /**
      * @description       空值查看时默认展示内容
      * @default           '-'

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

@@ -34,9 +34,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;
@@ -47,9 +44,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;

package/lib/ProForm/utils/valueType.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _big = _interopRequireDefault(require("big.js"));
+var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
 var transformDate = _utils.transforms.transformDate,
   transformSwitch = _utils.transforms.transformSwitch;
@@ -20,8 +21,35 @@ var transformRatio = function transformRatio(_ref) {
     precision = _ref$precision === void 0 ? 2 : _ref$precision,
     valueType = _ref.valueType;
   if (type === 'ProNumberRange' && ['permillage', 'percentage'].includes(valueType)) {
-    console.error('Warning: ProNumberRange valueType can only be set to [thousandth]');
-    return {};
+    var ref = null;
+    return {
+      normalize: function normalize(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {};
+        }
+        return [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? (0, _big.default)(value[0] - 0).div(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? (0, _big.default)(value[1] - 0).div(Math.pow(10, precision)).toNumber() : null];
+      },
+      getValueProps: function getValueProps(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {
+            value: []
+          };
+        }
+        if ((0, _lodash.isEqual)(ref, value)) {
+          return {
+            value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? (0, _big.default)(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? (0, _big.default)(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+          };
+        }
+        ref = value;
+        return {
+          value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? (0, _big.default)(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? (0, _big.default)(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+        };
+      }
+    };
   }
   return {
     normalize: function normalize(value) {

package/lib/ProLayout/index.js

@@ -31,7 +31,8 @@ var ProLayout = function ProLayout(props) {
     headerNotice = props.headerNotice,
     noticeIn = props.notice,
     dataSource = props.dataSource,
-    theme = props.theme;
+    theme = props.theme,
+    onCollapsedChange = props.onCollapsedChange;
   var _useSetState = (0, _ahooks.useSetState)({
       notice: headerNotice || noticeIn,
       menus: [],
@@ -92,7 +93,10 @@ var ProLayout = function ProLayout(props) {
         dataSource: menus,
         notice: notice,
         collapsed: collapsed,
-        onToggle: toggle
+        onToggle: function onToggle() {
+          toggle();
+          onCollapsedChange && onCollapsedChange(!collapsed);
+        }
       })), (0, _jsxRuntime.jsx)("div", {
         className: "pro-layout-content",
         style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, contentStyle), {}, {

package/lib/ProLayout/propTypes.d.ts

@@ -51,6 +51,10 @@ export interface ProLayoutProps {
     contentStyle?: CSSProperties;
     waterMarkProps?: ProWaterMarkProps;
     theme?: themeEnum;
+    /**
+  *  折叠回调事件
+  */
+    onCollapsedChange?: (collapsed: any) => void;
     [key: string]: any;
 }
 export interface ProLayoutStates {

package/lib/ProTreeModal/index.js

@@ -260,10 +260,16 @@ var ProTreeModal = function ProTreeModal(props) {
       }
       onChange === null || onChange === void 0 ? void 0 : onChange(values);
     }
-    setState({
-      open: false
-    });
-    openChange === null || openChange === void 0 ? void 0 : openChange(false);
+    // fix: 当有 openChange 时候、点击确定应该由关闭 openChange 控制
+    if (!openChange || open === undefined) {
+      setState({
+        open: false
+      });
+      openChange === null || openChange === void 0 ? void 0 : openChange(false);
+    }
+    if (openChange && open !== undefined) {
+      openChange === null || openChange === void 0 ? void 0 : openChange(true);
+    }
   };
   /**
    * clear all checked

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.13-beta.9",
+  "version": "3.5.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",