eoss-ui 0.5.11 → 0.5.12

package/lib/flow-list.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 44);
+/******/ 	return __webpack_require__(__webpack_require__.s = 45);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -98,14 +98,9 @@ module.exports =
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(2);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_6__);
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
+/* harmony import */ var _webSocket__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(2);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_5__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
 /**
@@ -116,8 +111,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(9).sm2;
-
+var sm2 = __webpack_require__(10).sm2;
 
 
 
@@ -265,7 +259,7 @@ var ajax = function ajax(_ref) {
             clearTimeout(loginMsg);
             loginMsg = setTimeout(function () {
               sessionStorage.setItem('remind', 1);
-              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
                 confirmButtonText: '确定',
                 closeOnClickModal: false,
                 type: 'warning'
@@ -312,7 +306,7 @@ var ajax = function ajax(_ref) {
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
         initAuth = setTimeout(function () {
-          Object(eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"])({
+          Object(eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"])({
             title: '请进行二次鉴权',
             closeOnClickModal: false,
             closeOnPressEscape: false,
@@ -2013,7 +2007,7 @@ var isLogined = function isLogined(_ref8) {
               win.top.location.href = href;
               break;
             case 4:
-              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
                 type: 'error',
                 callback: function callback() {
@@ -2033,7 +2027,7 @@ var isLogined = function isLogined(_ref8) {
             default:
           }
         } else {
-          eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(res.msg, '提示', {
+          eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].alert(res.msg, '提示', {
             confirmButtonText: '确定',
             type: 'error',
             callback: function callback() {
@@ -2164,7 +2158,7 @@ var loadJs = function loadJs(_ref10) {
  **/
 var loading = function loading($loading, res) {
   if (!$loading) {
-    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_6__["Loading"].service;
+    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service;
   }
   if (isObject(res)) {
     var config = extend({}, {
@@ -2529,63 +2523,25 @@ var setStorage = function setStorage(_ref14) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
+ * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
+ * @param {Function} [success] - 调试
+ * @param {Function} [error] - 重连间隔时间
  **/
-function socket(options) {
-  var nextDate = 0;
-  var connect = 1;
-  return new Promise(function (resolve, reject) {
-    var wshost = getStorage('wshost') || '';
-    var option = {
-      url: wshost + _config_api__WEBPACK_IMPORTED_MODULE_0__[/* wss */ "Zb"],
-      take: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* topic */ "Qb"],
-      debug: true,
-      interval: 20
-    };
-    var websocket = win.websocket || {};
-    if (options && isObject(options)) {
-      option = _extends({}, option, options);
-    }
-    var key = window.btoa(option.url);
-    if (!websocket[key]) {
-      websocket[key] = { socket: new sockjs_client__WEBPACK_IMPORTED_MODULE_4___default.a(option.url) };
-      win.websocket = websocket;
-    }
-
-    var client = websocket[key] ? websocket[key].client : null;
-    if (!client) {
-      client = websocket[key].client = stompjs__WEBPACK_IMPORTED_MODULE_5___default.a.over(websocket[key].socket);
-      !option.debug && (client.debug = null);
+function socket(option, vm) {
+  var options = {};
+  for (var i in option) {
+    if (i === 'send') {
+      options['isSend'] = option[i];
+    } else {
+      options[i] = option[i];
     }
-    client.connect({}, function () {
-      client.subscribe(option.take, function (response) {
-        var res = JSON.parse(response.body);
-        resolve(res, function () {
-          client.disconnect();
-          win.top.websocket && win.top.websocket[key] && delete win.top.websocket[key];
-        }, client, websocket[key]);
-      });
-    }, function (error) {
-      var diffSecond = parseInt((new Date() - nextDate) / 1000, 10);
-      if (connect > 5 && diffSecond < option.interval) {
-        client.disconnect();
-        if (win.top.websocket) {
-          if (Object.keys(win.top.websocket).length > 1) {
-            delete win.top.websocket[key];
-          } else {
-            delete win.top.websocket;
-          }
-        }
-      } else {
-        win.top.websocket && win.top.websocket[key] && setTimeout(function () {
-          socket(options);
-        }, 5000);
-      }
-      reject(error);
-    });
-  });
+  }
+  var socket = new _webSocket__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"]();
+  socket.init(options, vm);
+  return socket;
 }
 /**
  * sum
@@ -3366,7 +3322,14 @@ var formContents = '/config/admin/online/onlineForm/render';
 
 /***/ }),
 
-/***/ 14:
+/***/ 10:
+/***/ (function(module, exports) {
+
+module.exports = require("sm-crypto");
+
+/***/ }),
+
+/***/ 15:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3660,15 +3623,15 @@ module.exports = require("qs");
 
 /***/ }),
 
-/***/ 44:
+/***/ 45:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=template&id=529329ae&
-var mainvue_type_template_id_529329ae_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=template&id=7b7f270e&
+var mainvue_type_template_id_7b7f270e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3690,10 +3653,11 @@ var mainvue_type_template_id_529329ae_render = function () {
                     _vm.splitReadingData.length > 0) ||
                   (item.type == "preset" &&
                     _vm.presetData &&
-                    _vm.presetData.length > 0) ||
+                    _vm.presetData.length > 0 &&
+                    _vm.currentUserHasPresetInfoAuth) ||
                   (item.type != "splitReading" && item.type != "preset"),
                 expression:
