eoss-ui 0.5.10 → 0.5.12

package/packages/theme-chalk/lib/pagination.css

@@ -1 +1 @@
-.es-pagination .el-select .el-input{width:56px}.es-pagination:not(.is-background) .btn-next,.es-pagination:not(.is-background) .btn-prev,.es-pagination:not(.is-background) li{background-color:transparent!important}
+.es-pagination .el-select .el-input{width:56px}.es-pagination:not(.is-background) .btn-next,.es-pagination:not(.is-background) .btn-prev,.es-pagination:not(.is-background) li{background-color:transparent!important}.es-pagination button,.es-pagination span:not([class*=suffix]){height:26px;line-height:26px}.es-pagination .el-input__suffix{line-height:26px}

package/packages/theme-chalk/lib/toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content,.es-toolbar .el-form-item__label{line-height:32px!important}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
+@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content{line-height:32px!important}.es-toolbar .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}

package/packages/theme-chalk/src/pagination.scss

@@ -11,4 +11,12 @@
       background-color: transparent !important;
     }
   }
+  button,
+  span:not([class*='suffix']) {
+    height: 26px;
+    line-height: 26px;
+  }
+  .el-input__suffix {
+    line-height: 26px;
+  }
 }

package/packages/theme-chalk/src/toolbar.scss

@@ -120,6 +120,7 @@
   }
   .el-form-item__label {
     line-height: 32px !important;
+    height: 32px;
   }
   .el-button.es-upload {
     padding: 0 !important;

package/packages/toolbar/src/main.vue

@@ -41,6 +41,14 @@ export default {
     small: {
       type: Boolean,
       default: true
+    },
+    showLabel: {
+      type: Boolean,
+      default: false
+    },
+    labelWidth: {
+      type: String,
+      default: 'auto'
     }
   },
   computed: {
@@ -226,6 +234,7 @@ export default {
           )
         ]);
       }
