eoss-ui 0.4.91 → 0.4.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.91",
+  "version": "0.4.93",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -95,7 +95,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.73",
+    "eoss-element": "^0.2.74",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/main/src/main.vue

@@ -253,6 +253,7 @@ import message from './message.vue';
 import notice from './notice.vue';
 import AsyncComponent from './async-component/index.vue';
 import {
+  authCenter,
   mainConfig,
   updateUserCustomInfo,
   getComplexApplications,
@@ -624,12 +625,9 @@ export default {
     this.homePage =
       typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
     this.isHeader = util.getParams('header');
-    this.getConfig();
-    if (this.socket) {
-      this.initWebSocket();
-    }
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util.setFavicon(sysLogoIco);
+    this.isLogin();
   },
   mounted() {
     util.win.reLogin = this.handleReLogin;
@@ -644,6 +642,162 @@ export default {
     util.win.windowOpen = this.openPage;
   },
   methods: {
+    async isLogin() {
+      const query = this.$route.query;
+      const token =
+        util.getStorage('token') || util.getStorage('Authorization');
+
+      let loginPage = util.getStorage('login') || util.getStorage('loginPage');
+      if (loginPage) {
+        if (!util.startWith(loginPage, ['http', '/'], true)) {
+          let pathname = util.win.top.location.pathname;
+          if (pathname !== '/') {
+            pathname = pathname.split('/');
+            pathname.splice(pathname.length - 1);
+            pathname = pathname.join('/');
+            loginPage = pathname + '/' + loginPage.replace('./', '');
+          } else {
+            loginPage = pathname + loginPage.replace('./', '');
+          }
+        }
+      }
+      if (
+        !token &&
+        Object.prototype.hasOwnProperty.call(query, 'serverId') &&
+        Object.prototype.hasOwnProperty.call(query, 'authType')
+      ) {
+        let url = util.win.top.location.href;
+        if (query.openType) {
+          switch (query.openType) {
+            case 'self':
+              url = util.win.location.href;
+              break;
+            case 'blank':
+              url = util.win.open(url);
+              break;
+            case 'parent':
+              url = util.win.parent.location.href;
+              break;
+          }
+        }
+        await util
+          .ajax({
+            method: 'post',
+            url: authCenter,
+            data: query
+          })
+          .then((res) => {
+            if (res.rCode === 0) {
+              this.getConfig();
+              if (this.socket) {
+                this.initWebSocket();
+              }
+              let { results } = res;
+              switch (results.statusCode) {
+                case 0:
+                  const storage = getStorage('storage');
+                  setStorage({
+                    type: storage,
+                    key: {
+                      ssId: results.ssId,
+                      token: results.token,
+                      Authorization: results.token,
+                      deviceUnique: results.deviceUnique
+                    }
+                  });
+                  break;
+                case 1:
+                  break;
+                case 2:
+                  break;
+                case 3:
+                  const href = results.authorizeUrl.replace(
+                    '{redirectUri}',
+                    encodeURIComponent(url)
+                  );
+                  if (query.openType) {
+                    switch (query.openType) {
+                      case 'self':
+                        util.win.location.href = href;
+                        break;
+                      case 'blank':
+                        util.win.open(href);
+                        break;
+                      case 'top':
+                        util.win.top.location.href = href;
+                        break;
+                      case 'parent':
+                        util.win.parent.location.href = href;
+                        break;
+                    }
+                  } else {
+                    if (open) {
+                      util.win.open(href);
+                    } else {
+                      util.win.top.location.href = href;
+                    }
+                  }
+                  break;
+                case 4:
+                  this.$alert(
+                    results.msg
+                      ? results.msg
+                      : '账号未绑定，账号密码登录后自动绑定！',
+                    '提示',
+                    {
+                      confirmButtonText: '确定',
+                      type: 'error',
+                      callback: () => {
+                        sessionStorage.setItem(
+                          'extUserBindHandleId',
+                          results.extUserBindHandleId
+                        );
+                        //window.location.href = delUrlParam({ key: 'code' });
+                        if (loginPage) {
+                          util.win.top.location.replace(loginPage);
+                        } else if (document.referrer) {
+                          util.win.top.location.replace(document.referrer);
+                        } else if (
+                          util.win.top.location.href.indexOf('main.html') > -1
+                        ) {
+                          util.win.top.location.href = './login.html';
+                        } else {
+                          this.$router.replace('/login');
+                        }
+                      }
+                    }
+                  );
+                  break;
+                default:
+              }
+            } else {
+              this.$alert(res.msg, '提示', {
+                confirmButtonText: '确定',
+                type: 'error',
+                callback: () => {
+                  if (loginPage) {
+                    util.win.top.location.replace(loginPage);
+                  } else if (document.referrer) {
+                    util.win.top.location.replace(document.referrer);
+                  } else if (
+                    util.win.top.location.href.indexOf('main.html') > -1
+                  ) {
+                    util.win.top.location.href = './login.html';
+                  } else {
+                    this.$router.replace('/login');
+                  }
+                }
+              });
+            }
+          })
+          .catch((e) => {});
+      } else {
+        this.getConfig();
+        if (this.socket) {
+          this.initWebSocket();
+        }
+      }
+    },
     menuSuccess(res) {
       // this.menus
       this.menuType = 'custom';
@@ -740,6 +894,17 @@ export default {
             this.navIds = ids;
             this.setTitle(ids[0]);
           }
+        } else if (sessionStorage.getItem('jump') && this.history) {
+          let ids = this.getId(
+            this.menus,
+            sessionStorage.getItem('jump'),
+            true
+          );
+          if (ids) {
+            this.defaultActive = ids;
+            this.navIds = ids;
+            this.setTitle(ids[0]);
+          }
         } else if (util.win.location.hash) {
           let hash = util.win.location.hash;
           if (hash) {
@@ -764,17 +929,6 @@ export default {
               this.setTitle(ids[0]);
             }
           }
-        } else if (sessionStorage.getItem('jump') && this.history) {
-          let ids = this.getId(
-            this.menus,
-            sessionStorage.getItem('jump'),
-            true
-          );
-          if (ids) {
-            this.defaultActive = ids;
-            this.navIds = ids;
-            this.setTitle(ids[0]);
-          }
         }
         this.setMenu(this.menus);
       }
@@ -1027,6 +1181,17 @@ export default {
                 if (ids) {
                   this.defaultActive = ids;
                 }
+              } else if (sessionStorage.getItem('jump') && this.history) {
+                let ids = this.getId(
+                  this.menus,
+                  sessionStorage.getItem('jump'),
+                  true
+                );
+                if (ids) {
+                  this.defaultActive = ids;
+                  this.navIds = ids;
+                  this.setTitle(ids[0]);
+                }
               } else if (util.win.location.hash) {
                 let hash = util.win.location.hash;
                 if (hash) {
@@ -1055,17 +1220,6 @@ export default {
                     this.setTitle(ids[0]);
                   }
                 }
-              } else if (sessionStorage.getItem('jump') && this.history) {
-                let ids = this.getId(
-                  this.menus,
-                  sessionStorage.getItem('jump'),
-                  true
-                );
-                if (ids) {
-                  this.defaultActive = ids;
-                  this.navIds = ids;
-                  this.setTitle(ids[0]);
-                }
               }
               this.setTips(this.menus);
               store.set('nav', this.menus);

package/src/index.js

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

package/src/utils/util.js

@@ -393,11 +393,11 @@ const ajax = function ({
   }
   if (method === 'post' && format) {
     data = qs.stringify(data);
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   } else {
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/json;charset=UTF-8';
     }
   }
@@ -1863,6 +1863,17 @@ const isLogined = function ({
   if (logined || cookie == true || cookie == 1) {
     if (loginPage) {
       sessionStorage.setItem('loginPage', loginPage);
+        if (!startWith(loginPage, ['http', '/'], true)) {
+          let pathname = win.top.location.pathname;
+          if (pathname !== '/') {
+            pathname = pathname.split('/');
+            pathname.splice(pathname.length - 1);
+            pathname = pathname.join('/');
+            loginPage = pathname + '/' + loginPage.replace('./', '');
+          } else {
+            loginPage = pathname + loginPage.replace('./', '');
+          }
+        }
     }
     next();
   } else {
@@ -1878,7 +1889,7 @@ const isLogined = function ({
             url = win.location.href;
             break;
           case 'blank':
-            url = win.location.href;
+            url = win.open(url);
             break;
           case 'parent':
             url = win.parent.location.href;
@@ -1939,40 +1950,51 @@ const isLogined = function ({
               }
               break;
             case 4:
-              this.$alert(
+              MessageBox.alert(
                 results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！',
                 '提示',
                 {
                   confirmButtonText: '确定',
-                  type: 'error'
-                }
-              )
-                .then(() => {
-                  sessionStorage.setItem(
-                    'extUserBindHandleId',
-                    results.extUserBindHandleId
-                  );
-                  window.location.href = delUrlParam({ key: 'code' });
-                  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');
+                  type: 'error',
+                  callback: () => {
+                    sessionStorage.setItem(
+                      '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');
+                    }
                   }
-                })
-                .catch((e) => { });
+                }
+              );
               break;
             default:
           }
         } else {
-          if (token) {
-            next();
-          } else {
-            alert(res.msg);
-          }
+          MessageBox.alert(res.msg,
+            '提示',
+            {
+              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');
+                }
+              }
+            }
+          );
         }
       }).catch(e => { });
     } else if (