eoss-ui 0.5.10 → 0.5.12

package/lib/eoss-ui.common.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 19);
+/******/ 	return __webpack_require__(__webpack_require__.s = 20);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -97,14 +97,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__(8);
 /* 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__(9);
-/* 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__(10);
-/* 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__(5);
-/* 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__(9);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(5);
+/* 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; };
 
 /**
@@ -115,8 +110,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(20).sm2;
-
+var sm2 = __webpack_require__(21).sm2;
 
 
 
@@ -264,7 +258,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'
@@ -311,7 +305,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,
@@ -745,6 +739,7 @@ var delUrlParam = function delUrlParam(_ref2) {
       key.forEach(function (item) {
         if (param.hasOwnProperty(item)) {
           var reg = item + '=' + param[item];
+          console.log(reg);
           if (src.indexOf(reg + '&') > -1) {
             src = src.replace(reg + '&', '');
           } else if (src.indexOf('&' + reg) > -1) {
@@ -1945,7 +1940,6 @@ var isLogined = function isLogined(_ref8) {
       next = _ref8.next,
       _ref8$exclude = _ref8.exclude,
       exclude = _ref8$exclude === undefined ? [] : _ref8$exclude,
-      open = _ref8.open,
       cookie = _ref8.cookie,
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
@@ -1953,24 +1947,24 @@ var isLogined = function isLogined(_ref8) {
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
+  var pathname = win.top.location.pathname;
   if (loginPage) {
     sessionStorage.setItem('loginPage', loginPage);
     if (!startWith(loginPage, ['http', '/'], true)) {
-      var pathname = win.top.location.pathname;
       if (pathname !== '/') {
-        pathname = pathname.split('/');
-        pathname.splice(pathname.length - 1);
-        pathname = pathname.join('/');
-        loginPage = pathname + '/' + loginPage.replace('./', '');
+        var path = pathname.split('/');
+        path.splice(pathname.length - 1);
+        path = path.join('/');
+        loginPage = path + '/' + loginPage.replace('./', '');
       } else {
         loginPage = pathname + loginPage.replace('./', '');
       }
     }
   }
   var token = getStorage('token') || getStorage('Authorization');
-  var logined = getStorage('logined');
+  // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
-  if (token || logined || cookie == true || cookie == 1) {
+  if (token || cookie == true || cookie == 1) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
@@ -1994,40 +1988,25 @@ var isLogined = function isLogined(_ref8) {
                   deviceUnique: results.deviceUnique
                 }
               });
-              next();
+              var url = delUrlParam({
+                url: win.top.location.href,
+                key: ['serverId', 'authType', 'code', 'sessionId']
+              });
+              win.top.location.href = url;
+              setTimeout(function () {
+                win.top.location.reload();
+              }, 200);
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              var url = win.top.location.href;
-              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              if (to.query.openType) {
-                switch (to.query.openType) {
-                  case 'self':
-                    win.location.href = href;
-                    break;
-                  case 'blank':
-                    win.open(href);
-                    break;
-                  case 'top':
-                    win.top.location.href = href;
-                    break;
-                  case 'parent':
-                    win.parent.location.href = href;
-                    break;
-                }
-              } else {
-                if (open) {
-                  win.open(href);
-                } else {
-                  win.top.location.href = href;
-                }
-              }
+              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
+              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() {
@@ -2047,7 +2026,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() {
@@ -2178,7 +2157,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({}, {
@@ -2543,63 +2522,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
@@ -3421,91 +3362,226 @@ module.exports = require("json-bigint");
 
 /***/ }),
 /* 9 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
+/* 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__(11);
+/* 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);
+
+/***/ }),
+/* 10 */
 /***/ (function(module, exports) {
 
 module.exports = require("sockjs-client");
 
 /***/ }),
-/* 10 */
+/* 11 */
 /***/ (function(module, exports) {
 
 module.exports = require("stompjs");
 
 /***/ }),
-/* 11 */
+/* 12 */
 /***/ (function(module, exports) {
 
 module.exports = require("vue");
 
 /***/ }),
-/* 12 */
+/* 13 */
 /***/ (function(module, exports) {
 
 module.exports = require("wujie-vue2");
 
 /***/ }),
-/* 13 */
+/* 14 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("[\"zuomian\",\"monitor\",\"maximize\",\"pointer-up\",\"pointer-left\",\"pointer-down\",\"tri-down\",\"retrograde\",\"rainfall\",\"caveat\",\"print\",\"alarm\",\"table\",\"duigouquan\",\"bumen\",\"mm\",\"accelerate\",\"quanping\",\"password\",\"qing\",\"kaifa\",\"daoru\",\"piaochongicon\",\"instructions\",\"notice\",\"wifi\",\"tishicuo\",\"minganciguanli\",\"switch-off\",\"switch-on\",\"narrow\",\"yidongduan\",\"web\",\"upload\",\"message\",\"go-back\",\"close\",\"shujutongji\",\"folder\",\"edit\",\"enter\",\"dian\",\"wendu\",\"shangwu\",\"shenbao\",\"magnifier\",\"project-add\",\"xiexian\",\"caidan\",\"tupian\",\"home\",\"yinyu\",\"wenhao\",\"template\",\"daiban\",\"set\",\"zhengwen\",\"cuowu\",\"chenggong\",\"indent\",\"increase\",\"ziliaoku\",\"tuichu\",\"quit\",\"leaf\",\"refresh\",\"statistic\",\"gengduo\",\"lvyou\",\"mail\",\"user\",\"zhishi\",\"weizhi\",\"jinggao\",\"zuzhijigou\",\"xue\",\"fenxiang\",\"jinrong\",\"shanchu\",\"jianhao\",\"jiahao\",\"yinzhang\",\"renyuanqiehuan\",\"gouxuanzhong1\",\"circle\",\"fuxuankuang1\",\"fangkuang\",\"application\",\"wenjianjia\",\"jiaren\",\"xiugai\",\"duanxinguanli\",\"workbench\",\"rizhi\",\"gongwen\",\"qingshi\",\"shiwu\",\"official\",\"baogao\",\"document\",\"wodeyouxiang\",\"ziliaojiaohuan\",\"denglu\",\"podium\",\"fangkuai\",\"xuewei\",\"duoyun\",\"pm\",\"xiajia\",\"huanbao\",\"dunpai\",\"shu\",\"gongzuozheng\",\"more\",\"fenlei\",\"delete\",\"fengsu\",\"bar\",\"yuanqu\",\"duomeiti\",\"youjian\",\"qiye\",\"zuixinzixun\",\"biaoge\",\"omit\",\"diaotou\",\"jiantou-left\",\"jiantou-right\",\"jiantou-up\",\"roles\",\"jiantou-next\",\"chijiuhuacunchu\",\"zhuanhuan\",\"cloudy\",\"form\",\"wuye\",\"tri-up\",\"pointer-right\",\"bianji\",\"tri-right\",\"tri-left\",\"daimaguanli\",\"jiankong\",\"kaifazhong\",\"fujian\",\"bingtu\",\"zhuzhuangtu\",\"lose\",\"rmb\",\"move\",\"xiazai\",\"yiban\",\"laoshi\",\"clear\",\"jinyong\",\"yunxing\",\"weihu\",\"chakan\",\"pifu\",\"ren\",\"gouwuche\",\"loading2\",\"yulan\",\"ziliao\",\"yidong\",\"fenxiang11\",\"kaoqin\",\"change\",\"shidu\",\"portfolio\",\"info\",\"yanjing\",\"laba\",\"camera\",\"xitongxiaoxi\",\"xitongguanli\",\"webduan\",\"wagnz\",\"group\",\"shengqian\",\"jiantou-prev\",\"attention\",\"look\",\"guanzhu\",\"daikuan\",\"tubiao\",\"duigou\",\"star\",\"dayin\",\"xinzeng\",\"reduce\",\"goup\",\"calendar\",\"tree\",\"yingyong\",\"caution\",\"zhuanfa\",\"add\",\"zongtiqixian\",\"daochu\",\"gongwu\",\"ihouse\",\"chilun\",\"weixiu\",\"chengguo\",\"trophy\",\"duiwu\",\"qiehuanjiaose\",\"door\",\"shebei\",\"fangjian\",\"microscope\",\"huaxue\",\"shiyanshianquan\",\"shiyan\",\"qiyexinxi\",\"yewuxinxi\",\"lab\",\"shiyanguanli\",\"yuqing\",\"big-screen\",\"signal-search\",\"database\",\"star-mark\",\"cng\",\"professor\",\"informatization\",\"code\",\"science\",\"price\",\"xunhuan\",\"savings\",\"administration\",\"aid\",\"biao\",\"line\",\"xietong\",\"jingzheng\",\"enterprise\",\"datatable\",\"toubiao\",\"bingdu\",\"keji2\",\"qiyeku5\",\"touzi5\",\"zijinliu\",\"zhishichanquan3\",\"kejifuwu2\",\"zhishichanquan2\",\"zijinanquan\",\"kejifuwu1\",\"geju\",\"yiqingfangkong\",\"kejifuwu\",\"anquanfangkong\",\"shujufuwu\",\"shujuceng\",\"shujugongxiang\",\"flows\",\"setup\",\"shujulian\",\"caiwujianguan\",\"caiwuliushui\",\"mubiaogeju\",\"juxing\",\"fuwuqi\",\"touzijigou\",\"xiezilou\",\"jianzhu\",\"logo\",\"touzhi\",\"zijin\",\"fintech\",\"touzixiangmu\",\"library\",\"touziguanli\",\"zhongda\",\"ziyuan\",\"shujutai\",\"shujudongtai\",\"bank\",\"shujuzhongxin\",\"zhongyaomubiao\",\"touzishijian\",\"caiwuguanli\",\"mingzhong\",\"touzishenpi\",\"jingzhenggeju\",\"property\",\"keji\",\"qiyeku\",\"zhongyaojihui\",\"touzilicai\",\"zhishichanquan\",\"touzi\",\"tzz\",\"menu\",\"xiangmushu\",\"pdf\",\"jiazai\",\"gongsi\",\"rise\",\"jbxx\",\"zwxx\",\"jypx\",\"jcgl\",\"ndkh\",\"grjl\",\"shgx\",\"gou\",\"shijian\",\"fukuan\",\"guoji\",\"shoukuan\",\"down\",\"gongzuotai\",\"gaigedongtai\",\"xitongshezhi\",\"relation\",\"zuzhirenshi\",\"kaohepingjia\",\"caiwujiandu\",\"sanzhongyida\",\"mima\",\"xianshi\",\"zhanghao\",\"bangongshi\",\"checked\",\"checke\",\"help\",\"kuoda\",\"banli\",\"xiaoxi\",\"shouqicaidan\",\"shouqicaidan-right\",\"smile\",\"tongzhi\",\"guanji\",\"shuaxin\",\"guiji\",\"tianjiawenjianjia\",\"yunxiazai\",\"del\",\"touzifangan\",\"zongheguanli\",\"sanzhongyida_mian\",\"gongwenguanli1\",\"heguiguanli\",\"jingyingfenxi\",\"txl\",\"diannao\",\"renliziyuan\",\"caiwuxitong\",\"shiwuguanli\",\"shouye\",\"bangongyongpin\",\"sidebar\",\"zhidulashi\",\"log\",\"fawenguanli\",\"huiyiguanli\",\"zuzhishishi\",\"gongwenqianshou\",\"jinxiupeixun\",\"gongwenbao\",\"jiaohuan\",\"daibanshixiang\",\"richeng\",\"tongxunlu\",\"yongche\",\"yanzheng\",\"daibanxinxi\",\"shuben\",\"fanfu\",\"guangbo\",\"shuzhuangtu\",\"bengqiye\",\"tongguo\",\"dengdai\",\"cross\",\"daichuli\",\"zhenggai\",\"shouli\",\"shujuhecha\",\"guanli\",\"paper-file\",\"wenjian\",\"dakaiwenjian\",\"yewu\",\"jiance\",\"jiheguanli\",\"jinru\",\"arrow-right\",\"lingdao\",\"rencai\",\"prev\",\"next\",\"jianpan\",\"qrcode\",\"bohui\",\"homepage\",\"download\",\"gantanhao\",\"dingding\",\"weixin\",\"pad\",\"ios\",\"android\",\"txt\",\"doc\",\"audioo\",\"video\",\"zip\",\"shuru\",\"duanxin\",\"saoma\",\"youxiang\",\"word\",\"excel\",\"fileword\",\"picture\",\"ppt\",\"ca\",\"usb-key\"]");
 
 /***/ }),
