@zat-design/sisyphus-react 3.3.1 → 3.3.2

package/lib/ProEnum/hooks/useEnumRequest.js

@@ -79,6 +79,18 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               case 9:
                 res.data = response;
               case 10:
+                if (!((0, _typeof2.default)(response) !== 'object' || response === null)) {
+                  _context.next = 12;
+                  break;
+                }
+                throw Error('response enum data must be object');
+              case 12:
+                if (!(Object.keys(response).length === 0)) {
+                  _context.next = 14;
+                  break;
+                }
+                throw Error('Please return valid enumeration data');
+              case 14:
                 // 只返回fieldNames对象的key
                 if (clear) {
                   // 忽略清洗的 codes
@@ -113,7 +125,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   }, 10000);
                 }
                 return _context.abrupt("return", res);
-              case 17:
+              case 21:
               case "end":
                 return _context.stop();
             }

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

@@ -14,7 +14,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["format", "otherProps", "separator"];
+var _excluded = ["format", "otherProps", "separator"]; // @ts-check
 var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,

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

@@ -31,7 +31,6 @@ var Group = function Group(props) {
   if (!Array.isArray(names)) {
     console.error('Warning: Composite form components whose type is Group must be configured with names');
   }
-  var _parentNames = (0, _utils.parseName)(id);
   var data = (0, _react.useMemo)(function () {
     var fieldList = [];
     var result = columns.map(function (item) {
@@ -39,7 +38,7 @@ var Group = function Group(props) {
         disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: _parentNames
+        parentNames: id
       });
     });
     var node = (0, _jsxRuntime.jsx)(_antd.Button, {
@@ -50,7 +49,7 @@ var Group = function Group(props) {
       columns: (0, _utils.insertSeparator)(result, space, node, otherProps),
       fieldList: fieldList
     };
-  }, [name, columns, space, props]);
+  }, [name, columns, space, props, names]);
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {

package/lib/ProForm/components/combination/Group/style/index.less

@@ -2,20 +2,20 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .border-radius(@start-end: 0, @end-end: 0, @start-start: 0, @end-start: 0) {
-  border-start-end-radius  : @start-end;
-  border-end-end-radius    : @end-end;
+  border-start-end-radius: @start-end;
+  border-end-end-radius: @end-end;
   border-start-start-radius: @start-start;
-  border-end-start-radius  : @end-start;
+  border-end-start-radius: @end-start;
 }
 
 .start-radius() {
   border-start-start-radius: var(--zaui-border-radius, 4px);
-  border-end-start-radius  : var(--zaui-border-radius, 4px);
+  border-end-start-radius: var(--zaui-border-radius, 4px);
 }
 
 .end-radius() {
   border-start-end-radius: var(--zaui-border-radius, 4px);
-  border-end-end-radius  : var(--zaui-border-radius, 4px);
+  border-end-end-radius: var(--zaui-border-radius, 4px);
 }
 
 .pro-group {
@@ -39,7 +39,6 @@
     }
 
     .@{ant-prefix}-form-item {
-
       margin-bottom: 0 !important;
     }
   }
@@ -49,19 +48,38 @@
   }
 
   .@{ant-prefix}-space-compact {
+    flex: auto;
     align-items: center;
-    flex       : auto;
-    width      : 100%;
+    width: 100%;
+
+    &>.@{ant-prefix}-input-number{
+      &:first-child{
+        border-end-end-radius: 0;
+        border-start-end-radius: 0;
+      }
+      &:last-child{
+        border-start-start-radius: 0;
+        border-end-start-radius: 0;
+        margin-left: -1px;
+      }
+    }
 
     .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
     .group-separator {
-      margin-inline-end        : -2px;
-      margin-inline-start      : -1px;
+      margin-inline-end: -2px;
+      margin-inline-start: -1px;
       border-start-start-radius: 0;
-      border-end-start-radius  : 0;
+      border-end-start-radius: 0;
+    }
+    .pro-modal-select {
+      margin-left: -1px;
+      .@{ant-prefix}-input{
+        border-start-start-radius: 0;
+        border-end-start-radius: 0;
+      }
     }
 
     // 定制内敛合并样式
@@ -69,16 +87,16 @@
     .@{ant-prefix}-select {
       .border-radius(0, 0, 0, 0);
 
-      &:nth-child(n+2) {
-        margin-inline-start: -1px
+      &:nth-child(n + 2) {
+        margin-inline-start: -1px;
       }
 
       &:first-child {
-        .start-radius()
+        .start-radius();
       }
 
       &:last-child {
-        .end-radius()
+        .end-radius();
       }
     }
 
@@ -89,22 +107,21 @@
 
       &:first-child {
         .@{ant-prefix}-select-selector {
-          .start-radius()
+          .start-radius();
         }
       }
 
       &:last-child {
         .@{ant-prefix}-select-selector {
-          .end-radius()
+          .end-radius();
         }
       }
-
     }
 
     // 报错样式定制
-    .@{ant-prefix}-input-affix-wrapper-status-error~.group-separator {
+    .@{ant-prefix}-input-affix-wrapper-status-error ~ .group-separator {
+      color: var(--ant-error-color);
       border-color: var(--ant-error-color);
-      color       : var(--ant-error-color);
     }
   }
-}
+}

