eoss-ui 0.4.61 → 0.4.63

package/lib/dialog.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 41);
+/******/ 	return __webpack_require__(__webpack_require__.s = 40);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -247,52 +247,54 @@ var ajax = function ajax(_ref) {
       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', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
-          clearTimeout(loginMsg);
           var remind = sessionStorage.getItem('remind');
-          !remind && (loginMsg = setTimeout(function () {
-            sessionStorage.setItem('remind', 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) {
-                var src = void 0;
-                if (!startWith(loginPage, ['http', '/'])) {
-                  var pathname = win.top.location.pathname;
-                  if (pathname !== '/') {
-                    pathname = pathname.split('/');
-                    pathname.splice(pathname.length - 1);
-                    pathname = pathname.join('/');
-                    src = pathname + '/' + loginPage.replace('./', '');
+          if (!remind) {
+            clearTimeout(loginMsg);
+            loginMsg = setTimeout(function () {
+              sessionStorage.setItem('remind', 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) {
+                  var src = void 0;
+                  if (!startWith(loginPage, ['http', '/'], true)) {
+                    var 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 = pathname + loginPage.replace('./', '');
+                    src = loginPage;
                   }
+                  win.top.location.href = src;
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
                 } 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 {
-                var hash = win.top.location.hash;
-                if (hash) {
-                  var 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';
+                  var hash = win.top.location.hash;
+                  if (hash) {
+                    var 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(function (e) {
-              sessionStorage.removeItem('remind');
-            });
-          }, 1000));
+              }).catch(function (e) {
+                sessionStorage.removeItem('remind');
+              });
+            }, 2000);
+          }
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -2081,7 +2083,7 @@ var setStorage = function setStorage(_ref14) {
  * @param {boolean} [or] - 或者（等同于||）
  **/
 var startWith = function startWith(value, reg) {
-  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
     var flag = true;
@@ -2887,15 +2889,15 @@ module.exports = require("vue");
 
 /***/ }),
 /* 14 */,
-/* 15 */,
-/* 16 */,
-/* 17 */,
-/* 18 */
+/* 15 */
 /***/ (function(module, exports) {
 
 module.exports = require("wujie-vue2");
 
 /***/ }),
+/* 16 */,
+/* 17 */,
+/* 18 */,
 /* 19 */,
 /* 20 */,
 /* 21 */,
@@ -2917,8 +2919,7 @@ module.exports = require("wujie-vue2");
 /* 37 */,
 /* 38 */,
 /* 39 */,
-/* 40 */,
-/* 41 */
+/* 40 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3446,7 +3447,7 @@ var regenerator_ = __webpack_require__(9);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 
 // EXTERNAL MODULE: external "wujie-vue2"
-var external_wujie_vue2_ = __webpack_require__(18);
+var external_wujie_vue2_ = __webpack_require__(15);
 var external_wujie_vue2_default = /*#__PURE__*/__webpack_require__.n(external_wujie_vue2_);
 
 // EXTERNAL MODULE: ./src/utils/util.js

package/lib/editor.js

@@ -82,19 +82,19 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 32);
+/******/ 	return __webpack_require__(__webpack_require__.s = 31);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 19:
+/***/ 16:
 /***/ (function(module, exports) {
 
 module.exports = require("slate");
 
 /***/ }),
 
-/***/ 20:
+/***/ 17:
 /***/ (function(module, exports) {
 
 module.exports = require("slate-history");
@@ -206,7 +206,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 32:
+/***/ 31:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -255,10 +255,10 @@ render._withStripped = true
 // CONCATENATED MODULE: ./packages/editor/src/main.vue?vue&type=template&id=f482498c&
 
 // EXTERNAL MODULE: external "slate"
-var external_slate_ = __webpack_require__(19);
+var external_slate_ = __webpack_require__(16);
 
 // EXTERNAL MODULE: external "slate-history"
-var external_slate_history_ = __webpack_require__(20);
+var external_slate_history_ = __webpack_require__(17);
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/editor/src/toolbar.vue?vue&type=template&id=1ddba256&
 var toolbarvue_type_template_id_1ddba256_render = function () {

package/lib/enterprise.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 42);
+/******/ 	return __webpack_require__(__webpack_require__.s = 41);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 42:
+/***/ 41:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";