ecinc-cloud-mappaio 9.7.9 → 9.7.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1027,23 +1027,23 @@ var actions = {
1027
1027
  state = _ref5.state;
1028
1028
  return new Promise( /*#__PURE__*/function () {
1029
1029
  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
1030
- var jwtToken, tokenChanged, loginUser;
1030
+ var jwtToken, loginUser;
1031
1031
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
1032
1032
  while (1) switch (_context3.prev = _context3.next) {
1033
1033
  case 0:
1034
- jwtToken = inJwtToken || window.$auth.getToken(); // 检测令牌是否被外部更新(如 WebView 通过 cookie 传入新 token)
1035
- tokenChanged = jwtToken && state.token && jwtToken !== state.token;
1036
- if (!((!state.loginUser.userId || !state.productCodeAll || inJwtToken || tokenChanged) && jwtToken)) {
1034
+ jwtToken = inJwtToken || window.$auth.getToken();
1035
+ if (!((!state.loginUser.userId || !state.productCodeAll || inJwtToken) && jwtToken)) {
1037
1036
  _context3.next = 11;
1038
1037
  break;
1039
1038
  }
1040
- _context3.next = 5;
1039
+ _context3.next = 4;
1041
1040
  return window.$user.getLoginUser(jwtToken);
1042
- case 5:
1041
+ case 4:
1043
1042
  loginUser = _context3.sent;
1044
1043
  commit('SET_TOKEN', window.$auth.getToken());
1045
1044
  commit('SET_LOGIN_USER', loginUser);
1046
- window.$user.findUserRolePermissions().then(function (response) {
1045
+ window.$auth.removeTicket();
1046
+ window.$user.findUserRolePermissions(jwtToken).then(function (response) {
1047
1047
  if (response.code === 'success') {
1048
1048
  var data = response.body;
1049
1049
  window.$auth.setProductCode(data['PRODUCT_CODE_LIST'], loginUser.sysCode);
@@ -55052,11 +55052,17 @@ var user_install = function install(Vue) {
55052
55052
  method: 'get'
55053
55053
  });
55054
55054
  },
55055
- findUserRolePermissions: function findUserRolePermissions() {
55056
- return httpRequest({
55055
+ findUserRolePermissions: function findUserRolePermissions(jwtToken) {
55056
+ var req = {
55057
55057
  url: 'base/resRolePermission/getUserRolePermissions',
55058
55058
  method: 'get'
55059
- });
55059
+ };
55060
+ if (jwtToken) {
55061
+ req.params = {
55062
+ jwtToken: jwtToken
55063
+ };
55064
+ }
55065
+ return httpRequest(req);
55060
55066
  },
55061
55067
  findH5apps: function findH5apps() {
55062
55068
  var searchFields = [{
@@ -1037,23 +1037,23 @@ var actions = {
1037
1037
  state = _ref5.state;
1038
1038
  return new Promise( /*#__PURE__*/function () {
1039
1039
  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
1040
- var jwtToken, tokenChanged, loginUser;
1040
+ var jwtToken, loginUser;
1041
1041
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
1042
1042
  while (1) switch (_context3.prev = _context3.next) {
1043
1043
  case 0:
1044
- jwtToken = inJwtToken || window.$auth.getToken(); // 检测令牌是否被外部更新(如 WebView 通过 cookie 传入新 token)
1045
- tokenChanged = jwtToken && state.token && jwtToken !== state.token;
1046
- if (!((!state.loginUser.userId || !state.productCodeAll || inJwtToken || tokenChanged) && jwtToken)) {
1044
+ jwtToken = inJwtToken || window.$auth.getToken();
1045
+ if (!((!state.loginUser.userId || !state.productCodeAll || inJwtToken) && jwtToken)) {
1047
1046
  _context3.next = 11;
1048
1047
  break;
1049
1048
  }
1050
- _context3.next = 5;
1049
+ _context3.next = 4;
1051
1050
  return window.$user.getLoginUser(jwtToken);
1052
- case 5:
1051
+ case 4:
1053
1052
  loginUser = _context3.sent;
1054
1053
  commit('SET_TOKEN', window.$auth.getToken());
1055
1054
  commit('SET_LOGIN_USER', loginUser);
1056
- window.$user.findUserRolePermissions().then(function (response) {
1055
+ window.$auth.removeTicket();
1056
+ window.$user.findUserRolePermissions(jwtToken).then(function (response) {
1057
1057
  if (response.code === 'success') {
1058
1058
  var data = response.body;
1059
1059
  window.$auth.setProductCode(data['PRODUCT_CODE_LIST'], loginUser.sysCode);
@@ -55062,11 +55062,17 @@ var user_install = function install(Vue) {
55062
55062
  method: 'get'
55063
55063
  });
55064
55064
  },
55065
- findUserRolePermissions: function findUserRolePermissions() {
55066
- return httpRequest({
55065
+ findUserRolePermissions: function findUserRolePermissions(jwtToken) {
55066
+ var req = {
55067
55067
  url: 'base/resRolePermission/getUserRolePermissions',
55068
55068
  method: 'get'
55069
- });
55069
+ };
55070
+ if (jwtToken) {
55071
+ req.params = {
55072
+ jwtToken: jwtToken
55073
+ };
55074
+ }
55075
+ return httpRequest(req);
55070
55076
  },
55071
55077
  findH5apps: function findH5apps() {
55072
55078
  var searchFields = [{