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

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

@@ -120,8 +120,12 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
-    // fix:修复 InputNumber , DatePicker时，originalValue与最新值一致时，显示为 changed的问题
-    var _originalValue = normalize && ['InputNumber', 'ProNumberRange', 'DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
+    var _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
+    if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
+      return 'same';
+    }
     return diffOriginal({
       value: _value,
       originalValue: _originalValue,

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

@@ -47,8 +47,12 @@ var ChangedWrapper = function ChangedWrapper(props) {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
-    // fix:修复 InputNumber , DatePicker时，originalValue与最新值一致时，显示为 changed的问题
-    var _originalValue = normalize && ['InputNumber', 'ProNumberRange', 'DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
+    var _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
+    if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
+      return 'same';
+    }
     return diffOriginal({
       value: _value,
       originalValue: _originalValue,

package/es/ProForm/utils/useShouldUpdate.js

@@ -2,6 +2,14 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
 import { isFunction, isEqualWith, get } from 'lodash';
 import { customEqualForFun } from './index';
+/** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
+var isDeleteLine = function isDeleteLine(form, namePath) {
+  if (namePath) {
+    var line = form.getFieldValue(namePath);
+    return line === undefined;
+  }
+  return false;
+};
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
   var show = props.show,
@@ -169,7 +177,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
         namePath: namePath
       }) : fieldProps;
       // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false && (name || names)) {
+      if (clearNotShow !== false && (name || names) && !isDeleteLine(form, namePath)) {
         // 当show为其他变为false的时候记录一次需要清值
         if (_show !== showRef.current && _show === false) {
           needClear.current = true;

package/es/ProStep/components/Item/index.js

@@ -2,6 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["id", "title", "collapse", "children"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect } from 'react';
 import { useStep } from '../../index';
 import ProCollapse from '../../../ProLayout/components/ProCollapse';
 export default (function (_ref) {
@@ -14,10 +15,18 @@ export default (function (_ref) {
   var _useStep = useStep(),
     register = _useStep.register,
     collapse = _useStep.collapse;
-  register === null || register === void 0 ? void 0 : register(_objectSpread(_objectSpread({}, restProps), {}, {
-    title: title,
-    id: id
-  }));
+  useEffect(function () {
+    // 子组件更新父组件 延迟状态更新，避免重渲染
+    var timeoutId = setTimeout(function () {
+      register === null || register === void 0 ? void 0 : register(_objectSpread(_objectSpread({}, restProps), {}, {
+        title: title,
+        id: id
+      }));
+    }, 0);
+    return function () {
+      return clearTimeout(timeoutId);
+    };
+  }, [register]);
   return _jsx("div", {
     className: "pro-step-item",
     id: id,

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

@@ -125,8 +125,12 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
-    // fix:修复 InputNumber , DatePicker时，originalValue与最新值一致时，显示为 changed的问题
-    var _originalValue = normalize && ['InputNumber', 'ProNumberRange', 'DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
+    var _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
+    if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
+      return 'same';
+    }
     return (0, _diffOriginal.diffOriginal)({
       value: _value,
       originalValue: _originalValue,

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

@@ -52,8 +52,12 @@ var ChangedWrapper = function ChangedWrapper(props) {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
-    // fix:修复 InputNumber , DatePicker时，originalValue与最新值一致时，显示为 changed的问题
-    var _originalValue = normalize && ['InputNumber', 'ProNumberRange', 'DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
+    var _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
+    if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
+      return 'same';
+    }
     return (0, _diffOriginal.diffOriginal)({
       value: _value,
       originalValue: _originalValue,

package/lib/ProForm/utils/useShouldUpdate.js

@@ -9,6 +9,14 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _lodash = require("lodash");
 var _index = require("./index");
+/** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
+var isDeleteLine = function isDeleteLine(form, namePath) {
+  if (namePath) {
+    var line = form.getFieldValue(namePath);
+    return line === undefined;
+  }
+  return false;
+};
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
   var show = props.show,
@@ -176,7 +184,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
         namePath: namePath
       }) : fieldProps;
       // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false && (name || names)) {
+      if (clearNotShow !== false && (name || names) && !isDeleteLine(form, namePath)) {
         // 当show为其他变为false的时候记录一次需要清值
         if (_show !== showRef.current && _show === false) {
           needClear.current = true;

package/lib/ProStep/components/Item/index.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
 var _index = require("../../index");
 var _ProCollapse = _interopRequireDefault(require("../../../ProLayout/components/ProCollapse"));
 var _excluded = ["id", "title", "collapse", "children"];
@@ -21,10 +22,18 @@ var _default = exports.default = function _default(_ref) {
   var _useStep = (0, _index.useStep)(),
     register = _useStep.register,
     collapse = _useStep.collapse;
-  register === null || register === void 0 ? void 0 : register((0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
-    title: title,
-    id: id
-  }));
+  (0, _react.useEffect)(function () {
+    // 子组件更新父组件 延迟状态更新，避免重渲染
+    var timeoutId = setTimeout(function () {
+      register === null || register === void 0 ? void 0 : register((0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+        title: title,
+        id: id
+      }));
+    }, 0);
+    return function () {
+      return clearTimeout(timeoutId);
+    };
+  }, [register]);
   return (0, _jsxRuntime.jsx)("div", {
     className: "pro-step-item",
     id: id,

package/package.json

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

package/.vscode/extensions.json

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