shineout 3.7.1-beta.4 → 3.7.1-beta.6

package/cjs/index.js

@@ -522,5 +522,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.7.1-beta.4'
+  version: '3.7.1-beta.6'
 };

package/dist/shineout.js

@@ -12227,7 +12227,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.7.1-beta.4');
+/* harmony default export */ var version = ('3.7.1-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -31017,6 +31017,20 @@ var usePositionStyle = function usePositionStyle(config) {
   var popupElSize = useCheckElementSize(popupElRef, {
     enable: show
   });
+  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
+    _useState4 = slicedToArray_default()(_useState3, 2),
+    popupElWidth = _useState4[0],
+    setPopupElWidth = _useState4[1];
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    if (!show || !popupElRef.current) return;
+    if (popupElRef.current) {
+      // 二次打开弹出层时，元素被之前的动画设置了display: none，重新获取元素尺寸时，需要立即设置display: block
+      if (popupElRef.current.style.display === 'none') {
+        popupElRef.current.style.display = 'block';
+      }
+      setPopupElWidth(popupElRef.current.getBoundingClientRect().width);
+    }
+  }, [show, popupElRef.current]);
   var adjustPosition = function adjustPosition(position) {
     var winHeight = docSize.height;
     if (!verticalPosition.includes(position)) return position;
@@ -31043,6 +31057,14 @@ var usePositionStyle = function usePositionStyle(config) {
           newPosition = newPosition.replace('left', 'right');
         }
       }
+    } else {
+      // absolute 场景下，右侧溢出判断需要考虑弹出层元素的尺寸
+      var _position$split = position.split('-'),
+        _position$split2 = slicedToArray_default()(_position$split, 2),
+        _horizontalPosition = _position$split2[1];
+      if (_horizontalPosition === 'left' && context.parentRect.left + (popupElWidth || context.popUpWidth) > docSize.width) {
+        newPosition = newPosition.replace('left', 'right');
+      }
     }
     return newPosition;
   };
@@ -50077,85 +50099,6 @@ var useForm = function useForm(props) {
       removeLock: false
     }),
     context = _React$useRef.current;
-  var update = function update(name) {
-    var _context$flowMap$glob;
-    if (!name) {
-      Object.keys(context.updateMap).forEach(function (key) {
-        var _context$updateMap$ke;
-        (_context$updateMap$ke = context.updateMap[key]) === null || _context$updateMap$ke === void 0 || _context$updateMap$ke.forEach(function (update) {
-          update(context.value, context.errors, context.serverErrors);
-        });
-      });
-      Object.keys(context.flowMap).forEach(function (key) {
-        context.flowMap[key].forEach(function (update) {
-          update();
-        });
-      });
-    } else {
-      var names = isArray(name) ? name : [name];
-      names.forEach(function (key) {
-        var _context$flowMap$key;
-        // 外部直接设置user.name这种格式的，但是又没有显性的声明user.name绑定的表单元素；
-        // 这里需要手动触发，否则会导致Input输入过程中光标跳到末尾的异常
-        if (!context.updateMap[key]) {
-          var _context$updateMap$pa;
-          var parentKey = key.split('.')[0];
-          (_context$updateMap$pa = context.updateMap[parentKey]) === null || _context$updateMap$pa === void 0 || _context$updateMap$pa.forEach(function (update) {
-            update(context.value, context.errors, context.serverErrors);
-          });
-        } else {
-          var _context$updateMap$ke2;
-          (_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (update) {
-            update(context.value, context.errors, context.serverErrors);
-          });
-        }
-        (_context$flowMap$key = context.flowMap[key]) === null || _context$flowMap$key === void 0 || _context$flowMap$key.forEach(function (update) {
-          update();
-        });
-      });
-    }
-    (_context$flowMap$glob = context.flowMap[globalKey]) === null || _context$flowMap$glob === void 0 || _context$flowMap$glob.forEach(function (update) {
-      update();
-    });
-  };
-  var updateFieldsets = use_persist_fn(function (name) {
-    var na = "".concat(name, "[");
-    var no = "".concat(name, ".");
-    context.names.forEach(function (key) {
-      if (key.startsWith(na) || key.startsWith(no)) {
-        update(key);
-      }
-    });
-  });
-  var handleSubmitError = function handleSubmitError(err) {
-    onError === null || onError === void 0 || onError(err);
-    if (!props.scrollToError) return;
-    setTimeout(function () {
-      var _props$formElRef$curr;
-      var selector = "[".concat(getDataAttributeName('status'), "=\"error\"]");
-      var el = (_props$formElRef$curr = props.formElRef.current) === null || _props$formElRef$curr === void 0 ? void 0 : _props$formElRef$curr.querySelector(selector);
-      if (el) {
-        el.scrollIntoView();
-        var focusableSelectors = 'textarea, input,[tabindex]:not([tabindex="-1"])';
-        var focusEl = el.querySelector(focusableSelectors);
-        if (focusEl && focusEl.focus) focusEl.focus();
-      }
-      if (typeof scrollToError === 'number' && scrollToError !== 0) {
-        var scrollEl = scrollParent === null || scrollParent === void 0 ? void 0 : scrollParent();
-        if (scrollEl) {
-          scrollEl.scrollTop -= scrollToError;
-        } else {
-          docScroll.top -= scrollToError;
-        }
-      }
-    });
-  };
-  var onChange = use_persist_fn(function (change) {
-    var _props$onChange;
-    var newValue = typeof change === 'function' ? utils_immer_produce(context.value, change) : change;
-    context.value = newValue;
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, context.value);
-  });
   var getValue = use_persist_fn(function (name) {
     if (name) {
       return deepGet(context.value, name);
@@ -50238,6 +50181,88 @@ var useForm = function useForm(props) {
       }
     });
   });
