shineout 3.4.4-beta.7 → 3.4.4-beta.9

package/cjs/index.js

@@ -492,5 +492,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.4.4-beta.7'
+  version: '3.4.4-beta.9'
 };

package/dist/shineout.js

@@ -11984,7 +11984,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.4.4-beta.7');
+/* harmony default export */ var version = ('3.4.4-beta.9');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -29030,7 +29030,7 @@ var usePositionStyle = function usePositionStyle(config) {
     }
     var targetPosition = position;
     var rootContainer = getContainer() || document.body;
-    var closestScrollContainer = getClosestScrollContainer(parentElRef.current);
+    var closestScrollContainer = absolute ? null : getClosestScrollContainer(parentElRef.current);
     var containerRect = rootContainer.getBoundingClientRect();
     var bodyRect = (document.documentElement || document.body).getBoundingClientRect();
     var containerScrollBarWidth = rootContainer.offsetWidth - rootContainer.clientWidth;
@@ -30071,22 +30071,23 @@ var getPopoverPosition = function getPopoverPosition(target) {
     var popupRect = popup === null || popup === void 0 ? void 0 : popup.getBoundingClientRect();
     if (verticalPoint > windowHeight / 2) position = 'top';else position = 'bottom';
 
+    // TODO: 暂时移除，另考虑方案
     // 如果渲染了弹出内容，则根据弹出内容宽度计算是否自动调整位置
-    if (popupRect) {
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > rect.left) {
-        position += '-left';
-      }
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > windowWidth - rect.right) {
-        position += '-right';
-      }
-    } else {
-      // 兜底计算
-      if (horizontalPoint > windowWidth * 0.6) {
-        position += '-right';
-      } else if (horizontalPoint < windowWidth * 0.4) {
-        position += '-left';
-      }
+    // if (popupRect && popupRect?.width) {
+    //   if (popupRect?.width / 2 > rect.left) {
+    //     position += '-left';
+    //   }
+    //   if (popupRect?.width / 2 > windowWidth - rect.right) {
+    //     position += '-right';
+    //   }
+    // } else {
+    // 兜底计算
+    if (horizontalPoint > windowWidth * 0.6) {
+      position += '-right';
+    } else if (horizontalPoint < windowWidth * 0.4) {
+      position += '-left';
     }
+    // }
   }
   return position;
 };
@@ -38879,18 +38880,37 @@ function useFormControl(props) {
     var errors = arguments.length > 1 ? arguments[1] : undefined;
     var severErrors = arguments.length > 2 ? arguments[2] : undefined;
     if (!name) return;
-    var value = getValue(name, formValue);
-    var error = getError(name, errors, severErrors);
-    if (error !== errorState) {
-      setErrorState(error);
-    }
-    if (!shallowEqual(value, latestInfo.valueState)) {
-      if (value === undefined && defaultValue !== undefined) {
-        setValueState(defaultValue);
-      } else {
-        setValueState(value);
+    if (isArray(name)) {
+      var _value = getValue(name, formValue);
+      var _error = getError(name, errors, severErrors);
+      if (_error !== errorState) {
+        setErrorState(_error);
+      }
+      // format defaultValue
+      var dv = isArray(defaultValue) ? defaultValue : [];
+      var nextValue = [];
+      name.forEach(function (n, index) {
+        if (_value[index] === undefined && dv[index] !== undefined) {
+          nextValue[index] = dv[index];
+        } else {
+          nextValue[index] = _value[index];
+        }
+      });
+      setValueState(nextValue);
+    } else {
+      var _value2 = getValue(name, formValue);
+      var _error2 = getError(name, errors, severErrors);
+      if (_error2 !== errorState) {
+        setErrorState(_error2);
+      }
+      if (!shallowEqual(_value2, latestInfo.valueState)) {
+        if (_value2 === undefined && defaultValue !== undefined) {
+          setValueState(defaultValue);
+        } else {
+          setValueState(_value2);
+        }
+        latestInfo.valueState = _value2;
       }
-      latestInfo.valueState = value;
     }
   });
   var validateFiled = use_persist_fn(function (name, v, formV) {
@@ -65234,7 +65254,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.4-beta.7'
+  version: '3.4.4-beta.9'
 });
 }();
 /******/ 	return __webpack_exports__;