-                  "\n      (item.type == 'splitReading' &&\n        splitReadingData &&\n        splitReadingData.length > 0) ||\n      (item.type == 'preset' && presetData && presetData.length > 0) ||\n      (item.type != 'splitReading' && item.type != 'preset')\n    ",
+                  "\n      (item.type == 'splitReading' &&\n        splitReadingData &&\n        splitReadingData.length > 0) ||\n      (item.type == 'preset' && presetData && presetData.length > 0 && currentUserHasPresetInfoAuth) ||\n      (item.type != 'splitReading' && item.type != 'preset')\n    ",
               },
             ],
             key: index,
@@ -3864,16 +3828,16 @@ var mainvue_type_template_id_529329ae_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_529329ae_render._withStripped = true
+mainvue_type_template_id_7b7f270e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=529329ae&
+// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=7b7f270e&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./packages/flow/src/component/FileList.vue + 4 modules
-var FileList = __webpack_require__(14);
+var FileList = __webpack_require__(15);
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -4006,6 +3970,7 @@ var _components;
       pressTableList: [],
       currentPage: 1,
       pageSize: 20,
+      currentUserHasPresetInfoAuth: false,
       pressThead: [{
         title: '催办节点',
         align: 'center',
@@ -4164,18 +4129,21 @@ var _components;
           label: '经办部门',
           field: 'deptid',
           align: 'center',
+          key: 'jbbm',
           showOverflowTooltip: true,
           width: 150
         }, {
           label: '步骤',
           field: 'itemname',
           align: 'center',
+          key: 'bz',
           showOverflowTooltip: true,
           width: 110
         }, {
           label: '办理人',
           field: 'userName',
           align: 'center',
+          key: 'blr',
           showOverflowTooltip: true,
           width: 110
         }, {
@@ -4183,10 +4151,12 @@ var _components;
           field: 'deptName',
           align: 'center',
           showOverflowTooltip: true,
+          key: 'blrbm',
           width: 110
         }, {
           label: '状态',
           field: 'pendstate',
+          key: 'zt',
           align: 'center',
           showOverflowTooltip: true,
           width: 80,
@@ -4203,6 +4173,7 @@ var _components;
           field: 'doresult',
           align: 'center',
           showOverflowTooltip: true,
+          key: 'blyj',
           render: function render(h, params) {
             return h('span', {}, params.row.doresult || params.row.handleInfo);
           }
@@ -4210,6 +4181,7 @@ var _components;
           label: '验签',
           field: 'authTypeStr',
           align: 'center',
+          key: 'yq',
           showOverflowTooltip: true,
           width: 70,
           render: function render(h, params) {
@@ -4217,6 +4189,7 @@ var _components;
           }
         }, {
           label: '附件',
+          key: 'fj',
           field: 'hasAdjunct',
           align: 'center',
           showOverflowTooltip: true,
@@ -4235,6 +4208,7 @@ var _components;
           label: '时间',
           field: 'doetime',
           align: 'center',
+          key: 'sj',
           showOverflowTooltip: true,
           width: 150,
           render: function render(h, params) {
@@ -4244,6 +4218,7 @@ var _components;
           label: '代办人',
           field: 'douserid',
           align: 'center',
+          key: 'dbr',
           showOverflowTooltip: true,
           width: 80,
           hide: _that.flowTableInfo.hasAgent != '1'
@@ -4251,6 +4226,7 @@ var _components;
           label: '催办',
           field: 'pressTimes',
           align: 'center',
+          key: 'cb',
           showOverflowTooltip: true,
           width: 150,
           render: function render(h, params) {
@@ -4278,6 +4254,7 @@ var _components;
         splitReading: [{
           label: '经办部门',
           field: 'deptid',
+          key: 'jbbm',
           align: 'center',
           showOverflowTooltip: true,
           width: 150
@@ -4285,18 +4262,21 @@ var _components;
           label: '步骤',
           field: 'itemname',
           align: 'center',
+          key: 'bz',
           showOverflowTooltip: true,
           width: 110
         }, {
           label: '办理人',
           field: 'userName',
           align: 'center',
+          key: 'blr',
           showOverflowTooltip: true,
           width: 110
         }, {
           label: '状态',
           field: 'pendstate',
           align: 'center',
+          key: 'zt',
           showOverflowTooltip: true,
           width: 80,
           render: function render(h, params) {
@@ -4311,6 +4291,7 @@ var _components;
           label: '办理意见',
           field: 'doresult',
           align: 'center',
+          key: 'blyj',
           showOverflowTooltip: true,
           render: function render(h, params) {
             return h('span', {}, params.row.doresult || params.row.handleInfo);
@@ -4319,6 +4300,7 @@ var _components;
           label: '验签',
           field: 'authTypeStr',
           align: 'center',
+          key: 'yq',
           showOverflowTooltip: true,
           width: 70,
           render: function render(h, params) {
@@ -4328,6 +4310,7 @@ var _components;
           label: '附件',
           field: 'hasAdjunct',
           align: 'center',
+          key: 'fj',
           showOverflowTooltip: true,
           width: 70,
           render: function render(h, params) {
@@ -4344,6 +4327,7 @@ var _components;
           label: '时间',
           field: 'doetime',
           align: 'center',
+          key: 'sj',
           showOverflowTooltip: true,
           width: 150,
           render: function render(h, params) {
@@ -4353,6 +4337,7 @@ var _components;
           label: '代办人',
           field: 'douserid',
           align: 'center',
+          key: 'dbr',
           showOverflowTooltip: true,
           width: 80,
           hide: _that.flowTableInfo.hasAgent != '1'
@@ -4360,6 +4345,7 @@ var _components;
           label: '催办',
           field: 'pressTimes',
           align: 'center',
+          key: 'cb',
           showOverflowTooltip: true,
           width: 150,
           render: function render(h, params) {
@@ -4861,12 +4847,14 @@ var _components;
             _res$data2 = res.data,
             presetInfoList = _res$data2.presetInfoList,
             presetInfoListHiddenColumns = _res$data2.presetInfoListHiddenColumns,
-            canDelete = _res$data2.canDelete;
+            canDelete = _res$data2.canDelete,
+            currentUserHasPresetInfoAuth = _res$data2.currentUserHasPresetInfoAuth;
 
         _this9.loading.close();
         if (status == 'success') {
           presetInfoList && (_this9.presetData = presetInfoList);
           _this9.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
+          _this9.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth;
           _this9.canDelete = canDelete;
         } else {
           _this9.$message.error(message || '系统错误，请联系管理员！');
@@ -4895,7 +4883,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_529329ae_render,
+  mainvue_type_template_id_7b7f270e_render,
   staticRenderFns,
   false,
   null,
@@ -4931,23 +4919,152 @@ module.exports = require("json-bigint");
 /***/ }),
 
 /***/ 7:
-/***/ (function(module, exports) {
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = require("sockjs-client");
+"use strict";
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+
+
+
+var WebSocket = function () {
+  // 构造函数
+  function WebSocket() {
+    _classCallCheck(this, WebSocket);
+
+    this.host = sessionStorage.getItem('wshost') || '';
+    this.tryTimes = 1; // 重连次数
+    this.callback = null; // 回调函数
+    this.client = null; // stomp对象
+    this.reconTimeout = null; // 重连延时器
+    this.debug = true; // 调试
+    this.interval = 20; // 重连间隔时间
+    this.vm = null;
+    this.nextDate = 0;
+    this.connects = 1;
+    this.recon = false;
+    this.sendTimeout = null;
+    this.isSend = false;
+  }
+
+  /** socket连接 */
+
+
+  WebSocket.prototype.connect = function connect() {
+    var _this = this;
+
+    if (!this.client) {
+      // 连接SockJS
+      var socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url);
+      // 获取STOMP子协议的客户端对象
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      console.log(111);
+      this.client.debug = function () {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, function () {
+      _this.recon = true;
+      // tryTimes定义重置
+      _this.connects = 1;
+      // 订阅消息
+      // if (!this.isSend) {
+      _this.subscribe();
+      // }
+    }, function (error) {
+      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
+      if (_this.connects > 5 && diffSecond < _this.interval) {
+        _this.client.disconnect();
+        _this.error && _this.error(error);
+      } else {
+        _this.reconTimeout = setTimeout(function () {
+          _this.connect();
+          _this.connects++;
+        }, 5000);
+      }
+    });
+  };
+  /** 订阅服务端 */
+
+
+  WebSocket.prototype.subscribe = function subscribe() {
+    var _this2 = this;
+
+    // 订阅服务端提供的某个topic
+    this.client.subscribe(this.take, function (response) {
+      if (response && (_this2.callback || _this2.success)) {
+        var callback = _this2.callback || _this2.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  };
+
+  /** 赋值、初始化socket */
+
+
+  WebSocket.prototype.init = function init(option, vm) {
+    for (var i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  };
+
+  /** 发送消息 */
+
+
+  WebSocket.prototype.send = function send(data) {
+    var _this3 = this;
+
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(function () {
+        _this3.send(data);
+      }, 1000);
+    }
+  };
+
+  /** 销毁 */
+
+
+  WebSocket.prototype.destroy = function destroy() {
+    // 断开连接,清除定时器
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  };
+
+  return WebSocket;
+}();
+
+/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
 
 /***/ }),
 
 /***/ 8:
 /***/ (function(module, exports) {
 
-module.exports = require("stompjs");
+module.exports = require("sockjs-client");
 
 /***/ }),
 
 /***/ 9:
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("stompjs");
 
 /***/ })