-/* 14 */
+/* 15 */
 /***/ (function(module, exports) {
 
 module.exports = require("runtime-import");
 
 /***/ }),
-/* 15 */
+/* 16 */
 /***/ (function(module, exports) {
 
 module.exports = require("video.js/dist/lang/zh-CN.json");
 
 /***/ }),
-/* 16 */
+/* 17 */
 /***/ (function(module, exports) {
 
 module.exports = require("eoss-element/src/utils/clickoutside");
 
 /***/ }),
-/* 17 */
+/* 18 */
 /***/ (function(module, exports) {
 
 module.exports = require("sortablejs");
 
 /***/ }),
-/* 18 */
+/* 19 */
 /***/ (function(module, exports) {
 
 module.exports = require("js-base64");
 
 /***/ }),
-/* 19 */
+/* 20 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(23);
+module.exports = __webpack_require__(24);
 
 
 /***/ }),
-/* 20 */
+/* 21 */
 /***/ (function(module, exports) {
 
 module.exports = require("sm-crypto");
 
 /***/ }),
-/* 21 */
+/* 22 */
 /***/ (function(module, exports) {
 
 module.exports = require("video.js/dist/video-js.css");
 
 /***/ }),
-/* 22 */
+/* 23 */
 /***/ (function(module, exports) {
 
 module.exports = require("qrcode");
 
 /***/ }),
-/* 23 */
+/* 24 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5457,8 +5533,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=8d31e592&
-var mainvue_type_template_id_8d31e592_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=094be154&
+var mainvue_type_template_id_094be154_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5492,6 +5568,7 @@ var mainvue_type_template_id_8d31e592_render = function () {
                 "es-toolbar",
                 {
                   contents: _vm.toolbars,
+                  showLabel: _vm.showLabel,
                   close: _vm.close,
                   callBack: _vm.resetHeight,
                   showFormBtn: _vm.showFormBtn,
@@ -5793,11 +5870,11 @@ var mainvue_type_template_id_8d31e592_render = function () {
     1
   )
 }
-var mainvue_type_template_id_8d31e592_staticRenderFns = []
-mainvue_type_template_id_8d31e592_render._withStripped = true
+var mainvue_type_template_id_094be154_staticRenderFns = []
+mainvue_type_template_id_094be154_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=8d31e592&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=094be154&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 var childrenvue_type_template_id_796433ee_render = function () {
@@ -7832,8 +7909,8 @@ var children_component = normalizeComponent(
 )
 
 /* harmony default export */ var children = (children_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/sizer.vue?vue&type=template&id=78be3abc&
-var sizervue_type_template_id_78be3abc_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/sizer.vue?vue&type=template&id=58e4111d&
+var sizervue_type_template_id_58e4111d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7884,11 +7961,11 @@ var sizervue_type_template_id_78be3abc_render = function () {
       )
     : _vm._e()
 }
-var sizervue_type_template_id_78be3abc_staticRenderFns = []
-sizervue_type_template_id_78be3abc_render._withStripped = true
+var sizervue_type_template_id_58e4111d_staticRenderFns = []
+sizervue_type_template_id_58e4111d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/sizer.vue?vue&type=template&id=78be3abc&
+// CONCATENATED MODULE: ./packages/data-table/src/sizer.vue?vue&type=template&id=58e4111d&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/sizer.vue?vue&type=script&lang=js&
 var sizervue_type_script_lang_js_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; };
