eoss-ui 0.7.91 → 0.7.92

package/lib/utils/util.js

@@ -1900,6 +1900,10 @@ var getWeekday = function getWeekday(date) {
 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) {
@@ -1907,6 +1911,46 @@ var getWinTop = function getWinTop(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
  * @desc 获取缩放比
@@ -3652,6 +3696,7 @@ exports.default = {
   getValues: getValues,
   getWeekday: getWeekday,
   getWinTop: getWinTop,
+  getWinTopProperty: getWinTopProperty,
   handlerUrl: handlerUrl,
   hasChars: hasChars,
   hasClass: hasClass,

package/lib/wujie.js

@@ -2138,6 +2138,10 @@ var getWeekday = function getWeekday(date) {
 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) {
@@ -2145,6 +2149,46 @@ var getWinTop = function getWinTop(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
  * @desc 获取缩放比
@@ -3890,6 +3934,7 @@ var winTopOpen = function winTopOpen(config) {
   getValues: getValues,
   getWeekday: getWeekday,
   getWinTop: getWinTop,
+  getWinTopProperty: getWinTopProperty,
   handlerUrl: handlerUrl,
   hasChars: hasChars,
   hasClass: hasClass,

package/lib/wxlogin.js

@@ -2138,6 +2138,10 @@ var getWeekday = function getWeekday(date) {
 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) {
@@ -2145,6 +2149,46 @@ var getWinTop = function getWinTop(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
  * @desc 获取缩放比
@@ -3890,6 +3934,7 @@ var winTopOpen = function winTopOpen(config) {
   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.91",
+  "version": "0.7.92",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/data-table/src/main.vue

@@ -219,8 +219,7 @@ import children from './children.vue';
 import sizer from './sizer.vue';
 import util from 'eoss-ui/src/utils/util';
 import qs from 'qs';
-const systemMode =
-  util.getWinTop().systemMode || util.win.systemMode || 'default';
+const systemMode = util.getWinTopProperty('systemMode', 'default');
 const pageView = util.getParams('pageView');
 export default {
   name: 'EsDataTable',
@@ -877,7 +876,12 @@ export default {
     },
     showEditPage(val) {
       if (val === false) {
-        util.getwintop().refresh();
+        try {
+          const topWin = util.getWinTop();
+          topWin.refresh();
+        } catch (error) {
+          console.warn('Failed to refresh page:', error);
+        }
       }
     }
   },

package/packages/dialog/src/main.vue

@@ -268,8 +268,10 @@ import WujieVue from 'wujie-vue2';
 import util from 'eoss-ui/src/utils/util';
 let availWidth = 0;
 let availHeight = 0;
-availWidth = util.getWinTop().document.body.offsetWidth - 260;
-availHeight = util.getWinTop().document.body.offsetHeight - 60;
+const wind = util.getWinTop();
+availWidth = wind.document.body.offsetWidth - 260;
+availHeight = wind.document.body.offsetHeight - 60;
+const systemMode = wind.systemMode || util.win.systemMode || 'default';
 export default {
   name: 'EsDialog',
   inheritAttrs: false,
@@ -293,15 +295,7 @@ export default {
   props: {
     mode: {
       type: String,
-      default() {
-        try {
-          return (
-            util.getWinTop().systemMode || util.win.systemMode || 'default'
-          );
-        } catch (e) {
-          return util.win.systemMode || 'default';
-        }
-      }
+      default: systemMode
     },
     title: String,
     busEvent: String,

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

@@ -683,14 +683,25 @@ export default {
           method: 'windowClose',
           ...JSON.parse(windowOpenConfig)
         });
-        util.getWinTop().windowClose(JSON.parse(windowOpenConfig));
+        try {
+          const topWin = util.getWinTop();
+          topWin.windowClose(JSON.parse(windowOpenConfig));
+        } catch (error) {
+          console.warn('Failed to call windowClose:', error);
+        }
       } else if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
-      } else if (util.getWinTop().COOS_SDK) {
-        util.getWinTop().COOS_SDK.closePopup &&
-          util.getWinTop().COOS_SDK.closePopup();
-      } else if (util.getWinTop().opener) {
-        util.getWinTop().close();
+      } else {
+        try {
+          const topWin = util.getWinTop();
+          if (topWin.COOS_SDK) {
+            topWin.COOS_SDK.closePopup && topWin.COOS_SDK.closePopup();
+          } else if (topWin.opener) {
+            topWin.close();
+          }
+        } catch (error) {
+          console.warn('Failed to close window/popup:', error);
+        }
       }
       if (this.events && this.events.success) {
         this.events.success();
@@ -704,14 +715,25 @@ export default {
           method: 'windowClose',
           ...JSON.parse(windowOpenConfig)
         });
-        util.getWinTop().windowClose(JSON.parse(windowOpenConfig));
+        try {
+          const topWin = util.getWinTop();
+          topWin.windowClose(JSON.parse(windowOpenConfig));
+        } catch (error) {
+          console.warn('Failed to call windowClose:', error);
+        }
       } else if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
-      } else if (util.getWinTop().COOS_SDK) {
-        util.getWinTop().COOS_SDK.closePopup &&
-          util.getWinTop().COOS_SDK.closePopup();
-      } else if (util.getWinTop().opener) {
-        util.getWinTop().close();
+      } else {
+        try {
+          const topWin = util.getWinTop();
+          if (topWin.COOS_SDK) {
+            topWin.COOS_SDK.closePopup && topWin.COOS_SDK.closePopup();
+          } else if (topWin.opener) {
+            topWin.close();
+          }
+        } catch (error) {
+          console.warn('Failed to close window/popup:', error);
+        }
       }
       this.events && this.events.save(id, event);
       this.$emit('save', id, event);

package/packages/login/src/main.vue

@@ -1506,7 +1506,8 @@ export default {
       let isMarkdown = regex.test(content);
       if (isMarkdown) {
         content = await util.ajax({ url: content });
-        content = this.renderMarkdown(content);
+        console.log(content);
+        content = content ? this.renderMarkdown(content) : content;
       }
       this.$alert(content, title, {
         dangerouslyUseHTMLString: isMarkdown,

package/packages/main/src/default/userinfo.vue

@@ -408,11 +408,12 @@ export default {
                 .then(() => {
                   const loginPage =
                     util.getStorage('login') || util.getStorage('loginPage');
+                  const topWin = util.getWinTop();
                   try {
                     if (loginPage) {
                       let src;
                       if (!util.startWith(loginPage, ['http', '/'], true)) {
-                        let pathname = util.getWinTop().location.pathname;
+                        let pathname = topWin.location.pathname;
                         if (pathname !== '/') {
                           pathname = pathname.split('/');
                           pathname.splice(pathname.length - 1);
@@ -424,24 +425,31 @@ export default {
                       } else {
                         src = loginPage;
                       }
-                      util.getWinTop().location.href = src;
-                    } else if (
-                      util.getWinTop().location.href.indexOf('main.html') > -1
-                    ) {
-                      util.getWinTop().location.href = './login.html';
+                      topWin.location.href = src;
+                    } else if (topWin.location.href.indexOf('main.html') > -1) {
+                      topWin.location.href = './login.html';
                     } else {
-                      const hash = util.getWinTop().location.hash;
+                      const hash = topWin.location.hash;
                       if (hash) {
-                        const len = util
-                          .getWinTop()
-                          .location.href.indexOf(hash);
-                        util.getWinTop().location.href =
-                          util.win.location.href.slice(0, len) + '#/login';
+                        const len = topWin.location.href.indexOf(hash);
+                        topWin.location.href =
+                          topWin.location.href.slice(0, len) + '#/login';
                       } else {
-                        util.getWinTop().location.href = '/login.html';
+                        topWin.location.href = '/login.html';
                       }
                     }
-                  } catch (error) {}
+                  } catch (error) {
+                    console.warn('Failed to handle login redirect:', error);
+                    try {
+                      // Fallback to postMessage if direct access fails
+                      topWin.postMessage({ type: 1 }, '*');
+                    } catch (postMessageError) {
+                      console.warn(
+                        'Failed to send postMessage:',
+                        postMessageError
+                      );
+                    }
+                  }
                 })
                 .catch((e) => {});
             } else {

package/packages/main/src/main.vue

@@ -232,12 +232,12 @@ export default {
           ) {
             window.location.href = './login.html';
           } else {
-            next('/login');
+            this.$router.replace('/login');
           }
         } else if (window.location.href.indexOf('main.html') > -1) {
           window.location.href = './login.html';
         } else {
-          next('/login');
+          this.$router.replace('/login');
         }
       }
     },
@@ -350,10 +350,11 @@ export default {
               const loginPage =
                 util.getStorage('login') || util.getStorage('loginPage');
               try {
+                const topWin = util.getWinTop();
                 if (loginPage) {
                   let src;
                   if (!util.startWith(loginPage, ['http', '/'], true)) {
-                    let pathname = util.getWinTop().location.pathname;
+                    let pathname = topWin.location.pathname;
                     if (pathname !== '/') {
                       pathname = pathname.split('/');
                       pathname.splice(pathname.length - 1);
@@ -365,19 +366,17 @@ export default {
                   } else {
                     src = loginPage;
                   }
-                  util.getWinTop().location.href = src;
-                } else if (
-                  util.getWinTop().location.href.indexOf('main.html') > -1
-                ) {
-                  util.getWinTop().location.href = './login.html';
+                  topWin.location.href = src;
+                } else if (topWin.location.href.indexOf('main.html') > -1) {
+                  topWin.location.href = './login.html';
                 } else {
-                  const hash = util.getWinTop().location.hash;
+                  const hash = topWin.location.hash;
                   if (hash) {
-                    const len = util.getWinTop().location.href.indexOf(hash);
-                    util.getWinTop().location.href =
+                    const len = topWin.location.href.indexOf(hash);
+                    topWin.location.href =
                       util.win.location.href.slice(0, len) + '#/login';
                   } else {
-                    util.getWinTop().location.href = '/login.html';
+                    topWin.location.href = '/login.html';
                   }
                 }
               } catch (error) {}

package/packages/main/src/simplicity/index.vue

@@ -407,7 +407,7 @@ import {
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 const isIE = /MSIE|Trident/.test(navigator.userAgent);
-const systemMode = util.win.systemMode || 'default';
+const systemMode = util.getWinTopProperty('systemMode', 'default');
 import WujieVue from 'wujie-vue2';
 let events = [
   (tabs, index, that) => {
@@ -2118,10 +2118,11 @@ export default {
                   try {
                     const loginPage =
                       util.getStorage('login') || util.getStorage('loginPage');
+                    const topWin = util.getWinTop();
                     if (loginPage) {
                       let src;
                       if (!util.startWith(loginPage, ['http', '/'], true)) {
-                        let pathname = util.getWinTop().location.pathname;
+                        let pathname = topWin.location.pathname;
                         if (pathname !== '/') {
                           pathname = pathname.split('/');
                           pathname.splice(pathname.length - 1);
@@ -2133,25 +2134,29 @@ export default {
                       } else {
                         src = loginPage;
                       }
-                      util.getWinTop().location.href = src;
-                    } else if (
-                      util.getWinTop().location.href.indexOf('main.html') > -1
-                    ) {
-                      util.getWinTop().location.href = './login.html';
+                      topWin.location.href = src;
+                    } else if (topWin.location.href.indexOf('main.html') > -1) {
+                      topWin.location.href = './login.html';
                     } else {
-                      const hash = util.getWinTop().location.hash;
+                      const hash = topWin.location.hash;
                       if (hash) {
-                        const len = util
-                          .getWinTop()
-                          .location.href.indexOf(hash);
-                        util.getWinTop().location.href =
+                        const len = topWin.location.href.indexOf(hash);
+                        topWin.location.href =
                           util.win.location.href.slice(0, len) + '#/login';
                       } else {
-                        util.getWinTop().location.href = '/login.html';
+                        topWin.location.href = '/login.html';
                       }
                     }
                   } catch (error) {
-                    util.getWinTop().postMessage({ type: 1 }, '*');
+                    console.warn('Failed to handle login redirect:', error);
+                    try {
+                      util.getWinTop().postMessage({ type: 1 }, '*');
+                    } catch (postMessageError) {
+                      console.warn(
+                        'Failed to send postMessage:',
+                        postMessageError
+                      );
+                    }
                   }
                 }
               }

package/packages/main/src/simplicity/userinfo.vue

@@ -338,10 +338,11 @@ export default {
                   const loginPage =
                     util.getStorage('login') || util.getStorage('loginPage');
                   try {
+                    const topWin = util.getWinTop();
                     if (loginPage) {
                       let src;
                       if (!util.startWith(loginPage, ['http', '/'], true)) {
-                        let pathname = util.getWinTop().location.pathname;
+                        let pathname = topWin.location.pathname;
                         if (pathname !== '/') {
                           pathname = pathname.split('/');
                           pathname.splice(pathname.length - 1);
@@ -353,25 +354,29 @@ export default {
                       } else {
                         src = loginPage;
                       }
-                      util.getWinTop().location.href = src;
-                    } else if (
-                      util.getWinTop().location.href.indexOf('main.html') > -1
-                    ) {
-                      util.getWinTop().location.href = './login.html';
+                      topWin.location.href = src;
+                    } else if (topWin.location.href.indexOf('main.html') > -1) {
+                      topWin.location.href = './login.html';
                     } else {
-                      const hash = util.getWinTop().location.hash;
+                      const hash = topWin.location.hash;
                       if (hash) {
-                        const len = util
-                          .getWinTop()
-                          .location.href.indexOf(hash);
-                        util.getWinTop().location.href =
+                        const len = topWin.location.href.indexOf(hash);
+                        topWin.location.href =
                           util.win.location.href.slice(0, len) + '#/login';
                       } else {
-                        util.getWinTop().location.href = '/login.html';
+                        topWin.location.href = '/login.html';
                       }
                     }
                   } catch (error) {
-                    util.getWinTop().postMessage({ type: 1 }, '*');
+                    console.warn('Failed to handle login redirect:', error);
+                    try {
+                      util.getWinTop().postMessage({ type: 1 }, '*');
+                    } catch (postMessageError) {
+                      console.warn(
+                        'Failed to send postMessage:',
+                        postMessageError
+                      );
+                    }
                   }
                 })
                 .catch((e) => {});

package/packages/main/src/simplicityTop/index.vue

@@ -329,7 +329,7 @@ import {
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 const isIE = /MSIE|Trident/.test(navigator.userAgent);
-const systemMode = util.win.systemMode || 'default';
+const systemMode = util.getWinTopProperty('systemMode', 'default');
 // let events = [
 //   (tabs, index, that) => {
 //     let tab = tabs[index];

package/packages/main/src/simplicityTop/userinfo.vue

@@ -338,10 +338,11 @@ export default {
                   const loginPage =
                     util.getStorage('login') || util.getStorage('loginPage');
                   try {
+                    const topWin = util.getWinTop();
                     if (loginPage) {
                       let src;
                       if (!util.startWith(loginPage, ['http', '/'], true)) {
-                        let pathname = util.getWinTop().location.pathname;
+                        let pathname = topWin.location.pathname;
                         if (pathname !== '/') {
                           pathname = pathname.split('/');
                           pathname.splice(pathname.length - 1);
@@ -353,25 +354,29 @@ export default {
                       } else {
                         src = loginPage;
                       }
-                      util.getWinTop().location.href = src;
-                    } else if (
-                      util.getWinTop().location.href.indexOf('main.html') > -1
-                    ) {
-                      util.getWinTop().location.href = './login.html';
+                      topWin.location.href = src;
+                    } else if (topWin.location.href.indexOf('main.html') > -1) {
+                      topWin.location.href = './login.html';
                     } else {
-                      const hash = util.getWinTop().location.hash;
+                      const hash = topWin.location.hash;
                       if (hash) {
-                        const len = util
-                          .getWinTop()
-                          .location.href.indexOf(hash);
-                        util.getWinTop().location.href =
+                        const len = topWin.location.href.indexOf(hash);
+                        topWin.location.href =
                           util.win.location.href.slice(0, len) + '#/login';
                       } else {
-                        util.getWinTop().location.href = '/login.html';
+                        topWin.location.href = '/login.html';
                       }
                     }
                   } catch (error) {
-                    util.getWinTop().postMessage({ type: 1 }, '*');
+                    console.warn('Failed to handle login redirect:', error);
+                    try {
+                      util.getWinTop().postMessage({ type: 1 }, '*');
+                    } catch (postMessageError) {
+                      console.warn(
+                        'Failed to send postMessage:',
+                        postMessageError
+                      );
+                    }
                   }
                 })
                 .catch((e) => {});

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,