@zat-design/sisyphus-react 3.4.12 → 3.4.13-beta.2

package/README.md

@@ -92,9 +92,16 @@ render(<App />, document.getElementById('root'));
 5. 执行 yarn build 成功
 6. 执行 yarn release
 
-
 ### 发布
 
 npm publish --registry https://registry.npmjs.org --access=public
 
+### 发布内网库
 
+1. `package.json`里增加配置 
+```
+  "publishConfig": {
+    "registry": "https://npm.zhonganinfo.com"
+  },
+```
+2. 之后使用 `npm publish` 发布, 如果提示登录使用域账号登录

package/dist/index.esm.css

@@ -4362,7 +4362,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-edit-table .ant-table-tbody > .is-editing:not(.ant-table-measure-row) > td {
   border-bottom: 0;
-  vertical-align: top;
+  vertical-align: middle;
 }
 .pro-edit-table .ant-table-tbody tr:nth-child(n) > td {
   background-color: var(--zaui-base-bg, #ffffff);

package/dist/less.esm.css

@@ -4362,7 +4362,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-edit-table .ant-table-tbody > .is-editing:not(.ant-table-measure-row) > td {
   border-bottom: 0;
-  vertical-align: top;
+  vertical-align: middle;
 }
 .pro-edit-table .ant-table-tbody tr:nth-child(n) > td {
   background-color: var(--zaui-base-bg, #ffffff);

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

@@ -101,6 +101,7 @@ var RenderField = function RenderField(_ref) {
   var options = {
     index: index,
     form: form,
+    name: column === null || column === void 0 ? void 0 : column.name,
     namePath: [].concat(_toConsumableArray(namePath), [index])
   };
   // 行参数

package/es/ProEditTable/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { ProEditTableProps, ProEditTableRefProps } from './propsType';
-declare const ForwardProEditTable: React.ForwardRefExoticComponent<ProEditTableProps<any> & React.RefAttributes<ProEditTableRefProps>>;
+declare const ForwardProEditTable: React.ForwardRefExoticComponent<Omit<ProEditTableProps<any>, "ref"> & React.RefAttributes<ProEditTableRefProps>>;
 export default ForwardProEditTable;

package/es/ProEditTable/index.js

@@ -295,7 +295,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       }
     }
   }, [value]);
-  useImperativeHandle(ref, function () {
+  useImperativeHandle((resetProps === null || resetProps === void 0 ? void 0 : resetProps.ref) || ref, function () {
     return {
       getInternalState: function getInternalState() {
         return state;

package/es/ProEditTable/propsType.d.ts

@@ -16,6 +16,7 @@ export interface OptionsProps {
     index: number;
     form: FormInstance;
     namePath: NamePath;
+    name: NamePath;
 }
 export interface SummaryColumnProps {
     key: string;
@@ -252,4 +253,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      */
     headerRender?: ReactNode;
     rowDisabled?: (record?: T) => string | boolean;
+    ref?: any;
 }

package/es/ProEditTable/style/index.less

@@ -222,7 +222,7 @@
 
   .@{ant-prefix}-table-tbody>.is-editing:not(.@{ant-prefix}-table-measure-row)>td {
     border-bottom : 0;
-    vertical-align: top;
+    vertical-align: middle;
   }
 
   .@{ant-prefix}-table-tbody tr:nth-child(n)>td {

package/es/ProEditTable/utils/config.js

@@ -1,7 +1,7 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/message/style";
 import _message from "antd/es/message";
@@ -57,7 +57,7 @@ export var actions = {
       delete record.isEditing;
     }
     // 复制当前行数据
-    form.setFieldValue(virtualRowName, record);
+    form.setFieldValue(virtualRowName, _objectSpread({}, record));
     setState({
       editingKeys: nextEditingKeys
     });

package/es/ProForm/components/base/InputNumber/index.js

@@ -234,7 +234,14 @@ var InputNumber = function InputNumber(props) {
   var handleBlur = function handleBlur(e) {
     var _e$target, _e$target2;
     activateRef.current = false;
-    var value = _parser(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value, props.precision);
+    var value = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
+    if (_max !== undefined && value > _max) {
+      value = _max;
+    }
+    if (_min !== undefined && value < _min) {
+      value = _min;
+    }
+    value = _parser(String(value), props.precision);
     var limit = {
       min: Number(_min),
       max: Number(_max)

package/es/ProForm/components/base/TextArea/index.js

@@ -14,6 +14,7 @@ import Container from '../../Container';
 import './index.less';
 var TextArea = _Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
+  var _props$style;
   var placeholder = props.placeholder,
     otherProps = props.otherProps,
     className = props.className,
@@ -42,7 +43,7 @@ var TextAreaDef = function TextAreaDef(props) {
     showCount: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder).concat(label || ''),
-    autoSize: true
+    autoSize: !(props === null || props === void 0 ? void 0 : (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.height)
   }, omit(initialConfig, ['trim'])), rest), {}, {
     className: _className
   }));

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -45,7 +45,7 @@ var ComRender = function ComRender(props) {
   var mergedGetValueProps = getValueProps || function (val) {
     return _defineProperty({}, valuePropName, val);
   };
-  var _props = mergedGetValueProps(props.value);
+  var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
   var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
   var Com = getComRender(Component, props, componentProps);

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

@@ -98,13 +98,13 @@ var ProNumberRange = function ProNumberRange(props) {
       case 'percentage':
         return _jsx(Container, {
           viewEmpty: viewEmpty,
-          children: "".concat(formatPercent(value[0], precision || decimal), " ").concat(separator, " ").concat(formatPercent(value[1], precision || decimal))
+          children: "".concat(formatAmount(value[0], precision || decimal), " ").concat(separator, " ").concat(formatAmount(value[1], precision || decimal))
         });
       // 千分比
       case 'permillage':
         return _jsx(Container, {
           viewEmpty: viewEmpty,
-          children: "".concat(formatPerMill(value[0], precision || decimal), " ").concat(separator, " ").concat(formatPerMill(value[1], precision || decimal))
+          children: "".concat(formatAmount(value[0], precision || decimal), " ").concat(separator, " ").concat(formatAmount(value[1], precision || decimal))
         });
       // 千分位
       case 'amount':

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

@@ -119,20 +119,18 @@ var ProRangeLimit = function ProRangeLimit(props) {
   var handleForeverChange = function handleForeverChange(e) {
     var foreverStr = e.target.checked ? 'Y' : 'N';
     var _ref8 = value || [],
-      _ref9 = _slicedToArray(_ref8, 2),
-      start = _ref9[0],
-      end = _ref9[1];
+      _ref9 = _slicedToArray(_ref8, 1),
+      start = _ref9[0];
+    var _ref10 = value || [],
+      _ref11 = _slicedToArray(_ref10, 2),
+      end = _ref11[1];
     if (e.target.checked) {
-      var _rest$allowEmpty, _start, _end;
-      if (((_rest$allowEmpty = rest.allowEmpty) === null || _rest$allowEmpty === void 0 ? void 0 : _rest$allowEmpty[0]) === true) {
-        start = null;
-      } else {
-        start = start || moment().startOf('day');
-      }
+      var _end;
       end = foreverMoment;
-      onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
+      onChange([start, end, e.target.checked], [start === null || start === void 0 ? void 0 : start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
     } else {
-      onChange(null);
+      // 不清除起期时间
+      onChange([start, null]);
     }
   };
   return _jsxs(_Input.Group, {

package/es/ProForm/utils/index.js

@@ -3,7 +3,7 @@ import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIt
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useState } from 'react';
+import React, { useState } from 'react';
 import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
 import moment from 'moment';
 export var getLayout = function getLayout(params) {
@@ -323,7 +323,7 @@ export function getArrayBeforeNumber(arr) {
 }
 // 自定义深比对 如果两边都是函数类型则认为相等
 export var customEqualForFun = function customEqualForFun(value, other) {
-  if (isFunction(value) && isFunction(other)) {
+  if (isFunction(value) && isFunction(other) || /*#__PURE__*/React.isValidElement(value) && /*#__PURE__*/React.isValidElement(other)) {
     return true;
   }
 };

package/es/ProForm/utils/useShouldUpdate.js

@@ -181,12 +181,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
       // ) {
       //   form.validateFields([name]);
       // }
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) || !isEqualWith(originComponentRef.current, _component, customEqualForFun) || equalDependencies(dependencies, prevValues, _currentValues)) {
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) ||
+      // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
+      equalDependencies(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;
-        rulesRef.current = _rules || [];
-        originComponentRef.current = _component;
+        rulesRef.current = _rules;
+        // originComponentRef.current = _component;
         fieldPropsRef.current = _fieldProps;
         reRender({});
         return false;

package/es/ProSelect/index.js

@@ -9,10 +9,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView", "viewportReady"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import React, { useImperativeHandle, useState, forwardRef } from 'react';
+import { useDeepCompareEffect, useInViewport, useRequest as useRequestFunc } from 'ahooks';
+import React, { useImperativeHandle, useState, forwardRef, useRef, useEffect } from 'react';
 import { isFunction, isObject, isString, omit, cloneDeep, isNumber } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
@@ -54,7 +54,22 @@ export var ProSelect = function ProSelect(props, ref) {
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
+    _props$viewportReady = props.viewportReady,
+    viewportReady = _props$viewportReady === void 0 ? false : _props$viewportReady,
     selectProps = _objectWithoutProperties(props, _excluded);
+  /** 是否在可视区域出现过 */
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    viewFlag = _useState2[0],
+    setViewFlag = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    inputEl = _useState4[0],
+    setInputEl = _useState4[1];
+  var refSelect1 = useRef((Math.random() * 100).toFixed(0));
+  var _useInViewport = useInViewport(inputEl),
+    _useInViewport2 = _slicedToArray(_useInViewport, 1),
+    inViewport = _useInViewport2[0];
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = ProForm.useFieldProps() || {},
@@ -65,15 +80,15 @@ export var ProSelect = function ProSelect(props, ref) {
     code = fieldNames.value;
     label = fieldNames.label;
   }
-  var _useState = useState(dataSource || []),
-    _useState2 = _slicedToArray(_useState, 2),
-    selectList = _useState2[0],
-    setSelectList = _useState2[1];
+  var _useState5 = useState(dataSource || []),
+    _useState6 = _slicedToArray(_useState5, 2),
+    selectList = _useState6[0],
+    setSelectList = _useState6[1];
   // 用来控制只有第一次才会设置 defaultOne 属性、🔒
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isDefaultOne = _useState4[0],
-    setIsDefaultOne = _useState4[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isDefaultOne = _useState8[0],
+    setIsDefaultOne = _useState8[1];
   var OptionRender = optionRender;
   var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
     var _res$status = res.status,
@@ -134,8 +149,22 @@ export var ProSelect = function ProSelect(props, ref) {
     if (manual) {
       return;
     }
+    if (viewportReady && !viewFlag) {
+      return;
+    }
     fetchFunction.run(defaultParams);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue, viewFlag]);
+  useEffect(function () {
+    if (inViewport && !viewFlag && viewportReady) {
+      setViewFlag(true);
+    }
+  }, [inViewport]);
+  useEffect(function () {
+    var el = document.getElementById(refSelect1 === null || refSelect1 === void 0 ? void 0 : refSelect1.current);
+    if (el) {
+      setInputEl(el);
+    }
+  }, []);
   // disable默认值
   if (defaultDisableValue) {
     return _jsx("span", {
@@ -281,6 +310,7 @@ export var ProSelect = function ProSelect(props, ref) {
     });
   }
   return _jsx(_Select, _objectSpread(_objectSpread({
+    id: refSelect1.current,
     placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
     allowClear: true,
     showArrow: true,

package/es/ProSelect/propsType.d.ts

@@ -10,6 +10,8 @@ export interface DataOption {
 export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     /** 是否查看模式 */
     isView?: boolean;
+    /** 是否开启组件在可视区域中才发起useRequest请求 默认 false */
+    viewportReady?: boolean;
     /** 默认数组第一项 */
     defaultOne?: boolean;
     /** 数据源 */

package/es/ProTree/components/Tree.js

@@ -355,7 +355,7 @@ function List(props) {
   }
   return _jsx("div", {
     className: disabledMode === 'hide' ? 'hide-disable-node' : '',
-    children: (_treeData === null || _treeData === void 0 ? void 0 : _treeData.length) ? _jsx(_Tree, _objectSpread(_objectSpread(_objectSpread({}, others), expandedKeys), {}, {
+    children: (_treeData === null || _treeData === void 0 ? void 0 : _treeData.length) ? _jsx(_Tree, _objectSpread(_objectSpread(_objectSpread({}, others), additionProps), {}, {
       disabled: disabled,
       style: {
         width: '100%'

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

@@ -104,6 +104,7 @@ var RenderField = function RenderField(_ref) {
   var options = {
     index: index,
     form: form,
+    name: column === null || column === void 0 ? void 0 : column.name,
     namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index])
   };
   // 行参数

package/lib/ProEditTable/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { ProEditTableProps, ProEditTableRefProps } from './propsType';
-declare const ForwardProEditTable: React.ForwardRefExoticComponent<ProEditTableProps<any> & React.RefAttributes<ProEditTableRefProps>>;
+declare const ForwardProEditTable: React.ForwardRefExoticComponent<Omit<ProEditTableProps<any>, "ref"> & React.RefAttributes<ProEditTableRefProps>>;
 export default ForwardProEditTable;

package/lib/ProEditTable/index.js

@@ -298,7 +298,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       }
     }
   }, [value]);
-  (0, _react.useImperativeHandle)(ref, function () {
+  (0, _react.useImperativeHandle)((resetProps === null || resetProps === void 0 ? void 0 : resetProps.ref) || ref, function () {
     return {
       getInternalState: function getInternalState() {
         return state;

package/lib/ProEditTable/propsType.d.ts

@@ -16,6 +16,7 @@ export interface OptionsProps {
     index: number;
     form: FormInstance;
     namePath: NamePath;
+    name: NamePath;
 }
 export interface SummaryColumnProps {
     key: string;
@@ -252,4 +253,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      */
     headerRender?: ReactNode;
     rowDisabled?: (record?: T) => string | boolean;
+    ref?: any;
 }

package/lib/ProEditTable/style/index.less

@@ -222,7 +222,7 @@
 
   .@{ant-prefix}-table-tbody>.is-editing:not(.@{ant-prefix}-table-measure-row)>td {
     border-bottom : 0;
-    vertical-align: top;
+    vertical-align: middle;
   }
 
   .@{ant-prefix}-table-tbody tr:nth-child(n)>td {

package/lib/ProEditTable/utils/config.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.iconMap = exports.defaultToolbarKeys = exports.defaultSingleActionKeys = exports.defaultMultipleActionKeys = exports.defaultEditingActionKeys = exports.defaultBtnNameMap = exports.actions = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
@@ -63,7 +63,7 @@ var actions = exports.actions = {
       delete record.isEditing;
     }
     // 复制当前行数据
-    form.setFieldValue(virtualRowName, record);
+    form.setFieldValue(virtualRowName, (0, _objectSpread2.default)({}, record));
     setState({
       editingKeys: nextEditingKeys
     });

package/lib/ProForm/components/base/InputNumber/index.js

@@ -238,7 +238,14 @@ var InputNumber = function InputNumber(props) {
   var handleBlur = function handleBlur(e) {
     var _e$target, _e$target2;
     activateRef.current = false;
-    var value = _parser(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value, props.precision);
+    var value = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
+    if (_max !== undefined && value > _max) {
+      value = _max;
+    }
+    if (_min !== undefined && value < _min) {
+      value = _min;
+    }
+    value = _parser(String(value), props.precision);
     var limit = {
       min: Number(_min),
       max: Number(_max)

package/lib/ProForm/components/base/TextArea/index.js

@@ -20,6 +20,7 @@ require("./index.less");
 var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
 var TextArea = _antd.Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
+  var _props$style;
   var placeholder = props.placeholder,
     otherProps = props.otherProps,
     className = props.className,
@@ -48,7 +49,7 @@ var TextAreaDef = function TextAreaDef(props) {
     showCount: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder).concat(label || ''),
-    autoSize: true
+    autoSize: !(props === null || props === void 0 ? void 0 : (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.height)
   }, (0, _lodash.omit)(initialConfig, ['trim'])), rest), {}, {
     className: _className
   }));

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -53,7 +53,7 @@ var ComRender = function ComRender(props) {
   var mergedGetValueProps = getValueProps || function (val) {
     return (0, _defineProperty2.default)({}, valuePropName, val);
   };
-  var _props = mergedGetValueProps(props.value);
+  var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
   var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
   var Com = getComRender(Component, props, componentProps);

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

@@ -102,13 +102,13 @@ var ProNumberRange = function ProNumberRange(props) {
       case 'percentage':
         return (0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: "".concat(formatPercent(value[0], precision || decimal), " ").concat(separator, " ").concat(formatPercent(value[1], precision || decimal))
+          children: "".concat(formatAmount(value[0], precision || decimal), " ").concat(separator, " ").concat(formatAmount(value[1], precision || decimal))
         });
       // 千分比
       case 'permillage':
         return (0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: "".concat(formatPerMill(value[0], precision || decimal), " ").concat(separator, " ").concat(formatPerMill(value[1], precision || decimal))
+          children: "".concat(formatAmount(value[0], precision || decimal), " ").concat(separator, " ").concat(formatAmount(value[1], precision || decimal))
         });
       // 千分位
       case 'amount':

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

@@ -121,20 +121,18 @@ var ProRangeLimit = function ProRangeLimit(props) {
   var handleForeverChange = function handleForeverChange(e) {
     var foreverStr = e.target.checked ? 'Y' : 'N';
     var _ref8 = value || [],
-      _ref9 = (0, _slicedToArray2.default)(_ref8, 2),
-      start = _ref9[0],
-      end = _ref9[1];
+      _ref9 = (0, _slicedToArray2.default)(_ref8, 1),
+      start = _ref9[0];
+    var _ref10 = value || [],
+      _ref11 = (0, _slicedToArray2.default)(_ref10, 2),
+      end = _ref11[1];
     if (e.target.checked) {
-      var _rest$allowEmpty, _start, _end;
-      if (((_rest$allowEmpty = rest.allowEmpty) === null || _rest$allowEmpty === void 0 ? void 0 : _rest$allowEmpty[0]) === true) {
-        start = null;
-      } else {
-        start = start || (0, _moment.default)().startOf('day');
-      }
+      var _end;
       end = foreverMoment;
-      onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
+      onChange([start, end, e.target.checked], [start === null || start === void 0 ? void 0 : start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
     } else {
-      onChange(null);
+      // 不清除起期时间
+      onChange([start, null]);
     }
   };
   return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {

package/lib/ProForm/utils/index.js

@@ -21,7 +21,7 @@ var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _lodash = _interopRequireWildcard(require("lodash"));
 var _moment = _interopRequireDefault(require("moment"));
 var getLayout = exports.getLayout = function getLayout(params) {
@@ -341,7 +341,7 @@ function getArrayBeforeNumber(arr) {
 }
 // 自定义深比对 如果两边都是函数类型则认为相等
 var customEqualForFun = exports.customEqualForFun = function customEqualForFun(value, other) {
-  if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other)) {
+  if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other) || /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
     return true;
   }
 };

package/lib/ProForm/utils/useShouldUpdate.js

@@ -188,12 +188,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
       // ) {
       //   form.validateFields([name]);
       // }
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(originComponentRef.current, _component, _index.customEqualForFun) || (0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) ||
+      // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
+      (0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;
-        rulesRef.current = _rules || [];
-        originComponentRef.current = _component;
+        rulesRef.current = _rules;
+        // originComponentRef.current = _component;
         fieldPropsRef.current = _fieldProps;
         reRender({});
         return false;

package/lib/ProSelect/index.js

@@ -21,7 +21,7 @@ var _ = require("..");
 var _locale = _interopRequireDefault(require("../locale"));
 var _utils = require("./utils");
 require("./index.less");
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView", "viewportReady"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _selectProps$showCode, _locale$ProSelect;
@@ -55,7 +55,22 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
+    _props$viewportReady = props.viewportReady,
+    viewportReady = _props$viewportReady === void 0 ? false : _props$viewportReady,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  /** 是否在可视区域出现过 */
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    viewFlag = _useState2[0],
+    setViewFlag = _useState2[1];
+  var _useState3 = (0, _react.useState)(),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    inputEl = _useState4[0],
+    setInputEl = _useState4[1];
+  var refSelect1 = (0, _react.useRef)((Math.random() * 100).toFixed(0));
+  var _useInViewport = (0, _ahooks.useInViewport)(inputEl),
+    _useInViewport2 = (0, _slicedToArray2.default)(_useInViewport, 1),
+    inViewport = _useInViewport2[0];
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = _.ProForm.useFieldProps() || {},
@@ -66,15 +81,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     code = fieldNames.value;
     label = fieldNames.label;
   }
-  var _useState = (0, _react.useState)(dataSource || []),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    selectList = _useState2[0],
-    setSelectList = _useState2[1];
+  var _useState5 = (0, _react.useState)(dataSource || []),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    selectList = _useState6[0],
+    setSelectList = _useState6[1];
   // 用来控制只有第一次才会设置 defaultOne 属性、🔒
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    isDefaultOne = _useState4[0],
-    setIsDefaultOne = _useState4[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    isDefaultOne = _useState8[0],
+    setIsDefaultOne = _useState8[1];
   var OptionRender = optionRender;
   var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
     var _res$status = res.status,
@@ -135,8 +150,22 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     if (manual) {
       return;
     }
+    if (viewportReady && !viewFlag) {
+      return;
+    }
     fetchFunction.run(defaultParams);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue, viewFlag]);
+  (0, _react.useEffect)(function () {
+    if (inViewport && !viewFlag && viewportReady) {
+      setViewFlag(true);
+    }
+  }, [inViewport]);
+  (0, _react.useEffect)(function () {
+    var el = document.getElementById(refSelect1 === null || refSelect1 === void 0 ? void 0 : refSelect1.current);
+    if (el) {
+      setInputEl(el);
+    }
+  }, []);
   // disable默认值
   if (defaultDisableValue) {
     return (0, _jsxRuntime.jsx)("span", {
@@ -282,6 +311,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     });
   }
   return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    id: refSelect1.current,
     placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
     allowClear: true,
     showArrow: true,

package/lib/ProSelect/propsType.d.ts

@@ -10,6 +10,8 @@ export interface DataOption {
 export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     /** 是否查看模式 */
     isView?: boolean;
+    /** 是否开启组件在可视区域中才发起useRequest请求 默认 false */
+    viewportReady?: boolean;
     /** 默认数组第一项 */
     defaultOne?: boolean;
     /** 数据源 */

package/lib/ProTree/components/Tree.js

@@ -360,7 +360,7 @@ function List(props) {
   }
   return (0, _jsxRuntime.jsx)("div", {
     className: disabledMode === 'hide' ? 'hide-disable-node' : '',
-    children: (_treeData === null || _treeData === void 0 ? void 0 : _treeData.length) ? (0, _jsxRuntime.jsx)(_antd.Tree, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, others), expandedKeys), {}, {
+    children: (_treeData === null || _treeData === void 0 ? void 0 : _treeData.length) ? (0, _jsxRuntime.jsx)(_antd.Tree, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, others), additionProps), {}, {
       disabled: disabled,
       style: {
         width: '100%'

package/package.json

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