package/lib/ProForm/components/combination/Group/utils.d.ts

@@ -6,5 +6,3 @@ import { SpaceType } from './propsType';
 * @returns
 */
 export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
-/** 解析name */
-export declare const parseName: (name: string) => any[];

package/lib/ProForm/components/combination/Group/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseName = exports.insertSeparator = void 0;
+exports.insertSeparator = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 /**
 * 插入间隔符
@@ -40,17 +40,4 @@ var insertSeparator = exports.insertSeparator = function insertSeparator(columns
     }
     return result;
   }, []);
-};
-/** 解析name */
-var parseName = exports.parseName = function parseName(name) {
-  var result = [];
-  var parts = name.split('_');
-  parts.forEach(function (part) {
-    if (!Number.isNaN(Number(part))) {
-      result.push(Number(part));
-    } else {
-      result.push(part);
-    }
-  });
-  return result;
 };

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

@@ -653,7 +653,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       disabled: disabled,
       addonAfter: forceAddonAfterRender(),
       autoComplete: "off"
-    }, restInputProps)), (0, _jsxRuntime.jsx)(_antd.Input, {
+    }, (0, _lodash.omit)(restInputProps, ['otherProps']))), (0, _jsxRuntime.jsx)(_antd.Input, {
       type: "hidden",
       value: value
     })]

package/lib/ProForm/components/old/InputRange/index.js

