eoss-ui 0.4.31 → 0.4.33

package/lib/input-number.js

@@ -126,6 +126,7 @@ var $brightnessStep2 = 0.15;
 var $lightColorCount = 5;
 var $darkColorCount = 4;
 var publicKey = 'abcdefghijklmnopqrstuvwxyz12345678';
+var loginMsg = void 0;
 
 var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ storeAsString: true });
 
@@ -147,7 +148,6 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
-var _timer = null;
 var pendingRequest = new Map();
 function getRequestKey(config) {
   var method = config.method,
@@ -246,44 +246,36 @@ var ajax = function ajax(_ref) {
     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', 'menus', 'useCaseCodes', 'mainConfig']);
-
-        var timer = getStorage('timer') || 0;
-        timer = parseInt(timer, 10);
-        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1 && !timer) {
-          sessionStorage.setItem('timer', 1);
-          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
-            confirmButtonText: '确定',
-            closeOnClickModal: false,
-            type: 'warning'
-          } : {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            closeOnClickModal: false,
-            type: 'warning'
-          }).then(function () {
-            var loginPage = getStorage('login') || getStorage('loginPage');
-            if (loginPage) {
-              win.top.location.href = loginPage;
-            } else if (win.top.location.href.indexOf('main.html') > -1) {
-              win.top.location.href = './login.html';
-            } else {
-              var hash = win.top.location.hash;
-              if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
-                var len = win.top.location.href.indexOf(hash);
-                var href = win.top.location.href.slice(0, len) + '#/login';
-                win.top.location.href = href;
+        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
+          clearTimeout(loginMsg);
+          loginMsg = setTimeout(function () {
+            eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              confirmButtonText: '确定',
+              closeOnClickModal: false,
+              type: 'warning'
+            } : {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              closeOnClickModal: false,
+              type: 'warning'
+            }).then(function () {
+              var loginPage = getStorage('login') || getStorage('loginPage');
+              if (loginPage) {
+                win.top.location.href = loginPage;
+              } else if (win.top.location.href.indexOf('main.html') > -1) {
+                win.top.location.href = './login.html';
               } else {
-                win.top.location.href = '/login.html';
+                var hash = win.top.location.hash;
+                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                  var len = win.top.location.href.indexOf(hash);
+                  var href = win.top.location.href.slice(0, len) + '#/login';
+                  win.top.location.href = href;
+                } else {
+                  win.top.location.href = '/login.html';
+                }
               }
-            }
-          }).catch(function (e) {
-            _timer && clearTimeout(_timer);
-            _timer = setTimeout(function () {
-              removeStorage('timer');
-              clearTimeout(_timer);
-              _timer = null;
-            }, 1000);
-          });
+            }).catch(function (e) {});
+          }, 1000);
         }
         return Promise.reject(response.data);
       } else {
@@ -427,31 +419,11 @@ var browser = function browser() {
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(fn, wait, immediate) {
-  var timeout = void 0;
+var debounce = function debounce(callback, delay) {
+  var timeout = null;
   return function () {
-    var self = this;
-    var args = arguments;
-
-    if (timeout) clearTimeout(timeout);
-    // 是否在某一批事件中首次执行
-    if (immediate) {
-      var callNow = !timeout;
-      timeout = setTimeout(function () {
-        timeout = null;
-        fn.apply(self, args);
-        immediate = true;
-      }, wait);
-      if (callNow) {
-        fn.apply(self, args);
-      }
-      immediate = false;
-    } else {
-      timeout = setTimeout(function () {
-        fn.apply(self, args);
-        immediate = true;
-      }, wait);
-    }
+    clearTimeout(timeout);
+    timeout = setTimeout(callback, delay ? delay : 500);
   };
 };
 /**

package/lib/input.js

@@ -126,6 +126,7 @@ var $brightnessStep2 = 0.15;
 var $lightColorCount = 5;
 var $darkColorCount = 4;
 var publicKey = 'abcdefghijklmnopqrstuvwxyz12345678';
+var loginMsg = void 0;
 
 var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ storeAsString: true });
 
@@ -147,7 +148,6 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
-var _timer = null;
 var pendingRequest = new Map();
 function getRequestKey(config) {
   var method = config.method,
@@ -246,44 +246,36 @@ var ajax = function ajax(_ref) {
     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', 'menus', 'useCaseCodes', 'mainConfig']);
-
-        var timer = getStorage('timer') || 0;
-        timer = parseInt(timer, 10);
-        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1 && !timer) {
-          sessionStorage.setItem('timer', 1);
-          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
-            confirmButtonText: '确定',
-            closeOnClickModal: false,
-            type: 'warning'
-          } : {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            closeOnClickModal: false,
-            type: 'warning'
-          }).then(function () {
-            var loginPage = getStorage('login') || getStorage('loginPage');
-            if (loginPage) {
-              win.top.location.href = loginPage;
-            } else if (win.top.location.href.indexOf('main.html') > -1) {
-              win.top.location.href = './login.html';
-            } else {
-              var hash = win.top.location.hash;
-              if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
-                var len = win.top.location.href.indexOf(hash);
-                var href = win.top.location.href.slice(0, len) + '#/login';
-                win.top.location.href = href;
+        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
+          clearTimeout(loginMsg);
+          loginMsg = setTimeout(function () {
+            eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              confirmButtonText: '确定',
+              closeOnClickModal: false,
+              type: 'warning'
+            } : {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              closeOnClickModal: false,
+              type: 'warning'
+            }).then(function () {
+              var loginPage = getStorage('login') || getStorage('loginPage');
+              if (loginPage) {
+                win.top.location.href = loginPage;
+              } else if (win.top.location.href.indexOf('main.html') > -1) {
+                win.top.location.href = './login.html';
               } else {
-                win.top.location.href = '/login.html';
+                var hash = win.top.location.hash;
+                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                  var len = win.top.location.href.indexOf(hash);
+                  var href = win.top.location.href.slice(0, len) + '#/login';
+                  win.top.location.href = href;
+                } else {
+                  win.top.location.href = '/login.html';
+                }
               }
-            }
-          }).catch(function (e) {
-            _timer && clearTimeout(_timer);
-            _timer = setTimeout(function () {
-              removeStorage('timer');
-              clearTimeout(_timer);
-              _timer = null;
-            }, 1000);
-          });
+            }).catch(function (e) {});
+          }, 1000);
         }
         return Promise.reject(response.data);
       } else {
@@ -427,31 +419,11 @@ var browser = function browser() {
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(fn, wait, immediate) {
-  var timeout = void 0;
+var debounce = function debounce(callback, delay) {
+  var timeout = null;
   return function () {
-    var self = this;
-    var args = arguments;
-
-    if (timeout) clearTimeout(timeout);
-    // 是否在某一批事件中首次执行
-    if (immediate) {
-      var callNow = !timeout;
-      timeout = setTimeout(function () {
-        timeout = null;
-        fn.apply(self, args);
-        immediate = true;
-      }, wait);
-      if (callNow) {
-        fn.apply(self, args);
-      }
-      immediate = false;
-    } else {
-      timeout = setTimeout(function () {
-        fn.apply(self, args);
-        immediate = true;
-      }, wait);
-    }
+    clearTimeout(timeout);
+    timeout = setTimeout(callback, delay ? delay : 500);
   };
 };
 /**

package/lib/login.js

@@ -125,6 +125,7 @@ var $brightnessStep2 = 0.15;
 var $lightColorCount = 5;
 var $darkColorCount = 4;
 var publicKey = 'abcdefghijklmnopqrstuvwxyz12345678';
+var loginMsg = void 0;
 
 var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ storeAsString: true });
 
@@ -146,7 +147,6 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
-var _timer = null;
 var pendingRequest = new Map();
 function getRequestKey(config) {
   var method = config.method,
@@ -245,44 +245,36 @@ var ajax = function ajax(_ref) {
     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', 'menus', 'useCaseCodes', 'mainConfig']);
-
-        var timer = getStorage('timer') || 0;
-        timer = parseInt(timer, 10);
-        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1 && !timer) {
-          sessionStorage.setItem('timer', 1);
-          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
-            confirmButtonText: '确定',
-            closeOnClickModal: false,
-            type: 'warning'
-          } : {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            closeOnClickModal: false,
-            type: 'warning'
-          }).then(function () {
-            var loginPage = getStorage('login') || getStorage('loginPage');
-            if (loginPage) {
-              win.top.location.href = loginPage;
-            } else if (win.top.location.href.indexOf('main.html') > -1) {
-              win.top.location.href = './login.html';
-            } else {
-              var hash = win.top.location.hash;
-              if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
-                var len = win.top.location.href.indexOf(hash);
-                var href = win.top.location.href.slice(0, len) + '#/login';
-                win.top.location.href = href;
+        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
+          clearTimeout(loginMsg);
+          loginMsg = setTimeout(function () {
+            eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              confirmButtonText: '确定',
+              closeOnClickModal: false,
+              type: 'warning'
+            } : {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              closeOnClickModal: false,
+              type: 'warning'
+            }).then(function () {
+              var loginPage = getStorage('login') || getStorage('loginPage');
+              if (loginPage) {
+                win.top.location.href = loginPage;
+              } else if (win.top.location.href.indexOf('main.html') > -1) {
+                win.top.location.href = './login.html';
               } else {
-                win.top.location.href = '/login.html';
+                var hash = win.top.location.hash;
+                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                  var len = win.top.location.href.indexOf(hash);
+                  var href = win.top.location.href.slice(0, len) + '#/login';
+                  win.top.location.href = href;
+                } else {
+                  win.top.location.href = '/login.html';
+                }
               }
-            }
-          }).catch(function (e) {
-            _timer && clearTimeout(_timer);
-            _timer = setTimeout(function () {
-              removeStorage('timer');
-              clearTimeout(_timer);
-              _timer = null;
-            }, 1000);
-          });
+            }).catch(function (e) {});
+          }, 1000);
         }
         return Promise.reject(response.data);
       } else {
@@ -426,31 +418,11 @@ var browser = function browser() {
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(fn, wait, immediate) {
-  var timeout = void 0;
+var debounce = function debounce(callback, delay) {
+  var timeout = null;
   return function () {
-    var self = this;
-    var args = arguments;
-
-    if (timeout) clearTimeout(timeout);
-    // 是否在某一批事件中首次执行
-    if (immediate) {
-      var callNow = !timeout;
-      timeout = setTimeout(function () {
-        timeout = null;
-        fn.apply(self, args);
-        immediate = true;
-      }, wait);
-      if (callNow) {
-        fn.apply(self, args);
-      }
-      immediate = false;
-    } else {
-      timeout = setTimeout(function () {
-        fn.apply(self, args);
-        immediate = true;
-      }, wait);
-    }
+    clearTimeout(timeout);
+    timeout = setTimeout(callback, delay ? delay : 500);
   };
 };
 /**
@@ -2777,7 +2749,7 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=f634d8fc&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=4aa8315b&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3578,7 +3550,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=f634d8fc&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=4aa8315b&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=669156c6&
 var resetPasswordvue_type_template_id_669156c6_render = function () {
@@ -4718,15 +4690,19 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       var values = localStorage.getItem('unpd');
       var value = {};
       if (values) {
-        values = JSON.parse(values);
-        for (var i in values) {
-          value[util["a" /* default */].esDecode(i)] = util["a" /* default */].esDecode(values[i]);
-        }
-        if (value[user]) {
-          this.checked = true;
+        try {
+          values = JSON.parse(values);
+          for (var i in values) {
+            value[util["a" /* default */].esDecode(i)] = util["a" /* default */].esDecode(values[i]);
+          }
+          if (value[user]) {
+            this.checked = true;
+          }
+          this.$set(this.formData, 'username', user);
+          this.$set(this.formData, 'password', value[user]);
+        } catch (error) {
+          localStorage.removeItem('unpd');
         }
-        this.$set(this.formData, 'username', user);
-        this.$set(this.formData, 'password', value[user]);
       }
     },
     handleBlur: function handleBlur() {
@@ -5125,7 +5101,6 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
                   _this10.$router.push({ name: 'main' });
                 }
               }
-              util["a" /* default */].removeStorage('timer');
             }
           });
           break;