@zat-design/sisyphus-react 3.6.5-beta.1 → 3.6.5-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -22,6 +22,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
22
22
  names = formItemProps.names,
23
23
  dependencies = formItemProps.dependencies;
24
24
  var timerRef = useRef();
25
+ var needClear = useRef(); // 是否需要执行清值操作
25
26
  var showRef = useRef();
26
27
  var disabledRef = useRef();
27
28
  var requiredRef = useRef();
@@ -158,17 +159,24 @@ var useShouldUpdate = function useShouldUpdate(props) {
158
159
  }) : fieldProps;
159
160
  // 清值防抖 多次刷新时以最后一次为准
160
161
  if (clearNotShow !== false && (name || names)) {
162
+ // 当show为其他变为false的时候记录一次需要清值
163
+ if (_show !== showRef.current && _show === false) {
164
+ needClear.current = true;
165
+ }
161
166
  if (_show === false) {
162
167
  clearTimeout(timerRef.current);
163
168
  timerRef.current = setTimeout(function () {
169
+ if (needClear.current !== true) return;
164
170
  if (Array.isArray(names)) {
165
171
  form.resetFields(names);
166
172
  } else {
167
173
  var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
168
174
  form.resetFields([clearName]);
169
175
  }
170
- }, 200);
176
+ needClear.current = false;
177
+ }, 300);
171
178
  } else {
179
+ needClear.current = false;
172
180
  clearTimeout(timerRef.current);
173
181
  }
174
182
  }
@@ -29,6 +29,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
29
29
  names = formItemProps.names,
30
30
  dependencies = formItemProps.dependencies;
31
31
  var timerRef = (0, _react.useRef)();
32
+ var needClear = (0, _react.useRef)(); // 是否需要执行清值操作
32
33
  var showRef = (0, _react.useRef)();
33
34
  var disabledRef = (0, _react.useRef)();
34
35
  var requiredRef = (0, _react.useRef)();
@@ -165,17 +166,24 @@ var useShouldUpdate = function useShouldUpdate(props) {
165
166
  }) : fieldProps;
166
167
  // 清值防抖 多次刷新时以最后一次为准
167
168
  if (clearNotShow !== false && (name || names)) {
169
+ // 当show为其他变为false的时候记录一次需要清值
170
+ if (_show !== showRef.current && _show === false) {
171
+ needClear.current = true;
172
+ }
168
173
  if (_show === false) {
169
174
  clearTimeout(timerRef.current);
170
175
  timerRef.current = setTimeout(function () {
176
+ if (needClear.current !== true) return;
171
177
  if (Array.isArray(names)) {
172
178
  form.resetFields(names);
173
179
  } else {
174
180
  var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
175
181
  form.resetFields([clearName]);
176
182
  }
177
- }, 200);
183
+ needClear.current = false;
184
+ }, 300);
178
185
  } else {
186
+ needClear.current = false;
179
187
  clearTimeout(timerRef.current);
180
188
  }
181
189
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.6.5-beta.1",
3
+ "version": "3.6.5-beta.2",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -58,7 +58,7 @@
58
58
  "@dnd-kit/sortable": "^7.0.2",
59
59
  "@dnd-kit/utilities": "^3.2.1",
60
60
  "@pansy/react-watermark": "^3.1.13",
61
- "@zat-design/utils": "^1.1.28",
61
+ "@zat-design/utils": "^1.1.29",
62
62
  "ahooks": "3.7.4",
63
63
  "antd": "4.24.8",
64
64
  "big.js": "^6.2.1",