@@ -13,7 +13,6 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable no-param-reassign */
-
 var positiveInteger = {
   formatter: function formatter(value) {
     return value.replace(/[^0-9]/g, '');

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

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

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

@@ -28,9 +28,10 @@ var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
+/* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _classNames, _otherProps$names2;
+  var _ref2, _classNames, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -160,8 +161,8 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先取formDisabled（全局），其次取disabled函数返回值，最后取fieldProps函数返回的disabled
-  var lastDisabled = componentProps.disabledStrictly ? formDisabled || _disabled || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) : false;
+  // 优先取组件上的disabled, 最后取formDisabled（全局
+  var lastDisabled = componentProps.disabledStrictly ? (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled : false;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -189,8 +190,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = (0, _toConsumableArray2.default)(args);
-    var _ref2 = otherProps || {},
-      valueType = _ref2.valueType;
+    var _ref3 = otherProps || {},
+      valueType = _ref3.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -248,9 +249,10 @@ var Render = function Render(props) {
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
       return false;
     }
-    // Group默认校验, 延时校验解决值未同步最新的问题
+    // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
+        form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames));
         form.validateFields([formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames]);
       }, 60);
     }
@@ -265,7 +267,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -292,7 +294,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -400,7 +402,12 @@ var Render = function Render(props) {
         shouldUpdate: _otherFormItemProps.shouldUpdate,
         noStyle: true,
         children: function children() {
-          return orgFormItem;
+          return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+            // @ts-ignore
+            _internalItemRender: internalItemRender,
+            className: _className,
+            children: child
+          }));
         }
       });
     }

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

@@ -52,6 +52,7 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
+    var _ref, _formItemProps$disabl;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -130,7 +131,7 @@ var RenderFields = function RenderFields(props) {
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
-    var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
+    var comDisabled = (_ref = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled) !== null && _ref !== void 0 ? _ref : disabled;
     var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
     // 当前组件是不是一个选择组件
     var _isSelect = (0, _utils.isSelect)({

package/lib/ProForm/style/index.less

@@ -56,7 +56,8 @@
     visibility: unset;
   }
 
-  .@{ant-prefix}-input-affix-wrapper:hover span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
+  .@{ant-prefix}-input-affix-wrapper:hover
+    span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
     display: unset;
     visibility: hidden;
   }
@@ -140,9 +141,9 @@
         }
       }
 
-      .@{ant-prefix}-form-item-control-input-content > span {
-        background: @zaui-contract-bg;
+      .@{ant-prefix}-form-item-control-input-content > .pro-form-view-container {
         padding: 4px 8px;
+        background: @zaui-contract-bg;
         border-radius: 4px;
       }
     }
@@ -306,7 +307,7 @@
 
   div.pro-form-custom-footer {
     width: unset !important;
-    height:32px;
+    height: 32px;
     margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 
     &.pro-form-custom-footer-hidden {

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

@@ -1,6 +1,5 @@
 import { FormInstance } from 'antd';
 interface Params {
-    originalValues: any;
     originalValue: any;
     value: any;
     form: FormInstance;

package/lib/ProForm/utils/contrastOriginal.js

@@ -8,7 +8,6 @@ var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 var contrastOriginal = exports.contrastOriginal = function contrastOriginal(params) {
   var originalValue = params.originalValue,
-    originalValues = params.originalValues,
     value = params.value,
     equalWith = params.equalWith;
   // 支持传入自定义比较事件

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

@@ -1,15 +1,8 @@
-import { FormInstance } from 'antd';
-import { NamePath } from 'antd/lib/form/interface';
-interface Params {
-    name?: NamePath;
-    names?: NamePath[];
-    namesStr?: NamePath;
-    originalName?: NamePath;
-    originalNames?: NamePath[];
-    originalNameStr?: NamePath;
+export declare const useChanged: ({ name, names, namesStr, originalValues, form, equalWith }: {
+    name: any;
+    names: any;
+    namesStr: any;
     originalValues: any;
-    form: FormInstance;
-    equalWith?: (originalValue: any, currentValue: any) => boolean;
-}
-export declare const useChanged: (params: Params) => any[];
-export {};
+    form: any;
+    equalWith: any;
+}) => any[];

package/lib/ProForm/utils/useChanged.js

@@ -7,30 +7,23 @@ exports.useChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _contrastOriginal = require("./contrastOriginal");
-var useChanged = exports.useChanged = function useChanged(params) {
-  var name = params.name,
-    names = params.names,
-    namesStr = params.namesStr,
-    _params$originalName = params.originalName,
-    originalName = _params$originalName === void 0 ? name : _params$originalName,
-    _params$originalNames = params.originalNames,
-    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
-    originalValues = params.originalValues,
-    form = params.form,
-    equalWith = params.equalWith;
-  var _form = form;
-  var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-    return (0, _lodash.get)(originalValues, originalName);
-  }) : (0, _lodash.get)(originalValues, originalName);
+var useChanged = exports.useChanged = function useChanged(_ref) {
+  var name = _ref.name,
+    names = _ref.names,
+    namesStr = _ref.namesStr,
+    originalValues = _ref.originalValues,
+    form = _ref.form,
+    equalWith = _ref.equalWith;
+  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
+    return (0, _lodash.get)(originalValues, name);
+  }) : (0, _lodash.get)(originalValues, name);
   var notWatch = !originalValues || originalValue === undefined;
-  // @ts-ignore
-  if (notWatch) _form = [];
-  var value = _antd.Form.useWatch(namesStr || name, _form);
+  if (notWatch) form = [];
+  var value = _antd.Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
   var changed = (0, _contrastOriginal.contrastOriginal)({
-    value: value,
     originalValue: originalValue,
-    originalValues: originalValues,
+    value: value,
     form: form,
     equalWith: equalWith
   });

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

@@ -0,0 +1,16 @@
+import { FormInstance } from 'antd';
+import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
+interface Params {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: NamePath;
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    originalNameStr?: NamePath;
+    originalValues: any;
+    form: FormInstance;
+    rowKeyPath?: InternalNamePath;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const useListChanged: (params: Params) => any[];
+export {};

package/lib/ProForm/utils/useListChanged.js

@@ -0,0 +1,86 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useListChanged = void 0;
+var _antd = require("antd");
+var _lodash = require("lodash");
+var _contrastOriginal = require("./contrastOriginal");
+var toNamePath = function toNamePath(name) {
+  if (Array.isArray(name)) {
+    return name;
+  }
+  return [name];
+};
+var toNamePaths = function toNamePaths(names) {
+  return names.map(function (name) {
+    return toNamePath(name);
+  });
+};
+var getOriginalValue = function getOriginalValue(_ref) {
+  var namePath = _ref.namePath,
+    originalName = _ref.originalName,
+    originalNames = _ref.originalNames,
+    originalValues = _ref.originalValues,
+    rowKeyPath = _ref.rowKeyPath,
+    form = _ref.form;
+  if (!originalValues) {
+    return undefined;
+  }
+  if (rowKeyPath) {
+    var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
+    var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
+    var rowValue = form.getFieldValue(rowValueNamePath);
+    var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
+    if (!keyValue) return undefined;
+    var originalValueList = (0, _lodash.get)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
+    var originalValueRow = originalValueList.find(function (item) {
+      return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
+    });
+    var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+      return (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    }) : (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    return originalValue;
+  }
+  return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+    return (0, _lodash.get)(originalValues, originalName);
+  }) : (0, _lodash.get)(originalValues, originalName);
+};
+var useListChanged = exports.useListChanged = function useListChanged(params) {
+  var name = params.name,
+    names = params.names,
+    namesStr = params.namesStr,
+    _params$originalName = params.originalName,
+    originalName = _params$originalName === void 0 ? name : _params$originalName,
+    _params$originalNames = params.originalNames,
+    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
+    originalValues = params.originalValues,
+    form = params.form,
+    equalWith = params.equalWith,
+    rowKeyPath = params.rowKeyPath;
+  // let _form = form;
+  var namePath = toNamePath(namesStr || name);
+  var originalNamePath = toNamePath(originalName);
+  var originalNamePaths = originalNames && toNamePaths(originalNames);
+  var originalValue = getOriginalValue({
+    namePath: namePath,
+    originalName: originalNamePath,
+    originalNames: originalNamePaths,
+    originalValues: originalValues,
+    rowKeyPath: rowKeyPath,
+    form: form
+  });
+  var notWatch = !originalValues || originalValue === undefined;
+  // @ts-ignore
+  // if (notWatch) _form = [];
+  var value = _antd.Form.useWatch(namePath, form);
+  if (notWatch) return [false];
+  var changed = (0, _contrastOriginal.contrastOriginal)({
+    value: value,
+    originalValue: originalValue,
+    form: form,
+    equalWith: equalWith
+  });
+  return [changed, originalValue];
+};

package/lib/ProForm/utils/useShouldUpdate.js

@@ -20,7 +20,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     required = props.required,
     fieldProps = props.fieldProps,
     component = props.component,
-    originComponent = props.originComponent;
+    originComponent = props.originComponent,
+    type = props.type;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,
@@ -67,11 +68,24 @@ var useShouldUpdate = function useShouldUpdate(props) {
     showRef.current = show;
   }
   if ((0, _lodash.isFunction)(disabled)) {
-    disabledRef.current = Boolean(disabled(values, {
+    // RangePicker返回数组时，特殊处理
+    if (type === 'RangePicker' && Array.isArray(disabled(values, {
       form: form,
       index: index,
       namePath: namePath
-    }));
+    }))) {
+      disabledRef.current = disabled(values, {
+        form: form,
+        index: index,
+        namePath: namePath
+      });
+    } else {
+      disabledRef.current = Boolean(disabled(values, {
+        form: form,
+        index: index,
+        namePath: namePath
+      }));
+    }
   } else {
     disabledRef.current = disabled;
   }

package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js

@@ -30,7 +30,8 @@ var FoldMenu = function FoldMenu(props) {
     'pro-layout-menu-tooltip-nav-open': collapsed
   });
   var _useContext = (0, _react.useContext)(_index2.LayoutContext),
-    selectedPath = _useContext.selectedPath;
+    selectedPath = _useContext.selectedPath,
+    onSelected = _useContext.onSelected;
   return (0, _jsxRuntime.jsx)("div", {
     className: "pro-layout-menu-fold",
     style: (0, _objectSpread2.default)({}, style),
@@ -98,10 +99,17 @@ var FoldMenu = function FoldMenu(props) {
         }, "".concat(id, "-").concat(name)) : !collapsed ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
           placement: "right",
           title: name,
-          children: (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
-            to: toPath,
-            children: LiNode
-          }, toPath)
+          children: (0, _jsxRuntime.jsx)("span", {
+            onClick: function onClick() {
+              onSelected({
+                selectedPath: toPath
+              });
+            },
+            children: (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
+              to: toPath,
+              children: LiNode
+            }, toPath)
+          })
         }, toPath) : (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
           to: toPath,
           children: LiNode