eoss-ui 0.5.43 → 0.5.44

package/src/utils/util.js

@@ -185,9 +185,15 @@ const ajax = function ({
             'mainConfig',
             'jump'
           ]);
+          let href = '';
+          try {
+            href = win.top.location.href;
+          } catch (error) {
+            href = win.location.href;
+          }
           if (
-            win.top.location.href.indexOf('#/login') === -1 &&
-            win.top.location.href.indexOf('/login.html') === -1
+            href.indexOf('#/login') === -1 &&
+            href.indexOf('/login.html') === -1
           ) {
             let remind = sessionStorage.getItem('remind');
             if (!remind) {
@@ -213,36 +219,40 @@ const ajax = function ({
                     }
                 )
                   .then(() => {
-                    const loginPage = getStorage('login') || getStorage('loginPage');
-                    if (loginPage) {
-                      let src;
-                      if (!startWith(loginPage, ['http', '/'], true)) {
-                        let pathname = win.top.location.pathname;
-                        if (pathname !== '/') {
-                          pathname = pathname.split('/');
-                          pathname.splice(pathname.length - 1);
-                          pathname = pathname.join('/');
-                          src = pathname + '/' + loginPage.replace('./', '');
+                    try {
+                      const loginPage = getStorage('login') || getStorage('loginPage');
+                      if (loginPage) {
+                        let src;
+                        if (!startWith(loginPage, ['http', '/'], true)) {
+                          let pathname = win.top.location.pathname;
+                          if (pathname !== '/') {
+                            pathname = pathname.split('/');
+                            pathname.splice(pathname.length - 1);
+                            pathname = pathname.join('/');
+                            src = pathname + '/' + loginPage.replace('./', '');
+                          } else {
+                            src = pathname + loginPage.replace('./', '');
+                          }
                         } else {
-                          src = pathname + loginPage.replace('./', '');
+                          src = loginPage;
                         }
+                        win.top.location.href = src;
+                      } else if (
+                        win.top.location.href.indexOf('main.html') > -1
+                      ) {
+                        win.top.location.href = './login.html';
                       } else {
-                        src = loginPage;
-                      }
-                      win.top.location.href = src;
-                    } else if (
-                      win.top.location.href.indexOf('main.html') > -1
-                    ) {
-                      win.top.location.href = './login.html';
-                    } else {
-                      const hash = win.top.location.hash;
-                      if (hash) {
-                        const len = win.top.location.href.indexOf(hash);
-                        win.top.location.href =
-                          win.location.href.slice(0, len) + '#/login';
-                      } else {
-                        win.top.location.href = '/login.html';
+                        const hash = win.top.location.hash;
+                        if (hash) {
+                          const len = win.top.location.href.indexOf(hash);
+                          win.top.location.href =
+                            win.location.href.slice(0, len) + '#/login';
+                        } else {
+                          win.top.location.href = '/login.html';
+                        }
                       }
+                    } catch (error) {
+                      win.postMessage({ type: 1 }, '*');
                     }
                   })
                   .catch(e => {
@@ -663,7 +673,13 @@ const debounce = function (callback, delay) {
  * @param {String,Array} [key] - 参数名
  **/
 const delUrlParam = function ({ url, key }) {
-  let src = url ? decodeURI(url) : decodeURI(win.top.location.href);
+  let pUrl = '';
+  try {
+    pUrl = win.top.location.href;
+  } catch (error) {
+    pUrl = win.location.href;
+  }
+  let src = url ? decodeURI(url) : decodeURI(pUrl);
   let param = getParams({ url: src });
   if (param && key.length) {
     if (Array.isArray(key)) {
@@ -1923,15 +1939,20 @@ const isLogined = function ({
   let quit = getParams('quit') || getParams('logout');
   if (quit) {
     ajax({ method: 'post', url: logout })
-            .then((res) => {
-              if (res.rCode === 0) {
-                removeStorage();
-              }
-            })
-            .catch(() => {});
+      .then((res) => {
+        if (res.rCode === 0) {
+          removeStorage();
+        }
+      })
+      .catch(() => { });
     return;
   }
-  let pathname = win.top.location.pathname;
+  let pathname = '';
+  try {
+    pathname = win.top.location.pathname;
+  } catch (error) {
+    pathname = win.location.pathname;
+  }
   if (loginPage) {
     sessionStorage.setItem('loginPage', loginPage);
     if (!startWith(loginPage, ['http', '/'], true)) {
@@ -1974,25 +1995,44 @@ const isLogined = function ({
                   deviceUnique: results.deviceUnique
                 }
               });
-              let url = delUrlParam({
-                url: win.top.location.href,
-                key: ['serverId', 'authType', 'code', 'sessionId']
-              });
-              win.top.location.href = url;
-              setTimeout(() => {
-                win.top.location.reload();
-              }, 200);
+              try {
+                let url = delUrlParam({
+                  url: win.top.location.href,
+                  key: ['serverId', 'authType', 'code', 'sessionId']
+                });
+                win.top.location.href = url;
+                setTimeout(() => {
+                  win.top.location.reload();
+                }, 200);
+              } catch (error) {
+                let url = delUrlParam({
+                  url: win.location.href,
+                  key: ['serverId', 'authType', 'code', 'sessionId']
+                });
+                win.location.href = url;
+                setTimeout(() => {
+                  win.location.reload();
+                }, 200);
+              }
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              const href = results.authorizeUrl.replace(
-                '{redirectUri}',
-                encodeURIComponent(win.top.location.href)
-              );
-              win.top.location.href = href;
+              try {
+                const href = results.authorizeUrl.replace(
+                  '{redirectUri}',
+                  encodeURIComponent(win.top.location.href)
+                );
+                win.top.location.href = href;
+              } catch (error) {
+                const href = results.authorizeUrl.replace(
+                  '{redirectUri}',
+                  encodeURIComponent(win.location.href)
+                );
+                win.location.href = href;
+              }
               break;
             case 4:
               MessageBox.alert(
@@ -2006,14 +2046,18 @@ const isLogined = function ({
                       'extUserBindHandleId',
                       results.extUserBindHandleId
                     );
-                    if (loginPage) {
-                      win.top.location.replace(loginPage);
-                    } else if (document.referrer) {
-                      win.top.location.replace(document.referrer);
-                    } else if (win.top.location.href.indexOf('main.html') > -1) {
-                      win.top.location.href = './login.html';
-                    } else {
-                      next('/login');
+                    try {
+                      if (loginPage) {
+                        win.top.location.replace(loginPage);
+                      } else if (document.referrer) {
+                        win.top.location.replace(document.referrer);
+                      } else if (win.top.location.href.indexOf('main.html') > -1) {
+                        win.top.location.href = './login.html';
+                      } else {
+                        next('/login');
+                      }
+                    } catch (error) {
+                      win.postMessage({ type: 1 }, '*');
                     }
                   }
                 }
@@ -2028,14 +2072,18 @@ const isLogined = function ({
               confirmButtonText: '确定',
               type: 'error',
               callback: () => {
-                if (loginPage) {
-                  win.top.location.replace(loginPage);
-                } else if (document.referrer) {
-                  win.top.location.replace(document.referrer);
-                } else if (win.top.location.href.indexOf('main.html') > -1) {
-                  win.top.location.href = './login.html';
-                } else {
-                  next('/login');
+                try {
+                  if (loginPage) {
+                    win.top.location.replace(loginPage);
+                  } else if (document.referrer) {
+                    win.top.location.replace(document.referrer);
+                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    win.top.location.href = './login.html';
+                  } else {
+                    next('/login');
+                  }
+                } catch (error) {
+                  win.postMessage({ type: 1 }, '*');
                 }
               }
             }
@@ -2057,14 +2105,18 @@ const isLogined = function ({
           next();
         }
       } else {
-        if (loginPage) {
-          win.top.location.replace(loginPage);
-        } else if (document.referrer) {
-          win.top.location.replace(document.referrer);
-        } else if (win.top.location.href.indexOf('main.html') > -1) {
-          win.top.location.href = './login.html';
-        } else {
-          next('/login');
+        try {
+          if (loginPage) {
+            win.top.location.replace(loginPage);
+          } else if (document.referrer) {
+            win.top.location.replace(document.referrer);
+          } else if (win.top.location.href.indexOf('main.html') > -1) {
+            win.top.location.href = './login.html';
+          } else {
+            next('/login');
+          }
+        } catch (error) {
+          win.postMessage({ type: 1 }, '*');
         }
       }
   }
@@ -2484,30 +2536,30 @@ const setStorage = function ({ type, key, value }) {
   if (value && typeof value === 'object') {
     value = JSON.stringify(value);
   }
-  if (type === undefined || type === 'sessionStorage') {
+  if (type === 'localStorage') {
     if (typeof key === 'string') {
-      sessionStorage.setItem(key, value);
+      localStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
       for (let i in key) {
-        sessionStorage.setItem(key[i], value);
+        localStorage.setItem(key[i], value);
       }
     } else {
       for (let i in key) {
         let val = typeof key[i] === 'object' ? JSON.stringify(key[i]) : key[i];
-        sessionStorage.setItem(i, val);
+        localStorage.setItem(i, val);
       }
     }
   } else {
     if (typeof key === 'string') {
-      localStorage.setItem(key, value);
+      sessionStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
       for (let i in key) {
-        localStorage.setItem(key[i], value);
+        sessionStorage.setItem(key[i], value);
       }
     } else {
       for (let i in key) {
         let val = typeof key[i] === 'object' ? JSON.stringify(key[i]) : key[i];
-        localStorage.setItem(i, val);
+        sessionStorage.setItem(i, val);
       }
     }
   }

package/packages/theme-chalk/gulpfile.js

@@ -1,25 +0,0 @@
-'use strict';
-
-const { series, src, dest } = require('gulp');
-const sass = require('gulp-sass');
-const autoprefixer = require('gulp-autoprefixer');
-const cssmin = require('gulp-cssmin');
-
-function compile() {
-  return src('./src/*.scss')
-    .pipe(sass.sync())
-    .pipe(autoprefixer({
-      overrideBrowserslist: ['ie > 9', 'last 2 versions'],
-      cascade: false
-    }))
-    .pipe(cssmin())
-    .pipe(dest('./lib'));
-}
-
-function copyfont() {
-  return src('./src/fonts/**')
-    .pipe(cssmin())
-    .pipe(dest('./lib/fonts'));
-}
-
-exports.build = series(compile, copyfont);