@zat-design/sisyphus-react 3.9.3-beta.4 → 3.9.3-beta.6

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

@@ -16,7 +16,7 @@ import _Typography from "antd/es/typography";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
-import { omit, find as _find } from 'lodash';
+import { omit, find as _find, isBoolean } from 'lodash';
 import { transformDataName } from './utils/index';
 import { useProConfig } from '../../../../ProConfigProvider';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
@@ -111,6 +111,12 @@ var ProCascader = function ProCascader(props) {
     var result = transformDataName(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
+  var lastDisabled = useMemo(function () {
+    if (isBoolean(disabled) || disabled === undefined) {
+      return [disabled, disabled];
+    }
+    return disabled;
+  }, [disabled]);
   var _useRequest = _objectSpread({}, useRequest),
     service = _useRequest.service,
     _useRequest$defaultPa = _useRequest.defaultParams,
@@ -268,7 +274,7 @@ var ProCascader = function ProCascader(props) {
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
       options: service ? serviceData : realDataSource,
-      disabled: disabled,
+      disabled: lastDisabled[0],
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,
@@ -278,19 +284,19 @@ var ProCascader = function ProCascader(props) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, omit(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && disabled && detail ? _jsx(_Tooltip, {
+    }, omit(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? _jsx(_Tooltip, {
       title: detail,
       children: _jsx("span", {
         className: "pro-address-detail",
         children: _jsx(_Input, {
-          disabled: disabled,
+          disabled: lastDisabled[1],
           value: detail
         })
       })
     }) : _jsx(_Input, {
       allowClear: true,
       autoComplete: "off",
-      disabled: disabled,
+      disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
       placeholder: detailPlaceholder || (locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),

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

@@ -2,6 +2,7 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -63,23 +64,20 @@ var ChangedWrapper = function ChangedWrapper(props) {
   }, [isWatch, noChange, props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
-  var viewRenderFun = useMemo(function () {
-    return function (orgValue) {
-      return viewRender(orgValue, originalValues, {
-        form: form
-      });
-    };
-  }, [form]);
   var tipContent = useMemo(function () {
     if (!isWatch || noChange) return undefined;
     var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
       value: originalValue
     };
-    if (viewRender) return viewRenderFun(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value);
+    if (viewRender) {
+      return viewRender(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value, originalValues, {
+        form: form
+      });
+    }
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, _defineProperty({
       isView: true
     }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
-  }, [originalValue, children]);
+  }, [_typeof(viewRender), originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
     var isNestedField = ['ProEditTable'].includes(type);

package/es/ProForm/utils/useShouldUpdate.js

@@ -72,7 +72,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   }
   if (isFunction(disabled)) {
     // RangePicker返回数组时，特殊处理
-    if (['Group', 'RangePicker'].includes(type) && Array.isArray(disabled(values, {
+    if (['Group', 'RangePicker', 'ProCascader'].includes(type) && Array.isArray(disabled(values, {
       form: form,
       index: index,
       namePath: namePath

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

@@ -111,6 +111,12 @@ var ProCascader = function ProCascader(props) {
     var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
+  var lastDisabled = (0, _react.useMemo)(function () {
+    if ((0, _lodash.isBoolean)(disabled) || disabled === undefined) {
+      return [disabled, disabled];
+    }
+    return disabled;
+  }, [disabled]);
   var _useRequest = (0, _objectSpread3.default)({}, useRequest),
     service = _useRequest.service,
     _useRequest$defaultPa = _useRequest.defaultParams,
@@ -268,7 +274,7 @@ var ProCascader = function ProCascader(props) {
       placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar = _locale.default.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
       options: service ? serviceData : realDataSource,
-      disabled: disabled,
+      disabled: lastDisabled[0],
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,
@@ -278,19 +284,19 @@ var ProCascader = function ProCascader(props) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, (0, _lodash.omit)(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    }, (0, _lodash.omit)(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: detail,
       children: (0, _jsxRuntime.jsx)("span", {
         className: "pro-address-detail",
         children: (0, _jsxRuntime.jsx)(_antd.Input, {
-          disabled: disabled,
+          disabled: lastDisabled[1],
           value: detail
         })
       })
     }) : (0, _jsxRuntime.jsx)(_antd.Input, {
       allowClear: true,
       autoComplete: "off",
-      disabled: disabled,
+      disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
       placeholder: detailPlaceholder || (_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -68,23 +69,20 @@ var ChangedWrapper = function ChangedWrapper(props) {
   }, [isWatch, noChange, props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
-  var viewRenderFun = (0, _react.useMemo)(function () {
-    return function (orgValue) {
-      return viewRender(orgValue, originalValues, {
-        form: form
-      });
-    };
-  }, [form]);
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
     var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
       value: originalValue
     };
-    if (viewRender) return viewRenderFun(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value);
+    if (viewRender) {
+      return viewRender(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value, originalValues, {
+        form: form
+      });
+    }
     return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
       isView: true
     }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
-  }, [originalValue, children]);
+  }, [(0, _typeof2.default)(viewRender), originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
     var isNestedField = ['ProEditTable'].includes(type);

package/lib/ProForm/utils/useShouldUpdate.js

@@ -79,7 +79,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   }
   if ((0, _lodash.isFunction)(disabled)) {
     // RangePicker返回数组时，特殊处理
-    if (['Group', 'RangePicker'].includes(type) && Array.isArray(disabled(values, {
+    if (['Group', 'RangePicker', 'ProCascader'].includes(type) && Array.isArray(disabled(values, {
       form: form,
       index: index,
       namePath: namePath

package/package.json

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