shineout 3.8.0-beta.23 → 3.8.0-beta.25

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.8.0-beta.23'
+  version: '3.8.0-beta.25'
 };

package/dist/shineout.js

@@ -12386,7 +12386,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.8.0-beta.23');
+/* harmony default export */ var version = ('3.8.0-beta.25');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -35500,6 +35500,34 @@ function removeStack(id, removeListener) {
   }
   delete components[id];
 }
+
+// 检测容器是否高度受限
+var isRootHeightConstrained = function isRootHeightConstrained(root, targetElement) {
+  if (!root || root === document.body) {
+    var bodyRect = document.body.getBoundingClientRect();
+    var _targetRect = targetElement.getBoundingClientRect();
+    // body的底部和targetElement的顶部永远不可能有相交，则是受限的
+    if (bodyRect.bottom < _targetRect.top) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  // 当root的overflow是auto或hidden，则认为不是受限的
+  var rootStyle = window.getComputedStyle(root);
+  if (rootStyle.overflow === 'auto' || rootStyle.overflow === 'hidden') {
+    return false;
+  }
+
+  // 当root的底部与targetElement的顶部永远不可能有相交，则是受限的
+  var rootRect = root.getBoundingClientRect();
+  var targetRect = targetElement.getBoundingClientRect();
+  if (rootRect.top > targetRect.bottom || rootRect.bottom < targetRect.top) {
+    return true;
+  }
+  return false;
+};
 function getObserver(obj, id) {
   var _obj$container = obj.container,
     container = _obj$container === void 0 ? null : _obj$container,
@@ -35509,6 +35537,10 @@ function getObserver(obj, id) {
     offscreen = obj.offscreen,
     noRemove = obj.noRemove;
   var fixedContainer = getClosestPositionedContainer(element, ['fixed', 'absolute']);
+
+  // 获取最优的观察器配置
+  var candidateRoot = fixedContainer || container;
+  var observerRoot = isRootHeightConstrained(candidateRoot, element) ? null : candidateRoot;
   var observer = new IntersectionObserver(function (entries) {
     entries.forEach(function (en) {
       if (en.isIntersecting || en.intersectionRatio > 0) {
@@ -35520,7 +35552,7 @@ function getObserver(obj, id) {
       }
     });
   }, {
-    root: fixedContainer || container,
+    root: observerRoot,
     rootMargin: "".concat(offset, "px")
   });
   obj.observer = observer;
@@ -52290,6 +52322,7 @@ var useFormFieldSet = function useFormFieldSet(props) {
 
 
 
+
 var form_fieldset_produce = utils_immer_produce;
 var FormFieldSet = function FormFieldSet(props) {
   var children = props.children,
@@ -52348,6 +52381,48 @@ var FormFieldSet = function FormFieldSet(props) {
   // }
 
   return valueArr.map(function (v, i) {
+    // 创建一个代理对象，让 {...value} 操作能获取最新值
+    // 确保 target 是一个对象，避免 Proxy 报错
+    var target = v && typeof_default()(v) === 'object' ? v : {};
+    var valueProxy = new Proxy(target, {
+      get: function get(target, prop) {
+        var currentValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+        var latestItem = Array.isArray(currentValue) ? currentValue[i] : v;
+
+        // 如果最新值是对象，返回对象的属性
+        if (latestItem && typeof_default()(latestItem) === 'object') {
+          return latestItem[prop];
+        }
+
+        // 如果最新值是基本类型，但原始target是对象，从target获取
+        if (target && typeof_default()(target) === 'object' && prop in target) {
+          return target[prop];
+        }
+
+        // 其他情况返回undefined
+        return undefined;
+      },
+      ownKeys: function ownKeys(target) {
+        var currentValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+        var latestItem = Array.isArray(currentValue) ? currentValue[i] : v;
+        if (latestItem && typeof_default()(latestItem) === 'object') {
+          return Object.keys(latestItem);
+        }
+        return Object.keys(target || {});
+      },
+      getOwnPropertyDescriptor: function getOwnPropertyDescriptor(target, prop) {
+        var currentValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+        var latestItem = Array.isArray(currentValue) ? currentValue[i] : v;
+        if (latestItem && typeof_default()(latestItem) === 'object' && prop in latestItem) {
+          return {
+            enumerable: true,
+            configurable: true,
+            value: latestItem[prop]
+          };
+        }
+        return Object.getOwnPropertyDescriptor(target || {}, prop);
+      }
+    });
     return /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
       value: {
         path: "".concat(ProviderValue.path, "[").concat(i, "]"),
@@ -52355,7 +52430,7 @@ var FormFieldSet = function FormFieldSet(props) {
       },
       children: children({
         list: valueArr,
-        value: v,
+        value: valueProxy,
         index: i,
         error: errorList,
         onChange: function onChange(val, options) {
@@ -72659,7 +72734,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.23'
+  version: '3.8.0-beta.25'
 });
 }();
 /******/ 	return __webpack_exports__;