eoss-ui 0.4.99 → 0.5.11

package/lib/eoss-ui.common.js

@@ -97,8 +97,14 @@ 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 eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
+/* 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; };
+
 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,6 +121,8 @@ var sm2 = __webpack_require__(20).sm2;
 
 
 
+
+
 var win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
 
 var $hueStep = 2;
@@ -256,7 +264,7 @@ var ajax = function ajax(_ref) {
             clearTimeout(loginMsg);
             loginMsg = setTimeout(function () {
               sessionStorage.setItem('remind', 1);
-              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
                 confirmButtonText: '确定',
                 closeOnClickModal: false,
                 type: 'warning'
@@ -303,7 +311,7 @@ var ajax = function ajax(_ref) {
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
         initAuth = setTimeout(function () {
-          Object(eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"])({
+          Object(eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"])({
             title: '请进行二次鉴权',
             closeOnClickModal: false,
             closeOnPressEscape: false,
@@ -737,6 +745,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) {
@@ -1752,7 +1761,7 @@ var getWeekday = function getWeekday(date) {
  * @param {String} [url] - url地址
  **/
 
-var handlerUrl = function handlerUrl(url, before) {
+var handlerUrl = function handlerUrl(url, param, before) {
   var arry = url.split('?');
   if (arry.length > 2) {
     var ary = arry.splice(1, arry.length);
@@ -1774,6 +1783,10 @@ var handlerUrl = function handlerUrl(url, before) {
   } else {
     url += '?_tt=' + new Date().getTime();
   }
+  if (param) {
+    var str = queryParams(param);
+    url += '&' + str;
+  }
   if (before && before === arry[0]) {
     var pathname = win.location.pathname;
     if (pathname === '/') {
@@ -1933,7 +1946,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;
@@ -1941,24 +1953,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')) {
@@ -1982,40 +1994,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_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
                 type: 'error',
                 callback: function callback() {
@@ -2035,7 +2032,7 @@ var isLogined = function isLogined(_ref8) {
             default:
           }
         } else {
-          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
+          eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(res.msg, '提示', {
             confirmButtonText: '确定',
             type: 'error',
             callback: function callback() {
@@ -2166,7 +2163,7 @@ var loadJs = function loadJs(_ref10) {
  **/
 var loading = function loading($loading, res) {
   if (!$loading) {
-    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_4__["Loading"].service;
+    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_6__["Loading"].service;
   }
   if (isObject(res)) {
     var config = extend({}, {
@@ -2525,6 +2522,70 @@ var setStorage = function setStorage(_ref14) {
   }
 };
 
+/**
+ * socket
+ * @desc:webSocket
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} [url] - 连接地址
+ * @param {String} [take] - 订阅地址
+ * @param {String} [debug] - 调试
+ * @param {String} [interval] - 重连间隔时间
+ **/
+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);
+    }
+    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);
+    });
+  });
+}
 /**
  * sum
  * @desc 求和
@@ -2777,7 +2838,6 @@ var urlJoinParams = function urlJoinParams(_ref15) {
       params[items[0]] = items[1];
     });
   }
-  '&_tt=' + new Date().getTime();
   params = extend(true, params, param);
   var str = queryParams(params);
   if (str) {
@@ -2945,6 +3005,7 @@ var watermark = function watermark(option) {
   sendMessage: sendMessage,
   setFavicon: setFavicon,
   setStorage: setStorage,
+  socket: socket,
   startWith: startWith,
   sum: sum,
   takeLeft: takeLeft,
@@ -3347,37 +3408,37 @@ module.exports = require("json-bigint");
 /* 9 */
 /***/ (function(module, exports) {
 
-module.exports = require("vue");
+module.exports = require("sockjs-client");
 
 /***/ }),
 /* 10 */
 /***/ (function(module, exports) {
 
-module.exports = require("wujie-vue2");
+module.exports = require("stompjs");
 
 /***/ }),
 /* 11 */
-/***/ (function(module) {
+/***/ (function(module, exports) {
 
-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\"]");
+module.exports = require("vue");
 
 /***/ }),
 /* 12 */
 /***/ (function(module, exports) {
 
-module.exports = require("runtime-import");
+module.exports = require("wujie-vue2");
 
 /***/ }),
 /* 13 */
-/***/ (function(module, exports) {
+/***/ (function(module) {
 
-module.exports = require("sockjs-client");
+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 */
 /***/ (function(module, exports) {
 
-module.exports = require("stompjs");
+module.exports = require("runtime-import");
 
 /***/ }),
 /* 15 */
@@ -3494,7 +3555,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
   },
   computed: {
     _type: function _type() {
-      return ['default', 'primary', 'success', 'info', 'warning', 'danger'].includes(this.type) ? this.type : this.mold;
+      return this.type ? this.type : this.mold;
     }
   },
   data: function data() {
@@ -5381,8 +5442,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=f3399f02&
+var mainvue_type_template_id_f3399f02_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5416,6 +5477,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,
@@ -5717,11 +5779,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_f3399f02_staticRenderFns = []
+mainvue_type_template_id_f3399f02_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=f3399f02&
 
 // 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 () {
@@ -5771,8 +5833,8 @@ childrenvue_type_template_id_796433ee_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 
-// 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/column.vue?vue&type=template&id=4ca382cb&
-var columnvue_type_template_id_4ca382cb_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/column.vue?vue&type=template&id=00ff0a77&
+var columnvue_type_template_id_00ff0a77_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6346,40 +6408,46 @@ var columnvue_type_template_id_4ca382cb_render = function () {
                                       : _vm.item.type == "selector"
                                       ? _c(
                                           "es-selector",
-                                          _vm._b(
-                                            {
-                                              on: {
-                                                change: function (value) {
-                                                  _vm.handleChange({
-                                                    item: _vm.item,
-                                                    name:
-                                                      _vm.item.field ||
-                                                      _vm.item.prop,
-                                                    value: value,
-                                                    data: scope.row,
-                                                  })
+                                          _vm._g(
+                                            _vm._b(
+                                              {
+                                                on: {
+                                                  change: function (value) {
+                                                    _vm.handleChange({
+                                                      item: _vm.item,
+                                                      name:
+                                                        _vm.item.field ||
+                                                        _vm.item.prop,
+                                                      value: value,
+                                                      data: scope.row,
+                                                    })
+                                                  },
                                                 },
-                                              },
-                                              model: {
-                                                value:
-                                                  scope.row[_vm.item.field],
-                                                callback: function ($$v) {
-                                                  _vm.$set(
-                                                    scope.row,
-                                                    _vm.item.field,
-                                                    $$v
-                                                  )
+                                                model: {
+                                                  value:
+                                                    scope.row[_vm.item.field],
+                                                  callback: function ($$v) {
+                                                    _vm.$set(
+                                                      scope.row,
+                                                      _vm.item.field,
+                                                      $$v
+                                                    )
+                                                  },
+                                                  expression:
+                                                    "scope.row[item.field]",
                                                 },
-                                                expression:
-                                                  "scope.row[item.field]",
                                               },
-                                            },
-                                            "es-selector",
+                                              "es-selector",
+                                              _vm.exclAttribute({
+                                                data: _vm.item,
+                                                attrs: "width",
+                                              }),
+                                              false
+                                            ),
                                             _vm.exclAttribute({
-                                              data: _vm.item,
-                                              attrs: "width",
-                                            }),
-                                            false
+                                              data: _vm.item.events,
+                                              attrs: "change",
+                                            })
                                           )
                                         )
                                       : _vm.item.type === "text" ||
@@ -6754,11 +6822,11 @@ var columnvue_type_template_id_4ca382cb_render = function () {
         2
       )
 }
-var columnvue_type_template_id_4ca382cb_staticRenderFns = []
-columnvue_type_template_id_4ca382cb_render._withStripped = true
+var columnvue_type_template_id_00ff0a77_staticRenderFns = []
+columnvue_type_template_id_00ff0a77_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=4ca382cb&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=00ff0a77&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(2);
@@ -7331,6 +7399,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 
 
@@ -7672,8 +7746,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
 var column_component = normalizeComponent(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_4ca382cb_render,
-  columnvue_type_template_id_4ca382cb_staticRenderFns,
+  columnvue_type_template_id_00ff0a77_render,
+  columnvue_type_template_id_00ff0a77_staticRenderFns,
   false,
   null,
   null,
@@ -7981,7 +8055,7 @@ var sizer_component = normalizeComponent(
 
 /* harmony default export */ var sizer = (sizer_component.exports);
 // EXTERNAL MODULE: external "vue"
-var external_vue_ = __webpack_require__(9);
+var external_vue_ = __webpack_require__(11);
 var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
 
 // CONCATENATED MODULE: ./src/utils/bus.js
@@ -8195,6 +8269,7 @@ var mainvue_type_script_lang_js_components;
 //
 //
 //
+//
 
 
 
@@ -8278,6 +8353,7 @@ var mainvue_type_script_lang_js_components;
       type: [Array, Boolean],
       default: false
     },
+    showLabel: Boolean,
     searchValue: Object,
     advanceValue: Object,
     // 是否开启序号
@@ -8697,25 +8773,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) {
@@ -9279,8 +9361,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_f3399f02_render,
+  mainvue_type_template_id_f3399f02_staticRenderFns,
   false,
   null,
   null,
@@ -11864,7 +11946,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__(10);
+var external_wujie_vue2_ = __webpack_require__(12);
 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&
@@ -12678,8 +12760,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=1499355a&
-var mainvue_type_template_id_1499355a_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
@@ -12852,21 +12934,14 @@ var mainvue_type_template_id_1499355a_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 ||
@@ -13365,28 +13440,13 @@ var mainvue_type_template_id_1499355a_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
                                                                     )
                                                                   )
@@ -13751,61 +13811,72 @@ var mainvue_type_template_id_1499355a_render = function () {
                                                                   "selector"
                                                                 ? _c(
                                                                     "es-selector",
-                                                                    _vm._b(
-                                                                      {
-                                                                        attrs: {
-                                                                          plain:
-                                                                            item.plain ||
-                                                                            item.name ===
-                                                                              undefined,
-                                                                          readonly:
-                                                                            _vm.readonly
-                                                                              ? _vm.readonly
-                                                                              : item.readonly,
-                                                                        },
-                                                                        on: {
-                                                                          change:
-                                                                            function (
-                                                                              val
-                                                                            ) {
-                                                                              _vm.handleChange(
-                                                                                item,
-                                                                                val
-                                                                              )
+                                                                    _vm._g(
+                                                                      _vm._b(
+                                                                        {
+                                                                          attrs:
+                                                                            {
+                                                                              plain:
+                                                                                item.plain ||
+                                                                                item.name ===
+                                                                                  undefined,
+                                                                              readonly:
+                                                                                _vm.readonly
+                                                                                  ? _vm.readonly
+                                                                                  : item.readonly,
                                                                             },
-                                                                        },
-                                                                        model: {
-                                                                          value:
-                                                                            _vm
-                                                                              .models[
-                                                                              item
-                                                                                .name
-                                                                            ],
-                                                                          callback:
-                                                                            function (
-                                                                              $$v
-                                                                            ) {
-                                                                              _vm.$set(
-                                                                                _vm.models,
-                                                                                item.name,
-                                                                                $$v
-                                                                              )
+                                                                          on: {
+                                                                            change:
+                                                                              function (
+                                                                                val
+                                                                              ) {
+                                                                                _vm.handleChange(
+                                                                                  item,
+                                                                                  val
+                                                                                )
+                                                                              },
+                                                                          },
+                                                                          model:
+                                                                            {
+                                                                              value:
+                                                                                _vm
+                                                                                  .models[
+                                                                                  item
+                                                                                    .name
+                                                                                ],
+                                                                              callback:
+                                                                                function (
+                                                                                  $$v
+                                                                                ) {
+                                                                                  _vm.$set(
+                                                                                    _vm.models,
+                                                                                    item.name,
+                                                                                    $$v
+                                                                                  )
+                                                                                },
+                                                                              expression:
+                                                                                "models[item.name]",
                                                                             },
-                                                                          expression:
-                                                                            "models[item.name]",
                                                                         },
-                                                                      },
-                                                                      "es-selector",
+                                                                        "es-selector",
+                                                                        _vm.handleExclAttribute(
+                                                                          {
+                                                                            data: item,
+                                                                            attrs:
+                                                                              [
+                                                                                "value",
+                                                                              ],
+                                                                          }
+                                                                        ),
+                                                                        false
+                                                                      ),
                                                                       _vm.handleExclAttribute(
                                                                         {
-                                                                          data: item,
+                                                                          data: item.events,
                                                                           attrs:
-                                                                            [
-                                                                              "value",
-                                                                            ],
+                                                                            "change",
                                                                         }
-                                                                      ),
-                                                                      false
+                                                                      )
                                                                     )
                                                                   )
                                                                 : item.type ==
@@ -14040,128 +14111,150 @@ var mainvue_type_template_id_1499355a_render = function () {
                                                                     "upload"
                                                                 ? _c(
                                                                     "es-upload",
-                                                                    _vm._b(
-                                                                      {
-                                                                        attrs: {
-                                                                          ownId:
-                                                                            item.ownId ||
-                                                                            _vm
-                                                                              .models
-                                                                              .id,
-                                                                          "btn-size":
-                                                                            "medium",
-                                                                          readonly:
-                                                                            _vm.readonly
-                                                                              ? _vm.readonly
-                                                                              : item.readonly,
-                                                                          rules:
-                                                                            item.rules,
-                                                                        },
-                                                                        on: {
-                                                                          change:
-                                                                            function (
-                                                                              val
-                                                                            ) {
-                                                                              _vm.handleChange(
-                                                                                item,
-                                                                                val
-                                                                              )
+                                                                    _vm._g(
+                                                                      _vm._b(
+                                                                        {
+                                                                          attrs:
+                                                                            {
+                                                                              ownId:
+                                                                                item.ownId ||
+                                                                                _vm
+                                                                                  .models
+                                                                                  .id,
+                                                                              "btn-size":
+                                                                                "medium",
+                                                                              readonly:
+                                                                                _vm.readonly
+                                                                                  ? _vm.readonly
+                                                                                  : item.readonly,
+                                                                              rules:
+                                                                                item.rules,
                                                                             },
-                                                                        },
-                                                                        model: {
-                                                                          value:
-                                                                            _vm
-                                                                              .models[
-                                                                              item
-                                                                                .name
-                                                                            ],
-                                                                          callback:
-                                                                            function (
-                                                                              $$v
-                                                                            ) {
-                                                                              _vm.$set(
-                                                                                _vm.models,
-                                                                                item.name,
-                                                                                $$v
-                                                                              )
+                                                                          on: {
+                                                                            change:
+                                                                              function (
+                                                                                val
+                                                                              ) {
+                                                                                _vm.handleChange(
+                                                                                  item,
+                                                                                  val
+                                                                                )
+                                                                              },
+                                                                          },
+                                                                          model:
+                                                                            {
+                                                                              value:
+                                                                                _vm
+                                                                                  .models[
+                                                                                  item
+                                                                                    .name
+                                                                                ],
+                                                                              callback:
+                                                                                function (
+                                                                                  $$v
+                                                                                ) {
+                                                                                  _vm.$set(
+                                                                                    _vm.models,
+                                                                                    item.name,
+                                                                                    $$v
+                                                                                  )
+                                                                                },
+                                                                              expression:
+                                                                                "models[item.name]",
                                                                             },
-                                                                          expression:
-                                                                            "models[item.name]",
                                                                         },
-                                                                      },
-                                                                      "es-upload",
+                                                                        "es-upload",
+                                                                        _vm.handleExclAttribute(
+                                                                          {
+                                                                            data: item,
+                                                                            attrs:
+                                                                              [
+                                                                                "value",
+                                                                                "ownId",
+                                                                              ],
+                                                                          }
+                                                                        ),
+                                                                        false
+                                                                      ),
                                                                       _vm.handleExclAttribute(
                                                                         {
-                                                                          data: item,
+                                                                          data: item.events,
                                                                           attrs:
-                                                                            [
-                                                                              "value",
-                                                                              "ownId",
-                                                                            ],
+                                                                            "change",
                                                                         }
-                                                                      ),
-                                                                      false
+                                                                      )
                                                                     )
                                                                   )
                                                                 : item.type ==
                                                                   "selector"
                                                                 ? _c(
                                                                     "es-selector",
-                                                                    _vm._b(
-                                                                      {
-                                                                        attrs: {
-                                                                          readonly:
-                                                                            _vm.readonly
-                                                                              ? _vm.readonly
-                                                                              : item.readonly,
-                                                                          plain:
-                                                                            item.plain ||
-                                                                            item.name ===
-                                                                              undefined,
-                                                                        },
-                                                                        on: {
-                                                                          change:
-                                                                            function (
-                                                                              val
-                                                                            ) {
-                                                                              _vm.handleChange(
-                                                                                item,
-                                                                                val
-                                                                              )
+                                                                    _vm._g(
+                                                                      _vm._b(
+                                                                        {
+                                                                          attrs:
+                                                                            {
+                                                                              readonly:
+                                                                                _vm.readonly
+                                                                                  ? _vm.readonly
+                                                                                  : item.readonly,
+                                                                              plain:
+                                                                                item.plain ||
+                                                                                item.name ===
+                                                                                  undefined,
                                                                             },
-                                                                        },
-                                                                        model: {
-                                                                          value:
-                                                                            _vm
-                                                                              .models[
-                                                                              item
-                                                                                .name
-                                                                            ],
-                                                                          callback:
-                                                                            function (
-                                                                              $$v
-                                                                            ) {
-                                                                              _vm.$set(
-                                                                                _vm.models,
-                                                                                item.name,
-                                                                                $$v
-                                                                              )
+                                                                          on: {
+                                                                            change:
+                                                                              function (
+                                                                                val
+                                                                              ) {
+                                                                                _vm.handleChange(
+                                                                                  item,
+                                                                                  val
+                                                                                )
+                                                                              },
+                                                                          },
+                                                                          model:
+                                                                            {
+                                                                              value:
+                                                                                _vm
+                                                                                  .models[
+                                                                                  item
+                                                                                    .name
+                                                                                ],
+                                                                              callback:
+                                                                                function (
+                                                                                  $$v
+                                                                                ) {
+                                                                                  _vm.$set(
+                                                                                    _vm.models,
+                                                                                    item.name,
+                                                                                    $$v
+                                                                                  )
+                                                                                },
+                                                                              expression:
+                                                                                "models[item.name]",
                                                                             },
-                                                                          expression:
-                                                                            "models[item.name]",
                                                                         },
-                                                                      },
-                                                                      "es-selector",
+                                                                        "es-selector",
+                                                                        _vm.handleExclAttribute(
+                                                                          {
+                                                                            data: item,
+                                                                            attrs:
+                                                                              [
+                                                                                "value",
+                                                                              ],
+                                                                          }
+                                                                        ),
+                                                                        false
+                                                                      ),
                                                                       _vm.handleExclAttribute(
                                                                         {
-                                                                          data: item,
+                                                                          data: item.events,
                                                                           attrs:
-                                                                            [
-                                                                              "value",
-                                                                            ],
+                                                                            "change",
                                                                         }
-                                                                      ),
-                                                                      false
+                                                                      )
                                                                     )
                                                                   )
                                                                 : item.type ===
@@ -16009,26 +16102,13 @@ var mainvue_type_template_id_1499355a_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
                                                       )
                                                     )
@@ -16391,226 +16471,114 @@ var mainvue_type_template_id_1499355a_render = function () {
                                                               "models[item.name]",
                                                           },
                                                         },
-                                                        "es-select-ganged",
-                                                        _vm.handleExclAttribute(
-                                                          {
-                                                            data: item,
-                                                            attrs: ["value"],
-                                                          }
-                                                        ),
-                                                        false
-                                                      )
-                                                    )
-                                                  : item.type == "switch"
-                                                  ? _c(
-                                                      "es-switch",
-                                                      _vm._b(
-                                                        {
-                                                          attrs: {
-                                                            plain:
-                                                              item.plain ||
-                                                              item.name ===
-                                                                undefined,
-                                                            readonly:
-                                                              _vm.readonly
-                                                                ? _vm.readonly
-                                                                : item.readonly,
-                                                          },
-                                                          on: {
-                                                            change: function (
-                                                              val
-                                                            ) {
-                                                              _vm.handleChange(
-                                                                item,
-                                                                val
-                                                              )
-                                                            },
-                                                          },
-                                                          model: {
-                                                            value:
-                                                              _vm.models[
-                                                                item.name
-                                                              ],
-                                                            callback: function (
-                                                              $$v
-                                                            ) {
-                                                              _vm.$set(
-                                                                _vm.models,
-                                                                item.name,
-                                                                $$v
-                                                              )
-                                                            },
-                                                            expression:
-                                                              "models[item.name]",
-                                                          },
-                                                        },
-                                                        "es-switch",
-                                                        _vm.handleExclAttribute(
-                                                          {
-                                                            data: item,
-                                                            attrs: ["value"],
-                                                          }
-                                                        ),
-                                                        false
-                                                      )
-                                                    )
-                                                  : item.date ||
-                                                    item.type == "date" ||
-                                                    item.type == "year" ||
-                                                    item.type == "month" ||
-                                                    item.type == "date" ||
-                                                    item.type == "dates" ||
-                                                    item.type == "week" ||
-                                                    item.type == "datetime" ||
-                                                    item.type ==
-                                                      "datetimerange" ||
-                                                    item.type == "daterange" ||
-                                                    item.type == "monthrange" ||
-                                                    item.type == "quarter" ||
-                                                    item.type == "halfyear"
-                                                  ? _c(
-                                                      "es-date-picker",
-                                                      _vm._b(
-                                                        {
-                                                          attrs: {
-                                                            plain:
-                                                              item.plain ||
-                                                              item.name ===
-                                                                undefined,
-                                                            readonly:
-                                                              _vm.readonly
-                                                                ? _vm.readonly
-                                                                : item.readonly,
-                                                          },
-                                                          on: {
-                                                            blur: function (
-                                                              event
-                                                            ) {
-                                                              _vm.handleBlur(
-                                                                item,
-                                                                event
-                                                              )
-                                                            },
-                                                            focus: function (
-                                                              event
-                                                            ) {
-                                                              _vm.handleFocus(
-                                                                item,
-                                                                event
-                                                              )
-                                                            },
-                                                            change: function (
-                                                              val
-                                                            ) {
-                                                              _vm.handleChange(
-                                                                item,
-                                                                val
-                                                              )
-                                                            },
-                                                          },
-                                                          model: {
-                                                            value:
-                                                              _vm.models[
-                                                                item.name
-                                                              ],
-                                                            callback: function (
-                                                              $$v
-                                                            ) {
-                                                              _vm.$set(
-                                                                _vm.models,
-                                                                item.name,
-                                                                $$v
-                                                              )
-                                                            },
-                                                            expression:
-                                                              "models[item.name]",
-                                                          },
-                                                        },
-                                                        "es-date-picker",
-                                                        _vm.handleExclAttribute(
-                                                          {
-                                                            data: item,
-                                                            attrs: ["value"],
-                                                          }
-                                                        ),
-                                                        false
-                                                      )
-                                                    )
-                                                  : item.type == "attachment" ||
-                                                    item.type == "upload"
-                                                  ? _c(
-                                                      "es-upload",
-                                                      _vm._b(
-                                                        {
-                                                          attrs: {
-                                                            ownId:
-                                                              item.ownId ||
-                                                              _vm.models.id,
-                                                            "btn-size":
-                                                              "medium",
-                                                            readonly:
-                                                              _vm.readonly
-                                                                ? _vm.readonly
-                                                                : item.readonly,
-                                                            rules: item.rules,
-                                                          },
-                                                          on: {
-                                                            change: function (
-                                                              val
-                                                            ) {
-                                                              _vm.handleChange(
-                                                                item,
-                                                                val
-                                                              )
-                                                            },
-                                                          },
-                                                          model: {
-                                                            value:
-                                                              _vm.models[
-                                                                item.name
-                                                              ],
-                                                            callback: function (
-                                                              $$v
-                                                            ) {
-                                                              _vm.$set(
-                                                                _vm.models,
-                                                                item.name,
-                                                                $$v
-                                                              )
-                                                            },
-                                                            expression:
-                                                              "models[item.name]",
-                                                          },
-                                                        },
-                                                        "es-upload",
+                                                        "es-select-ganged",
                                                         _vm.handleExclAttribute(
                                                           {
                                                             data: item,
-                                                            attrs: [
-                                                              "value",
-                                                              "ownId",
-                                                            ],
+                                                            attrs: ["value"],
                                                           }
                                                         ),
                                                         false
                                                       )
                                                     )
-                                                  : item.type === "selector"
+                                                  : item.type == "switch"
                                                   ? _c(
-                                                      "es-selector",
+                                                      "es-switch",
                                                       _vm._b(
                                                         {
                                                           attrs: {
+                                                            plain:
+                                                              item.plain ||
+                                                              item.name ===
+                                                                undefined,
                                                             readonly:
                                                               _vm.readonly
                                                                 ? _vm.readonly
                                                                 : item.readonly,
+                                                          },
+                                                          on: {
+                                                            change: function (
+                                                              val
+                                                            ) {
+                                                              _vm.handleChange(
+                                                                item,
+                                                                val
+                                                              )
+                                                            },
+                                                          },
+                                                          model: {
+                                                            value:
+                                                              _vm.models[
+                                                                item.name
+                                                              ],
+                                                            callback: function (
+                                                              $$v
+                                                            ) {
+                                                              _vm.$set(
+                                                                _vm.models,
+                                                                item.name,
+                                                                $$v
+                                                              )
+                                                            },
+                                                            expression:
+                                                              "models[item.name]",
+                                                          },
+                                                        },
+                                                        "es-switch",
+                                                        _vm.handleExclAttribute(
+                                                          {
+                                                            data: item,
+                                                            attrs: ["value"],
+                                                          }
+                                                        ),
+                                                        false
+                                                      )
+                                                    )
+                                                  : item.date ||
+                                                    item.type == "date" ||
+                                                    item.type == "year" ||
+                                                    item.type == "month" ||
+                                                    item.type == "date" ||
+                                                    item.type == "dates" ||
+                                                    item.type == "week" ||
+                                                    item.type == "datetime" ||
+                                                    item.type ==
+                                                      "datetimerange" ||
+                                                    item.type == "daterange" ||
+                                                    item.type == "monthrange" ||
+                                                    item.type == "quarter" ||
+                                                    item.type == "halfyear"
+                                                  ? _c(
+                                                      "es-date-picker",
+                                                      _vm._b(
+                                                        {
+                                                          attrs: {
                                                             plain:
                                                               item.plain ||
                                                               item.name ===
                                                                 undefined,
+                                                            readonly:
+                                                              _vm.readonly
+                                                                ? _vm.readonly
+                                                                : item.readonly,
                                                           },
                                                           on: {
+                                                            blur: function (
+                                                              event
+                                                            ) {
+                                                              _vm.handleBlur(
+                                                                item,
+                                                                event
+                                                              )
+                                                            },
+                                                            focus: function (
+                                                              event
+                                                            ) {
+                                                              _vm.handleFocus(
+                                                                item,
+                                                                event
+                                                              )
+                                                            },
                                                             change: function (
                                                               val
                                                             ) {
@@ -16638,7 +16606,7 @@ var mainvue_type_template_id_1499355a_render = function () {
                                                               "models[item.name]",
                                                           },
                                                         },
-                                                        "es-selector",
+                                                        "es-date-picker",
                                                         _vm.handleExclAttribute(
                                                           {
                                                             data: item,
@@ -16648,6 +16616,132 @@ var mainvue_type_template_id_1499355a_render = function () {
                                                         false
                                                       )
                                                     )
+                                                  : item.type == "attachment" ||
+                                                    item.type == "upload"
+                                                  ? _c(
+                                                      "es-upload",
+                                                      _vm._g(
+                                                        _vm._b(
+                                                          {
+                                                            attrs: {
+                                                              ownId:
+                                                                item.ownId ||
+                                                                _vm.models.id,
+                                                              "btn-size":
+                                                                "medium",
+                                                              readonly:
+                                                                _vm.readonly
+                                                                  ? _vm.readonly
+                                                                  : item.readonly,
+                                                              rules: item.rules,
+                                                            },
+                                                            on: {
+                                                              change: function (
+                                                                val
+                                                              ) {
+                                                                _vm.handleChange(
+                                                                  item,
+                                                                  val
+                                                                )
+                                                              },
+                                                            },
+                                                            model: {
+                                                              value:
+                                                                _vm.models[
+                                                                  item.name
+                                                                ],
+                                                              callback:
+                                                                function ($$v) {
+                                                                  _vm.$set(
+                                                                    _vm.models,
+                                                                    item.name,
+                                                                    $$v
+                                                                  )
+                                                                },
+                                                              expression:
+                                                                "models[item.name]",
+                                                            },
+                                                          },
+                                                          "es-upload",
+                                                          _vm.handleExclAttribute(
+                                                            {
+                                                              data: item,
+                                                              attrs: [
+                                                                "value",
+                                                                "ownId",
+                                                              ],
+                                                            }
+                                                          ),
+                                                          false
+                                                        ),
+                                                        _vm.handleExclAttribute(
+                                                          {
+                                                            data: item.events,
+                                                            attrs: "change",
+                                                          }
+                                                        )
+                                                      )
+                                                    )
+                                                  : item.type === "selector"
+                                                  ? _c(
+                                                      "es-selector",
+                                                      _vm._g(
+                                                        _vm._b(
+                                                          {
+                                                            attrs: {
+                                                              readonly:
+                                                                _vm.readonly
+                                                                  ? _vm.readonly
+                                                                  : item.readonly,
+                                                              plain:
+                                                                item.plain ||
+                                                                item.name ===
+                                                                  undefined,
+                                                            },
+                                                            on: {
+                                                              change: function (
+                                                                val
+                                                              ) {
+                                                                _vm.handleChange(
+                                                                  item,
+                                                                  val
+                                                                )
+                                                              },
+                                                            },
+                                                            model: {
+                                                              value:
+                                                                _vm.models[
+                                                                  item.name
+                                                                ],
+                                                              callback:
+                                                                function ($$v) {
+                                                                  _vm.$set(
+                                                                    _vm.models,
+                                                                    item.name,
+                                                                    $$v
+                                                                  )
+                                                                },
+                                                              expression:
+                                                                "models[item.name]",
+                                                            },
+                                                          },
+                                                          "es-selector",
+                                                          _vm.handleExclAttribute(
+                                                            {
+                                                              data: item,
+                                                              attrs: ["value"],
+                                                            }
+                                                          ),
+                                                          false
+                                                        ),
+                                                        _vm.handleExclAttribute(
+                                                          {
+                                                            data: item.events,
+                                                            attrs: "change",
+                                                          }
+                                                        )
+                                                      )
+                                                    )
                                                   : item.type === "table"
                                                   ? [
                                                       item.lazy
@@ -18369,20 +18463,14 @@ var mainvue_type_template_id_1499355a_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 ||
@@ -18867,28 +18955,13 @@ var mainvue_type_template_id_1499355a_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
                                                                 )
                                                               )
@@ -19454,80 +19527,12 @@ var mainvue_type_template_id_1499355a_render = function () {
                                                                         "models[item.name]",
                                                                     },
                                                                   },
-                                                                  "es-date-picker",
-                                                                  _vm.handleExclAttribute(
-                                                                    {
-                                                                      data: item,
-                                                                      attrs: [
-                                                                        "value",
-                                                                      ],
-                                                                    }
-                                                                  ),
-                                                                  false
-                                                                )
-                                                              )
-                                                            : item.type ==
-                                                                "attachment" ||
-                                                              item.type ==
-                                                                "upload"
-                                                            ? _c(
-                                                                "es-upload",
-                                                                _vm._b(
-                                                                  {
-                                                                    attrs: {
-                                                                      ownId:
-                                                                        item.ownId ||
-                                                                        _vm
-                                                                          .models
-                                                                          .id,
-                                                                      "btn-size":
-                                                                        "medium",
-                                                                      readonly:
-                                                                        _vm.readonly
-                                                                          ? _vm.readonly
-                                                                          : item.readonly,
-                                                                      rules:
-                                                                        item.rules,
-                                                                    },
-                                                                    on: {
-                                                                      change:
-                                                                        function (
-                                                                          val
-                                                                        ) {
-                                                                          _vm.handleChange(
-                                                                            item,
-                                                                            val
-                                                                          )
-                                                                        },
-                                                                    },
-                                                                    model: {
-                                                                      value:
-                                                                        _vm
-                                                                          .models[
-                                                                          item
-                                                                            .name
-                                                                        ],
-                                                                      callback:
-                                                                        function (
-                                                                          $$v
-                                                                        ) {
-                                                                          _vm.$set(
-                                                                            _vm.models,
-                                                                            item.name,
-                                                                            $$v
-                                                                          )
-                                                                        },
-                                                                      expression:
-                                                                        "models[item.name]",
-                                                                    },
-                                                                  },
-                                                                  "es-upload",
+                                                                  "es-date-picker",
                                                                   _vm.handleExclAttribute(
                                                                     {
                                                                       data: item,
                                                                       attrs: [
                                                                         "value",
-                                                                        "ownId",
                                                                       ],
                                                                     }
                                                                   ),
@@ -19535,52 +19540,149 @@ var mainvue_type_template_id_1499355a_render = function () {
                                                                 )
                                                               )
                                                             : item.type ==
-                                                              "selector"
+                                                                "attachment" ||
+                                                              item.type ==
+                                                                "upload"
                                                             ? _c(
-                                                                "es-selector",
-                                                                _vm._b(
-                                                                  {
-                                                                    attrs: {
-                                                                      readonly:
-                                                                        _vm.readonly
-                                                                          ? _vm.readonly
-                                                                          : item.readonly,
-                                                                      plain:
-                                                                        item.plain ||
-                                                                        item.name ===
-                                                                          undefined,
+                                                                "es-upload",
+                                                                _vm._g(
+                                                                  _vm._b(
+                                                                    {
+                                                                      attrs: {
+                                                                        ownId:
+                                                                          item.ownId ||
+                                                                          _vm
+                                                                            .models
+                                                                            .id,
+                                                                        "btn-size":
+                                                                          "medium",
+                                                                        readonly:
+                                                                          _vm.readonly
+                                                                            ? _vm.readonly
+                                                                            : item.readonly,
+                                                                        rules:
+                                                                          item.rules,
+                                                                      },
+                                                                      on: {
+                                                                        change:
+                                                                          function (
+                                                                            val
+                                                                          ) {
+                                                                            _vm.handleChange(
+                                                                              item,
+                                                                              val
+                                                                            )
+                                                                          },
+                                                                      },
+                                                                      model: {
+                                                                        value:
+                                                                          _vm
+                                                                            .models[
+                                                                            item
+                                                                              .name
+                                                                          ],
+                                                                        callback:
+                                                                          function (
+                                                                            $$v
+                                                                          ) {
+                                                                            _vm.$set(
+                                                                              _vm.models,
+                                                                              item.name,
+                                                                              $$v
+                                                                            )
+                                                                          },
+                                                                        expression:
+                                                                          "models[item.name]",
+                                                                      },
                                                                     },
-                                                                    model: {
-                                                                      value:
-                                                                        _vm
-                                                                          .models[
-                                                                          item
-                                                                            .name
+                                                                    "es-upload",
+                                                                    _vm.handleExclAttribute(
+                                                                      {
+                                                                        data: item,
+                                                                        attrs: [
+                                                                          "value",
+                                                                          "ownId",
                                                                         ],
-                                                                      callback:
-                                                                        function (
-                                                                          $$v
-                                                                        ) {
-                                                                          _vm.$set(
-                                                                            _vm.models,
-                                                                            item.name,
+                                                                      }
+                                                                    ),
+                                                                    false
+                                                                  ),
+                                                                  _vm.handleExclAttribute(
+                                                                    {
+                                                                      data: item.events,
+                                                                      attrs:
+                                                                        "change",
+                                                                    }
+                                                                  )
+                                                                )
+                                                              )
+                                                            : item.type ==
+                                                              "selector"
+                                                            ? _c(
+                                                                "es-selector",
+                                                                _vm._g(
+                                                                  _vm._b(
+                                                                    {
+                                                                      attrs: {
+                                                                        readonly:
+                                                                          _vm.readonly
+                                                                            ? _vm.readonly
+                                                                            : item.readonly,
+                                                                        plain:
+                                                                          item.plain ||
+                                                                          item.name ===
+                                                                            undefined,
+                                                                      },
+                                                                      on: {
+                                                                        change:
+                                                                          function (
+                                                                            val
+                                                                          ) {
+                                                                            _vm.handleChange(
+                                                                              item,
+                                                                              val
+                                                                            )
+                                                                          },
+                                                                      },
+                                                                      model: {
+                                                                        value:
+                                                                          _vm
+                                                                            .models[
+                                                                            item
+                                                                              .name
+                                                                          ],
+                                                                        callback:
+                                                                          function (
                                                                             $$v
-                                                                          )
-                                                                        },
-                                                                      expression:
-                                                                        "models[item.name]",
+                                                                          ) {
+                                                                            _vm.$set(
+                                                                              _vm.models,
+                                                                              item.name,
+                                                                              $$v
+                                                                            )
+                                                                          },
+                                                                        expression:
+                                                                          "models[item.name]",
+                                                                      },
                                                                     },
-                                                                  },
-                                                                  "es-selector",
+                                                                    "es-selector",
+                                                                    _vm.handleExclAttribute(
+                                                                      {
+                                                                        data: item,
+                                                                        attrs: [
+                                                                          "value",
+                                                                        ],
+                                                                      }
+                                                                    ),
+                                                                    false
+                                                                  ),
                                                                   _vm.handleExclAttribute(
                                                                     {
-                                                                      data: item,
-                                                                      attrs: [
-                                                                        "value",
-                                                                      ],
+                                                                      data: item.events,
+                                                                      attrs:
+                                                                        "change",
                                                                     }
-                                                                  ),
-                                                                  false
+                                                                  )
                                                                 )
                                                               )
                                                             : item.type ===
@@ -21346,25 +21448,11 @@ var mainvue_type_template_id_1499355a_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
                                                   )
                                                 )
@@ -21811,94 +21899,117 @@ var mainvue_type_template_id_1499355a_render = function () {
                                                 item.type == "upload"
                                               ? _c(
                                                   "es-upload",
-                                                  _vm._b(
-                                                    {
-                                                      attrs: {
-                                                        ownId:
-                                                          item.ownId ||
-                                                          _vm.models.id,
-                                                        "btn-size": "medium",
-                                                        readonly: _vm.readonly
-                                                          ? _vm.readonly
-                                                          : item.readonly,
-                                                        rules: item.rules,
-                                                      },
-                                                      on: {
-                                                        change: function (val) {
-                                                          _vm.handleChange(
-                                                            item,
+                                                  _vm._g(
+                                                    _vm._b(
+                                                      {
+                                                        attrs: {
+                                                          ownId:
+                                                            item.ownId ||
+                                                            _vm.models.id,
+                                                          "btn-size": "medium",
+                                                          readonly: _vm.readonly
+                                                            ? _vm.readonly
+                                                            : item.readonly,
+                                                          rules: item.rules,
+                                                        },
+                                                        on: {
+                                                          change: function (
                                                             val
-                                                          )
+                                                          ) {
+                                                            _vm.handleChange(
+                                                              item,
+                                                              val
+                                                            )
+                                                          },
                                                         },
-                                                      },
-                                                      model: {
-                                                        value:
-                                                          _vm.models[item.name],
-                                                        callback: function (
-                                                          $$v
-                                                        ) {
-                                                          _vm.$set(
-                                                            _vm.models,
-                                                            item.name,
+                                                        model: {
+                                                          value:
+                                                            _vm.models[
+                                                              item.name
+                                                            ],
+                                                          callback: function (
                                                             $$v
-                                                          )
+                                                          ) {
+                                                            _vm.$set(
+                                                              _vm.models,
+                                                              item.name,
+                                                              $$v
+                                                            )
+                                                          },
+                                                          expression:
+                                                            "models[item.name]",
                                                         },
-                                                        expression:
-                                                          "models[item.name]",
                                                       },
-                                                    },
-                                                    "es-upload",
+                                                      "es-upload",
+                                                      _vm.handleExclAttribute({
+                                                        data: item,
+                                                        attrs: [
+                                                          "value",
+                                                          "ownId",
+                                                        ],
+                                                      }),
+                                                      false
+                                                    ),
                                                     _vm.handleExclAttribute({
-                                                      data: item,
-                                                      attrs: ["value", "ownId"],
-                                                    }),
-                                                    false
+                                                      data: item.events,
+                                                      attrs: "change",
+                                                    })
                                                   )
                                                 )
                                               : item.type == "selector"
                                               ? _c(
                                                   "es-selector",
-                                                  _vm._b(
-                                                    {
-                                                      attrs: {
-                                                        readonly: _vm.readonly
-                                                          ? _vm.readonly
-                                                          : item.readonly,
-                                                        plain:
-                                                          item.plain ||
-                                                          item.name ===
-                                                            undefined,
-                                                      },
-                                                      on: {
-                                                        change: function (val) {
-                                                          _vm.handleChange(
-                                                            item,
+                                                  _vm._g(
+                                                    _vm._b(
+                                                      {
+                                                        attrs: {
+                                                          readonly: _vm.readonly
+                                                            ? _vm.readonly
+                                                            : item.readonly,
+                                                          plain:
+                                                            item.plain ||
+                                                            item.name ===
+                                                              undefined,
+                                                        },
+                                                        on: {
+                                                          change: function (
                                                             val
-                                                          )
+                                                          ) {
+                                                            _vm.handleChange(
+                                                              item,
+                                                              val
+                                                            )
+                                                          },
                                                         },
-                                                      },
-                                                      model: {
-                                                        value:
-                                                          _vm.models[item.name],
-                                                        callback: function (
-                                                          $$v
-                                                        ) {
-                                                          _vm.$set(
-                                                            _vm.models,
-                                                            item.name,
+                                                        model: {
+                                                          value:
+                                                            _vm.models[
+                                                              item.name
+                                                            ],
+                                                          callback: function (
                                                             $$v
-                                                          )
+                                                          ) {
+                                                            _vm.$set(
+                                                              _vm.models,
+                                                              item.name,
+                                                              $$v
+                                                            )
+                                                          },
+                                                          expression:
+                                                            "models[item.name]",
                                                         },
-                                                        expression:
-                                                          "models[item.name]",
                                                       },
-                                                    },
-                                                    "es-selector",
+                                                      "es-selector",
+                                                      _vm.handleExclAttribute({
+                                                        data: item,
+                                                        attrs: ["value"],
+                                                      }),
+                                                      false
+                                                    ),
                                                     _vm.handleExclAttribute({
-                                                      data: item,
-                                                      attrs: ["value"],
-                                                    }),
-                                                    false
+                                                      data: item.events,
+                                                      attrs: "change",
+                                                    })
                                                   )
                                                 )
                                               : item.type === "table"
@@ -23564,11 +23675,11 @@ var mainvue_type_template_id_1499355a_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_1499355a_staticRenderFns = []
-mainvue_type_template_id_1499355a_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=1499355a&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=2fd814fb&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -27448,6 +27559,25 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -27911,6 +28041,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;
@@ -28658,8 +28791,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_1499355a_render,
-  mainvue_type_template_id_1499355a_staticRenderFns,
+  mainvue_type_template_id_2fd814fb_render,
+  mainvue_type_template_id_2fd814fb_staticRenderFns,
   false,
   null,
   null,
@@ -41483,8 +41616,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=e47d85b2&
-var mainvue_type_template_id_e47d85b2_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=529329ae&
+var mainvue_type_template_id_529329ae_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -41504,9 +41637,12 @@ var mainvue_type_template_id_e47d85b2_render = function () {
                   (item.type == "splitReading" &&
                     _vm.splitReadingData &&
                     _vm.splitReadingData.length > 0) ||
-                  item.type != "splitReading",
+                  (item.type == "preset" &&
+                    _vm.presetData &&
+                    _vm.presetData.length > 0) ||
+                  (item.type != "splitReading" && item.type != "preset"),
                 expression:
-                  "\n      (item.type == 'splitReading' &&\n        splitReadingData &&\n        splitReadingData.length > 0) ||\n      item.type != 'splitReading'\n    ",
+                  "\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    ",
               },
             ],
             key: index,
@@ -41676,11 +41812,11 @@ var mainvue_type_template_id_e47d85b2_render = function () {
     2
   )
 }
-var mainvue_type_template_id_e47d85b2_staticRenderFns = []
-mainvue_type_template_id_e47d85b2_render._withStripped = true
+var mainvue_type_template_id_529329ae_staticRenderFns = []
+mainvue_type_template_id_529329ae_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=e47d85b2&
+// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=529329ae&
 
 // 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; };
@@ -41772,6 +41908,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
 //
 //
 //
+//
 
 
 
@@ -42069,6 +42206,12 @@ var flow_list_src_mainvue_type_script_lang_js_components;
             rules: function rules(rows) {
               return rows.canDelete;
             }
+            // {
+            //   text: '修改',
+            //   rules: (rows) => {
+            //     return this.modify && rows.pendstate == 2;
+            //   }
+            // }
           }]
         }],
         preset: this.thead,
@@ -42689,8 +42832,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_e47d85b2_render,
-  mainvue_type_template_id_e47d85b2_staticRenderFns,
+  mainvue_type_template_id_529329ae_render,
+  mainvue_type_template_id_529329ae_staticRenderFns,
   false,
   null,
   null,
@@ -43572,7 +43715,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__(11);
+var icon = __webpack_require__(13);
 
 // 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&
 //
@@ -44806,8 +44949,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=51f9bb88&
-var mainvue_type_template_id_51f9bb88_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=b33f92be&
+var mainvue_type_template_id_b33f92be_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -45660,11 +45803,11 @@ var mainvue_type_template_id_51f9bb88_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_51f9bb88_staticRenderFns = []
-mainvue_type_template_id_51f9bb88_render._withStripped = true
+var mainvue_type_template_id_b33f92be_staticRenderFns = []
+mainvue_type_template_id_b33f92be_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=51f9bb88&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=b33f92be&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=4f5da52e&
 var resetPasswordvue_type_template_id_4f5da52e_render = function () {
@@ -46787,6 +46930,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
   },
   mounted: function mounted() {
     this.getRemember();
+    delete utils_util["a" /* default */].win.websocket;
   },
 
   methods: {
@@ -47400,8 +47544,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_51f9bb88_render,
-  mainvue_type_template_id_51f9bb88_staticRenderFns,
+  mainvue_type_template_id_b33f92be_render,
+  mainvue_type_template_id_b33f92be_staticRenderFns,
   false,
   null,
   null,
@@ -47418,8 +47562,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=6d42b802&
-var mainvue_type_template_id_6d42b802_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=e6267c3c&
+var mainvue_type_template_id_e6267c3c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47844,11 +47988,11 @@ var mainvue_type_template_id_6d42b802_render = function () {
     1
   )
 }
-var mainvue_type_template_id_6d42b802_staticRenderFns = []
-mainvue_type_template_id_6d42b802_render._withStripped = true
+var mainvue_type_template_id_e6267c3c_staticRenderFns = []
+mainvue_type_template_id_e6267c3c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6d42b802&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=e6267c3c&
 
 // 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 () {
@@ -49482,7 +49626,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__(12);
+var external_runtime_import_ = __webpack_require__(14);
 
 // 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&
 
@@ -49633,21 +49777,9 @@ var async_component_component = normalizeComponent(
 )
 
 /* harmony default export */ var async_component = (async_component_component.exports);
-// EXTERNAL MODULE: external "sockjs-client"
-var external_sockjs_client_ = __webpack_require__(13);
-var external_sockjs_client_default = /*#__PURE__*/__webpack_require__.n(external_sockjs_client_);
-
-// EXTERNAL MODULE: external "stompjs"
-var external_stompjs_ = __webpack_require__(14);
-var external_stompjs_default = /*#__PURE__*/__webpack_require__.n(external_stompjs_);
-
 // 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"); }); }; }
-
 //
 //
 //
@@ -49905,13 +50037,17 @@ function main_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 
 
-
-
 var isIE = navigator.userAgent.indexOf('MSIE') != -1;
 var log = utils_util["a" /* default */].getParams('console');
 /* harmony default export */ var main_src_mainvue_type_script_lang_js_ = ({
   name: 'EsMain',
   inheritAttrs: false,
+  provide: function provide() {
+    return {
+      esMain: this
+    };
+  },
+
   components: {
     userinfo: userinfo,
     settings: settings,
@@ -50174,8 +50310,7 @@ var log = utils_util["a" /* default */].getParams('console');
         copyright: { comp: '', data: {} }
       },
       pageLoading: false,
-      client: null,
-      websocket: null,
+      close: null,
       connect: 0,
       wjName: 'singlespa',
       menus: '',
@@ -50258,14 +50393,11 @@ var log = utils_util["a" /* default */].getParams('console');
   },
   created: function created() {
     var params = utils_util["a" /* default */].getParams() || {};
-    if (Object.prototype.hasOwnProperty.call(params, 'history')) {
-      this.history = params.history == true || params.history == 'true' || params.history == 1;
-    }
     this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
     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;
@@ -50281,156 +50413,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';
@@ -50442,14 +50424,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;
         }
@@ -50485,7 +50467,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);
         }
       });
     },
@@ -50527,7 +50509,7 @@ var log = utils_util["a" /* default */].getParams('console');
             this.navIds = ids;
             this.setTitle(ids[0]);
           }
-        } else if (sessionStorage.getItem('jump') && this.history) {
+        } else if (sessionStorage.getItem('jump') && this.isHistory) {
           var _ids = this.getId(this.menus, sessionStorage.getItem('jump'), true);
           if (_ids) {
             this.defaultActive = _ids;
@@ -50546,7 +50528,7 @@ var log = utils_util["a" /* default */].getParams('console');
               this.navIds = _ids2;
               this.setTitle(_ids2[0]);
             }
-          } else if (sessionStorage.getItem('jump') && this.history) {
+          } else if (sessionStorage.getItem('jump') && this.isHistory) {
             var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
             if (_ids3) {
               this.defaultActive = _ids3;
@@ -50561,7 +50543,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //设置主题颜色
     setTheme: function setTheme(color) {
-      var _this3 = this;
+      var _this2 = this;
 
       if (!color) {
         return;
@@ -50572,24 +50554,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);
         }
       });
     },
@@ -50621,18 +50603,28 @@ var log = utils_util["a" /* default */].getParams('console');
           this.results[i] = results[i].split(',');
         }
         if (i === 'indexUrl' && this.loadHomePage) {
-          this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : results[i];
-          if (this.isHomePage && this.homePage) {
-            if (this.menus && this.menus.length) {
-              var ids = null;
-              this.homePage && (ids = this.getId(this.menus, this.homePage));
-              if (ids) {
-                this.defaultActive = ids;
-              } else if (this.homePage) {
-                this.handleJump(this.homePage);
+          var applicationid = utils_util["a" /* default */].getParams('applicationid') || utils_util["a" /* default */].getParams('applicationId');
+          var hash = utils_util["a" /* default */].win.location.hash;
+          if (hash) {
+            hash = hash.split('?')[0];
+          }
+          var jump = sessionStorage.getItem('jump');
+          if (!applicationid && (!jump || !this.isHistory) && hash === '#/' && hash === '#/main') {
+            this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : results[i];
+            if (this.isHomePage && this.homePage) {
+              if (this.menus && this.menus.length) {
+                var ids = null;
+                this.homePage && (ids = this.getId(this.menus, this.homePage));
+                if (ids) {
+                  this.defaultActive = ids;
+                } else if (this.homePage) {
+                  this.handleJump(this.homePage);
+                }
+                this.setMenu(this.menus);
               }
-              this.setMenu(this.menus);
             }
+          } else if (this.menus && this.menus.length) {
+            this.setMenu(this.menus);
           }
         }
         if (i === 'doorIndex' && results[i]) {
@@ -50666,9 +50658,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);
@@ -50681,58 +50677,62 @@ 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);
         }
       });
     },
-    jumpMenu: function jumpMenu(res, flag) {
+    jumpMenu: function jumpMenu(res, flag, param) {
+      var option = { url: res, flag: flag, param: param };
+      if (utils_util["a" /* default */].isObject(res)) {
+        option = main_src_mainvue_type_script_lang_js_extends({}, option, res);
+      }
       var ids = void 0;
-      if (typeof res === 'string') {
-        if (flag) {
-          ids = this.getId(this.menus, res, true);
+      if (typeof option.url === 'string') {
+        if (option.flag) {
+          ids = this.getId(this.menus, option.url, true);
           if (!ids) {
             this.$message.error('未在菜单栏中找到此地址');
             return;
           }
         } else {
-          ids = res.split(',');
+          ids = option.url.split(',');
         }
       } else {
-        ids = res;
+        ids = option.url;
       }
-      this.setDefault(this.menus, ids);
+      this.setDefault(this.menus, ids, option.param);
     },
     getId: function getId(arry, res, path) {
       if (!res) {
@@ -50770,8 +50770,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;
             }
           }
@@ -50782,24 +50782,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.history) {
-              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;
@@ -50807,34 +50807,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.history) {
-                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);
         }
       });
     },
@@ -50956,11 +50956,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) {
@@ -50970,7 +50970,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;
             }
           });
@@ -50980,7 +50980,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;
             }
           });
@@ -50999,12 +50999,12 @@ var log = utils_util["a" /* default */].getParams('console');
     },
 
     //设置默认导航页面