@@ -8058,8 +8135,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 
 var sizer_component = normalizeComponent(
   src_sizervue_type_script_lang_js_,
-  sizervue_type_template_id_78be3abc_render,
-  sizervue_type_template_id_78be3abc_staticRenderFns,
+  sizervue_type_template_id_58e4111d_render,
+  sizervue_type_template_id_58e4111d_staticRenderFns,
   false,
   null,
   null,
@@ -8069,7 +8146,7 @@ var sizer_component = normalizeComponent(
 
 /* harmony default export */ var sizer = (sizer_component.exports);
 // EXTERNAL MODULE: external "vue"
-var external_vue_ = __webpack_require__(11);
+var external_vue_ = __webpack_require__(12);
 var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
 
 // CONCATENATED MODULE: ./src/utils/bus.js
@@ -8283,6 +8360,7 @@ var mainvue_type_script_lang_js_components;
 //
 //
 //
+//
 
 
 
@@ -8366,6 +8444,7 @@ var mainvue_type_script_lang_js_components;
       type: [Array, Boolean],
       default: false
     },
+    showLabel: Boolean,
     searchValue: Object,
     advanceValue: Object,
     // 是否开启序号
@@ -8536,8 +8615,8 @@ var mainvue_type_script_lang_js_components;
 
     theads: {
       get: function get() {
-        if (typeof this.thead === 'string') {
-          this.theadData.length && this.setMinWidth(this.theadData);
+        if (this.theadData.length) {
+          this.setMinWidth(this.theadData);
           return this.theadData;
         }
         this.setMinWidth(this.thead);
@@ -8785,25 +8864,31 @@ var mainvue_type_script_lang_js_components;
     handleClickAddData: function handleClickAddData(scope) {
       var data = JSON.parse(JSON.stringify(scope.row));
       var index = scope.$index + 1;
-      this.datas.splice(index, 0, data);
+      if (this.page) {
+        index += (this.config.pageNum - 1) * this.config.pageSize;
+      }
+      this.data.splice(index, 0, data);
       this.$emit('dataChange', 'add', data);
       this.$emit('btnClick', {
         event: 'addRow',
         row: data,
         index: index,
-        data: data
+        data: this.data
       });
     },
     handleClickDeleteData: function handleClickDeleteData(scope) {
       var data = JSON.parse(JSON.stringify(scope.row));
       var index = scope.$index;
-      this.datas.splice(index, 1);
+      if (this.page) {
+        index += (this.config.pageNum - 1) * this.config.pageSize;
+      }
+      this.data.splice(index, 1);
       this.$emit('dataChange', 'delete', data);
       this.$emit('btnClick', {
         event: 'deleteRow',
         row: data,
         index: index,
-        data: this.datas
+        data: this.data
       });
     },
     checkSelect: function checkSelect(newVal) {
@@ -9367,8 +9452,8 @@ var mainvue_type_script_lang_js_components;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_8d31e592_render,
-  mainvue_type_template_id_8d31e592_staticRenderFns,
+  mainvue_type_template_id_094be154_render,
+  mainvue_type_template_id_094be154_staticRenderFns,
   false,
   null,
   null,
@@ -11952,7 +12037,7 @@ mainvue_type_template_id_19392db6_render._withStripped = true
 // CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=19392db6&
 
 // EXTERNAL MODULE: external "wujie-vue2"
-var external_wujie_vue2_ = __webpack_require__(12);
+var external_wujie_vue2_ = __webpack_require__(13);
 var external_wujie_vue2_default = /*#__PURE__*/__webpack_require__.n(external_wujie_vue2_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=script&lang=js&
@@ -12766,8 +12851,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=b0256522&
-var mainvue_type_template_id_b0256522_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=2fd814fb&
+var mainvue_type_template_id_2fd814fb_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12940,21 +13025,14 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                                   item.label
                                                                     ? _c(
                                                                         "es-label",
-                                                                        {
-                                                                          attrs:
-                                                                            {
-                                                                              contents:
-                                                                                item.label,
-                                                                              event:
-                                                                                item
-                                                                                  .label
-                                                                                  .event,
-                                                                              events:
-                                                                                item
-                                                                                  .label
-                                                                                  .events,
-                                                                            },
-                                                                        }
+                                                                        _vm._b(
+                                                                          {},
+                                                                          "es-label",
+                                                                          _vm.getLabel(
+                                                                            item.label
+                                                                          ),
+                                                                          false
+                                                                        )
                                                                       )
                                                                     : _vm._e(),
                                                                   item.text ||
@@ -13453,28 +13531,13 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                                       {
                                                                         attrs: {
                                                                           slot: "label",
-                                                                          contents:
-                                                                            item.label,
-                                                                          plain:
-                                                                            item.plain ||
-                                                                            item.name ===
-                                                                              undefined,
                                                                         },
                                                                         slot: "label",
                                                                       },
                                                                       "es-label",
-                                                                      item.label
-                                                                        ? {
-                                                                            event:
-                                                                              item
-                                                                                .label
-                                                                                .event,
-                                                                            events:
-                                                                              item
-                                                                                .label
-                                                                                .events,
-                                                                          }
-                                                                        : {},
+                                                                      _vm.getLabel(
+                                                                        item.label
+                                                                      ),
                                                                       false
                                                                     )
                                                                   )
@@ -16130,26 +16193,13 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                         {
                                                           attrs: {
                                                             slot: "label",
-                                                            contents:
-                                                              item.label,
-                                                            plain:
-                                                              item.plain ||
-                                                              item.name ===
-                                                                undefined,
                                                           },
                                                           slot: "label",
                                                         },
                                                         "es-label",
-                                                        item.label
-                                                          ? {
-                                                              event:
-                                                                item.label
-                                                                  .event,
-                                                              events:
-                                                                item.label
-                                                                  .events,
-                                                            }
-                                                          : {},
+                                                        _vm.getLabel(
+                                                          item.label
+                                                        ),
                                                         false
                                                       )
                                                     )
@@ -18504,20 +18554,14 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                               item.label
                                                                 ? _c(
                                                                     "es-label",
-                                                                    {
-                                                                      attrs: {
-                                                                        contents:
-                                                                          item.label,
-                                                                        event:
-                                                                          item
-                                                                            .label
-                                                                            .event,
-                                                                        events:
-                                                                          item
-                                                                            .label
-                                                                            .events,
-                                                                      },
-                                                                    }
+                                                                    _vm._b(
+                                                                      {},
+                                                                      "es-label",
+                                                                      _vm.getLabel(
+                                                                        item.label
+                                                                      ),
+                                                                      false
+                                                                    )
                                                                   )
                                                                 : _vm._e(),
                                                               item.text ||
@@ -19002,28 +19046,13 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                                   {
                                                                     attrs: {
                                                                       slot: "label",
-                                                                      contents:
-                                                                        item.label,
-                                                                      plain:
-                                                                        item.plain ||
-                                                                        item.name ===
-                                                                          undefined,
                                                                     },
                                                                     slot: "label",
                                                                   },
                                                                   "es-label",
-                                                                  item.label
-                                                                    ? {
-                                                                        event:
-                                                                          item
-                                                                            .label
-                                                                            .event,
-                                                                        events:
-                                                                          item
-                                                                            .label
-                                                                            .events,
-                                                                      }
-                                                                    : {},
+                                                                  _vm.getLabel(
+                                                                    item.label
+                                                                  ),
                                                                   false
                                                                 )
                                                               )
@@ -21510,25 +21539,11 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                   "es-label",
                                                   _vm._b(
                                                     {
-                                                      attrs: {
-                                                        slot: "label",
-                                                        contents: item.label,
-                                                        plain:
-                                                          item.plain ||
-                                                          item.name ===
-                                                            undefined,
-                                                      },
+                                                      attrs: { slot: "label" },
                                                       slot: "label",
                                                     },
                                                     "es-label",
-                                                    item.label
-                                                      ? {
-                                                          event:
-                                                            item.label.event,
-                                                          events:
-                                                            item.label.events,
-                                                        }
-                                                      : {},
+                                                    _vm.getLabel(item.label),
                                                     false
                                                   )
                                                 )
