eoss-ui 0.6.84 → 0.6.86

package/src/utils/http.js

@@ -1,50 +1,50 @@
-// 封装请求参数
-import util from './util.js';
-
-// function request({
-//   method = 'get',
-//   url,
-//   data = {},
-//   params = {},
-//   headers = {},
-//   format = true,
-//   mix = true
-// }) {
-//   if (
-//     method.toLowerCase() === 'post' &&
-//     !Object.prototype.hasOwnProperty.call(data, 'userId') &&
-//     util.getStorage('userId')
-//   ) {
-//     data.userId = util.getStorage('userId');
-//   }
-//   if (
-//     (method === 'get' || method === 'GET') &&
-//     !Object.prototype.hasOwnProperty.call(params, 'userId') &&
-//     util.getStorage('userId')
-//   ) {
-//     params.userId = util.getStorage('userId');
-//   }
-//   if (format && (method === 'post' || method === 'POST')) {
-//     data = qs.stringify(data);
-//     headers['content-type'] = 'application/x-www-form-urlencoded';
-//   }
-//   if (!mix && (method === 'get' || method === 'GET')) {
-//     data = {};
-//   }
-//   if (!mix && (method === 'post' || method === 'POST')) {
-//     params = {};
-//   }
-//   return http({
-//     method,
-//     url,
-//     data,
-//     params,
-//     headers
-//   });
-// }
-
-function request(params) {
-  return util.ajax({mix: true, ...params});
-}
-
-export default request;
+// 封装请求参数
+import util from './util.js';
+
+// function request({
+//   method = 'get',
+//   url,
+//   data = {},
+//   params = {},
+//   headers = {},
+//   format = true,
+//   mix = true
+// }) {
+//   if (
+//     method.toLowerCase() === 'post' &&
+//     !Object.prototype.hasOwnProperty.call(data, 'userId') &&
+//     util.getStorage('userId')
+//   ) {
+//     data.userId = util.getStorage('userId');
+//   }
+//   if (
+//     (method === 'get' || method === 'GET') &&
+//     !Object.prototype.hasOwnProperty.call(params, 'userId') &&
+//     util.getStorage('userId')
+//   ) {
+//     params.userId = util.getStorage('userId');
+//   }
+//   if (format && (method === 'post' || method === 'POST')) {
+//     data = qs.stringify(data);
+//     headers['content-type'] = 'application/x-www-form-urlencoded';
+//   }
+//   if (!mix && (method === 'get' || method === 'GET')) {
+//     data = {};
+//   }
+//   if (!mix && (method === 'post' || method === 'POST')) {
+//     params = {};
+//   }
+//   return http({
+//     method,
+//     url,
+//     data,
+//     params,
+//     headers
+//   });
+// }
+
+function request(params) {
+  return util.ajax({mix: true, ...params});
+}
+
+export default request;

package/src/utils/rules.js

@@ -1,18 +1,18 @@
-// 手机号
-const phone = {pattern: new RegExp('^[1][3, 4, 5, 6, 7, 8, 9][0-9]{9}$'), message: '手机号不合法'};
-// 身份证
-const idCard = {pattern: new RegExp('(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)'), message: '身份证号不合法'};
-// 座机号
-const telephone = {pattern: new RegExp('^(\\d{3,4}-)?\\d{7,8}$'), message: '座机号不合法'};
-// IP
-const ip = {pattern: new RegExp('^(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])$'), message: 'IP地址不合法'};
-// 银行卡号
-const bankCard = {pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message: '银行卡号不合法'};
-
-export default {
-  phone,
-  idCard,
-  telephone,
-  ip,
-  bankCard
-};
+// 手机号
+const phone = {pattern: new RegExp('^[1][3, 4, 5, 6, 7, 8, 9][0-9]{9}$'), message: '手机号不合法'};
+// 身份证
+const idCard = {pattern: new RegExp('(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)'), message: '身份证号不合法'};
+// 座机号
+const telephone = {pattern: new RegExp('^(\\d{3,4}-)?\\d{7,8}$'), message: '座机号不合法'};
+// IP
+const ip = {pattern: new RegExp('^(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])$'), message: 'IP地址不合法'};
+// 银行卡号
+const bankCard = {pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message: '银行卡号不合法'};
+
+export default {
+  phone,
+  idCard,
+  telephone,
+  ip,
+  bankCard
+};

package/src/utils/store.js

