eoss-ui 0.7.91 → 0.7.93

package/packages/pagination/src/main.vue

@@ -20,10 +20,10 @@
 </template>
 <script>
 import util from 'eoss-ui/src/utils/util';
-const paginationLayout =
-  util.getWinTop().tableLayout ||
-  util.win.tableLayout ||
-  'prev, pager, next, sizes, total';
+const paginationLayout = util.getWinTopProperty(
+  'tableLayout',
+  'prev, pager, next, sizes, total'
+);
 export default {
   name: 'EsPagination',
   inheritAttrs: false,

package/packages/retrial-auth/src/main.vue

@@ -171,10 +171,21 @@ export default {
                   type: 'success'
                 });
                 this.msgBox.handleClose();
+                const topWin = util.getWinTop();
                 try {
-                  this.reload && util.getWinTop().location.reload();
+                  if (this.reload) {
+                    topWin.location.reload();
+                  }
                 } catch (error) {
-                  this.reload && util.getWinTop().postMessage({ type: 3 }, '*');
+                  console.warn('Failed to reload page:', error);
+                  try {
+                    this.reload && topWin.postMessage({ type: 3 }, '*');
+                  } catch (postMessageError) {
+                    console.warn(
+                      'Failed to send postMessage:',
+                      postMessageError
+                    );
+                  }
                 }
               } else {
                 this.$message({
@@ -253,10 +264,18 @@ export default {
                 type: 'success'
               });
               this.msgBox.handleClose();
+              const topWin = util.getWinTop();
               try {
-                this.reload && util.getWinTop().location.reload();
+                if (this.reload) {
+                  topWin.location.reload();
+                }
               } catch (error) {
-                this.reload && util.getWinTop().postMessage({ type: 3 }, '*');
+                console.warn('Failed to reload page:', error);
+                try {
+                  this.reload && topWin.postMessage({ type: 3 }, '*');
+                } catch (postMessageError) {
+                  console.warn('Failed to send postMessage:', postMessageError);
+                }
               }
             } else {
               this.scanCode = setTimeout(() => {

package/packages/tree-group/src/main.vue

@@ -184,8 +184,7 @@
 
 <script>
 import util from 'eoss-ui/src/utils/util';
-const systemMode =
-  util.getWinTop().systemMode || util.win.systemMode || 'default';
+const systemMode = util.getWinTopProperty('systemMode', 'default');
 export default {
   name: 'EsTreeGroup',
   inheritAttrs: false,

package/src/index.js

@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.7.91',
+  version: '0.7.93',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -1963,6 +1963,10 @@ const getWeekday = function (date, type = 0) {
 const getWinTop = function (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) {
@@ -1970,6 +1974,46 @@ const getWinTop = function (wind) {
   }
 };
 
+/**
+ * getWinTopProperty
+ * @desc 安全获取顶层窗口的属性，避免跨域访问错误
+ * @param {string} propertyName - 要获取的属性名
+ * @param {any} defaultValue - 默认值，当属性获取失败时返回
+ * @return {any} 属性值或默认值
+ **/
+const getWinTopProperty = function (propertyName, defaultValue) {
+  // 1. 先尝试获取 window.top 的属性
+  try {
+    if (window.top && window.top[propertyName] !== undefined) {
+      return window.top[propertyName];
+    }
+  } catch (topError) {
+    // window.top 跨域，继续尝试
+  }
+
+  // 2. 尝试获取同源的最上层窗口的属性
+  try {
+    const 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
  * @desc 获取缩放比
@@ -3811,6 +3855,7 @@ export default {
   getValues,
   getWeekday,
   getWinTop,
+  getWinTopProperty,
   handlerUrl,
   hasChars,
   hasClass,