eoss-ui 0.4.99 → 0.5.11

package/src/utils/util.js

@@ -7,10 +7,12 @@
 
 /* eslint-disable indent */
 const sm2 = require('sm-crypto').sm2;
-import { authCenter } from '../config/api';
+import { authCenter, wss, topic } from '../config/api';
 import axios from 'axios';
 import qs from 'qs';
 import JSONbig from 'json-bigint';
+import SockJS from 'sockjs-client';
+import Stomp from 'stompjs';
 
 const win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
 
@@ -661,6 +663,7 @@ const delUrlParam = function ({ url, key }) {
       key.forEach(item => {
         if (param.hasOwnProperty(item)) {
           let reg = `${item}=${param[item]}`;
+          console.log(reg);
           if (src.indexOf(reg + '&') > -1) {
             src = src.replace(reg + '&', '');
           } else if (src.indexOf('&' + reg) > -1) {
@@ -1685,7 +1688,7 @@ const getWeekday = function (date, type = 0) {
  * @param {String} [url] - url地址
  **/
 
-const handlerUrl = function (url, before) {
+const handlerUrl = function (url, param, before) {
   let arry = url.split('?');
   if (arry.length > 2) {
     let ary = arry.splice(1, arry.length);
@@ -1707,6 +1710,10 @@ const handlerUrl = function (url, before) {
   } else {
     url += '?_tt=' + new Date().getTime();
   }
+  if (param) {
+    let str = queryParams(param);
+    url += ('&' + str);
+  }
   if (before && before === arry[0]) {
     let pathname = win.location.pathname;
     if (pathname === '/') {
@@ -1870,7 +1877,6 @@ const isLogined = function ({
   from,
   next,
   exclude = [],
-  open,
   cookie,
   loginPage,
   redirect
@@ -1878,24 +1884,24 @@ const isLogined = function ({
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
+  let pathname = win.top.location.pathname;
   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('./', '');
+        let path = pathname.split('/');
+        path.splice(pathname.length - 1);
+        path = path.join('/');
+        loginPage = path + '/' + loginPage.replace('./', '');
       } else {
         loginPage = pathname + loginPage.replace('./', '');
       }
     }
   }
   const token = getStorage('token') || getStorage('Authorization');
-  const logined = getStorage('logined');
+  // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
-  if (token || logined || cookie == true || cookie == 1) {
+  if (token || cookie == true || cookie == 1) {
     next && next();
   } else {
     if (
@@ -1921,40 +1927,25 @@ const isLogined = function ({
                   deviceUnique: results.deviceUnique
                 }
               });
-              next();
+              let url = delUrlParam({
+                url: win.top.location.href,
+                key: ['serverId', 'authType', 'code', 'sessionId']
+              });
+              win.top.location.href = url;
+              setTimeout(() => {
+                win.top.location.reload();
+              }, 200);
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              let url = win.top.location.href;
               const href = results.authorizeUrl.replace(
                 '{redirectUri}',
-                encodeURIComponent(url)
+                encodeURIComponent(win.top.location.href)
               );
-              if (to.query.openType) {
-                switch (to.query.openType) {
-                  case 'self':
-                    win.location.href = href;
-                    break;
-                  case 'blank':
-                    win.open(href);
-                    break;
-                  case 'top':
-                    win.top.location.href = href;
-                    break;
-                  case 'parent':
-                    win.parent.location.href = href;
-                    break;
-                }
-              } else {
-                if (open) {
-                  win.open(href);
-                } else {
-                  win.top.location.href = href;
-                }
-              }
+              win.top.location.href = href;
               break;
             case 4:
               MessageBox.alert(
@@ -2004,7 +1995,8 @@ const isLogined = function ({
           );
         }
       }).catch(e => { });
-    } else if (
+    } else
+      if (
       token ||
       to.path === '/' ||
       to.path === '/404' ||
@@ -2474,6 +2466,74 @@ const setStorage = function ({ type, key, value }) {
   }
 };
 
+/**
+ * socket
+ * @desc:webSocket
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} [url] - 连接地址
+ * @param {String} [take] - 订阅地址
+ * @param {String} [debug] - 调试
+ * @param {String} [interval] - 重连间隔时间
+ **/
+function socket(options) {
+  let nextDate = 0;
+  let connect = 1;
+  return new Promise((resolve, reject) => {
+    let wshost = getStorage('wshost') || '';
+    let option = {
+      url: wshost + wss,
+      take: topic,
+      debug: true,
+      interval: 20
+    };
+    let websocket = win.websocket || {};
+    if (options && isObject(options)) {
+      option = { ...option, ...options };
+    }
+    let key = window.btoa(option.url);
+    if (!websocket[key]) {
+      websocket[key] = { socket: new SockJS(option.url) };
+      win.websocket = websocket;
+    }
+
+    let client = websocket[key] ? websocket[key].client : null;
+    if (!client) {
+      client = websocket[key].client = Stomp.over(websocket[key].socket);
+      !option.debug && (client.debug = null);
+    }
+    client.connect(
+      {},
+      () => {
+        client.subscribe(option.take, (response) => {
+          let res = JSON.parse(response.body);
+          resolve(res, () => {
+            client.disconnect();
+            win.top.websocket && win.top.websocket[key] && delete win.top.websocket[key];
+          }, client, websocket[key]);
+        });
+      },
+      (error) => {
+        let diffSecond = parseInt((new Date() - nextDate) / 1000, 10);
+        if (connect > 5 && diffSecond < option.interval) {
+          client.disconnect();
+          if (win.top.websocket) {
+            if (Object.keys(win.top.websocket).length > 1) {
+              delete win.top.websocket[key];
+            } else {
+              delete win.top.websocket;
+            }
+          }
+        } else {
+          win.top.websocket && win.top.websocket[key] && setTimeout(() => {
+            socket(options);
+          }, 5000);
+        }
+        reject(error);
+      }
+    );
+  });
+}
 /**
  * sum
  * @desc 求和
@@ -2725,7 +2785,6 @@ const urlJoinParams = function ({ url, param, timestamp }) {
       params[items[0]] = items[1];
     });
   }
-  '&_tt=' + new Date().getTime();
   params = extend(true, params, param);
   let str = queryParams(params);
   if (str) {
@@ -2879,6 +2938,7 @@ export default {
   sendMessage,
   setFavicon,
   setStorage,
+  socket,
   startWith,
   sum,
   takeLeft,

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);