ecinc-cloud-wappaio 9.6.228 → 9.6.229

package/index.js

@@ -213,6 +213,8 @@ export default {
 
 import $hequest from '../../common/request/index'
 import $store from '../../common/store/index'
+import $webSocket from '../../common/websocket/index'
 
 export const httpRequest = $hequest
 export const store = $store
+export const webSocket = $webSocket

package/lib/ecwappaio.common.js

@@ -10146,9 +10146,11 @@ var actions = {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ecwplat_Module_index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(79447);
+/* harmony import */ var _websocket_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31831);
 var defaultSettings = __webpack_require__(47710);
 var showTopMenus = defaultSettings.showTopMenus;
 
+
 var state = {
   routes: []
 };
@@ -10161,6 +10163,8 @@ var actions = {
   generateRoutes: function generateRoutes(_ref, nowf) {
     var commit = _ref.commit;
     return new Promise(function (resolve, reject) {
+      // 登录成功后连接webSocket
+      _websocket_index__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.connectWebSocket(window.$wapp);
       window.$user.findNavMenus(nowf).then(function (response) {
         var layout = window.$loadComponent('@/wapp/common/layout/index');
         var accessedRoutes = [];
@@ -10697,6 +10701,163 @@ var actions = {
 
 /***/ }),
 
+/***/ 31831:
+/***/ (function(__unused_webpack_module, __webpack_exports__) {
+
+"use strict";
+/* eslint-disable space-before-function-paren */
+
+var wsurl = location.host;
+wsurl = "".concat(location.protocol.indexOf('https') > -1 ? 'wss://' : 'ws://', "/").concat(wsurl, "/webSocket/");
+// const wsurl = 'ws://toa.ecinc.com.cn:2028/webSocket/'
+// let wsurl = 'wss://portal.ecinc.com.cn:8090/webSocket/'
+// let wsurl = 'wss://tsk.ecinc.com.cn:2039/webSocket/'
+var connect = false;
+var wsSocket = null;
+var $scope = null;
+var socketPing = null;
+
+// 连接websocket
+function connectWebSocket(scope) {
+  if (connect) return;
+  $scope = scope;
+  connect = true;
+  var WebSocket = window.ReconnectingWebSocket;
+  var loginUser = scope.$store.getters.loginUser;
+  var protocols = []; // 可选的子协议数组
+  var options = {
+    debug: false,
+    // 自动重新连接的选项（可选）
+    reconnectInterval: 3000
+  };
+  // 创建连接
+  console.log('创建连接===', wsurl + loginUser.userId + '_' + (window.deviceId || 'web'));
+  wsSocket = new WebSocket(wsurl + loginUser.userId + '_' + (window.deviceId || 'web'), protocols, options);
+
+  // 连接发生错误的回调方法
+  wsSocket.onerror = function (event) {
+    connect = false;
+    console.log('websocket连接错误===', event);
+    //通知业务
+    scope.$bus.emit('webSocketError', event);
+  };
+
+  // 连接成功建立的回调方法
+  wsSocket.onopen = function (event) {
+    console.log('websocket连接成功');
+    connect = true;
+    sendSocketPing($scope.$store.getters.loginUser, window.$auth.getTicket());
+    //通知业务
+    scope.$bus.emit('webSocketOpen', event);
+  };
+
+  // 接收到消息的回调方法
+  wsSocket.onmessage = function (event) {
+    var message = JSON.parse(event.data);
+    if (message.body.type === 'heartBeat') {
+      //心跳回执消息，不需要处理
+      //console.log(`onmessage==${message.body.type}`, message)
+      return;
+    } else if (message.body.type === '212') {
+      // 取消发送心跳
+      if (socketPing !== null) {
+        clearInterval(socketPing);
+        socketPing = null;
+      }
+      close();
+    }
+    //通知业务
+    scope.$bus.emit('webSocketOnmessage', event);
+  };
+
+  // 监听websocket关闭
+  wsSocket.onclose = function (event) {
+    console.log('websocket连接断开');
+    connect = false;
+    //通知业务
+    scope.$bus.emit('webSocketOnClose', event);
+  };
+
+  // 连接关闭的回调方法，供业务调用
+  scope.$bus.on('webSocketClose', close);
+  // 发送消息，供业务调用
+  scope.$bus.on('webSocketSend', sendMessage);
+  // 重新连接，供业务调用
+  scope.$bus.on('reloadWebSocketConnect', reloadWebSocketConnect);
+  // 获取连接参数，供业务调用
+  scope.$bus.on('getConnectParams', getConnectParams);
+
+  // 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
+  window.onbeforeunload = function () {
+    close();
+  };
+}
+
+// 关闭websocket
+function close() {
+  wsSocket.close();
+}
+
+// 发送消息
+function sendMessage(data) {
+  var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (_) {
+    return _;
+  };
+  // const message = JSON.parse(data)
+  // console.log(`sendMessage==${message.message.body.type}`, message)
+  wsSocket.send(data);
+  callback();
+}
+// 重新连接
+function reloadWebSocketConnect(socketUrl) {
+  // 取消发送心跳
+  if (socketPing !== null) {
+    clearInterval(socketPing);
+    socketPing = null;
+  }
+  if (socketUrl) wsurl = socketUrl;
+  if (wsSocket !== null) {
+    close();
+  }
+  connect = false;
+  connectWebSocket($scope);
+}
+// 获取连接的一些先关参数
+function getConnectParams() {
+  var callback = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function (_) {
+    return _;
+  };
+  callback({
+    wsurl: wsurl,
+    connect: connect
+  });
+}
+// 发送socketPing心跳
+function sendSocketPing(loginUser, ticket) {
+  socketPing = setInterval(function () {
+    sendMessage(JSON.stringify({
+      message: {
+        receipt: false,
+        //不需要回执
+        fromUser: {
+          userId: loginUser.userId + '_' + (window.deviceId || 'web'),
+          userName: loginUser.personName
+        },
+        body: {
+          type: 'heartBeat',
+          message: '维持心跳消息'
+        }
+      },
+      ticket: ticket
+    }));
+  }, 30 * 1000);
+}
+/* harmony default export */ __webpack_exports__.A = ({
+  connectWebSocket: connectWebSocket
+});
+
+/***/ }),
+
 /***/ 72160:
 /***/ (function(module) {
 
@@ -41498,7 +41659,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".CodeMirror-hints,.CodeMirror-lint-too
 
 /***/ }),
 
-/***/ 15190:
+/***/ 8575:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -41519,7 +41680,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".form_item .el-date-editor .el-input__
 
 /***/ }),
 
-/***/ 40386:
+/***/ 61807:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -41533,7 +41694,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, "span[data-v-ed52dbba]{white-space:pre-wrap}[data-v-ed52dbba] .el-upload--text{width:100%}[data-v-ed52dbba] .el-divider--horizontal{margin:10px 0}.form_item .el-link[data-v-ed52dbba]{margin-left:6px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "span[data-v-2df1321a]{white-space:pre-wrap}[data-v-2df1321a] .el-upload--text{width:100%}[data-v-2df1321a] .el-divider--horizontal{margin:10px 0}.form_item .el-link[data-v-2df1321a]{margin-left:6px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -44212,7 +44373,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".process-desc-container{width:350px;bo
 
 /***/ }),
 
-/***/ 90412:
+/***/ 5141:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -44245,7 +44406,7 @@ var ___CSS_LOADER_URL_REPLACEMENT_5___ = _node_modules_css_loader_dist_runtime_g
 var ___CSS_LOADER_URL_REPLACEMENT_6___ = _node_modules_css_loader_dist_runtime_getUrl_js__WEBPACK_IMPORTED_MODULE_2___default()(___CSS_LOADER_URL_IMPORT_6___);
 var ___CSS_LOADER_URL_REPLACEMENT_7___ = _node_modules_css_loader_dist_runtime_getUrl_js__WEBPACK_IMPORTED_MODULE_2___default()(___CSS_LOADER_URL_IMPORT_7___);
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "[data-v-b3917cea]:export{stdMenuBgcolor:var(--lmBgColor);stdMenuHover:var(--lmBgColorActive)!important;stdMenuText:var(--lmTextColor)!important;stdMenuAcitveText:var(--lmTextColorActive)!important;stdSubMenuBgcolor:var(--lmBgColor);stdSubMenuHover:hsla(193,8%,67%,.42);stdSubMenuActiveText:var(--lmTextColorActive)!important;darkMenuBgcolor:#304156;darkMenuHover:#263445;darkMenuText:#bfcbd9;darkMenuAcitveText:#ffd04b;darkSubMenuBgcolor:#384b63;darkSubMenuHover:#263445;darkSubMenuActiveText:#ffd04b;sideBarWidth:210px;formLabelWidth:133px;lightBlue:var(--subjectColor)}.dropdown-menu[data-v-b3917cea]{width:160px;display:none;position:fixed;z-index:9999;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;text-align:left;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box}.dropdown-menu li a[data-v-b3917cea]{padding:5px 20px;line-height:1.5;white-space:nowrap;color:#333}.dropdown-menu li[data-v-b3917cea]:hover{background:#f5f5f5}[data-v-b3917cea] .line_text{cursor:pointer;position:absolute;left:0;top:0;font-size:14px}[data-v-b3917cea] svg:hover path{stroke:red}[data-v-b3917cea] svg:hover path:last-child{fill:red}[data-v-b3917cea] path{cursor:pointer}[data-v-b3917cea] path:last-child{fill:#438eb9}[data-v-b3917cea] circle{fill:#438eb9;stroke:none}li[data-v-b3917cea],ul[data-v-b3917cea]{list-style:none}body[data-v-b3917cea]{margin:0;padding:0;background:#f3f3f3;overflow-x:hidden}[data-v-b3917cea] #center{background:#fff;position:relative;overflow:hidden;overflow-y:auto;width:100%;min-height:calc(100vh - 110px)}[data-v-b3917cea] #center .add-node-btn{position:relative;margin:-15px -10px;z-index:4000;display:none}[data-v-b3917cea] #center .icon-drag-line{position:relative;margin:-10px 10px;z-index:4000;display:none}[data-v-b3917cea] #center .model_process{position:absolute;border:1px solid #dadada;width:140px;background:#fff;overflow:hidden}[data-v-b3917cea] #center .model_process .title{background:#f8f8ff;height:30px;line-height:30px;border-bottom:1px solid #dadada;padding:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;cursor:pointer}[data-v-b3917cea] #center .model_process .title img{width:16px;height:18px;margin-left:18px;margin-right:7px}[data-v-b3917cea] #center .model_process .title span{color:#666;font-size:14px}[data-v-b3917cea] #center .model_process p{padding:0 4px;background:#fff;word-break:break-all;color:#666;width:140px;height:48px;text-align:center;line-height:16px;font-size:14px;margin:0 auto;vertical-align:middle;display:table-cell}[data-v-b3917cea] #center .model_process_yb p{background:#48ba79;color:#fff}[data-v-b3917cea] #center .model_process_yth p{background:#fa7d08;color:#fff}[data-v-b3917cea] #center .model_process_wwc .title{background:#eee}[data-v-b3917cea] #center .model_process_wwc p{background:#d8d8d8;color:#333}[data-v-b3917cea] #center .model_process_jxz .title{background:#dbe1eb}[data-v-b3917cea] #center .model_process_jxz p{background:#4477bc;color:#fff}[data-v-b3917cea] #center .seled .title{background:#ffffe0}[data-v-b3917cea] #center .start{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_0___ + ") 50% no-repeat;background-size:60px 60px}[data-v-b3917cea] #center .jslc{background:url(" + ___CSS_LOADER_URL_REPLACEMENT_1___ + ") no-repeat;background-size:60px 60px}[data-v-b3917cea] #center .jslc,[data-v-b3917cea] #center .jsrw{width:60px;height:60px;position:absolute}[data-v-b3917cea] #center .jsrw{background:url(" + ___CSS_LOADER_URL_REPLACEMENT_2___ + ") no-repeat;background-size:60px 60px}[data-v-b3917cea] #center .parentWf{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_3___ + ") no-repeat;background-size:60px 60px}[data-v-b3917cea] #center .zyjd{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_4___ + ") no-repeat;background-size:60px 60px}[data-v-b3917cea] #center .dfzjd{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_5___ + ") no-repeat;background-size:60px 60px}[data-v-b3917cea] #center .jhjd{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_6___ + ") no-repeat;background-size:60px 60px}[data-v-b3917cea] #center .jcjd{width:140px;height:60px;line-height:60px;text-align:center;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_7___ + ") no-repeat 50%;white-space:nowrap;background-size:140px 60px;border:0;font-size:14px}[data-v-b3917cea] #center .jcjd_model_process_yb{color:#fff}[data-v-b3917cea] #center .li{height:44px;line-height:44px;padding-left:30px}[data-v-b3917cea] #center #centextMenu{border:1px solid rgba(0,0,0,.15);position:absolute;z-index:9999;background:#fff;width:160px;padding:4px 0;border-radius:4px}[data-v-b3917cea] #center #centextMenu a{padding:4px 10px;text-decoration:none;display:block;height:26px;font-size:14px;color:#545454}[data-v-b3917cea] #center #centextMenu a:hover{background:#f5f5f5}[data-v-b3917cea] #center .el-loading-spinner{top:100px}[data-v-b3917cea] #center .el-loading-spinner circle{fill:#fff}.wfdialog-center-container[data-v-b3917cea]{margin:-20px}.wfdialog-center-container .node-bg-desc[data-v-b3917cea]{position:absolute;right:0;z-index:1000;font-size:14px;margin:10px}.wfdialog-center-container .node-bg-desc[data-v-b3917cea] .el-col{width:90px;padding-left:10px}.wfdialog-center-container .node-bg-desc .node-bg[data-v-b3917cea]{width:30px;height:15px;margin-bottom:5px;float:left;margin-right:5px}.wfdialog-center-container .node-bg-desc .model_process_yb[data-v-b3917cea]{background-color:#48ba79}.wfdialog-center-container .node-bg-desc .model_process_yth[data-v-b3917cea]{background-color:#fa7d08}.wfdialog-center-container .node-bg-desc .model_process_wwc[data-v-b3917cea]{background-color:#4477bc}.wfdialog-center-container .node-bg-desc .model_process_wks[data-v-b3917cea]{background-color:#d8d8d8}.wflogInfo[data-v-b3917cea]{width:300px;position:absolute;border:1px solid #e1e1e1}.wflogInfo[data-v-b3917cea] .el-card__header{padding:12px}.wflogInfo[data-v-b3917cea] .el-card__header .el-button--text{font-size:15px}.wflogInfo[data-v-b3917cea] .el-card__body{max-height:400px;overflow-y:auto;padding:10px}.wflogInfo[data-v-b3917cea] .el-card__body div:last-child{border-bottom:0 solid #e1e1e1!important}.wflogInfo .el-descriptions[data-v-b3917cea]{padding-top:5px;border-bottom:1px solid #e1e1e1}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-db492b2a]:export{stdMenuBgcolor:var(--lmBgColor);stdMenuHover:var(--lmBgColorActive)!important;stdMenuText:var(--lmTextColor)!important;stdMenuAcitveText:var(--lmTextColorActive)!important;stdSubMenuBgcolor:var(--lmBgColor);stdSubMenuHover:hsla(193,8%,67%,.42);stdSubMenuActiveText:var(--lmTextColorActive)!important;darkMenuBgcolor:#304156;darkMenuHover:#263445;darkMenuText:#bfcbd9;darkMenuAcitveText:#ffd04b;darkSubMenuBgcolor:#384b63;darkSubMenuHover:#263445;darkSubMenuActiveText:#ffd04b;sideBarWidth:210px;formLabelWidth:133px;lightBlue:var(--subjectColor)}.dropdown-menu[data-v-db492b2a]{width:160px;display:none;position:fixed;z-index:9999;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;text-align:left;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box}.dropdown-menu li a[data-v-db492b2a]{padding:5px 20px;line-height:1.5;white-space:nowrap;color:#333}.dropdown-menu li[data-v-db492b2a]:hover{background:#f5f5f5}[data-v-db492b2a] .line_text{cursor:pointer;position:absolute;left:0;top:0;font-size:14px}[data-v-db492b2a] svg:hover path{stroke:red}[data-v-db492b2a] svg:hover path:last-child{fill:red}[data-v-db492b2a] path{cursor:pointer}[data-v-db492b2a] path:last-child{fill:#438eb9}[data-v-db492b2a] circle{fill:#438eb9;stroke:none}li[data-v-db492b2a],ul[data-v-db492b2a]{list-style:none}body[data-v-db492b2a]{margin:0;padding:0;background:#f3f3f3;overflow-x:hidden}[data-v-db492b2a] #center{background:#fff;position:relative;overflow:hidden;overflow-y:auto;width:100%;min-height:calc(100vh - 110px)}[data-v-db492b2a] #center .add-node-btn{position:relative;margin:-15px -10px;z-index:4000;display:none}[data-v-db492b2a] #center .icon-drag-line{position:relative;margin:-10px 10px;z-index:4000;display:none}[data-v-db492b2a] #center .model_process{position:absolute;border:1px solid #dadada;width:140px;background:#fff;overflow:hidden}[data-v-db492b2a] #center .model_process .title{background:#f8f8ff;height:30px;line-height:30px;border-bottom:1px solid #dadada;padding:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;cursor:pointer}[data-v-db492b2a] #center .model_process .title img{width:16px;height:18px;margin-left:18px;margin-right:7px}[data-v-db492b2a] #center .model_process .title span{color:#666;font-size:14px}[data-v-db492b2a] #center .model_process p{padding:0 4px;background:#fff;word-break:break-all;color:#666;width:140px;height:48px;text-align:center;line-height:16px;font-size:14px;margin:0 auto;vertical-align:middle;display:table-cell}[data-v-db492b2a] #center .model_process_yb p{background:#48ba79;color:#fff}[data-v-db492b2a] #center .model_process_yth p{background:#fa7d08;color:#fff}[data-v-db492b2a] #center .model_process_wwc .title{background:#eee}[data-v-db492b2a] #center .model_process_wwc p{background:#d8d8d8;color:#333}[data-v-db492b2a] #center .model_process_jxz .title{background:#dbe1eb}[data-v-db492b2a] #center .model_process_jxz p{background:#4477bc;color:#fff}[data-v-db492b2a] #center .seled .title{background:#ffffe0}[data-v-db492b2a] #center .start{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_0___ + ") 50% no-repeat;background-size:60px 60px}[data-v-db492b2a] #center .jslc{background:url(" + ___CSS_LOADER_URL_REPLACEMENT_1___ + ") no-repeat;background-size:60px 60px}[data-v-db492b2a] #center .jslc,[data-v-db492b2a] #center .jsrw{width:60px;height:60px;position:absolute}[data-v-db492b2a] #center .jsrw{background:url(" + ___CSS_LOADER_URL_REPLACEMENT_2___ + ") no-repeat;background-size:60px 60px}[data-v-db492b2a] #center .parentWf{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_3___ + ") no-repeat;background-size:60px 60px}[data-v-db492b2a] #center .zyjd{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_4___ + ") no-repeat;background-size:60px 60px}[data-v-db492b2a] #center .dfzjd{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_5___ + ") no-repeat;background-size:60px 60px}[data-v-db492b2a] #center .jhjd{width:60px;height:60px;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_6___ + ") no-repeat;background-size:60px 60px}[data-v-db492b2a] #center .jcjd{width:140px;height:60px;line-height:60px;text-align:center;position:absolute;background:url(" + ___CSS_LOADER_URL_REPLACEMENT_7___ + ") no-repeat 50%;white-space:nowrap;background-size:140px 60px;border:0;font-size:14px}[data-v-db492b2a] #center .jcjd_model_process_yb{color:#fff}[data-v-db492b2a] #center .li{height:44px;line-height:44px;padding-left:30px}[data-v-db492b2a] #center #centextMenu{border:1px solid rgba(0,0,0,.15);position:absolute;z-index:9999;background:#fff;width:160px;padding:4px 0;border-radius:4px}[data-v-db492b2a] #center #centextMenu a{padding:4px 10px;text-decoration:none;display:block;height:26px;font-size:14px;color:#545454}[data-v-db492b2a] #center #centextMenu a:hover{background:#f5f5f5}[data-v-db492b2a] #center .el-loading-spinner{top:100px}[data-v-db492b2a] #center .el-loading-spinner circle{fill:#fff}.wfdialog-center-container[data-v-db492b2a]{margin:-20px}.wfdialog-center-container .node-bg-desc[data-v-db492b2a]{position:absolute;right:0;z-index:1000;font-size:14px;margin:10px}.wfdialog-center-container .node-bg-desc[data-v-db492b2a] .el-col{width:90px;padding-left:10px}.wfdialog-center-container .node-bg-desc .node-bg[data-v-db492b2a]{width:30px;height:15px;margin-bottom:5px;float:left;margin-right:5px}.wfdialog-center-container .node-bg-desc .model_process_yb[data-v-db492b2a]{background-color:#48ba79}.wfdialog-center-container .node-bg-desc .model_process_yth[data-v-db492b2a]{background-color:#fa7d08}.wfdialog-center-container .node-bg-desc .model_process_wwc[data-v-db492b2a]{background-color:#4477bc}.wfdialog-center-container .node-bg-desc .model_process_wks[data-v-db492b2a]{background-color:#d8d8d8}.wflogInfo[data-v-db492b2a]{width:300px;position:absolute;border:1px solid #e1e1e1}.wflogInfo[data-v-db492b2a] .el-card__header{padding:12px}.wflogInfo[data-v-db492b2a] .el-card__header .el-button--text{font-size:15px}.wflogInfo[data-v-db492b2a] .el-card__body{max-height:400px;overflow-y:auto;padding:10px}.wflogInfo[data-v-db492b2a] .el-card__body div:last-child{border-bottom:0 solid #e1e1e1!important}.wflogInfo .el-descriptions[data-v-db492b2a]{padding-top:5px;border-bottom:1px solid #e1e1e1}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -134306,35 +134467,35 @@ var update = add("f9ee0d56", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 32716:
+/***/ 11905:
 /***/ (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__(15190);
+var content = __webpack_require__(8575);
 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__(99548)/* ["default"] */ .A)
-var update = add("03d5c85c", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("fb331bf6", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
-/***/ 87636:
+/***/ 74909:
 /***/ (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__(40386);
+var content = __webpack_require__(61807);
 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__(99548)/* ["default"] */ .A)
-var update = add("2cc59ac4", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("04b7d451", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -136370,19 +136531,19 @@ var update = add("2973868c", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 17118:
+/***/ 85087:
 /***/ (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__(90412);
+var content = __webpack_require__(5141);
 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__(99548)/* ["default"] */ .A)
-var update = add("7ad63379", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("0e24328a", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -139112,7 +139273,8 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ entry_lib; },
   httpRequest: function() { return /* reexport */ httpRequest; },
   lang: function() { return /* reexport */ npmaio_wappaio_lang; },
-  store: function() { return /* reexport */ wappaio_store; }
+  store: function() { return /* reexport */ wappaio_store; },
+  webSocket: function() { return /* reexport */ webSocket; }
 });
 
 // NAMESPACE OBJECT: ./node_modules/axios/lib/platform/common/utils.js
@@ -143203,6 +143365,7 @@ service.interceptors.response.use(function (response) {
     store/* default */.A.dispatch('user/resetToken').then(function () {
       if (window.vType === 'wapp') {
         //认证会话已过期，请重新登录。
+
         window.$alert(window.$tx('request.status401relogin'), window.$tx('common.operationTip'), {
           type: 'error',
           callback: function callback() {
@@ -146443,8 +146606,8 @@ var DynamicFormvue_type_template_id_1a7d28ac_render = function render() {
 };
 var DynamicFormvue_type_template_id_1a7d28ac_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/ecwapp/Basicform/src/FormItem.vue?vue&type=template&id=ed52dbba&scoped=true
-var FormItemvue_type_template_id_ed52dbba_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/ecwapp/Basicform/src/FormItem.vue?vue&type=template&id=2df1321a&scoped=true
+var FormItemvue_type_template_id_2df1321a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -146830,7 +146993,7 @@ var FormItemvue_type_template_id_ed52dbba_scoped_true_render = function render()
             "disabled": _vm.formItem.disabled,
             "editable": false,
             "value-format": "yyyy-MM-dd HH:mm:ss",
-            "picker-options": _vm.pickerOptions
+            "picker-options": _vm.pickerOptions1
           },
           on: {
             "change": _vm.valueChange,
@@ -146843,6 +147006,31 @@ var FormItemvue_type_template_id_ed52dbba_scoped_true_render = function render()
             },
             expression: "formItem.dateValue"
           }
+        }) : _vm.formItem.elementType === 'date' && _vm.formItem.pickerType === 'time' && _vm.formItem.stepNum ? _c('el-time-select', {
+          staticClass: "date_time_inner",
+          staticStyle: {
+            "width": "100%"
+          },
+          attrs: {
+            "name": _vm.formItem.propName,
+            "type": _vm.formItem.pickerType,
+            "format": _vm.formItem.textFormatter,
+            "placeholder": _vm.formItem.emptyMessage,
+            "disabled": _vm.formItem.disabled,
+            "editable": false,
+            "value-format": "yyyy-MM-dd HH:mm:ss",
+            "picker-options": _vm.pickerOptions2
+          },
+          on: {
+            "change": _vm.valueChange
+          },
+          model: {
+            value: _vm.formItem.value,
+            callback: function callback($$v) {
+              _vm.$set(_vm.formItem, "value", $$v);
+            },
+            expression: "formItem.value"
+          }
         }) : _vm.formItem.elementType === 'date' && _vm.formItem.pickerType === 'time' ? _c('el-time-picker', {
           staticClass: "date_time_inner",
           staticStyle: {
@@ -146853,7 +147041,6 @@ var FormItemvue_type_template_id_ed52dbba_scoped_true_render = function render()
             "type": _vm.formItem.pickerType,
             "format": _vm.formItem.textFormatter,
             "placeholder": _vm.formItem.emptyMessage,
-            "step": '00:30',
             "disabled": _vm.formItem.disabled,
             "editable": false,
             "value-format": "yyyy-MM-dd HH:mm:ss"
@@ -147000,7 +147187,7 @@ var FormItemvue_type_template_id_ed52dbba_scoped_true_render = function render()
     }])
   })], 1);
 };
-var FormItemvue_type_template_id_ed52dbba_scoped_true_staticRenderFns = [];
+var FormItemvue_type_template_id_2df1321a_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./src/global/filters/index.js
 
@@ -147167,7 +147354,7 @@ var FormItemvue_type_script_lang_js_moment = __webpack_require__(95093);
       encrypted: false,
       autocomplete: 'off',
       selectOptionLoading: false,
-      pickerOptions: {
+      pickerOptions1: {
         disabledDate: function disabledDate(time) {
           if (_this.$vnode.context[_this.formItem.disabledDate]) {
             return _this.$vnode.context[_this.formItem.disabledDate](time);
@@ -147175,6 +147362,11 @@ var FormItemvue_type_script_lang_js_moment = __webpack_require__(95093);
             return false;
           }
         }
+      },
+      pickerOptions2: {
+        start: '00:00',
+        step: '00:15',
+        end: '23:59'
       }
     };
   },
@@ -147480,10 +147672,12 @@ var FormItemvue_type_script_lang_js_moment = __webpack_require__(95093);
           });
         }
       } else if (this.formItem.elementType === 'date' && this.formItem.pickerType === 'time' && this.formItem.stepNum) {
-        if (this.formItem.stepNum < 10) {
-          this.$set(this.formItem, 'step', '00:0' + this.formItem.stepNum);
+        if (this.formItem.stepNum <= 1) {
+          this.formItem.stepNum = 0;
+        } else if (this.formItem.stepNum < 10) {
+          this.pickerOptions2.step = '00:0' + this.formItem.stepNum;
         } else {
-          this.$set(this.formItem, 'step', '00:' + this.formItem.stepNum);
+          this.pickerOptions2.step = '00:' + this.formItem.stepNum;
         }
       }
       if (this.formItem.elementType === 'file' && (this.formItem.limitCount === null || this.formItem.limitCount === '' || this.formItem.limitCount === undefined)) this.formItem.limitCount = 1;
@@ -148172,13 +148366,13 @@ var FormItemvue_type_script_lang_js_moment = __webpack_require__(95093);
 });
 ;// CONCATENATED MODULE: ./packages/ecwapp/Basicform/src/FormItem.vue?vue&type=script&lang=js
  /* harmony default export */ var src_FormItemvue_type_script_lang_js = (FormItemvue_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/ecwapp/Basicform/src/FormItem.vue?vue&type=style&index=0&id=ed52dbba&prod&lang=scss
-var FormItemvue_type_style_index_0_id_ed52dbba_prod_lang_scss = __webpack_require__(32716);
-;// CONCATENATED MODULE: ./packages/ecwapp/Basicform/src/FormItem.vue?vue&type=style&index=0&id=ed52dbba&prod&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/ecwapp/Basicform/src/FormItem.vue?vue&type=style&index=0&id=2df1321a&prod&lang=scss
+var FormItemvue_type_style_index_0_id_2df1321a_prod_lang_scss = __webpack_require__(11905);
+;// CONCATENATED MODULE: ./packages/ecwapp/Basicform/src/FormItem.vue?vue&type=style&index=0&id=2df1321a&prod&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/ecwapp/Basicform/src/FormItem.vue?vue&type=style&index=1&id=ed52dbba&prod&lang=scss&scoped=true
-var FormItemvue_type_style_index_1_id_ed52dbba_prod_lang_scss_scoped_true = __webpack_require__(87636);
-;// CONCATENATED MODULE: ./packages/ecwapp/Basicform/src/FormItem.vue?vue&type=style&index=1&id=ed52dbba&prod&lang=scss&scoped=true
+// 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/ecwapp/Basicform/src/FormItem.vue?vue&type=style&index=1&id=2df1321a&prod&lang=scss&scoped=true
+var FormItemvue_type_style_index_1_id_2df1321a_prod_lang_scss_scoped_true = __webpack_require__(74909);
+;// CONCATENATED MODULE: ./packages/ecwapp/Basicform/src/FormItem.vue?vue&type=style&index=1&id=2df1321a&prod&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ecwapp/Basicform/src/FormItem.vue
 
@@ -148192,11 +148386,11 @@ var FormItemvue_type_style_index_1_id_ed52dbba_prod_lang_scss_scoped_true = __we
 
 var FormItem_component = (0,componentNormalizer/* default */.A)(
   src_FormItemvue_type_script_lang_js,
-  FormItemvue_type_template_id_ed52dbba_scoped_true_render,
-  FormItemvue_type_template_id_ed52dbba_scoped_true_staticRenderFns,
+  FormItemvue_type_template_id_2df1321a_scoped_true_render,
+  FormItemvue_type_template_id_2df1321a_scoped_true_staticRenderFns,
   false,
   null,
-  "ed52dbba",
+  "2df1321a",
   null
   
 )
@@ -261091,8 +261285,8 @@ var ImportWf_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var ImportWf = (ImportWf_component.exports);
-;// 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/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=template&id=b3917cea&scoped=true
-var FlowTracevue_type_template_id_b3917cea_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/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=template&id=db492b2a&scoped=true
+var FlowTracevue_type_template_id_db492b2a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -261271,7 +261465,7 @@ var FlowTracevue_type_template_id_b3917cea_scoped_true_render = function render(
     }
   }) : _vm._e()], 1);
 };