+  var update = function update(name) {
+    var _context$flowMap$glob;
+    if (!name) {
+      Object.keys(context.updateMap).forEach(function (key) {
+        var _context$updateMap$ke;
+        (_context$updateMap$ke = context.updateMap[key]) === null || _context$updateMap$ke === void 0 || _context$updateMap$ke.forEach(function (update) {
+          update(context.value, context.errors, context.serverErrors);
+          if (context.errors[key]) {
+            validateFields(key).catch(function () {});
+          }
+        });
+      });
+      Object.keys(context.flowMap).forEach(function (key) {
+        context.flowMap[key].forEach(function (update) {
+          update();
+        });
+      });
+    } else {
+      var names = isArray(name) ? name : [name];
+      names.forEach(function (key) {
+        var _context$flowMap$key;
+        // 外部直接设置user.name这种格式的，但是又没有显性的声明user.name绑定的表单元素；
+        // 这里需要手动触发，否则会导致Input输入过程中光标跳到末尾的异常
+        if (!context.updateMap[key]) {
+          var _context$updateMap$pa;
+          var parentKey = key.split('.')[0];
+          (_context$updateMap$pa = context.updateMap[parentKey]) === null || _context$updateMap$pa === void 0 || _context$updateMap$pa.forEach(function (update) {
+            update(context.value, context.errors, context.serverErrors);
+          });
+        } else {
+          var _context$updateMap$ke2;
+          (_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (update) {
+            update(context.value, context.errors, context.serverErrors);
+          });
+        }
+        (_context$flowMap$key = context.flowMap[key]) === null || _context$flowMap$key === void 0 || _context$flowMap$key.forEach(function (update) {
+          update();
+        });
+      });
+    }
+    (_context$flowMap$glob = context.flowMap[globalKey]) === null || _context$flowMap$glob === void 0 || _context$flowMap$glob.forEach(function (update) {
+      update();
+    });
+  };
+  var updateFieldsets = use_persist_fn(function (name) {
+    var na = "".concat(name, "[");
+    var no = "".concat(name, ".");
+    context.names.forEach(function (key) {
+      if (key.startsWith(na) || key.startsWith(no)) {
+        update(key);
+      }
+    });
+  });
+  var handleSubmitError = function handleSubmitError(err) {
+    onError === null || onError === void 0 || onError(err);
+    if (!props.scrollToError) return;
+    setTimeout(function () {
+      var _props$formElRef$curr;
+      var selector = "[".concat(getDataAttributeName('status'), "=\"error\"]");
+      var el = (_props$formElRef$curr = props.formElRef.current) === null || _props$formElRef$curr === void 0 ? void 0 : _props$formElRef$curr.querySelector(selector);
+      if (el) {
+        el.scrollIntoView();
+        var focusableSelectors = 'textarea, input,[tabindex]:not([tabindex="-1"])';
+        var focusEl = el.querySelector(focusableSelectors);
+        if (focusEl && focusEl.focus) focusEl.focus();
+      }
+      if (typeof scrollToError === 'number' && scrollToError !== 0) {
+        var scrollEl = scrollParent === null || scrollParent === void 0 ? void 0 : scrollParent();
+        if (scrollEl) {
+          scrollEl.scrollTop -= scrollToError;
+        } else {
+          docScroll.top -= scrollToError;
+        }
+      }
+    });
+  };
+  var onChange = use_persist_fn(function (change) {
+    var _props$onChange;
+    var newValue = typeof change === 'function' ? utils_immer_produce(context.value, change) : change;
+    context.value = newValue;
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, context.value);
+  });
   var scrollToField = use_persist_fn(function (name) {
     var _document;
     var scrollIntoViewOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -71310,7 +71335,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.1-beta.4'
+  version: '3.7.1-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;