shineout 3.6.7-beta.6 → 3.6.7-beta.7

package/cjs/index.js

@@ -514,5 +514,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.6.7-beta.6'
+  version: '3.6.7-beta.7'
 };

package/dist/shineout.js

@@ -12217,7 +12217,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.6.7-beta.6');
+/* harmony default export */ var version = ('3.6.7-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -49572,7 +49572,8 @@ var useForm = function useForm(props) {
       resetTime: 0,
       mounted: false,
       unmounted: false,
-      removeLock: false
+      removeLock: false,
+      settingMap: {}
     }),
     context = _React$useRef.current;
   var update = function update(name) {
@@ -49809,6 +49810,8 @@ var useForm = function useForm(props) {
         // upload组件返回的可能是函数: (prev) => [...prev, file]
         var valueOfKey = typeof vals[key] === 'function' ? vals[key](getValue(key)) : vals[key];
         deepSet(draft, key, valueOfKey, deepSetOptions);
+        // 设置 settingMap 用于标记该字段正在被设置值
+        context.settingMap[key] = true;
       });
       values.forEach(function (key) {
         if (option.validate) {
@@ -49819,6 +49822,13 @@ var useForm = function useForm(props) {
           });
         }
       });
+
+      // 设置 settingMap 的值为 false，表示该字段设置值完成
+      setTimeout(function () {
+        values.forEach(function (key) {
+          delete context.settingMap[key];
+        });
+      });
     });
 
     // 获取vals的所有key,包括嵌套对象的key
@@ -49999,11 +50009,18 @@ var useForm = function useForm(props) {
       context.updateMap[n].add(updateFn);
       var shouldTriggerResetChange = context.removeArr.has(n);
       context.removeArr.delete(n);
-      var shouldTriggerDefaultChange = df !== undefined && deepGet(context.value, n) === undefined;
+      var currentValue = deepGet(context.value, n);
+      var shouldTriggerDefaultChange = df !== undefined && currentValue === undefined;
       if (shouldTriggerDefaultChange || shouldTriggerResetChange) {
         if (!context.mounted) context.defaultValues[n] = df;
+        var _defaultValue = df;
+
+        // 如果组件是重新 bind ，比如更改了 key 或者通过三元表达式切换了组件但 name 都是相同的情况下，在切换过程中改了 value 的值（比如通过 datum.set），需要阻止 defaultValue 的上位，按照当前的 value 来设置 defaultValue
+        if (shouldTriggerResetChange && context.settingMap[n]) {
+          _defaultValue = currentValue !== undefined ? currentValue : df;
+        }
         onChange(function (v) {
-          deepSet(v, n, df, deepSetOptions);
+          deepSet(v, n, _defaultValue, deepSetOptions);
         });
         update(n);
       }
@@ -70160,7 +70177,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.7-beta.6'
+  version: '3.6.7-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;