@@ -1,21 +1,21 @@
-let store = {
-  state: {},
-  set(name, value) {
-    this.state[name] = value;
-  },
-  get(name) {
-    return this.state[name];
-  },
-  clear(name) {
-    this.state[name] = null;
-  },
-  remove(name) {
-    if (name) {
-      delete this.state[name];
-    } else {
-      this.state = {};
-    }
-  }
-};
-window.__store = store;
-export default store;
+let store = {
+  state: {},
+  set(name, value) {
+    this.state[name] = value;
+  },
+  get(name) {
+    return this.state[name];
+  },
+  clear(name) {
+    this.state[name] = null;
+  },
+  remove(name) {
+    if (name) {
+      delete this.state[name];
+    } else {
+      this.state = {};
+    }
+  }
+};
+window.__store = store;
+export default store;

package/src/utils/util.js

@@ -170,135 +170,7 @@ const ajax = function ({
           }
         }
         if (response.status === 200) {
-          if (
-            response.data.rCode === 64 ||
-            response.data.rCode === 65 ||
-            response.data.rCode === 67 ||
-            response.data.rCode === 69
-          ) {
-            removeStorage([
-              'Authorization',
-              'token',
-              'ssId',
-              'userId',
-              'userName',
-              'deviceUnique',
-              'menus',
-              'useCaseCodes',
-              'mainConfig',
-              'jump',
-              'showLaunch'
-            ]);
-            let href = '';
-            try {
-              href = win.top.location.href;
-            } catch (error) {
-              href = win.location.href;
-            }
-            if (
-              href.indexOf('#/login') === -1 &&
-              href.indexOf('/login.html') === -1
-            ) {
-              let remind = sessionStorage.getItem('remind');
-              if (!remind) {
-                clearTimeout(loginMsg);
-                loginMsg = setTimeout(() => {
-                  sessionStorage.setItem('remind', 1);
-                  MessageBox.confirm(
-                    response.data.rCode === 69
-                      ? '该账号在其他地方已登陆!'
-                      : '登录已过期，请重新登录!',
-                    '提示',
-                    response.data.rCode === 69
-                      ? {
-                        confirmButtonText: '确定',
-                        closeOnClickModal: false,
-                        type: 'warning'
-                      }
-                      : {
-                        confirmButtonText: '确定',
-                        cancelButtonText: '取消',
-                        closeOnClickModal: false,
-                        type: 'warning'
-                      }
-                  )
-                    .then(() => {
-                      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 = 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';
-                          }
-                        }
-                      } catch (error) {
-                        win.postMessage({ type: 1 }, '*');
-                      }
-                    })
-                    .catch((e) => {
-                      sessionStorage.removeItem('remind');
-                    });
-                }, 2000);
-              }
-            }
-          } else if (response.data.rCode === 61) {
-            clearTimeout(initAuth);
-            initAuth = setTimeout(() => {
-              MessageBox({
-                title: '请进行二次鉴权',
-                closeOnClickModal: false,
-                closeOnPressEscape: false,
-                showConfirmButton: false,
-                dangerouslyUseHTMLString: true,
-                scroll: false,
-                customClass: 'es-retrial-auth-msg',
-                render: (h, msgBox) => {
-                  return h('es-retrial-auth', {
-                    ref: 'auth',
-                    props: {
-                      reload:
-                        response.data.results.reload ||
-                        response.data.results.refresh,
-                      group: response.data.results.retrialAuthGroupIds,
-                      type: response.data.results.retrialAuthType,
-                      msgBox: msgBox
-                    }
-                  });
-                },
-                callback: (res, obj) => {
-                  obj.$children.forEach((item) => {
-                    item.clearTimeouts && item.clearTimeouts();
-                    return;
-                  });
-                }
-              });
-            }, 1000);
-          }
+          responses(response.data);
           // eslint-disable-next-line no-undef
           return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
         }
@@ -2897,6 +2769,145 @@ const replenish = function ({ data, precision }) {
   return data;
 };
 
