@zat-design/sisyphus-react 3.9.1-beta.12 → 3.9.1-beta.14

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

@@ -118,7 +118,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return diffOriginal({
       value: _value,
       originalValue: originalValue,

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

@@ -745,8 +745,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, 1000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
-      },
-      className: "pro-modal-select-item"
+      }
     }, omit(restProps, ['otherProps']))) : _jsx(_Input, _objectSpread({
       value: viewText,
       onChange: handleChangeValue,

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

@@ -44,7 +44,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return diffOriginal({
       originalValue: originalValue,
       value: _value,

package/es/ProSelect/index.js

@@ -287,10 +287,6 @@ export var ProSelect = function ProSelect(props, ref) {
       mode: selectProps.mode
     });
   }
-  // modalselect样式特殊处理
-  if ((selectProps === null || selectProps === void 0 ? void 0 : selectProps.className) === 'pro-modal-select-item') {
-    selectProps === null || selectProps === void 0 ? true : delete selectProps.style;
-  }
   return _jsx("div", {
     style: props.style,
     className: "pro-select",
@@ -314,7 +310,7 @@ export var ProSelect = function ProSelect(props, ref) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, omit(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'onFieldChange'])), {}, {
+    }, omit(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
       value: transformValue(),
       children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
         return _jsx(Option, {

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

@@ -123,7 +123,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return (0, _diffOriginal.diffOriginal)({
       value: _value,
       originalValue: originalValue,

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

@@ -740,8 +740,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, 1000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
-      },
-      className: "pro-modal-select-item"
+      }
     }, (0, _lodash.omit)(restProps, ['otherProps']))) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread3.default)({
       value: viewText,
       onChange: handleChangeValue,

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

@@ -49,7 +49,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return (0, _diffOriginal.diffOriginal)({
       originalValue: originalValue,
       value: _value,

package/lib/ProSelect/index.js

@@ -288,10 +288,6 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       mode: selectProps.mode
     });
   }
-  // modalselect样式特殊处理
-  if ((selectProps === null || selectProps === void 0 ? void 0 : selectProps.className) === 'pro-modal-select-item') {
-    selectProps === null || selectProps === void 0 ? true : delete selectProps.style;
-  }
   return (0, _jsxRuntime.jsx)("div", {
     style: props.style,
     className: "pro-select",
@@ -315,7 +311,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, (0, _lodash.omit)((0, _objectSpread2.default)({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'onFieldChange'])), {}, {
+    }, (0, _lodash.omit)((0, _objectSpread2.default)({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
       value: transformValue(),
       children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
         return (0, _jsxRuntime.jsx)(Option, {

package/package.json

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

package/.vscode/extensions.json

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