@zat-design/sisyphus-react 3.8.2-beta.14 → 3.8.2-beta.15

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

@@ -1,10 +1,11 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "valuePropName"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
@@ -65,6 +66,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   }) : get(originalValues, originalName);
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
+  var _getValueProps;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -79,6 +81,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     children = props.children,
     type = props.type,
     normalize = props.normalize,
+    getValueProps = props.getValueProps,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = _objectWithoutProperties(props, _excluded);
@@ -124,12 +127,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       return target.parentElement;
     },
     title: _jsxs(_Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, _defineProperty(_defineProperty({
         // @ts-ignore
-        isView: true,
-        value: originalValue,
-        checked: type === 'Switch' ? originalValue : undefined
-      })) : undefined]
+        isView: true
+      }, valuePropName, getValueProps ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : props[valuePropName]), "checked", type === 'Switch' ? originalValue : undefined))) : undefined]
     }),
     children: _jsx("div", {
       className: diffClassName,

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

@@ -559,6 +559,7 @@ var RenderField = function RenderField(_ref) {
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,
         normalize: _formItemProps.normalize,
+        getValueProps: _formItemProps.getValueProps,
         children: FieldComponent
       });
     }

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

@@ -5,7 +5,7 @@ import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { get } from 'lodash';
@@ -26,6 +26,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     normalize = props.normalize,
+    getValueProps = props.getValueProps,
     rest = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -53,9 +54,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = useMemo(function () {
     if (!isWatch || noChange) return undefined;
+    var valueProps = getValueProps ? getValueProps(originalValue) : originalValue;
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, _defineProperty({
       isView: true
-    }, valuePropName, originalValue))) : undefined;
+    }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件

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

@@ -438,6 +438,7 @@ var Render = function Render(props) {
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
+        getValueProps: _otherFormItemProps.getValueProps,
         children: child
       });
     }

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

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
@@ -16,7 +17,7 @@ var _lodash = require("lodash");
 var _diffOriginal = require("../../../ProForm/utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "valuePropName"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -70,6 +71,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   }) : (0, _lodash.get)(originalValues, originalName);
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
+  var _getValueProps;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -84,6 +86,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     children = props.children,
     type = props.type,
     normalize = props.normalize,
+    getValueProps = props.getValueProps,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
@@ -116,7 +119,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   if (!isWatch || noChange) {
-    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest));
   }
   var diffClassName = (0, _classnames.default)({
     'pro-form-item-changed': isChanged,
@@ -131,16 +134,14 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       return target.parentElement;
     },
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children), {}, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({
         // @ts-ignore
-        isView: true,
-        value: originalValue,
-        checked: type === 'Switch' ? originalValue : undefined
-      })) : undefined]
+        isView: true
+      }, valuePropName, getValueProps ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : props[valuePropName]), "checked", type === 'Switch' ? originalValue : undefined))) : undefined]
     }),
     children: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest)) : undefined
     })
   });
 };

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

@@ -566,6 +566,7 @@ var RenderField = function RenderField(_ref) {
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,
         normalize: _formItemProps.normalize,
+        getValueProps: _formItemProps.getValueProps,
         children: FieldComponent
       });
     }

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

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps"];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
@@ -31,6 +31,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     normalize = props.normalize,
+    getValueProps = props.getValueProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -58,9 +59,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
+    var valueProps = getValueProps ? getValueProps(originalValue) : originalValue;
     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, originalValue))) : undefined;
+    }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件

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

@@ -438,6 +438,7 @@ var Render = function Render(props) {
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
+        getValueProps: _otherFormItemProps.getValueProps,
         children: child
       });
     }

package/package.json

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

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}