+      let { config, ...other } = items;
       if (items.type === 'search') {
         let itemClass = {
           radio: 'es-toolbar-item-radio',
@@ -237,14 +246,12 @@ export default {
             class: [
               'es-form-search',
               this.small ? 'es-form-search-small' : '',
-              this.showFormBtn ? '' : 'es-form-search-nobtn'
+              this.showLabel ? 'es-form-search-nobtn' : ''
             ],
             props: {
-              showButton: items.showButton,
-              formatSubmit: items.formatSubmit,
-              ...(items.config || {}),
               size: 'medium',
-              showLabel: false,
+              showLabel: this.showLabel,
+              labelWidth: this.labelWidth,
               closeDialog: false,
               model: this.searchData,
               contents: items.contents,
@@ -252,7 +259,9 @@ export default {
               inline: true,
               search: true,
               isReset: items.reset,
-              showButton: this.showFormBtn
+              showButton: this.showFormBtn,
+              ...other,
+              ...(config || {})
             },
             on: {
               submit: (data) => {
@@ -326,8 +335,8 @@ export default {
                     class: 'es-form-search',
                     ref: 'filter',
                     props: {
-                      formatSubmit: items.formatSubmit,
-                      ...(items.config || {}),
+                      ...other,
+                      ...(config || {}),
                       size: 'medium',
                       closeDialog: false,
                       model: this.advancedData,

package/src/index.js

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

package/src/utils/util.js

@@ -7,12 +7,11 @@
 
 /* eslint-disable indent */
 const sm2 = require('sm-crypto').sm2;
-import { authCenter, wss, topic } from '../config/api';
+import { authCenter } 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';
+import WebSocket from './webSocket';
 
 const win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
 
@@ -663,6 +662,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) {
@@ -1876,7 +1876,6 @@ const isLogined = function ({
   from,
   next,
   exclude = [],
-  open,
   cookie,
   loginPage,
   redirect
@@ -1884,24 +1883,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 (
@@ -1927,40 +1926,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(
@@ -2010,30 +1994,31 @@ const isLogined = function ({
           );
         }
       }).catch(e => { });
-    } else if (
-      token ||
-      to.path === '/' ||
-      to.path === '/404' ||
-      exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 ||
-      to.path === '/login' ||
-      (token && to.path === '/main')
-    ) {
-      if (redirect && (to.path === '/main' || to.path === '/login')) {
-        window.location.replace(urlJoinParams({ url: `.${to.path}.html`, param: to.query }));
-      } else {
-        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
+      if (
+        token ||
+        to.path === '/' ||
+        to.path === '/404' ||
+        exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 ||
+        to.path === '/login' ||
+        (token && to.path === '/main')
+      ) {
+        if (redirect && (to.path === '/main' || to.path === '/login')) {
+          window.location.replace(urlJoinParams({ url: `.${to.path}.html`, param: to.query }));
+        } else {
+          next();
+        }
       } else {
-        next('/login');
+        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');
+        }
       }
-    }
   }
 };
 const isLogged = function (res) {
@@ -2486,67 +2471,25 @@ const setStorage = function ({ type, key, value }) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
+ * @param {String} [send] - 是否发送消息
  * @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);
+ * @param {Function} [success] - 调试
+ * @param {Function} [error] - 重连间隔时间
+ **/
+function socket(option, vm) {
+  let options = {};
+  for (let i in option) {
+    if (i === 'send') {
+      options['isSend'] = option[i];
+    } else {
+      options[i] = option[i];
     }
-    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);
-      }
-    );
-  });
+  }
+  const socket = new WebSocket();
+  socket.init(options, vm);
+  return socket;
 }
 /**
  * sum

package/src/utils/webSocket.js

@@ -0,0 +1,103 @@
+import SockJS from 'sockjs-client';
+import Stomp from 'stompjs';
+class WebSocket {
+  // 构造函数
+  constructor() {
+    this.host = sessionStorage.getItem('wshost') || '';
+    this.tryTimes = 1; // 重连次数
+    this.callback = null; // 回调函数
+    this.client = null; // stomp对象
+    this.reconTimeout = null; // 重连延时器
+    this.debug = true; // 调试
+    this.interval = 20; // 重连间隔时间
+    this.vm = null;
+    this.nextDate = 0;
+    this.connects = 1;
+    this.recon = false;
+    this.sendTimeout = null;
+    this.isSend = false;
+  }
+
+  /** socket连接 */
+  connect() {
+    if (!this.client) {
+    // 连接SockJS
+      let socket = new SockJS(this.host + this.url);
+      // 获取STOMP子协议的客户端对象
+      this.client = Stomp.over(socket);
+
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      console.log(111);
+      this.client.debug = () => {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, () => {
+      this.recon = true;
+      // tryTimes定义重置
+      this.connects = 1;
+      // 订阅消息
+      // if (!this.isSend) {
+      this.subscribe();
+      // }
+    }, (error) => {
+      let diffSecond = parseInt((new Date() - this.nextDate) / 1000, 10);
+      if (this.connects > 5 && diffSecond < this.interval) {
+        this.client.disconnect();
+        this.error && this.error(error);
+      } else {
+        this.reconTimeout = setTimeout(() => {
+          this.connect();
+          this.connects++;
+        }, 5000);
+      }
+    });
+  }
+  /** 订阅服务端 */
+  subscribe() {
+    // 订阅服务端提供的某个topic
+    this.client.subscribe(this.take, (response) => {
+      if (response && (this.callback || this.success)) {
+        let callback = this.callback || this.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  }
+
+  /** 赋值、初始化socket */
+  init(option, vm) {
+    for (let i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  }
+
+  /** 发送消息 */
+  send(data) {
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(() => {
+        this.send(data);
+      }, 1000);
+    }
+  }
+
+  /** 销毁 */
+  destroy() {
+    // 断开连接,清除定时器
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  }
+}
+
+export default WebSocket;