@@ -23751,11 +23766,11 @@ var mainvue_type_template_id_b0256522_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_b0256522_staticRenderFns = []
-mainvue_type_template_id_b0256522_render._withStripped = true
+var mainvue_type_template_id_2fd814fb_staticRenderFns = []
+mainvue_type_template_id_2fd814fb_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=b0256522&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=2fd814fb&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -27654,46 +27669,6 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 
 
 
@@ -28157,6 +28132,9 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
   },
 
   methods: {
+    getLabel: function getLabel(res) {
+      return typeof res === 'string' ? { contents: res } : form_src_mainvue_type_script_lang_js_extends({}, res, { plain: res.plain || res.name === undefined });
+    },
     getHeight: function getHeight() {
       if (utils_util["a" /* default */].hasClass(this.$parent.$el, 'el-dialog__wrapper') || this.full || this.$el.parentNode.children.length == 1 && utils_util["a" /* default */].getStyle(this.$el.parentNode, 'height')) {
         var pt = parseInt(utils_util["a" /* default */].getStyle(this.$el.parentNode, 'padding-top'), 10) || 0;
@@ -28904,8 +28882,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_b0256522_render,
-  mainvue_type_template_id_b0256522_staticRenderFns,
+  mainvue_type_template_id_2fd814fb_render,
+  mainvue_type_template_id_2fd814fb_staticRenderFns,
   false,
   null,
   null,
@@ -28922,8 +28900,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=fd749ad0&
-var mainvue_type_template_id_fd749ad0_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/src/main.vue?vue&type=template&id=57a9df9a&
+var mainvue_type_template_id_57a9df9a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -29754,6 +29732,7 @@ var mainvue_type_template_id_fd749ad0_render = function () {
                                                   selectUserList:
                                                     _vm.selectReadUserList,
                                                   options: _vm.userOptions,
+                                                  title: "分阅用户",
                                                   mix: true,
                                                   types: _vm.types,
                                                   tabs: _vm.tabs,
@@ -29794,6 +29773,7 @@ var mainvue_type_template_id_fd749ad0_render = function () {
                                                   radioList:
                                                     _vm.presetReadUserId,
                                                   presetEdit: 1,
+                                                  title: "分阅用户",
                                                   mix: true,
                                                   types: _vm.types,
                                                   tabs: _vm.tabs,
@@ -30553,11 +30533,11 @@ var mainvue_type_template_id_fd749ad0_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_fd749ad0_staticRenderFns = []
-mainvue_type_template_id_fd749ad0_render._withStripped = true
+var mainvue_type_template_id_57a9df9a_staticRenderFns = []
+mainvue_type_template_id_57a9df9a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=fd749ad0&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=57a9df9a&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=4e1f4030&
 var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
@@ -31497,8 +31477,8 @@ var CommonOpinions_component = normalizeComponent(
 )
 
 /* harmony default export */ var CommonOpinions = (CommonOpinions_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=98eb2948&
-var processFormvue_type_template_id_98eb2948_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/src/processForm.vue?vue&type=template&id=d47486b0&
+var processFormvue_type_template_id_d47486b0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -31753,6 +31733,7 @@ var processFormvue_type_template_id_98eb2948_render = function () {
                           multiple: true,
                           selectUserList: _vm.selectReadUserList,
                           options: _vm.userOptions,
+                          title: "分阅用户",
                           mix: true,
                           types: _vm.types,
                           tabs: _vm.tabs,
@@ -31783,6 +31764,7 @@ var processFormvue_type_template_id_98eb2948_render = function () {
                           multiple: true,
                           selectUserList: _vm.selectPresetUserList,
                           options: _vm.presetOptions,
+                          title: "分阅用户",
                           radioList: _vm.presetReadUserId,
                           presetEdit: 1,
                           mix: true,
@@ -31962,11 +31944,11 @@ var processFormvue_type_template_id_98eb2948_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_98eb2948_staticRenderFns = []
-processFormvue_type_template_id_98eb2948_render._withStripped = true
+var processFormvue_type_template_id_d47486b0_staticRenderFns = []
+processFormvue_type_template_id_d47486b0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=98eb2948&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=d47486b0&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=db651118&
 var selectUservue_type_template_id_db651118_render = function () {
@@ -33662,7 +33644,6 @@ var processFormvue_type_script_lang_js_components;
 //
 //
 //
-//
 
 
 
@@ -33730,11 +33711,15 @@ var processFormvue_type_script_lang_js_components;
       tabs: {
         employee: {
           param: {
-            filid: sessionStorage.getItem('orgId'),
+            filid: JSON.parse(sessionStorage.getItem('mainConfig')).userModel.orgId,
             name: '本单位用户'
           }
         },
-        department: { param: { filid: sessionStorage.getItem('orgId') } }
+        department: {
+          param: {
+            filid: JSON.parse(sessionStorage.getItem('mainConfig')).userModel.orgId
+          }
+        }
       },
       nextUserTabs: {},
       selectPresetUserList: [],
@@ -33794,7 +33779,11 @@ var processFormvue_type_script_lang_js_components;
         if (val == 7 || val == 8) {
           this.nextUserTypes = ['department'];
           this.nextUserTabs = {
-            department: { param: { filid: sessionStorage.getItem('orgId') } }
+            department: {
+              param: {
+                filid: JSON.parse(sessionStorage.getItem('mainConfig')).userModel.orgId
+              }
+            }
           };
           this.multiple = true;
         } else if (val == 9 || val == 10) {
@@ -33805,7 +33794,11 @@ var processFormvue_type_script_lang_js_components;
           this.nextUserTypes = ['department', 'enterprise'];
           this.nextUserTabs = {
             enterprise: { param: { filid: 'other' } },
-            department: { param: { filid: sessionStorage.getItem('orgId') } }
+            department: {
+              param: {
+                filid: JSON.parse(sessionStorage.getItem('mainConfig')).userModel.orgId
+              }
+            }
           };
           this.multiple = true;
         }
@@ -34245,8 +34238,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = normalizeComponent(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_98eb2948_render,
-  processFormvue_type_template_id_98eb2948_staticRenderFns,
+  processFormvue_type_template_id_d47486b0_render,
+  processFormvue_type_template_id_d47486b0_staticRenderFns,
   false,
   null,
   null,
@@ -38106,6 +38099,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
+//
+//
 
 
 
@@ -39839,8 +39834,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_fd749ad0_render,
-  mainvue_type_template_id_fd749ad0_staticRenderFns,
+  mainvue_type_template_id_57a9df9a_render,
+  mainvue_type_template_id_57a9df9a_staticRenderFns,
   false,
   null,
   null,
@@ -41729,8 +41724,8 @@ flow_group_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var flow_group = (flow_group_src_main);
-// 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
@@ -41752,10 +41747,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,
@@ -41925,11 +41921,11 @@ var mainvue_type_template_id_529329ae_render = function () {
     2
   )
 }
-var mainvue_type_template_id_529329ae_staticRenderFns = []
-mainvue_type_template_id_529329ae_render._withStripped = true
+var mainvue_type_template_id_7b7f270e_staticRenderFns = []
+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&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=script&lang=js&
 var flow_list_src_mainvue_type_script_lang_js_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; };
@@ -42059,6 +42055,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
       pressTableList: [],
       currentPage: 1,
       pageSize: 20,
+      currentUserHasPresetInfoAuth: false,
       pressThead: [{
         title: '催办节点',
         align: 'center',
@@ -42217,18 +42214,21 @@ var flow_list_src_mainvue_type_script_lang_js_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
         }, {
@@ -42236,10 +42236,12 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           field: 'deptName',
           align: 'center',
           showOverflowTooltip: true,
+          key: 'blrbm',
           width: 110
         }, {
           label: '状态',
           field: 'pendstate',
+          key: 'zt',
           align: 'center',
           showOverflowTooltip: true,
           width: 80,
@@ -42256,6 +42258,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           field: 'doresult',
           align: 'center',
           showOverflowTooltip: true,
+          key: 'blyj',
           render: function render(h, params) {
             return h('span', {}, params.row.doresult || params.row.handleInfo);
           }
@@ -42263,6 +42266,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '验签',
           field: 'authTypeStr',
           align: 'center',
+          key: 'yq',
           showOverflowTooltip: true,
           width: 70,
           render: function render(h, params) {
@@ -42270,6 +42274,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           }
         }, {
           label: '附件',
+          key: 'fj',
           field: 'hasAdjunct',
           align: 'center',
           showOverflowTooltip: true,
@@ -42288,6 +42293,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '时间',
           field: 'doetime',
           align: 'center',
+          key: 'sj',
           showOverflowTooltip: true,
           width: 150,
           render: function render(h, params) {
@@ -42297,6 +42303,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '代办人',
           field: 'douserid',
           align: 'center',
+          key: 'dbr',
           showOverflowTooltip: true,
           width: 80,
           hide: _that.flowTableInfo.hasAgent != '1'
@@ -42304,6 +42311,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '催办',
           field: 'pressTimes',
           align: 'center',
+          key: 'cb',
           showOverflowTooltip: true,
           width: 150,
           render: function render(h, params) {
@@ -42331,6 +42339,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
         splitReading: [{
           label: '经办部门',
           field: 'deptid',
+          key: 'jbbm',
           align: 'center',
           showOverflowTooltip: true,
           width: 150
@@ -42338,18 +42347,21 @@ var flow_list_src_mainvue_type_script_lang_js_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) {
@@ -42364,6 +42376,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '办理意见',
           field: 'doresult',
           align: 'center',
+          key: 'blyj',
           showOverflowTooltip: true,
           render: function render(h, params) {
             return h('span', {}, params.row.doresult || params.row.handleInfo);
@@ -42372,6 +42385,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '验签',
           field: 'authTypeStr',
           align: 'center',
+          key: 'yq',
           showOverflowTooltip: true,
           width: 70,
           render: function render(h, params) {
@@ -42381,6 +42395,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '附件',
           field: 'hasAdjunct',
           align: 'center',
+          key: 'fj',
           showOverflowTooltip: true,
           width: 70,
           render: function render(h, params) {
@@ -42397,6 +42412,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '时间',
           field: 'doetime',
           align: 'center',
+          key: 'sj',
           showOverflowTooltip: true,
           width: 150,
           render: function render(h, params) {
@@ -42406,6 +42422,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '代办人',
           field: 'douserid',
           align: 'center',
+          key: 'dbr',
           showOverflowTooltip: true,
           width: 80,
           hide: _that.flowTableInfo.hasAgent != '1'
@@ -42413,6 +42430,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           label: '催办',
           field: 'pressTimes',
           align: 'center',
+          key: 'cb',
           showOverflowTooltip: true,
           width: 150,
           render: function render(h, params) {
@@ -42914,12 +42932,14 @@ var flow_list_src_mainvue_type_script_lang_js_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 || '系统错误，请联系管理员！');
@@ -42945,8 +42965,8 @@ var flow_list_src_mainvue_type_script_lang_js_components;
 
 var flow_list_src_main_component = normalizeComponent(
   packages_flow_list_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_529329ae_render,
-  mainvue_type_template_id_529329ae_staticRenderFns,
+  mainvue_type_template_id_7b7f270e_render,
+  mainvue_type_template_id_7b7f270e_staticRenderFns,
   false,
   null,
   null,
@@ -43828,7 +43848,7 @@ mainvue_type_template_id_32c03886_render._withStripped = true
 // CONCATENATED MODULE: ./packages/icons/src/main.vue?vue&type=template&id=32c03886&
 
 // EXTERNAL MODULE: ./packages/icons/src/icon.json
-var icon = __webpack_require__(13);
+var icon = __webpack_require__(14);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/icons/src/main.vue?vue&type=script&lang=js&
 //
@@ -47675,8 +47695,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=cef5b378&
-var mainvue_type_template_id_cef5b378_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=6a19317b&
+var mainvue_type_template_id_6a19317b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -48101,11 +48121,11 @@ var mainvue_type_template_id_cef5b378_render = function () {
     1
   )
 }
-var mainvue_type_template_id_cef5b378_staticRenderFns = []
-mainvue_type_template_id_cef5b378_render._withStripped = true
+var mainvue_type_template_id_6a19317b_staticRenderFns = []
+mainvue_type_template_id_6a19317b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=cef5b378&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6a19317b&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -49739,7 +49759,7 @@ async_componentvue_type_template_id_51f0233c_scoped_true_render._withStripped =
 // CONCATENATED MODULE: ./packages/main/src/async-component/index.vue?vue&type=template&id=51f0233c&scoped=true&
 
 // EXTERNAL MODULE: external "runtime-import"
-var external_runtime_import_ = __webpack_require__(14);
+var external_runtime_import_ = __webpack_require__(15);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/async-component/index.vue?vue&type=script&lang=js&
 
@@ -49891,12 +49911,8 @@ var async_component_component = normalizeComponent(
 
 /* harmony default export */ var async_component = (async_component_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=script&lang=js&
-
-
 var main_src_mainvue_type_script_lang_js_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; };
 
-function main_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
-
 //
 //
 //
@@ -50427,8 +50443,6 @@ var log = utils_util["a" /* default */].getParams('console');
         copyright: { comp: '', data: {} }
       },
       pageLoading: false,
-      close: null,
-      connect: 0,
       wjName: 'singlespa',
       menus: '',
       //头部导航
@@ -50505,7 +50519,8 @@ var log = utils_util["a" /* default */].getParams('console');
       navIds: null,
       timer: null,
       pid: null,
-      showPage: false
+      showPage: false,
+      webSocket: null
     };
   },
   created: function created() {
@@ -50514,7 +50529,7 @@ var log = utils_util["a" /* default */].getParams('console');
     this.isHeader = params.header;
     var sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && utils_util["a" /* default */].setFavicon(sysLogoIco);
-    this.isLogin(params);
+    this.getConfig(params);
   },
   mounted: function mounted() {
     utils_util["a" /* default */].win.reLogin = this.handleReLogin;
@@ -50530,156 +50545,6 @@ var log = utils_util["a" /* default */].getParams('console');
   },
 
   methods: {
-    isLogin: function isLogin(query) {
-      var _this = this;
-
-      return main_src_mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
-        var token, loginPage, pathname;
-        return regenerator_default.a.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                token = utils_util["a" /* default */].getStorage('token') || utils_util["a" /* default */].getStorage('Authorization');
-                loginPage = utils_util["a" /* default */].getStorage('login') || utils_util["a" /* default */].getStorage('loginPage');
-
-                if (loginPage) {
-                  if (!utils_util["a" /* default */].startWith(loginPage, ['http', '/'], true)) {
-                    pathname = utils_util["a" /* default */].win.top.location.pathname;
-
-                    if (pathname !== '/') {
-                      pathname = pathname.split('/');
-                      pathname.splice(pathname.length - 1);
-                      pathname = pathname.join('/');
-                      loginPage = pathname + '/' + loginPage.replace('./', '');
-                    } else {
-                      loginPage = pathname + loginPage.replace('./', '');
-                    }
-                  }
-                }
-
-                if (!(!token && query && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType'))) {
-                  _context.next = 8;
-                  break;
-                }
-
-                _context.next = 6;
-                return utils_util["a" /* default */].ajax({
-                  method: 'post',
-                  url: api["b" /* authCenter */],
-                  data: query
-                }).then(function (res) {
-                  if (res.rCode === 0) {
-                    var results = res.results;
-
-                    switch (results.statusCode) {
-                      case 0:
-                        utils_util["a" /* default */].setStorage({
-                          type: _this.storage,
-                          key: {
-                            ssId: results.ssId,
-                            token: results.token,
-                            Authorization: results.token,
-                            deviceUnique: results.deviceUnique
-                          }
-                        });
-                        if (query.openType) {
-                          var _url2 = utils_util["a" /* default */].win.top.location.href;
-                          var newUrl = utils_util["a" /* default */].delUrlParam({
-                            url: _url2,
-                            key: ['serverId', 'authType', 'openType']
-                          });
-                          switch (query.openType) {
-                            case 'self':
-                              utils_util["a" /* default */].win.location.href = newUrl;
-                              break;
-                            case 'blank':
-                              utils_util["a" /* default */].win.open(newUrl);
-                              break;
-                            case 'parent':
-                              utils_util["a" /* default */].win.parent.location.href = _href;
-                              break;
-                            default:
-                              utils_util["a" /* default */].win.top.location.href = _href;
-                          }
-                        } else {
-                          _this.getConfig();
-                        }
-                        break;
-                      case 1:
-                        break;
-                      case 2:
-                        break;
-                      case 3:
-                        var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-                        switch (query.openType) {
-                          case 'self':
-                            utils_util["a" /* default */].win.location.href = _href;
-                            break;
-                          case 'blank':
-                            utils_util["a" /* default */].win.open(_href);
-                            break;
-                          case 'parent':
-                            utils_util["a" /* default */].win.parent.location.href = _href;
-                            break;
-                          default:
-                            utils_util["a" /* default */].win.top.location.href = _href;
-                        }
-                        break;
-                      case 4:
-                        _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
-                          confirmButtonText: '确定',
-                          type: 'error',
-                          callback: function callback() {
-                            sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-                            //window.location.href = delUrlParam({ key: 'code' });
-                            if (loginPage) {
-                              utils_util["a" /* default */].win.top.location.replace(loginPage);
-                            } else if (document.referrer) {
-                              utils_util["a" /* default */].win.top.location.replace(document.referrer);
-                            } else if (utils_util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
-                              utils_util["a" /* default */].win.top.location.href = './login.html';
-                            } else {
-                              _this.$router.replace('/login');
-                            }
-                          }
-                        });
-                        break;
-                      default:
-                    }
-                  } else {
-                    _this.$alert(res.msg, '提示', {
-                      confirmButtonText: '确定',
-                      type: 'error',
-                      callback: function callback() {
-                        if (loginPage) {
-                          utils_util["a" /* default */].win.top.location.replace(loginPage);
-                        } else if (document.referrer) {
-                          utils_util["a" /* default */].win.top.location.replace(document.referrer);
-                        } else if (utils_util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
-                          utils_util["a" /* default */].win.top.location.href = './login.html';
-                        } else {
-                          _this.$router.replace('/login');
-                        }
-                      }
-                    });
-                  }
-                }).catch(function (e) {});
-
-              case 6:
-                _context.next = 9;
-                break;
-
-              case 8:
-                _this.getConfig();
-
-              case 9:
-              case 'end':
-                return _context.stop();
-            }
-          }
-        }, _callee, _this);
-      }))();
-    },
     menuSuccess: function menuSuccess(res) {
       // this.menus
       this.menuType = 'custom';
@@ -50691,14 +50556,14 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //获取主题模板JSON
     getMainDetail: function getMainDetail(id) {
-      var _this2 = this;
+      var _this = this;
 
       var params = {
         url: api["cb" /* mainDetail */],
         params: { id: id }
       };
       utils_util["a" /* default */].ajax(params).then(function (res) {
-        var _that = _this2;
+        var _that = _this;
         if (!res.results) {
           _that.showDefault = true;
         }
@@ -50734,7 +50599,7 @@ var log = utils_util["a" /* default */].getParams('console');
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this2.$message.error(err.message);
+          _this.$message.error(err.message);
         }
       });
     },
@@ -50810,7 +50675,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //设置主题颜色
     setTheme: function setTheme(color) {
-      var _this3 = this;
+      var _this2 = this;
 
       if (!color) {
         return;
@@ -50821,24 +50686,24 @@ var log = utils_util["a" /* default */].getParams('console');
         data: { color: escape(color.toLowerCase()) }
       }).then(function (res) {
         if (res.rCode === 0) {
-          _this3.color = color;
+          _this2.color = color;
           localStorage.setItem('theme', color);
           var _mainConfig = JSON.parse(utils_util["a" /* default */].getStorage('mainConfig'));
-          _mainConfig.userStyle.color = _this3.color;
+          _mainConfig.userStyle.color = _this2.color;
           sessionStorage.setItem('mainConfig', JSON.stringify(_mainConfig));
-          _this3.$emit('setting', 'theme', _this3.color);
-          _this3.$message({
+          _this2.$emit('setting', 'theme', _this2.color);
+          _this2.$message({
             message: res.msg,
             type: 'success',
             duration: 2000
           });
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this3.$message.error(msg);
+          _this2.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this3.$message.error(err.message);
+          _this2.$message.error(err.message);
         }
       });
     },
@@ -50925,9 +50790,13 @@ var log = utils_util["a" /* default */].getParams('console');
     },
 
     //获取用户配置及信息
-    getConfig: function getConfig() {
-      var _this4 = this;
+    getConfig: function getConfig(query) {
+      var _this3 = this;
 
+      var token = utils_util["a" /* default */].getStorage('token') || utils_util["a" /* default */].getStorage('Authorization');
+      if (!token && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType')) {
+        return false;
+      }
       if (utils_util["a" /* default */].getStorage('mainConfig')) {
         var results = JSON.parse(utils_util["a" /* default */].getStorage('mainConfig'));
         this.setConfig(results);
@@ -50940,39 +50809,39 @@ var log = utils_util["a" /* default */].getParams('console');
       }
       utils_util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
-          _this4.setConfig(res.results, 1);
-          if (_this4.socket) {
-            _this4.initWebSocket();
+          _this3.setConfig(res.results, 1);
+          if (_this3.socket) {
+            _this3.initWebSocket();
           }
-          if (_this4.remote) {
-            _this4.getMenu();
+          if (_this3.remote) {
+            _this3.getMenu();
           } else {
-            _this4.renderMenu();
+            _this3.renderMenu();
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this4.$message.error(msg);
+          _this3.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this3.$message.error(err.message);
         }
       });
     },
     reGetConfig: function reGetConfig() {
-      var _this5 = this;
+      var _this4 = this;
 
       utils_util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
           var results = JSON.parse(JSON.stringify(res.results));
-          _this5.setConfig(results, 1);
+          _this4.setConfig(results, 1);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this5.$message.error(msg);
+          _this4.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this5.$message.error(err.message);
+          _this4.$message.error(err.message);
         }
       });
     },
@@ -51033,8 +50902,8 @@ var log = utils_util["a" /* default */].getParams('console');
           return item.id;
         } else {
           if (path && item.url) {
-            var _url3 = new URL(item.url, window.location.origin);
-            if (_url3.hash == res) {
+            var url = new URL(item.url, window.location.origin);
+            if (url.hash == res) {
               return item.id;
             }
           }
@@ -51045,24 +50914,24 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //获取应用导航菜单
     getMenu: function getMenu() {
-      var _this6 = this;
+      var _this5 = this;
 
       utils_util["a" /* default */].ajax({ url: this.action, params: this.param ? this.param : {} }).then(function (res) {
         if (res.rCode === 0) {
           if (res.results && res.results.length) {
-            _this6.menus = JSON.parse(JSON.stringify(res.results));
+            _this5.menus = JSON.parse(JSON.stringify(res.results));
             var applicationid = utils_util["a" /* default */].getParams('applicationid') || utils_util["a" /* default */].getParams('applicationId');
             if (applicationid) {
-              var ids = _this6.getId(_this6.menus, applicationid);
+              var ids = _this5.getId(_this5.menus, applicationid);
               if (ids) {
-                _this6.defaultActive = ids;
+                _this5.defaultActive = ids;
               }
-            } else if (sessionStorage.getItem('jump') && _this6.isHistory) {
-              var _ids4 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
+            } else if (sessionStorage.getItem('jump') && _this5.isHistory) {
+              var _ids4 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
               if (_ids4) {
-                _this6.defaultActive = _ids4;
-                _this6.navIds = _ids4;
-                _this6.setTitle(_ids4[0]);
+                _this5.defaultActive = _ids4;
+                _this5.navIds = _ids4;
+                _this5.setTitle(_ids4[0]);
               }
             } else if (utils_util["a" /* default */].win.location.hash) {
               var hash = utils_util["a" /* default */].win.location.hash;
@@ -51070,34 +50939,34 @@ var log = utils_util["a" /* default */].getParams('console');
                 hash = hash.split('?')[0];
               }
               if (hash !== '#/' && hash !== '#/main') {
-                var _ids5 = _this6.getId(_this6.menus, utils_util["a" /* default */].win.location.hash, true);
+                var _ids5 = _this5.getId(_this5.menus, utils_util["a" /* default */].win.location.hash, true);
                 if (_ids5) {
-                  _this6.defaultActive = _ids5;
-                  _this6.navIds = _ids5;
-                  _this6.setTitle(_ids5[0]);
+                  _this5.defaultActive = _ids5;
+                  _this5.navIds = _ids5;
+                  _this5.setTitle(_ids5[0]);
                 }
-              } else if (sessionStorage.getItem('jump') && _this6.isHistory) {
-                var _ids6 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
+              } else if (sessionStorage.getItem('jump') && _this5.isHistory) {
+                var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
                 if (_ids6) {
-                  _this6.defaultActive = _ids6;
-                  _this6.navIds = _ids6;
-                  _this6.setTitle(_ids6[0]);
+                  _this5.defaultActive = _ids6;
+                  _this5.navIds = _ids6;
+                  _this5.setTitle(_ids6[0]);
                 }
               }
             }
-            _this6.setTips(_this6.menus);
-            utils_store.set('nav', _this6.menus);
-            _this6.setMenu(_this6.menus);
+            _this5.setTips(_this5.menus);
+            utils_store.set('nav', _this5.menus);
+            _this5.setMenu(_this5.menus);
           } else {
-            _this6.$message.error('未分配菜单权限，请联系管理员！');
+            _this5.$message.error('未分配菜单权限，请联系管理员！');
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this6.$message.error(msg);
+          _this5.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     },
@@ -51219,11 +51088,11 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //遍历设置菜单气泡提醒
     setTips: function setTips(obj) {
-      var _this7 = this;
+      var _this6 = this;
 
       if (Array.isArray(obj)) {
         obj.forEach(function (item) {
-          _this7.setTips(item);
+          _this6.setTips(item);
         });
       } else {
         if (obj && Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
@@ -51233,7 +51102,7 @@ var log = utils_util["a" /* default */].getParams('console');
         var flag = false;
         if (obj.children && obj.children.length) {
           obj.children.forEach(function (item) {
-            if (_this7.setTips(item)) {
+            if (_this6.setTips(item)) {
               flag = true;
             }
           });
@@ -51243,7 +51112,7 @@ var log = utils_util["a" /* default */].getParams('console');
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
           obj.fourthTabs.forEach(function (item) {
-            if (_this7.setTips(item)) {
+            if (_this6.setTips(item)) {
               flag = true;
             }
           });
@@ -51327,19 +51196,19 @@ var log = utils_util["a" /* default */].getParams('console');
           } else {
             if (item.children && item.children.length) {
               index++;
-              var _url4 = this.getUrl(item.children, active, index, param);
-              if (_url4 && index === active.length - 1) {
+              var url = this.getUrl(item.children, active, index, param);
+              if (url && index === active.length - 1) {
                 this.tabs = '';
               }
-              return _url4;
+              return url;
             }
             if (item.fourthTabs && item.fourthTabs.length) {
               index++;
-              var _url5 = this.getUrl(item.fourthTabs, active, index, param);
-              if (_url5) {
+              var _url2 = this.getUrl(item.fourthTabs, active, index, param);
+              if (_url2) {
                 this.$set(this, 'tabs', item.fourthTabs);
               }
-              return _url5;
+              return _url2;
             }
           }
         } else if (item.children && item.children.length) {
@@ -51537,7 +51406,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //头部工具交互事件
     handleClick: function handleClick(res) {
-      var _this8 = this;
+      var _this7 = this;
 
       var type = res.type;
 
@@ -51558,7 +51427,7 @@ var log = utils_util["a" /* default */].getParams('console');
             this.setMenu(this.menus);
           }
           this.$nextTick(function () {
-            _this8.reset = true;
+            _this7.reset = true;
           });
           break;
         case 'user':
@@ -51586,21 +51455,21 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //刷新子页面、子路由
     handleRefresh: function handleRefresh() {
-      var _this9 = this;
+      var _this8 = this;
 
       if (this.method === 'iframe') {
         this.page = utils_util["a" /* default */].handlerUrl(this.page);
       } else {
         this.refresh = false;
         this.$nextTick(function () {
-          _this9.refresh = true;
+          _this8.refresh = true;
         });
       }
     },
 
     //跳转页面
     handleJump: function handleJump(page, type, res, param) {
-      var _this10 = this;
+      var _this9 = this;
 
       console.log(page);
       var prevPage = sessionStorage.getItem('jump');
@@ -51631,7 +51500,7 @@ var log = utils_util["a" /* default */].getParams('console');
           this.wjName = 'singlespa';
           this.page = this.host + page;
           this.$nextTick(function () {
-            _this10.refresh = true;
+            _this9.refresh = true;
           });
         } else if (urls[0].indexOf('.dhtml') > 0 || urls[0].indexOf('.html') > 0 && urls[0].indexOf('.html#') === -1) {
           this.method = 'iframe';
@@ -51663,7 +51532,7 @@ var log = utils_util["a" /* default */].getParams('console');
                   query: params
                 });
                 this.$nextTick(function () {
-                  _this10.refresh = true;
+                  _this9.refresh = true;
                 });
               } else {
                 var urlopenmode = utils_util["a" /* default */].getParams({
@@ -51679,7 +51548,7 @@ var log = utils_util["a" /* default */].getParams('console');
                   this.wjName = res && res.appCode ? res.appCode : 'application';
                   this.page = this.host + page;
                   this.$nextTick(function () {
-                    _this10.refresh = true;
+                    _this9.refresh = true;
                   });
                 }
               }
@@ -51691,7 +51560,7 @@ var log = utils_util["a" /* default */].getParams('console');
         }
       }
       this.$nextTick(function () {
-        _this10.showPage = true;
+        _this9.showPage = true;
       });
     },
 
@@ -51803,7 +51672,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //监听改变菜单
     handleListener: function handleListener() {
-      var _this11 = this;
+      var _this10 = this;
 
       utils_util["a" /* default */].win.addEventListener('message', function (e) {
         var msg = e.data;
@@ -51812,61 +51681,62 @@ var log = utils_util["a" /* default */].getParams('console');
           if (typeof res === 'string') {
             res = res.split(',');
           }
-          _this11.setDefault(_this11.menus, res);
+          _this10.setDefault(_this10.menus, res);
         }
       }, false);
     },
 
     //开启weosocket
     initWebSocket: function initWebSocket() {
-      var _this12 = this;
+      var _this11 = this;
 
-      utils_util["a" /* default */].socket().then(function (res, close) {
-        _this12.close = close;
-        var data = res.data;
-        for (var i in data) {
-          if (data[i] !== null && data[i] !== undefined) {
-            if (i === 'onlineUserNums' && data[i] > 0) {
-              _this12.online = data[i];
-            }
-            if (i === 'sysMsgNums') {
-              _this12.notice = data[i];
-              if (_this12.showMsg) {
-                _this12.$refs.message.getMsg(true);
+      this.webSocket = utils_util["a" /* default */].socket({
+        url: api["Zb" /* wss */],
+        take: api["Qb" /* topic */],
+        success: function success(res) {
+          var data = res.data || {};
+          for (var i in data) {
+            if (data[i] !== null && data[i] !== undefined) {
+              if (i === 'onlineUserNums' && data[i] > 0) {
+                _this11.online = data[i];
+              }
+              if (i === 'sysMsgNums') {
+                _this11.notice = data[i];
+                if (_this11.showMsg) {
+                  _this11.$refs.message.getMsg(true);
+                }
+              }
+              if (i === 'menuTipsMap') {
+                _this11.menuTips = data[i];
+              }
+              if (i === 'sysMsgList') {
+                _this11.sysMsg = data[i];
+              }
+              if (i === 'extraData') {
+                _this11.extraData = data[i];
               }
-            }
-            if (i === 'menuTipsMap') {
-              _this12.menuTips = data[i];
-            }
-            if (i === 'sysMsgList') {
-              _this12.sysMsg = data[i];
-            }
-            if (i === 'extraData') {
-              _this12.extraData = data[i];
             }
           }
+          if (_this11.$store) {
+            _this11.$store.commit('websocket', data);
+          }
+          if (_this11.$eventBus) {
+            _this11.$eventBus.$emit('websocket', data);
+          }
+          if (utils_util["a" /* default */].win.eventBus) {
+            utils_util["a" /* default */].win.eventBus.$emit('websocket', data);
+          }
         }
-        if (_this12.$store) {
-          _this12.$store.commit('websocket', data);
-        }
-        if (_this12.$eventBus) {
-          _this12.$eventBus.$emit('websocket', data);
-        }
-        if (utils_util["a" /* default */].win.eventBus) {
-          utils_util["a" /* default */].win.eventBus.$emit('websocket', data);
-        }
-      }).catch(function (err) {
-        console.log(err);
       });
     },
     handleOpened: function handleOpened(res) {
-      var _this13 = this;
+      var _this12 = this;
 
       if (res === undefined) {
         this.sysMsg = [];
       } else if (res == false && this.sysMsg.length) {
         this.sysMsgOut = setTimeout(function () {
-          _this13.sysMsg = [];
+          _this12.sysMsg = [];
         }, 3000);
       } else if (this.sysMsgOut) {
         clearTimeout(this.sysMsgOut);
@@ -51887,7 +51757,7 @@ var log = utils_util["a" /* default */].getParams('console');
       }
     },
     handleReLogin: function handleReLogin(res) {
-      var _this14 = this;
+      var _this13 = this;
 
       if (res && typeof res == 'string') {
         res = JSON.parse(res);
@@ -51918,7 +51788,7 @@ var log = utils_util["a" /* default */].getParams('console');
         this.timer = setTimeout(function () {
           console.log('handleReLogin');
           sessionStorage.setItem('remind', 1);
-          _this14.$confirm(msg, btn).then(function () {
+          _this13.$confirm(msg, btn).then(function () {
             utils_util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
             var loginPage = utils_util["a" /* default */].getStorage('login') || utils_util["a" /* default */].getStorage('loginPage');
             if (loginPage) {
@@ -51976,8 +51846,8 @@ var log = utils_util["a" /* default */].getParams('console');
   },
   beforeDestroy: function beforeDestroy() {
     this.timer = null;
-    if (this.close) {
-      this.close();
+    if (this.webSocket) {
+      this.webSocket.destroy();
     }
   }
 });
@@ -51993,8 +51863,8 @@ var log = utils_util["a" /* default */].getParams('console');
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_cef5b378_render,
-  mainvue_type_template_id_cef5b378_staticRenderFns,
+  mainvue_type_template_id_6a19317b_render,
+  mainvue_type_template_id_6a19317b_staticRenderFns,
   false,
   null,
   null,
@@ -53901,11 +53771,11 @@ var external_video_js_ = __webpack_require__(7);
 var external_video_js_default = /*#__PURE__*/__webpack_require__.n(external_video_js_);
 
 // EXTERNAL MODULE: external "video.js/dist/lang/zh-CN.json"
-var zh_CN_json_ = __webpack_require__(15);
+var zh_CN_json_ = __webpack_require__(16);
 var zh_CN_json_default = /*#__PURE__*/__webpack_require__.n(zh_CN_json_);
 
 // EXTERNAL MODULE: external "video.js/dist/video-js.css"
-var video_js_css_ = __webpack_require__(21);
+var video_js_css_ = __webpack_require__(22);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/player/src/main.vue?vue&type=script&lang=js&
 var player_src_mainvue_type_script_lang_js_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; };
@@ -54196,7 +54066,7 @@ mainvue_type_template_id_31151606_render._withStripped = true
 //
 
 
-var QRCode = __webpack_require__(22);
+var QRCode = __webpack_require__(23);
 /* harmony default export */ var qr_code_src_mainvue_type_script_lang_js_ = ({
   name: 'EsQrCode',
   props: {
@@ -54360,8 +54230,8 @@ qr_code_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var qr_code = (qr_code_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/radio-group/src/main.vue?vue&type=template&id=0995e7f2&
-var mainvue_type_template_id_0995e7f2_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/radio-group/src/main.vue?vue&type=template&id=a0afa96c&
+var mainvue_type_template_id_a0afa96c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -54490,11 +54360,11 @@ var mainvue_type_template_id_0995e7f2_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_0995e7f2_staticRenderFns = []
-mainvue_type_template_id_0995e7f2_render._withStripped = true
+var mainvue_type_template_id_a0afa96c_staticRenderFns = []
+mainvue_type_template_id_a0afa96c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/radio-group/src/main.vue?vue&type=template&id=0995e7f2&
+// CONCATENATED MODULE: ./packages/radio-group/src/main.vue?vue&type=template&id=a0afa96c&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/radio-group/src/main.vue?vue&type=script&lang=js&
 var radio_group_src_mainvue_type_script_lang_js_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; };
@@ -54682,7 +54552,7 @@ var radio_group_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "func
     labelVal: function labelVal() {
       var _this = this;
 
-      if (this.readonly && (this.model || this.model === 0) && this.results.length) {
+      if (this.readonly && this.model !== undefined && this.results.length) {
         if (radio_group_src_mainvue_type_script_lang_js_typeof(this.model) !== 'object') {
           if (utils_util["a" /* default */].isObject(this.results[0])) {
             var val = void 0;
@@ -54806,8 +54676,8 @@ var radio_group_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "func
 
 var radio_group_src_main_component = normalizeComponent(
   packages_radio_group_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_0995e7f2_render,
-  mainvue_type_template_id_0995e7f2_staticRenderFns,
+  mainvue_type_template_id_a0afa96c_render,
+  mainvue_type_template_id_a0afa96c_staticRenderFns,
   false,
   null,
   null,
@@ -57078,7 +56948,7 @@ mainvue_type_template_id_47cfcfa8_render._withStripped = true
 // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=47cfcfa8&
 
 // EXTERNAL MODULE: external "eoss-element/src/utils/clickoutside"
-var clickoutside_ = __webpack_require__(16);
+var clickoutside_ = __webpack_require__(17);
 var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=script&lang=js&
@@ -58391,7 +58261,7 @@ selectionvue_type_template_id_66e09547_render._withStripped = true
 // CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=66e09547&
 
 // EXTERNAL MODULE: external "sortablejs"
-var external_sortablejs_ = __webpack_require__(17);
+var external_sortablejs_ = __webpack_require__(18);
 var external_sortablejs_default = /*#__PURE__*/__webpack_require__.n(external_sortablejs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/selection.vue?vue&type=script&lang=js&
@@ -64942,6 +64812,8 @@ tree_group_src_main.install = function (Vue) {
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/toolbar/src/main.vue?vue&type=script&lang=js&
 var toolbar_src_mainvue_type_script_lang_js_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; };
 
+function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 /* harmony default export */ var toolbar_src_mainvue_type_script_lang_js_ = ({
   name: 'EsToolbar',
   inheritAttrs: false,
@@ -64984,6 +64856,14 @@ var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function
     small: {
       type: Boolean,
       default: true
+    },
+    showLabel: {
+      type: Boolean,
+      default: false
+    },
+    labelWidth: {
+      type: String,
+      default: 'auto'
     }
   },
   computed: {
@@ -65139,6 +65019,10 @@ var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function
           }, item.label || item.text);
         }))]);
       }
+
+      var config = items.config,
+          other = mainvue_type_script_lang_js_objectWithoutProperties(items, ['config']);
+
       if (items.type === 'search') {
         var itemClass = {
           radio: 'es-toolbar-item-radio',
@@ -65146,13 +65030,11 @@ var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function
           switch: 'es-toolbar-item-switch'
         };
         search = [h('es-form', {
-          class: ['es-form-search', _this2.small ? 'es-form-search-small' : '', _this2.showFormBtn ? '' : 'es-form-search-nobtn'],
+          class: ['es-form-search', _this2.small ? 'es-form-search-small' : '', _this2.showLabel ? 'es-form-search-nobtn' : ''],
           props: toolbar_src_mainvue_type_script_lang_js_extends({
-            showButton: items.showButton,
-            formatSubmit: items.formatSubmit
-          }, items.config || {}, {
             size: 'medium',
-            showLabel: false,
+            showLabel: _this2.showLabel,
+            labelWidth: _this2.labelWidth,
             closeDialog: false,
             model: _this2.searchData,
             contents: items.contents,
@@ -65161,7 +65043,7 @@ var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function
             search: true,
             isReset: items.reset,
             showButton: _this2.showFormBtn
-          }),
+          }, other, config || {}),
           on: {
             submit: function submit(data) {
               _this2.hanleSearch(data, items.multiCondition);
@@ -65205,9 +65087,7 @@ var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function
         }, [h('es-form', {
           class: 'es-form-search',
           ref: 'filter',
-          props: toolbar_src_mainvue_type_script_lang_js_extends({
-            formatSubmit: items.formatSubmit
-          }, items.config || {}, {
+          props: toolbar_src_mainvue_type_script_lang_js_extends({}, other, config || {}, {
             size: 'medium',
             closeDialog: false,
             model: _this2.advancedData,
@@ -65266,8 +65146,8 @@ toolbar_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_toolbar = (toolbar_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=template&id=fdf72a6c&
-var tablevue_type_template_id_fdf72a6c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=template&id=3e2bccce&
+var tablevue_type_template_id_3e2bccce_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -65453,20 +65333,9 @@ var tablevue_type_template_id_fdf72a6c_render = function () {
                                           ? _c(
                                               "es-label",
                                               _vm._b(
-                                                {
-                                                  attrs: {
-                                                    contents: item.label,
-                                                    plain: item.plain,
-                                                    rules: item.rules,
-                                                  },
-                                                },
+                                                {},
                                                 "es-label",
-                                                item.label
-                                                  ? {
-                                                      event: item.label.event,
-                                                      events: item.label.events,
-                                                    }
-                                                  : {},
+                                                _vm.getLabel(item.label),
                                                 false
                                               )
                                             )
@@ -67928,23 +67797,15 @@ var tablevue_type_template_id_fdf72a6c_render = function () {
     2
   )
 }
-var tablevue_type_template_id_fdf72a6c_staticRenderFns = []
-tablevue_type_template_id_fdf72a6c_render._withStripped = true
+var tablevue_type_template_id_3e2bccce_staticRenderFns = []
+tablevue_type_template_id_3e2bccce_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=fdf72a6c&
+// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=3e2bccce&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=script&lang=js&
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
+var src_tablevue_type_script_lang_js_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; };
+
 //
 //
 //
@@ -69168,6 +69029,9 @@ tablevue_type_template_id_fdf72a6c_render._withStripped = true
   },
 
   methods: {
+    getLabel: function getLabel(res) {
+      return typeof res === 'string' ? { contents: res } : src_tablevue_type_script_lang_js_extends({}, res, { plain: res.plain || res.name === undefined });
+    },
     getRules: function getRules(res) {
       if (res.rules && !res.hide) {
         if (Array.isArray(res.rules)) {
@@ -69297,8 +69161,8 @@ tablevue_type_template_id_fdf72a6c_render._withStripped = true
 
 var form_src_table_component = normalizeComponent(
   packages_form_src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_fdf72a6c_render,
-  tablevue_type_template_id_fdf72a6c_staticRenderFns,
+  tablevue_type_template_id_3e2bccce_render,
+  tablevue_type_template_id_3e2bccce_staticRenderFns,
   false,
   null,
   null,
@@ -69718,7 +69582,7 @@ mainvue_type_template_id_2f5f0ecd_render._withStripped = true
   pdf: 'data:image/png;base64,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'
 });
 // EXTERNAL MODULE: external "js-base64"
-var external_js_base64_ = __webpack_require__(18);
+var external_js_base64_ = __webpack_require__(19);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=script&lang=js&
 var upload_src_mainvue_type_script_lang_js_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; };
@@ -71261,7 +71125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.10',
+  version: '0.5.12',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,