-var FlowTracevue_type_template_id_b3917cea_scoped_true_staticRenderFns = [function () {
+var FlowTracevue_type_template_id_db492b2a_scoped_true_staticRenderFns = [function () {
   var _vm = this,
     _c = _vm._self._c;
   return _c('ul', {
@@ -261299,7 +261493,7 @@ var FlowTracevue_type_template_id_b3917cea_scoped_true_staticRenderFns = [functi
   }, [_vm._v("设置为添加新节点模式")])])]);
 }];
 
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=template&id=b3917cea&scoped=true
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=template&id=db492b2a&scoped=true
 
 ;// 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/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=script&lang=js
 function FlowTracevue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return FlowTracevue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, FlowTracevue_type_script_lang_js_typeof(o); }
@@ -262006,7 +262200,7 @@ var FlowTracevue_type_script_lang_js_require4 = __webpack_require__(53978),
           _this4.redoPathsTimes = item.pathName.split('-->').length - 2;
         }
         setTimeout(function () {
-          console.log('flowRedo', item);
+          //console.log('flowRedo', item)
           if (item.completeTime !== '未完成') {
             if (item.pathName && item.pathName.indexOf('会签') === -1 && (item.pathName.indexOf('退回') > -1 || item.pathName.indexOf('返回') > -1)) {
               jquery_default()("#".concat(item.nodeId)).removeClass('model_process_wwc');
@@ -262384,9 +262578,9 @@ var FlowTracevue_type_script_lang_js_require4 = __webpack_require__(53978),
 });
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=script&lang=js
  /* harmony default export */ var components_FlowTracevue_type_script_lang_js = (FlowTracevue_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/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=style&index=0&id=b3917cea&prod&scoped=true&lang=scss
-var FlowTracevue_type_style_index_0_id_b3917cea_prod_scoped_true_lang_scss = __webpack_require__(17118);
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=style&index=0&id=b3917cea&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/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=style&index=0&id=db492b2a&prod&scoped=true&lang=scss
+var FlowTracevue_type_style_index_0_id_db492b2a_prod_scoped_true_lang_scss = __webpack_require__(85087);
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue?vue&type=style&index=0&id=db492b2a&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/FlowTrace/index.vue
 
@@ -262399,11 +262593,11 @@ var FlowTracevue_type_style_index_0_id_b3917cea_prod_scoped_true_lang_scss = __w
 
 var FlowTrace_component = (0,componentNormalizer/* default */.A)(
   components_FlowTracevue_type_script_lang_js,
-  FlowTracevue_type_template_id_b3917cea_scoped_true_render,
-  FlowTracevue_type_template_id_b3917cea_scoped_true_staticRenderFns,
+  FlowTracevue_type_template_id_db492b2a_scoped_true_render,
+  FlowTracevue_type_template_id_db492b2a_scoped_true_staticRenderFns,
   false,
   null,
-  "b3917cea",
+  "db492b2a",
   null
   
 )
@@ -268773,6 +268967,8 @@ SystemDesigner_src.install = function (Vue) {
   Vue.component(SystemDesigner_src.name, SystemDesigner_src);
 };
 var SystemDesigner = SystemDesigner_src;
+// EXTERNAL MODULE: ./packages/common/websocket/index.js
+var websocket = __webpack_require__(31831);
 ;// CONCATENATED MODULE: ./packages/npmaio/wappaio/index.js
 function wappaio_typeof(o) { "@babel/helpers - typeof"; return wappaio_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, wappaio_typeof(o); }
 function wappaio_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -268867,8 +269063,10 @@ var npmaio_wappaio_lang = wappaio_lang;
 }, components));
 
 
+
 var httpRequest = request;
 var wappaio_store = store/* default */.A;
+var webSocket = websocket/* default */.A;
 ;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/entry-lib.js