+/**
+ * responses
+ * @desc:状态码响应
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {object} [data] - 数字或字符串型数字
+ **/
+const responses = function (data) {
+  if (
+    data.rCode === 64 ||
+    data.rCode === 65 ||
+    data.rCode === 67 ||
+    data.rCode === 69
+  ) {
+    removeStorage([
+      'Authorization',
+      'token',
+      'ssId',
+      'userId',
+      'userName',
+      'deviceUnique',
+      'menus',
+      'useCaseCodes',
+      'mainConfig',
+      'jump',
+      'showLaunch'
+    ]);
+    let href = '';
+    try {
+      href = win.top.location.href;
+    } catch (error) {
+      href = win.location.href;
+    }
+    if (
+      href.indexOf('#/login') === -1 &&
+      href.indexOf('/login.html') === -1
+    ) {
+      let remind = sessionStorage.getItem('remind');
+      if (!remind) {
+        clearTimeout(loginMsg);
+        loginMsg = setTimeout(() => {
+          sessionStorage.setItem('remind', 1);
+          MessageBox.confirm(
+            data.rCode === 69
+              ? '该账号在其他地方已登陆!'
+              : '登录已过期，请重新登录!',
+            '提示',
+            data.rCode === 69
+              ? {
+                confirmButtonText: '确定',
+                closeOnClickModal: false,
+                type: 'warning'
+              }
+              : {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                type: 'warning'
+              }
+          )
+            .then(() => {
+              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 = 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';
+                  }
+                }
+              } catch (error) {
+                win.postMessage({ type: 1 }, '*');
+              }
+            })
+            .catch((e) => {
+              sessionStorage.removeItem('remind');
+            });
+        }, 2000);
+      }
+    }
+  } else if (data.rCode === 61) {
+    clearTimeout(initAuth);
+    initAuth = setTimeout(() => {
+      MessageBox({
+        title: '请进行二次鉴权',
+        closeOnClickModal: false,
+        closeOnPressEscape: false,
+        showConfirmButton: false,
+        dangerouslyUseHTMLString: true,
+        scroll: false,
+        customClass: 'es-retrial-auth-msg',
+        render: (h, msgBox) => {
+          return h('es-retrial-auth', {
+            ref: 'auth',
+            props: {
+              reload:
+                data.results.reload ||
+                data.results.refresh,
+              group: data.results.retrialAuthGroupIds,
+              type: data.results.retrialAuthType,
+              msgBox: msgBox
+            }
+          });
+        },
+        callback: (res, obj) => {
+          obj.$children.forEach((item) => {
+            item.clearTimeouts && item.clearTimeouts();
+            return;
+          });
+        }
+      });
+    }, 1000);
+  }
+};
+
 /**
  * rgbToHsv
  * @desc:rgb转化成hsv
@@ -3611,6 +3622,7 @@ export default {
   receiveMessage,
   removeStorage,
   replenish,
+  responses,
   rgbToHsv,
   rmbToCapital,
   sendMessage,

package/src/utils/webSocket.js

@@ -1,107 +1,107 @@
-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.socket = null;
-    this.subscription = null;
-  }
-
-  /** socket连接 */
-  connect() {
-    if (!this.client) {
-    // 连接SockJS
-      this.socket = new SockJS(this.host + this.url, {timeout: 60000});
-      this.client = Stomp.over(this.socket);
-    }
-
-    // 日志不打印
-    if (!this.debug) {
-      this.client.debug = () => {};
-    }
-
-    // 向服务器发起websocket连接
-    this.client.connect({}, () => {
-      this.recon = true;
-      // tryTimes定义重置
-      this.connects = 1;
-      // 订阅消息
-      this.subscribe();
-    }, (error) => {
-      this.unsubscribe();
-      this.client = null;
-      let diffSecond = parseInt((new Date() - this.nextDate) / 1000, 10);
-      if (this.connects > 5 && diffSecond < this.interval) {
-        this.error && this.error(error);
-      } else {
-        this.reconTimeout = setTimeout(() => {
-          this.connect();
-          this.connects++;
-        }, 5000);
-      }
-    });
-  }// 清除订阅
-  unsubscribe() {
-    if (this.subscription) {
-      this.subscription.unsubscribe();
-      this.subscription = null;
-    }
-  }
-  /** 订阅服务端 */
-  subscribe() {
-    // 订阅服务端提供的某个topic
-    this.subscription = 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() {
-    // 断开连接,清除定时器
-    this.unsubscribe();
-    if (this.client) {
-      this.client.disconnect();
-    };
-    this.reconTimeout && clearTimeout(this.reconTimeout);
-    this.sendTimeout && clearTimeout(this.sendTimeout);
-  }
-}
-
-export default WebSocket;
+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.socket = null;
+    this.subscription = null;
+  }
+
+  /** socket连接 */
+  connect() {
+    if (!this.client) {
+    // 连接SockJS
+      this.socket = new SockJS(this.host + this.url, {timeout: 60000});
+      this.client = Stomp.over(this.socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      this.client.debug = () => {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, () => {
+      this.recon = true;
+      // tryTimes定义重置
+      this.connects = 1;
+      // 订阅消息
+      this.subscribe();
+    }, (error) => {
+      this.unsubscribe();
+      this.client = null;
+      let diffSecond = parseInt((new Date() - this.nextDate) / 1000, 10);
+      if (this.connects > 5 && diffSecond < this.interval) {
+        this.error && this.error(error);
+      } else {
+        this.reconTimeout = setTimeout(() => {
+          this.connect();
+          this.connects++;
+        }, 5000);
+      }
+    });
+  }// 清除订阅
+  unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
+  }
+  /** 订阅服务端 */
+  subscribe() {
+    // 订阅服务端提供的某个topic
+    this.subscription = 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() {
+    // 断开连接,清除定时器
+    this.unsubscribe();
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  }
+}
+
+export default WebSocket;