-    setDefault: function setDefault(res, active) {
+    setDefault: function setDefault(res, active, param) {
       this.navIds = JSON.parse(JSON.stringify(active));
       this.sysId = '';
       this.tabsId = '';
       this.active = '';
-      this.getUrl(res, active);
+      this.getUrl(res, active, param);
       if (this.layout === 'subsystem' || this.layout === 'subSystem' || this.layout === 'topnav' || this.layout === 'topNav' || this.layout === 'topside' || this.layout === 'topSide') {
         if (this.layout === 'subsystem' || this.layout === 'subSystem') {
           this.navs = [];
@@ -51053,34 +51053,34 @@ var log = utils_util["a" /* default */].getParams('console');
     },
 
     //获取页面类型及地址
-    getUrl: function getUrl(res, active, index) {
+    getUrl: function getUrl(res, active, index, param) {
       index = index === undefined ? 0 : index;
       for (var i = 0; i < res.length; i++) {
         var item = res[i];
         if (item.id === active[index]) {
           if (index === active.length - 1) {
-            this.handleJump(item.url, item.urlopenmode, item);
+            this.handleJump(item.url, item.urlopenmode, item, param);
             return item.url;
           } else {
             if (item.children && item.children.length) {
               index++;
-              var _url4 = this.getUrl(item.children, active, index);
-              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);
-              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) {
-          this.getUrl(item.children, active, index);
+          this.getUrl(item.children, active, index, param);
         }
       }
       return false;
@@ -51274,7 +51274,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //头部工具交互事件
     handleClick: function handleClick(res) {
-      var _this8 = this;
+      var _this7 = this;
 
       var type = res.type;
 
@@ -51295,7 +51295,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':
@@ -51323,22 +51323,23 @@ 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) {
-      var _this10 = this;
+    handleJump: function handleJump(page, type, res, param) {
+      var _this9 = this;
 
+      console.log(page);
       var prevPage = sessionStorage.getItem('jump');
       sessionStorage.setItem('jump', page);
       if (res) {
@@ -51359,7 +51360,7 @@ var log = utils_util["a" /* default */].getParams('console');
       } else if (type == 3) {
         this.method = 'iframe';
         this.refresh = false;
-        this.page = utils_util["a" /* default */].handlerUrl(page);
+        this.page = utils_util["a" /* default */].handlerUrl(page, param);
       } else if (page) {
         var urls = page.split('?');
         if (urls[0].indexOf('.js') > 1) {
@@ -51367,17 +51368,17 @@ 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';
           this.refresh = false;
-          this.page = utils_util["a" /* default */].handlerUrl(page);
+          this.page = utils_util["a" /* default */].handlerUrl(page, param);
         } else {
           if (urls[0].indexOf('.html') === -1 && urls[0].indexOf('#/') === -1) {
             this.method = 'iframe';
             this.refresh = false;
-            this.page = utils_util["a" /* default */].handlerUrl(page);
+            this.page = utils_util["a" /* default */].handlerUrl(page, param);
           } else {
             this.method = 'router';
             var routes = this.$router.options.routes;
@@ -51385,6 +51386,9 @@ var log = utils_util["a" /* default */].getParams('console');
               var path = this.hasRouter(routes, urls[0]);
               if (path) {
                 var params = utils_util["a" /* default */].getParams({ url: page });
+                if (param) {
+                  params = main_src_mainvue_type_script_lang_js_extends({}, params, param);
+                }
                 if (res) {
                   this.routerKey = res.id;
                   if (Object.prototype.hasOwnProperty.call(res, 'keepAlive')) {
@@ -51396,7 +51400,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({
@@ -51406,13 +51410,13 @@ var log = utils_util["a" /* default */].getParams('console');
                 if (this.loadWujie === false || this.downgrade && isIE || urlopenmode == 3) {
                   this.method = 'iframe';
                   this.refresh = false;
-                  this.page = utils_util["a" /* default */].handlerUrl(page);
+                  this.page = utils_util["a" /* default */].handlerUrl(page, param);
                 } else {
                   this.method = 'wujie';
                   this.wjName = res && res.appCode ? res.appCode : 'application';
                   this.page = this.host + page;
                   this.$nextTick(function () {
-                    _this10.refresh = true;
+                    _this9.refresh = true;
                   });
                 }
               }
@@ -51424,7 +51428,7 @@ var log = utils_util["a" /* default */].getParams('console');
         }
       }
       this.$nextTick(function () {
-        _this10.showPage = true;
+        _this9.showPage = true;
       });
     },
 
@@ -51536,7 +51540,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;
@@ -51545,69 +51549,61 @@ 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() {
-      //初始化weosocket
-      if (!this.websocket) {
-        var _url6 = (utils_util["a" /* default */].getStorage('wshost') || '') + api["Zb" /* wss */];
-        this.websocket = new external_sockjs_client_default.a(_url6);
-      }
-      this.client = external_stompjs_default.a.over(this.websocket);
-      if (!this.isConsole && this.client) {
-        this.client.debug = null;
-      }
-      this.handleConnect(this.client);
-    },
-    handleConnect: function handleConnect(client) {
-      var _this12 = this;
+      var _this11 = this;
 
-      client.connect({}, function () {
-        //localStorage.setItem("socket",true);
-        //订阅服务端的
-        client.subscribe(api["Qb" /* topic */], function (response) {
-          var res = JSON.parse(response.body);
-          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);
-                }
-              }
-              if (i === 'menuTipsMap') {
-                _this12.menuTips = data[i];
-              }
-              if (i === 'sysMsgList') {
-                _this12.sysMsg = data[i];
-              }
-              if (i === 'extraData') {
-                _this12.extraData = data[i];
+      utils_util["a" /* default */].socket().then(function (res, close) {
+        _this11.close = close;
+        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];
+            }
           }
-        });
-      }, function (error) {
-        console.log('webSocket连接失败');
-        client.disconnect();
+        }
+        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);
+        }
+      }).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);
@@ -51628,7 +51624,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);
@@ -51659,7 +51655,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) {
@@ -51717,8 +51713,8 @@ var log = utils_util["a" /* default */].getParams('console');
   },
   beforeDestroy: function beforeDestroy() {
     this.timer = null;
-    if (this.client && this.client.connected) {
-      this.client.disconnect();
+    if (this.close) {
+      this.close();
     }
   }
 });
@@ -51734,8 +51730,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_6d42b802_render,
-  mainvue_type_template_id_6d42b802_staticRenderFns,
+  mainvue_type_template_id_e6267c3c_render,
+  mainvue_type_template_id_e6267c3c_staticRenderFns,
   false,
   null,
   null,
@@ -54101,8 +54097,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=64807cce&
-var mainvue_type_template_id_64807cce_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
@@ -54133,6 +54129,7 @@ var mainvue_type_template_id_64807cce_render = function () {
                           expression: "display",
                         },
                       ],
+                      attrs: { "value-key": _vm.valueKey },
                       model: {
                         value: _vm.model,
                         callback: function ($$v) {
@@ -54230,11 +54227,11 @@ var mainvue_type_template_id_64807cce_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_64807cce_staticRenderFns = []
-mainvue_type_template_id_64807cce_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=64807cce&
+// 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; };
@@ -54296,6 +54293,7 @@ var radio_group_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "func
 //
 //
 //
+//
 
 
 
@@ -54421,7 +54419,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;
@@ -54545,8 +54543,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_64807cce_render,
-  mainvue_type_template_id_64807cce_staticRenderFns,
+  mainvue_type_template_id_a0afa96c_render,
+  mainvue_type_template_id_a0afa96c_staticRenderFns,
   false,
   null,
   null,
@@ -64681,6 +64679,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,
@@ -64723,6 +64723,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: {
@@ -64878,6 +64886,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',
@@ -64885,13 +64897,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,
@@ -64900,7 +64910,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);
@@ -64944,9 +64954,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,
@@ -65005,8 +65013,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=b2377b8c&
-var tablevue_type_template_id_b2377b8c_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
@@ -65192,20 +65200,9 @@ var tablevue_type_template_id_b2377b8c_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
                                               )
                                             )
@@ -65886,55 +65883,65 @@ var tablevue_type_template_id_b2377b8c_render = function () {
                                                           "selector"
                                                         ? _c(
                                                             "es-selector",
-                                                            _vm._b(
-                                                              {
-                                                                attrs: {
-                                                                  readonly:
-                                                                    _vm.readonly
-                                                                      ? _vm.readonly
-                                                                      : item.readonly,
-                                                                  plain:
-                                                                    item.plain,
-                                                                },
-                                                                on: {
-                                                                  change:
-                                                                    function (
-                                                                      val
-                                                                    ) {
-                                                                      _vm.handleChange(
-                                                                        item,
+                                                            _vm._g(
+                                                              _vm._b(
+                                                                {
+                                                                  attrs: {
+                                                                    readonly:
+                                                                      _vm.readonly
+                                                                        ? _vm.readonly
+                                                                        : item.readonly,
+                                                                    plain:
+                                                                      item.plain,
+                                                                  },
+                                                                  on: {
+                                                                    change:
+                                                                      function (
                                                                         val
-                                                                      )
-                                                                    },
-                                                                },
-                                                                model: {
-                                                                  value:
-                                                                    _vm.model[
-                                                                      item.name
-                                                                    ],
-                                                                  callback:
-                                                                    function (
-                                                                      $$v
-                                                                    ) {
-                                                                      _vm.$set(
-                                                                        _vm.model,
-                                                                        item.name,
+                                                                      ) {
+                                                                        _vm.handleChange(
+                                                                          item,
+                                                                          val
+                                                                        )
+                                                                      },
+                                                                  },
+                                                                  model: {
+                                                                    value:
+                                                                      _vm.model[
+                                                                        item
+                                                                          .name
+                                                                      ],
+                                                                    callback:
+                                                                      function (
                                                                         $$v
-                                                                      )
-                                                                    },
-                                                                  expression:
-                                                                    "model[item.name]",
+                                                                      ) {
+                                                                        _vm.$set(
+                                                                          _vm.model,
+                                                                          item.name,
+                                                                          $$v
+                                                                        )
+                                                                      },
+                                                                    expression:
+                                                                      "model[item.name]",
+                                                                  },
                                                                 },
-                                                              },
-                                                              "es-selector",
+                                                                "es-selector",
+                                                                _vm.handleExclAttribute(
+                                                                  {
+                                                                    data: item,
+                                                                    attrs:
+                                                                      "label",
+                                                                  }
+                                                                ),
+                                                                false
+                                                              ),
                                                               _vm.handleExclAttribute(
                                                                 {
-                                                                  data: item,
+                                                                  data: item.events,
                                                                   attrs:
-                                                                    "label",
+                                                                    "change",
                                                                 }
-                                                              ),
-                                                              false
+                                                              )
                                                             )
                                                           )
                                                         : item.type === "icon"
@@ -67657,17 +67664,15 @@ var tablevue_type_template_id_b2377b8c_render = function () {
     2
   )
 }
-var tablevue_type_template_id_b2377b8c_staticRenderFns = []
-tablevue_type_template_id_b2377b8c_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=b2377b8c&
+// 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; };
+
 //
 //
 //
@@ -68891,6 +68896,9 @@ tablevue_type_template_id_b2377b8c_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)) {
@@ -69020,8 +69028,8 @@ tablevue_type_template_id_b2377b8c_render._withStripped = true
 
 var form_src_table_component = normalizeComponent(
   packages_form_src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_b2377b8c_render,
-  tablevue_type_template_id_b2377b8c_staticRenderFns,
+  tablevue_type_template_id_3e2bccce_render,
+  tablevue_type_template_id_3e2bccce_staticRenderFns,
   false,
   null,
   null,
@@ -69038,8 +69046,8 @@ form_src_table.install = function (Vue) {
 };
 
 /* harmony default export */ var table_form = (form_src_table);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=079ba0f8&
-var mainvue_type_template_id_079ba0f8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=2f5f0ecd&
+var mainvue_type_template_id_2f5f0ecd_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -69418,11 +69426,11 @@ var mainvue_type_template_id_079ba0f8_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_079ba0f8_staticRenderFns = []
-mainvue_type_template_id_079ba0f8_render._withStripped = true
+var mainvue_type_template_id_2f5f0ecd_staticRenderFns = []
+mainvue_type_template_id_2f5f0ecd_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=079ba0f8&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=2f5f0ecd&
 
 // CONCATENATED MODULE: ./packages/upload/src/picture.js
 /* harmony default export */ var picture = ({
@@ -70182,7 +70190,6 @@ var mainvue_type_script_lang_js_props;
           host += this.host;
         }
       }
-      console.log(host);
       var url = encodeURIComponent(external_js_base64_["Base64"].encode(host + (typeof this.download === 'string' ? this.download : api["q" /* downloadByAdjunctId */]) + ('?adjunctId=' + (file.adjunctId || file.response.adjunctId) + '&fullfilename=' + file.originalName)));
       utils_util["a" /* default */].win.top.open(this.kkfileview + '?url=' + url);
     },
@@ -70509,8 +70516,8 @@ var mainvue_type_script_lang_js_props;
 
 var upload_src_main_component = normalizeComponent(
   packages_upload_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_079ba0f8_render,
-  mainvue_type_template_id_079ba0f8_staticRenderFns,
+  mainvue_type_template_id_2f5f0ecd_render,
+  mainvue_type_template_id_2f5f0ecd_staticRenderFns,
   false,
   null,
   null,
@@ -70985,7 +70992,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.99',
+  version: '0.5.11',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,