ecinc-cloud-mappaio 9.6.103 → 9.6.104

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.
Files changed (4) hide show
  1. package/lib/ecmappaio.common.js +17 -10
  2. package/lib/ecmappaio.umd.js +17 -10
  3. package/lib/ecmappaio.umd.min.js +4 -4
  4. package/package.json +1 -1
package/lib/ecmappaio.common.js CHANGED
@@ -39217,10 +39217,13 @@ service.interceptors.response.use(function (response) {
39217
39217
  $scope.customErrorHander(error);
39218
39218
  } else if (error.response && error.response.status === 401 && location.href.toLowerCase().indexOf('login') === -1 && error.config.url.indexOf('http:') === -1 && error.config.url.indexOf('https:') === -1) {
39219
39219
  store/* default */.A.dispatch('user/resetToken').then(function () {
39220
+ var errmsg = window.$tx('request.status401');
39221
+ if (error.response.data && error.response.data.message) {
39222
+ errmsg = error.response.data.message;
39223
+ }
39220
39224
  if (window.vType === 'wapp') {
39221
39225
  //认证会话已过期，请重新登录。
39222
-
39223
- window.$alert(window.$tx('request.status401relogin'), window.$tx('common.operationTip'), {
39226
+ window.$alert(errmsg, window.$tx('common.operationTip'), {
39224
39227
  type: 'error',
39225
39228
  callback: function callback() {
39226
39229
  if (location.href.indexOf('#/wflow?') !== -1 || location.href.indexOf('#/viewcontent?') !== -1 || location.href.indexOf('#/viewpdffile?') !== -1 || location.href.indexOf('#/designer?') !== -1) {
@@ -39235,7 +39238,7 @@ service.interceptors.response.use(function (response) {
39235
39238
  });
39236
39239
  } else {
39237
39240
  window.$alert({
39238
- message: window.$tx('request.status401'),
39241
+ message: errmsg,
39239
39242
  //'认证会话已过期。'
39240
39243
  type: 'error',
39241
39244
  callback: function callback() {
@@ -39288,9 +39291,6 @@ service.interceptors.response.use(function (response) {
39288
39291
  } else {
39289
39292
  errrst.message = error.response.data;
39290
39293
  }
39291
- if (errrst.message === 'Network Error') {
39292
- errrst.message = '当前设备网络异常，请联系管理员或更换设备重试。';
39293
- }
39294
39294
  errrst.message += '<br>' + error.config.url;
39295
39295
  if (window.vType === 'wapp') {
39296
39296
  window.$alert(errrst.message, window.$tx('common.operationTip'), {
@@ -39310,14 +39310,20 @@ service.interceptors.response.use(function (response) {
39310
39310
  if (typeof errmsg !== 'string' && error.message) {
39311
39311
  errmsg = error.message;
39312
39312
  }
39313
- if (error.config.onUploadProgress) {
39314
- //上传文件时tomcat服务器超过max-file-size异常，全局异常拦截未捕获
39313
+ if (errmsg === 'Network Error') {
39315
39314
  return {
39316
39315
  code: 'failure',
39317
- message: errmsg,
39316
+ message: '当前设备网络异常，请联系管理员或更换设备重试。',
39318
39317
  body: {}
39319
39318
  };
39320
39319
  } else if (errmsg.indexOf('timeout') !== -1) {
39320
+ return {
39321
+ code: 'failure',
39322
+ message: '服务接口请求超时，请重试。',
39323
+ body: {}
39324
+ };
39325
+ } else if (error.config.onUploadProgress) {
39326
+ //上传文件时tomcat服务器超过max-file-size异常，全局异常拦截未捕获
39321
39327
  return {
39322
39328
  code: 'failure',
39323
39329
  message: errmsg,
@@ -40065,9 +40071,10 @@ var wfengine_install = function install(Vue) {
40065
40071
  }
40066
40072
  if ($scope.curTN.tnCanEdit === 0 && canEdit === 1) {
40067
40073
  $scope.$set($scope.curTN, 'tnCanEdit', 1);
40074
+ $scope.btnSubmitClick('AutoSave');
40068
40075
  $scope.$notify({
40069
40076
  title: '提示',
40070
- message: '您已获取此文件的编辑。',
40077
+ message: '您已获取此文件的编辑权限。',
40071
40078
  offset: 60,
40072
40079
  duration: 10 * 1000,
40073
40080
  type: 'success'
package/lib/ecmappaio.umd.js CHANGED
@@ -39227,10 +39227,13 @@ service.interceptors.response.use(function (response) {
39227
39227
  $scope.customErrorHander(error);
39228
39228
  } else if (error.response && error.response.status === 401 && location.href.toLowerCase().indexOf('login') === -1 && error.config.url.indexOf('http:') === -1 && error.config.url.indexOf('https:') === -1) {
39229
39229
  store/* default */.A.dispatch('user/resetToken').then(function () {
39230
+ var errmsg = window.$tx('request.status401');
39231
+ if (error.response.data && error.response.data.message) {
39232
+ errmsg = error.response.data.message;
39233
+ }
39230
39234
  if (window.vType === 'wapp') {
39231
39235
  //认证会话已过期，请重新登录。
39232
-
39233
- window.$alert(window.$tx('request.status401relogin'), window.$tx('common.operationTip'), {
39236
+ window.$alert(errmsg, window.$tx('common.operationTip'), {
39234
39237
  type: 'error',
39235
39238
  callback: function callback() {
39236
39239
  if (location.href.indexOf('#/wflow?') !== -1 || location.href.indexOf('#/viewcontent?') !== -1 || location.href.indexOf('#/viewpdffile?') !== -1 || location.href.indexOf('#/designer?') !== -1) {
@@ -39245,7 +39248,7 @@ service.interceptors.response.use(function (response) {
39245
39248
  });
39246
39249
  } else {
39247
39250
  window.$alert({
39248
- message: window.$tx('request.status401'),
39251
+ message: errmsg,
39249
39252
  //'认证会话已过期。'
39250
39253
  type: 'error',
39251
39254
  callback: function callback() {
@@ -39298,9 +39301,6 @@ service.interceptors.response.use(function (response) {
39298
39301
  } else {
39299
39302
  errrst.message = error.response.data;
39300
39303
  }
39301
- if (errrst.message === 'Network Error') {
39302
- errrst.message = '当前设备网络异常，请联系管理员或更换设备重试。';
39303
- }
39304
39304
  errrst.message += '<br>' + error.config.url;
39305
39305
  if (window.vType === 'wapp') {
39306
39306
  window.$alert(errrst.message, window.$tx('common.operationTip'), {
@@ -39320,14 +39320,20 @@ service.interceptors.response.use(function (response) {
39320
39320
  if (typeof errmsg !== 'string' && error.message) {
39321
39321
  errmsg = error.message;
39322
39322
  }
39323
- if (error.config.onUploadProgress) {
39324
- //上传文件时tomcat服务器超过max-file-size异常，全局异常拦截未捕获
39323
+ if (errmsg === 'Network Error') {
39325
39324
  return {
39326
39325
  code: 'failure',
39327
- message: errmsg,
39326
+ message: '当前设备网络异常，请联系管理员或更换设备重试。',
39328
39327
  body: {}
39329
39328
  };
39330
39329
  } else if (errmsg.indexOf('timeout') !== -1) {
39330
+ return {
39331
+ code: 'failure',
39332
+ message: '服务接口请求超时，请重试。',
39333
+ body: {}
39334
+ };
39335
+ } else if (error.config.onUploadProgress) {
39336
+ //上传文件时tomcat服务器超过max-file-size异常，全局异常拦截未捕获
39331
39337
  return {
39332
39338
  code: 'failure',
39333
39339
  message: errmsg,
@@ -40075,9 +40081,10 @@ var wfengine_install = function install(Vue) {
40075
40081
  }
40076
40082
  if ($scope.curTN.tnCanEdit === 0 && canEdit === 1) {
40077
40083
  $scope.$set($scope.curTN, 'tnCanEdit', 1);
40084
+ $scope.btnSubmitClick('AutoSave');
40078
40085
  $scope.$notify({
40079
40086
  title: '提示',
40080
- message: '您已获取此文件的编辑。',
40087
+ message: '您已获取此文件的编辑权限。',
40081
40088
  offset: 60,
40082
40089
  duration: 10 * 1000,
40083
40090
  type: 'success'