eoss-ui 0.7.90 → 0.7.92

package/lib/wxlogin.js

@@ -2129,6 +2129,65 @@ var getWeekday = function getWeekday(date) {
   // Adjust for JavaScript's day numbering (0 is Sunday, 1 is Monday, etc.)
   return adjustedDay === 0 ? 7 : adjustedDay;
 };
+/**
+ * getWinTop
+ * @desc 获取同域的top窗口
+ * @param {object} [wind] - window对象
+ * @return {Window} 同域的top窗口
+ **/
+var getWinTop = function getWinTop(wind) {
+  wind = wind ? wind : window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
+  try {
+    // 检查是否已经是顶层窗口，避免无限递归
+    if (wind === wind.parent) {
+      return wind;
+    }
+    wind.parent.document;
+    return getWinTop(wind.parent);
+  } catch (error) {
+    return wind;
+  }
+};
+
+/**
+ * getWinTopProperty
+ * @desc 安全获取顶层窗口的属性，避免跨域访问错误
+ * @param {string} propertyName - 要获取的属性名
+ * @param {any} defaultValue - 默认值，当属性获取失败时返回
+ * @return {any} 属性值或默认值
+ **/
+var getWinTopProperty = function getWinTopProperty(propertyName, defaultValue) {
+  // 1. 先尝试获取 window.top 的属性
+  try {
+    if (window.top && window.top[propertyName] !== undefined) {
+      return window.top[propertyName];
+    }
+  } catch (topError) {}
+  // window.top 跨域，继续尝试
+
+
+  // 2. 尝试获取同源的最上层窗口的属性
+  try {
+    var sameOriginTop = getWinTop();
+    if (sameOriginTop && sameOriginTop[propertyName] !== undefined) {
+      return sameOriginTop[propertyName];
+    }
+  } catch (sameOriginError) {}
+  // 同源最上层窗口获取失败，继续尝试
+
+
+  // 3. 尝试获取当前窗口的属性
+  try {
+    if (window[propertyName] !== undefined) {
+      return window[propertyName];
+    }
+  } catch (currentWinError) {}
+  // 当前窗口获取失败，返回默认值
+
+
+  // 4. 所有尝试都失败，返回默认值
+  return defaultValue;
+};
 
 /**
  * getZoom
@@ -3874,6 +3933,8 @@ var winTopOpen = function winTopOpen(config) {
   getTypeName: getTypeName,
   getValues: getValues,
   getWeekday: getWeekday,
+  getWinTop: getWinTop,
+  getWinTopProperty: getWinTopProperty,
   handlerUrl: handlerUrl,
   hasChars: hasChars,
   hasClass: hasClass,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.7.90",
+  "version": "0.7.92",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/button/src/main.vue

@@ -77,8 +77,8 @@ export default {
           evt.preventDefault();
           let width = 0;
           let height = 0;
-          width = util.win.top.screen.availWidth - 10;
-          height = util.win.top.screen.availHeight - 60;
+          width = util.win.screen.availWidth - 10;
+          height = util.win.screen.availHeight - 60;
           let flag = true;
           if (this.esForm) {
             let params = util.getParams({ url: this.link });