eoss 0.1.0-alpha.5 → 0.1.0-alpha.7

package/lib/utils/ajax.js

@@ -708,7 +708,7 @@ function redirectToLogin() {
  **/
 var isLogined = exports.isLogined = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref3) {
-    var to, _from, next, _ref3$exclude, exclude, cookie, loginPage, redirect, quit, res, pathname, pathParts, token, loadingInstance, _res, targetOrigin, _t, _t2;
+    var to, _from, next, _ref3$exclude, exclude, cookie, loginPage, redirect, pathname, pathParts, token, loadingInstance, res, targetOrigin, _t;
     return _regenerator().w(function (_context12) {
       while (1) switch (_context12.p = _context12.n) {
         case 0:
@@ -720,32 +720,6 @@ var isLogined = exports.isLogined = /*#__PURE__*/function () {
             });
           }
 
-          // 处理退出登录
-          quit = (0, _util.getParams)('quit') || (0, _util.getParams)('logout');
-          if (!quit) {
-            _context12.n = 5;
-            break;
-          }
-          _context12.p = 1;
-          _context12.n = 2;
-          return ajax({
-            method: 'post',
-            url: _api.logout
-          });
-        case 2:
-          res = _context12.v;
-          if (res.rCode === 0) {
-            (0, _storage.removeStorage)();
-          }
-          _context12.n = 4;
-          break;
-        case 3:
-          _context12.p = 3;
-          _t = _context12.v;
-          console.error('退出登录失败:', _t);
-        case 4:
-          return _context12.a(2);
-        case 5:
           // 处理登录页面路径
           pathname = '';
           try {
@@ -773,46 +747,46 @@ var isLogined = exports.isLogined = /*#__PURE__*/function () {
           // 获取token
           token = (0, _storage.getStorage)('token') || (0, _storage.getStorage)('Authorization'); // 检查是否已登录或使用cookie登录
           if (!(token || cookie === true || cookie === '1')) {
-            _context12.n = 6;
+            _context12.n = 1;
             break;
           }
           next && next();
-          _context12.n = 13;
+          _context12.n = 8;
           break;
-        case 6:
+        case 1:
           if (!(!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType'))) {
-            _context12.n = 12;
+            _context12.n = 7;
             break;
           }
           loadingInstance = (0, _util.loading)('页面加载中...');
-          _context12.p = 7;
-          _context12.n = 8;
+          _context12.p = 2;
+          _context12.n = 3;
           return ajax({
             method: 'post',
             url: _api.authCenter,
             data: to.query
           });
-        case 8:
-          _res = _context12.v;
-          if (_res.rCode === 0) {
-            handleAuthCenterResponse(_res.results, loginPage, next);
+        case 3:
+          res = _context12.v;
+          if (res.rCode === 0) {
+            handleAuthCenterResponse(res.results, loginPage, next);
           } else {
-            handleAuthError(_res.msg, loginPage, next);
+            handleAuthError(res.msg, loginPage, next);
           }
-          _context12.n = 10;
+          _context12.n = 5;
           break;
-        case 9:
-          _context12.p = 9;
-          _t2 = _context12.v;
-          console.error('认证中心请求失败:', _t2);
-        case 10:
-          _context12.p = 10;
+        case 4:
+          _context12.p = 4;
+          _t = _context12.v;
+          console.error('认证中心请求失败:', _t);
+        case 5:
+          _context12.p = 5;
           loadingInstance.close();
-          return _context12.f(10);
-        case 11:
-          _context12.n = 13;
+          return _context12.f(5);
+        case 6:
+          _context12.n = 8;
           break;
-        case 12:
+        case 7:
           if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || (0, _indexOf.default)(exclude).call(exclude, to.path) > -1 || (0, _indexOf.default)(exclude).call(exclude, to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
             // 处理重定向
             if (redirect && (to.path === '/main' || to.path === '/login')) {
@@ -835,10 +809,10 @@ var isLogined = exports.isLogined = /*#__PURE__*/function () {
               }, targetOrigin);
             }
           }
-        case 13:
+        case 8:
           return _context12.a(2);
       }
-    }, _callee, null, [[7, 9, 10, 11], [1, 3]]);
+    }, _callee, null, [[2, 4, 5, 6]]);
   }));
   return function isLogined(_x) {
     return _ref4.apply(this, arguments);

package/lib/utils/index.js

@@ -4,7 +4,7 @@ var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
 exports.__esModule = true;
-exports.valueEquals = exports.toObject = exports.setStorage = exports.setCookie = exports.requestAnimationFrame = exports.removeStorage = exports.rafThrottle = exports.on = exports.off = exports.objToArray = exports.noop = exports.looseEqual = exports.loading = exports.kebabCase = exports.isUndefined = exports.isString = exports.isObject = exports.isIE = exports.isHtmlElement = exports.isFunction = exports.isFirefox = exports.isEqual = exports.isEdge = exports.isDefined = exports.hasOwn = exports.getValueByPath = exports.getStorage = exports.getPropByPath = exports.getCookie = exports.generateId = exports.escapeRegexpString = exports.doEncrypt = exports.doDecrypt = exports.default = exports.debounce = exports.dateUtil = exports.coerceTruthyValueToArray = exports.capitalize = exports.cancelAnimationFrame = exports.autoprefixer = exports.arrayFindIndex = exports.arrayFind = exports.arrayEquals = exports.ajax = void 0;
+exports.valueEquals = exports.toObject = exports.stream = exports.setStorage = exports.setCookie = exports.requestAnimationFrame = exports.removeStorage = exports.rafThrottle = exports.on = exports.off = exports.objToArray = exports.noop = exports.looseEqual = exports.loading = exports.kebabCase = exports.isUndefined = exports.isString = exports.isObject = exports.isLogined = exports.isIE = exports.isHtmlElement = exports.isFunction = exports.isFirefox = exports.isEqual = exports.isEdge = exports.isDefined = exports.hasOwn = exports.getValueByPath = exports.getStorage = exports.getPropByPath = exports.getCookie = exports.generateId = exports.escapeRegexpString = exports.doEncrypt = exports.doDecrypt = exports.default = exports.debounce = exports.dateUtil = exports.coerceTruthyValueToArray = exports.capitalize = exports.cancelAnimationFrame = exports.autoprefixer = exports.arrayFindIndex = exports.arrayFind = exports.arrayEquals = exports.ajax = void 0;
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
 var types = _interopRequireWildcard(require("./types"));
@@ -47,8 +47,7 @@ exports.isDate = _date.isDate;
 exports.isDateObject = _date.isDateObject;
 exports.toDate = _date.toDate;
 exports.getSettings = _date.getSettings;
-var ajax = _interopRequireWildcard(require("./ajax"));
-exports.ajax = ajax;
+var ajaxModule = _interopRequireWildcard(require("./ajax"));
 var _bus = _interopRequireDefault(require("./bus"));
 exports.bus = _bus.default;
 var dom = _interopRequireWildcard(require("./dom"));
@@ -120,6 +119,10 @@ var dateUtil = exports.dateUtil = {
 
 // Ajax相关
 
+var ajax = exports.ajax = ajaxModule.ajax,
+  isLogined = exports.isLogined = ajaxModule.isLogined,
+  stream = exports.stream = ajaxModule.stream;
+
 // 事件总线
 
 // DOM操作
@@ -177,9 +180,8 @@ var _default = exports.default = _extends({}, types, storage, {
   getDayCountOfYear: _date.getDayCountOfYear,
   getFirstDayOfMonth: _date.getFirstDayOfMonth,
   prevDate: _date.prevDate,
-  nextDate: _date.nextDate,
-  // Ajax相关
-  ajax: ajax,
+  nextDate: _date.nextDate
+}, ajaxModule, {
   // 事件总线
   bus: _bus.default
 }, dom, {