eoss-ui 0.4.31 → 0.4.33

package/lib/upload.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);
   };
 };
 /**
@@ -2685,8 +2657,8 @@ module.exports = require("qs");
 // 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/upload/src/main.vue?vue&type=template&id=0f78a687&
-var mainvue_type_template_id_0f78a687_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=4c9c8dba&
+var mainvue_type_template_id_4c9c8dba_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3020,10 +2992,10 @@ var mainvue_type_template_id_0f78a687_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_0f78a687_render._withStripped = true
+mainvue_type_template_id_4c9c8dba_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=0f78a687&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=4c9c8dba&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3553,35 +3525,42 @@ var _props;
         if (typeof this.image === 'string') {
           return this.image;
         }
-        return this.host + api["bb" /* previewAdjunct */] + '?adjunctId=' + this.image.adjunctId;
+        return this.host + this.previewAdjunct + '?adjunctId=' + this.image.adjunctId;
       }
       if (this.value) {
         if (typeof this.value === 'string') {
-          if (this.value.indexOf('data:image/') === -1) {
+          if (this.value.indexOf('data:image/') === 0) {
+            return this.value;
+          } else if (this.value.indexOf(this.previewAdjunct) > -1) {
             var val = this.host + util["a" /* default */].jointUrl({
               url: this.value,
               reg: '/main2'
             });
             return val;
-          }
-          if (this.value.indexOf(api["bb" /* previewAdjunct */]) === -1 || this.value.indexOf('/') === -1) {
-            return this.host + api["bb" /* previewAdjunct */] + '?adjunctId=' + this.value;
+          } else if (this.value.indexOf('/') === -1) {
+            return this.host + this.previewAdjunct + '?adjunctId=' + this.value;
           }
           return this.value;
         } else if (Array.isArray(this.value)) {
           var adjunctId = this.value[0].response ? this.value[0].response.adjunctId : this.value[0].adjunctId;
-          return this.host + api["bb" /* previewAdjunct */] + '?adjunctId=' + adjunctId;
+          return this.host + this.previewAdjunct + '?adjunctId=' + adjunctId;
         } else {
           var _adjunctId = this.value.response ? this.value.response.adjunctId : this.value.adjunctId;
-          return this.host + api["bb" /* previewAdjunct */] + '?adjunctId=' + _adjunctId;
+          return this.host + this.previewAdjunct + '?adjunctId=' + _adjunctId;
         }
       }
-      if (this.photo && typeof this.photo === 'string' && this.photo.indexOf('data:image/') === -1) {
-        var _val = this.host + util["a" /* default */].jointUrl({
-          url: this.photo,
-          reg: '/main2'
-        });
-        return _val;
+      if (this.photo && typeof this.photo === 'string') {
+        if (this.photo.indexOf('data:image/') === 0) {
+          return this.photo;
+        } else if (this.photo.indexOf(this.previewAdjunct) > -1) {
+          var _val = this.host + util["a" /* default */].jointUrl({
+            url: this.value,
+            reg: '/main2'
+          });
+          return _val;
+        } else if (this.photo.indexOf('/') === -1) {
+          return this.host + this.previewAdjunct + '?adjunctId=' + this.photo;
+        }
       }
       return this.photo;
     }
@@ -3734,7 +3713,7 @@ var _props;
             } else if (suffix.includes('pdf')) {
               util["a" /* default */].win.open(this.host + (url ? url : api["cb" /* previewAdjunct2 */]) + '/' + file.originalName + '?adjunctId=' + file.adjunctId);
             } else if (suffix.includes('jpge') || suffix.includes('jpg') || suffix.includes('gif') || suffix.includes('png')) {
-              this.imgUrl = this.host + (url ? url : api["bb" /* previewAdjunct */]) + '?adjunctId=' + file.adjunctId;
+              this.imgUrl = this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
               this.title = file.originalName;
               this.showImg = true;
               this.$nextTick(function () {
@@ -3742,12 +3721,12 @@ var _props;
               });
             } else if (suffix.includes('mp4')) {
               this.source = {
-                src: this.host + (url ? url : api["bb" /* previewAdjunct */]) + '?adjunctId=' + file.adjunctId
+                src: this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId
               };
               this.title = file.originalName;
               this.showVideo = true;
             } else {
-              util["a" /* default */].win.open(this.host + (url ? url : api["bb" /* previewAdjunct */]) + '?adjunctId=' + file.adjunctId);
+              util["a" /* default */].win.open(this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId);
             }
           } else {
             util["a" /* default */].win.open(URL.createObjectURL(file.raw));
@@ -4014,7 +3993,7 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_0f78a687_render,
+  mainvue_type_template_id_4c9c8dba_render,
   staticRenderFns,
   false,
   null,

package/lib/utils/util.js

@@ -41,6 +41,7 @@ var $brightnessStep2 = 0.15;
 var $lightColorCount = 5;
 var $darkColorCount = 4;
 var publicKey = 'abcdefghijklmnopqrstuvwxyz12345678';
+var loginMsg = void 0;
 
 var JSONbigToString = (0, _jsonBigint2.default)({ storeAsString: true });
 
@@ -62,7 +63,6 @@ var JSONbigToString = (0, _jsonBigint2.default)({ storeAsString: true });
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
-var _timer = null;
 var pendingRequest = new Map();
 function getRequestKey(config) {
   var method = config.method,
@@ -161,44 +161,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);
-          _eossElement.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 () {
+            _eossElement.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 {
@@ -342,31 +334,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/wujie.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/wxlogin.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/package.json

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