ecinc-cloud-mappaio 9.6.66 → 9.6.67

package/lib/ecmappaio.common.js

@@ -1397,7 +1397,7 @@ var actions = {
 
 /***/ }),
 
-/***/ 9252:
+/***/ 3803:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2270,8 +2270,8 @@ var SysSetupvue_type_template_id_2497073a_scoped_true_render = function render()
 };
 var SysSetupvue_type_template_id_2497073a_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=template&id=a71c2a12&scoped=true
-var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=template&id=6ff0d390&scoped=true
+var MenuItemFormvue_type_template_id_6ff0d390_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-form', {
@@ -3712,7 +3712,7 @@ var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_render = function rend
     }
   }, [_c('Icons')], 1) : _vm._e()], 1);
 };
-var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_staticRenderFns = [];
+var MenuItemFormvue_type_template_id_6ff0d390_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=script&lang=js
 /* harmony default export */ var MenuItemFormvue_type_script_lang_js = ({
@@ -4016,6 +4016,10 @@ var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_staticRenderFns = [];
             this.$set(this.vo, 'href', formUrl.split('.')[1]);
             this.$set(this.vo, 'wfEngineUrl', formUrl.split('.')[0] + '/' + formUrl.split('.')[1]);
           }
+          if (this.vo.leafType === 4) {
+            //定制起草文件链接
+            this.$set(this.vo, 'href', '#/wflow?busiCode=' + this.vo.href + '&wfEngineUrl=' + this.vo.wfEngineUrl);
+          }
         }
       } else if (attr.name === 'href') {
         if (this.vo.leafType === 6) {
@@ -4064,9 +4068,9 @@ var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=script&lang=js
  /* harmony default export */ var src_MenuItemFormvue_type_script_lang_js = (MenuItemFormvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=style&index=0&id=a71c2a12&prod&scoped=true&lang=scss
-var MenuItemFormvue_type_style_index_0_id_a71c2a12_prod_scoped_true_lang_scss = __webpack_require__(4727);
-;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=style&index=0&id=a71c2a12&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=style&index=0&id=6ff0d390&prod&scoped=true&lang=scss
+var MenuItemFormvue_type_style_index_0_id_6ff0d390_prod_scoped_true_lang_scss = __webpack_require__(8603);
+;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=style&index=0&id=6ff0d390&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/MenuItemForm.vue
 
@@ -4079,11 +4083,11 @@ var MenuItemFormvue_type_style_index_0_id_a71c2a12_prod_scoped_true_lang_scss =
 
 var MenuItemForm_component = (0,componentNormalizer/* default */.A)(
   src_MenuItemFormvue_type_script_lang_js,
-  MenuItemFormvue_type_template_id_a71c2a12_scoped_true_render,
-  MenuItemFormvue_type_template_id_a71c2a12_scoped_true_staticRenderFns,
+  MenuItemFormvue_type_template_id_6ff0d390_scoped_true_render,
+  MenuItemFormvue_type_template_id_6ff0d390_scoped_true_staticRenderFns,
   false,
   null,
-  "a71c2a12",
+  "6ff0d390",
   null
   
 )
@@ -5552,8 +5556,6 @@ var actions = {
   generateRoutes: function generateRoutes(_ref, nowf) {
     var commit = _ref.commit;
     return new Promise(function (resolve, reject) {
-      // 登录成功后连接webSocket
-      websocket/* default */.A.connectWebSocket(window.$wapp);
       window.$user.findNavMenus(nowf).then(function (response) {
         var layout = window.$loadComponent('@/wapp/common/layout/index');
         var accessedRoutes = [];
@@ -5579,6 +5581,12 @@ var actions = {
           }
         }
         commit('SET_ROUTES', accessedRoutes);
+
+        // 登录成功后连接webSocket
+        var href = location.href.split('#')[1];
+        if (href.indexOf('/lm/') !== -1 || href.indexOf('/portal') !== -1 || href.indexOf('/0/') !== -1) {
+          websocket/* default */.A.connectWebSocket(window.$wapp);
+        }
         resolve(accessedRoutes);
       }).catch(function (error) {
         reject(error);
@@ -6116,7 +6124,7 @@ function connectWebSocket(scope) {
   var loginUser = scope.$store.getters.loginUser;
   var protocols = []; // 可选的子协议数组
   var options = {
-    debug: false,
+    debug: true,
     // 自动重新连接的选项（可选）
     reconnectInterval: 3000,
     //重新连接尝试之间的间隔时间（毫秒）
@@ -6135,9 +6143,9 @@ function connectWebSocket(scope) {
   wsSocket = new WebSocket(wsurl + loginUser.userId + '_' + (window.deviceId || 'web'), protocols, options);
 
   // 连接发生错误的回调方法
-  wsSocket.onerror = function (event) {
+  wsSocket.onerror = function (event, b) {
     connect = false;
-    console.log('websocket连接错误===', event);
+    console.log('websocket连接错误===', event, b);
     //通知业务
     scope.$bus.emit('webSocketError', event);
   };
@@ -7647,7 +7655,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".loading[data-v-69610664]{margin-top:1
 
 /***/ }),
 
-/***/ 8969:
+/***/ 3765:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7661,7 +7669,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "[data-v-a71c2a12] .el-dialog__body{height:650px;overflow-y:auto;padding:0 0 20px 0}[data-v-a71c2a12] .el-dialog__body .el-tabs--top{margin-top:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-6ff0d390] .el-dialog__body{height:650px;overflow-y:auto;padding:0 0 20px 0}[data-v-6ff0d390] .el-dialog__body .el-tabs--top{margin-top:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -32811,19 +32819,19 @@ var update = add("e368663c", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 4727:
+/***/ 8603:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(8969);
+var content = __webpack_require__(3765);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("88a7f258", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("0252c95c", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -34376,7 +34384,7 @@ webpackContext.id = 2397;
 
 var map = {
 	"./app.js": 3299,
-	"./route.js": 9252,
+	"./route.js": 3803,
 	"./settings.js": 8183,
 	"./tagsView.js": 314
 };
@@ -39167,7 +39175,10 @@ service.interceptors.response.use(function (response) {
   }
   return response.data;
 }, function (error) {
-  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) {
+  var $scope = window.$wapp || window.$mapp;
+  if ($scope && $scope.customErrorHander) {
+    $scope.customErrorHander(error);
+  } 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) {
     store/* default */.A.dispatch('user/resetToken').then(function () {
       if (window.vType === 'wapp') {
         //认证会话已过期，请重新登录。

package/lib/ecmappaio.umd.js

@@ -1407,7 +1407,7 @@ var actions = {
 
 /***/ }),
 
-/***/ 7932:
+/***/ 7535:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2280,8 +2280,8 @@ var SysSetupvue_type_template_id_2497073a_scoped_true_render = function render()
 };
 var SysSetupvue_type_template_id_2497073a_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=template&id=a71c2a12&scoped=true
-var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=template&id=6ff0d390&scoped=true
+var MenuItemFormvue_type_template_id_6ff0d390_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-form', {
@@ -3722,7 +3722,7 @@ var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_render = function rend
     }
   }, [_c('Icons')], 1) : _vm._e()], 1);
 };
-var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_staticRenderFns = [];
+var MenuItemFormvue_type_template_id_6ff0d390_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=script&lang=js
 /* harmony default export */ var MenuItemFormvue_type_script_lang_js = ({
@@ -4026,6 +4026,10 @@ var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_staticRenderFns = [];
             this.$set(this.vo, 'href', formUrl.split('.')[1]);
             this.$set(this.vo, 'wfEngineUrl', formUrl.split('.')[0] + '/' + formUrl.split('.')[1]);
           }
+          if (this.vo.leafType === 4) {
+            //定制起草文件链接
+            this.$set(this.vo, 'href', '#/wflow?busiCode=' + this.vo.href + '&wfEngineUrl=' + this.vo.wfEngineUrl);
+          }
         }
       } else if (attr.name === 'href') {
         if (this.vo.leafType === 6) {
@@ -4074,9 +4078,9 @@ var MenuItemFormvue_type_template_id_a71c2a12_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=script&lang=js
  /* harmony default export */ var src_MenuItemFormvue_type_script_lang_js = (MenuItemFormvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=style&index=0&id=a71c2a12&prod&scoped=true&lang=scss
-var MenuItemFormvue_type_style_index_0_id_a71c2a12_prod_scoped_true_lang_scss = __webpack_require__(1069);
-;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=style&index=0&id=a71c2a12&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=style&index=0&id=6ff0d390&prod&scoped=true&lang=scss
+var MenuItemFormvue_type_style_index_0_id_6ff0d390_prod_scoped_true_lang_scss = __webpack_require__(4065);
+;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/MenuItemForm.vue?vue&type=style&index=0&id=6ff0d390&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/MenuItemForm.vue
 
@@ -4089,11 +4093,11 @@ var MenuItemFormvue_type_style_index_0_id_a71c2a12_prod_scoped_true_lang_scss =
 
 var MenuItemForm_component = (0,componentNormalizer/* default */.A)(
   src_MenuItemFormvue_type_script_lang_js,
-  MenuItemFormvue_type_template_id_a71c2a12_scoped_true_render,
-  MenuItemFormvue_type_template_id_a71c2a12_scoped_true_staticRenderFns,
+  MenuItemFormvue_type_template_id_6ff0d390_scoped_true_render,
+  MenuItemFormvue_type_template_id_6ff0d390_scoped_true_staticRenderFns,
   false,
   null,
-  "a71c2a12",
+  "6ff0d390",
   null
   
 )
@@ -5562,8 +5566,6 @@ var actions = {
   generateRoutes: function generateRoutes(_ref, nowf) {
     var commit = _ref.commit;
     return new Promise(function (resolve, reject) {
-      // 登录成功后连接webSocket
-      websocket/* default */.A.connectWebSocket(window.$wapp);
       window.$user.findNavMenus(nowf).then(function (response) {
         var layout = window.$loadComponent('@/wapp/common/layout/index');
         var accessedRoutes = [];
@@ -5589,6 +5591,12 @@ var actions = {
           }
         }
         commit('SET_ROUTES', accessedRoutes);
+
+        // 登录成功后连接webSocket
+        var href = location.href.split('#')[1];
+        if (href.indexOf('/lm/') !== -1 || href.indexOf('/portal') !== -1 || href.indexOf('/0/') !== -1) {
+          websocket/* default */.A.connectWebSocket(window.$wapp);
+        }
         resolve(accessedRoutes);
       }).catch(function (error) {
         reject(error);
@@ -6126,7 +6134,7 @@ function connectWebSocket(scope) {
   var loginUser = scope.$store.getters.loginUser;
   var protocols = []; // 可选的子协议数组
   var options = {
-    debug: false,
+    debug: true,
     // 自动重新连接的选项（可选）
     reconnectInterval: 3000,
     //重新连接尝试之间的间隔时间（毫秒）
@@ -6145,9 +6153,9 @@ function connectWebSocket(scope) {
   wsSocket = new WebSocket(wsurl + loginUser.userId + '_' + (window.deviceId || 'web'), protocols, options);
 
   // 连接发生错误的回调方法
-  wsSocket.onerror = function (event) {
+  wsSocket.onerror = function (event, b) {
     connect = false;
-    console.log('websocket连接错误===', event);
+    console.log('websocket连接错误===', event, b);
     //通知业务
     scope.$bus.emit('webSocketError', event);
   };
@@ -7657,7 +7665,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".loading[data-v-69610664]{margin-top:1
 
 /***/ }),
 
-/***/ 2425:
+/***/ 7221:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7671,7 +7679,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "[data-v-a71c2a12] .el-dialog__body{height:650px;overflow-y:auto;padding:0 0 20px 0}[data-v-a71c2a12] .el-dialog__body .el-tabs--top{margin-top:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-6ff0d390] .el-dialog__body{height:650px;overflow-y:auto;padding:0 0 20px 0}[data-v-6ff0d390] .el-dialog__body .el-tabs--top{margin-top:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -32821,19 +32829,19 @@ var update = add("4ed8efa6", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 1069:
+/***/ 4065:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(2425);
+var content = __webpack_require__(7221);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("e508eed0", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("57bb69c0", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -34386,7 +34394,7 @@ webpackContext.id = 2397;
 
 var map = {
 	"./app.js": 5905,
-	"./route.js": 7932,
+	"./route.js": 7535,
 	"./settings.js": 7577,
 	"./tagsView.js": 7556
 };
@@ -39177,7 +39185,10 @@ service.interceptors.response.use(function (response) {
   }
   return response.data;
 }, function (error) {
-  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) {
+  var $scope = window.$wapp || window.$mapp;
+  if ($scope && $scope.customErrorHander) {
+    $scope.customErrorHander(error);
+  } 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) {
     store/* default */.A.dispatch('user/resetToken').then(function () {
       if (window.vType === 'wapp') {
         //认证会话已过期，请重新登录。