eoss-ui 0.5.10 → 0.5.11

package/lib/eoss-ui.common.js

@@ -745,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) {
@@ -1945,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;
@@ -1953,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')) {
@@ -1994,37 +1994,22 @@ var isLogined = function isLogined(_ref8) {
                   deviceUnique: results.deviceUnique
                 }
               });
-              next();
+              var url = delUrlParam({
+                url: win.top.location.href,
+                key: ['serverId', 'authType', 'code', 'sessionId']
+              });
+              win.top.location.href = url;
+              setTimeout(function () {
+                win.top.location.reload();
+              }, 200);
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              var url = win.top.location.href;
-              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              if (to.query.openType) {
-                switch (to.query.openType) {
-                  case 'self':
-                    win.location.href = href;
-                    break;
-                  case 'blank':
-                    win.open(href);
-                    break;
-                  case 'top':
-                    win.top.location.href = href;
-                    break;
-                  case 'parent':
-                    win.parent.location.href = href;
-                    break;
-                }
-              } else {
-                if (open) {
-                  win.open(href);
-                } else {
-                  win.top.location.href = href;
-                }
-              }
+              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
+              win.top.location.href = href;
               break;
             case 4:
               eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
@@ -5457,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
@@ -5492,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,
@@ -5793,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 () {
@@ -8283,6 +8269,7 @@ var mainvue_type_script_lang_js_components;
 //
 //
 //
+//
 
 
 
@@ -8366,6 +8353,7 @@ var mainvue_type_script_lang_js_components;
       type: [Array, Boolean],
       default: false
     },
+    showLabel: Boolean,
     searchValue: Object,
     advanceValue: Object,
     // 是否开启序号
@@ -8785,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) {
@@ -9367,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,
@@ -12766,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=b0256522&
-var mainvue_type_template_id_b0256522_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=2fd814fb&
+var mainvue_type_template_id_2fd814fb_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12940,21 +12934,14 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                                   item.label
                                                                     ? _c(
                                                                         "es-label",
-                                                                        {
-                                                                          attrs:
-                                                                            {
-                                                                              contents:
-                                                                                item.label,
-                                                                              event:
-                                                                                item
-                                                                                  .label
-                                                                                  .event,
-                                                                              events:
-                                                                                item
-                                                                                  .label
-                                                                                  .events,
-                                                                            },
-                                                                        }
+                                                                        _vm._b(
+                                                                          {},
+                                                                          "es-label",
+                                                                          _vm.getLabel(
+                                                                            item.label
+                                                                          ),
+                                                                          false
+                                                                        )
                                                                       )
                                                                     : _vm._e(),
                                                                   item.text ||
@@ -13453,28 +13440,13 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                                       {
                                                                         attrs: {
                                                                           slot: "label",
-                                                                          contents:
-                                                                            item.label,
-                                                                          plain:
-                                                                            item.plain ||
-                                                                            item.name ===
-                                                                              undefined,
                                                                         },
                                                                         slot: "label",
                                                                       },
                                                                       "es-label",
-                                                                      item.label
-                                                                        ? {
-                                                                            event:
-                                                                              item
-                                                                                .label
-                                                                                .event,
-                                                                            events:
-                                                                              item
-                                                                                .label
-                                                                                .events,
-                                                                          }
-                                                                        : {},
+                                                                      _vm.getLabel(
+                                                                        item.label
+                                                                      ),
                                                                       false
                                                                     )
                                                                   )
@@ -16130,26 +16102,13 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                         {
                                                           attrs: {
                                                             slot: "label",
-                                                            contents:
-                                                              item.label,
-                                                            plain:
-                                                              item.plain ||
-                                                              item.name ===
-                                                                undefined,
                                                           },
                                                           slot: "label",
                                                         },
                                                         "es-label",
-                                                        item.label
-                                                          ? {
-                                                              event:
-                                                                item.label
-                                                                  .event,
-                                                              events:
-                                                                item.label
-                                                                  .events,
-                                                            }
-                                                          : {},
+                                                        _vm.getLabel(
+                                                          item.label
+                                                        ),
                                                         false
                                                       )
                                                     )
@@ -18504,20 +18463,14 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                               item.label
                                                                 ? _c(
                                                                     "es-label",
-                                                                    {
-                                                                      attrs: {
-                                                                        contents:
-                                                                          item.label,
-                                                                        event:
-                                                                          item
-                                                                            .label
-                                                                            .event,
-                                                                        events:
-                                                                          item
-                                                                            .label
-                                                                            .events,
-                                                                      },
-                                                                    }
+                                                                    _vm._b(
+                                                                      {},
+                                                                      "es-label",
+                                                                      _vm.getLabel(
+                                                                        item.label
+                                                                      ),
+                                                                      false
+                                                                    )
                                                                   )
                                                                 : _vm._e(),
                                                               item.text ||
@@ -19002,28 +18955,13 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                                   {
                                                                     attrs: {
                                                                       slot: "label",
-                                                                      contents:
-                                                                        item.label,
-                                                                      plain:
-                                                                        item.plain ||
-                                                                        item.name ===
-                                                                          undefined,
                                                                     },
                                                                     slot: "label",
                                                                   },
                                                                   "es-label",
-                                                                  item.label
-                                                                    ? {
-                                                                        event:
-                                                                          item
-                                                                            .label
-                                                                            .event,
-                                                                        events:
-                                                                          item
-                                                                            .label
-                                                                            .events,
-                                                                      }
-                                                                    : {},
+                                                                  _vm.getLabel(
+                                                                    item.label
+                                                                  ),
                                                                   false
                                                                 )
                                                               )
@@ -21510,25 +21448,11 @@ var mainvue_type_template_id_b0256522_render = function () {
                                                   "es-label",
                                                   _vm._b(
                                                     {
-                                                      attrs: {
-                                                        slot: "label",
-                                                        contents: item.label,
-                                                        plain:
-                                                          item.plain ||
-                                                          item.name ===
-                                                            undefined,
-                                                      },
+                                                      attrs: { slot: "label" },
                                                       slot: "label",
                                                     },
                                                     "es-label",
-                                                    item.label
-                                                      ? {
-                                                          event:
-                                                            item.label.event,
-                                                          events:
-                                                            item.label.events,
-                                                        }
-                                                      : {},
+                                                    _vm.getLabel(item.label),
                                                     false
                                                   )
                                                 )
@@ -23751,11 +23675,11 @@ var mainvue_type_template_id_b0256522_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_b0256522_staticRenderFns = []
-mainvue_type_template_id_b0256522_render._withStripped = true
+var mainvue_type_template_id_2fd814fb_staticRenderFns = []
+mainvue_type_template_id_2fd814fb_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=b0256522&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=2fd814fb&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -27654,46 +27578,6 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 
 
 
@@ -28157,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;
@@ -28904,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_b0256522_render,
-  mainvue_type_template_id_b0256522_staticRenderFns,
+  mainvue_type_template_id_2fd814fb_render,
+  mainvue_type_template_id_2fd814fb_staticRenderFns,
   false,
   null,
   null,
@@ -47675,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=cef5b378&
-var mainvue_type_template_id_cef5b378_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=e6267c3c&
+var mainvue_type_template_id_e6267c3c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -48101,11 +47988,11 @@ var mainvue_type_template_id_cef5b378_render = function () {
     1
   )
 }
-var mainvue_type_template_id_cef5b378_staticRenderFns = []
-mainvue_type_template_id_cef5b378_render._withStripped = true
+var mainvue_type_template_id_e6267c3c_staticRenderFns = []
+mainvue_type_template_id_e6267c3c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=cef5b378&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=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 () {
@@ -49891,12 +49778,8 @@ var async_component_component = normalizeComponent(
 
 /* harmony default export */ var async_component = (async_component_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=script&lang=js&
-
-
 var main_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-function main_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
-
 //
 //
 //
@@ -50514,7 +50397,7 @@ var log = utils_util["a" /* default */].getParams('console');
     this.isHeader = params.header;
     var sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && utils_util["a" /* default */].setFavicon(sysLogoIco);
-    this.isLogin(params);
+    this.getConfig(params);
   },
   mounted: function mounted() {
     utils_util["a" /* default */].win.reLogin = this.handleReLogin;
@@ -50530,156 +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';
@@ -50691,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;
         }
@@ -50734,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);
         }
       });
     },
@@ -50810,7 +50543,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //设置主题颜色
     setTheme: function setTheme(color) {
-      var _this3 = this;
+      var _this2 = this;
 
       if (!color) {
         return;
@@ -50821,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);
         }
       });
     },
@@ -50925,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);
@@ -50940,39 +50677,39 @@ var log = utils_util["a" /* default */].getParams('console');
       }
       utils_util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
-          _this4.setConfig(res.results, 1);
-          if (_this4.socket) {
-            _this4.initWebSocket();
+          _this3.setConfig(res.results, 1);
+          if (_this3.socket) {
+            _this3.initWebSocket();
           }
-          if (_this4.remote) {
-            _this4.getMenu();
+          if (_this3.remote) {
+            _this3.getMenu();
           } else {
-            _this4.renderMenu();
+            _this3.renderMenu();
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this4.$message.error(msg);
+          _this3.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this3.$message.error(err.message);
         }
       });
     },
     reGetConfig: function reGetConfig() {
-      var _this5 = this;
+      var _this4 = this;
 
       utils_util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
           var results = JSON.parse(JSON.stringify(res.results));
-          _this5.setConfig(results, 1);
+          _this4.setConfig(results, 1);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this5.$message.error(msg);
+          _this4.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this5.$message.error(err.message);
+          _this4.$message.error(err.message);
         }
       });
     },
@@ -51033,8 +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;
             }
           }
@@ -51045,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.isHistory) {
-              var _ids4 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
+            } else if (sessionStorage.getItem('jump') && _this5.isHistory) {
+              var _ids4 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
               if (_ids4) {
-                _this6.defaultActive = _ids4;
-                _this6.navIds = _ids4;
-                _this6.setTitle(_ids4[0]);
+                _this5.defaultActive = _ids4;
+                _this5.navIds = _ids4;
+                _this5.setTitle(_ids4[0]);
               }
             } else if (utils_util["a" /* default */].win.location.hash) {
               var hash = utils_util["a" /* default */].win.location.hash;
@@ -51070,34 +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.isHistory) {
-                var _ids6 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
+              } else if (sessionStorage.getItem('jump') && _this5.isHistory) {
+                var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
                 if (_ids6) {
-                  _this6.defaultActive = _ids6;
-                  _this6.navIds = _ids6;
-                  _this6.setTitle(_ids6[0]);
+                  _this5.defaultActive = _ids6;
+                  _this5.navIds = _ids6;
+                  _this5.setTitle(_ids6[0]);
                 }
               }
             }
-            _this6.setTips(_this6.menus);
-            utils_store.set('nav', _this6.menus);
-            _this6.setMenu(_this6.menus);
+            _this5.setTips(_this5.menus);
+            utils_store.set('nav', _this5.menus);
+            _this5.setMenu(_this5.menus);
           } else {
-            _this6.$message.error('未分配菜单权限，请联系管理员！');
+            _this5.$message.error('未分配菜单权限，请联系管理员！');
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this6.$message.error(msg);
+          _this5.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     },
@@ -51219,11 +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) {
@@ -51233,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;
             }
           });
@@ -51243,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;
             }
           });
@@ -51327,19 +51064,19 @@ var log = utils_util["a" /* default */].getParams('console');
           } else {
             if (item.children && item.children.length) {
               index++;
-              var _url4 = this.getUrl(item.children, active, index, param);
-              if (_url4 && index === active.length - 1) {
+              var url = this.getUrl(item.children, active, index, param);
+              if (url && index === active.length - 1) {
                 this.tabs = '';
               }
-              return _url4;
+              return url;
             }
             if (item.fourthTabs && item.fourthTabs.length) {
               index++;
-              var _url5 = this.getUrl(item.fourthTabs, active, index, param);
-              if (_url5) {
+              var _url2 = this.getUrl(item.fourthTabs, active, index, param);
+              if (_url2) {
                 this.$set(this, 'tabs', item.fourthTabs);
               }
-              return _url5;
+              return _url2;
             }
           }
         } else if (item.children && item.children.length) {
@@ -51537,7 +51274,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //头部工具交互事件
     handleClick: function handleClick(res) {
-      var _this8 = this;
+      var _this7 = this;
 
       var type = res.type;
 
@@ -51558,7 +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':
@@ -51586,21 +51323,21 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //刷新子页面、子路由
     handleRefresh: function handleRefresh() {
-      var _this9 = this;
+      var _this8 = this;
 
       if (this.method === 'iframe') {
         this.page = utils_util["a" /* default */].handlerUrl(this.page);
       } else {
         this.refresh = false;
         this.$nextTick(function () {
-          _this9.refresh = true;
+          _this8.refresh = true;
         });
       }
     },
 
     //跳转页面
     handleJump: function handleJump(page, type, res, param) {
-      var _this10 = this;
+      var _this9 = this;
 
       console.log(page);
       var prevPage = sessionStorage.getItem('jump');
@@ -51631,7 +51368,7 @@ var log = utils_util["a" /* default */].getParams('console');
           this.wjName = 'singlespa';
           this.page = this.host + page;
           this.$nextTick(function () {
-            _this10.refresh = true;
+            _this9.refresh = true;
           });
         } else if (urls[0].indexOf('.dhtml') > 0 || urls[0].indexOf('.html') > 0 && urls[0].indexOf('.html#') === -1) {
           this.method = 'iframe';
@@ -51663,7 +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({
@@ -51679,7 +51416,7 @@ var log = utils_util["a" /* default */].getParams('console');
                   this.wjName = res && res.appCode ? res.appCode : 'application';
                   this.page = this.host + page;
                   this.$nextTick(function () {
-                    _this10.refresh = true;
+                    _this9.refresh = true;
                   });
                 }
               }
@@ -51691,7 +51428,7 @@ var log = utils_util["a" /* default */].getParams('console');
         }
       }
       this.$nextTick(function () {
-        _this10.showPage = true;
+        _this9.showPage = true;
       });
     },
 
@@ -51803,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;
@@ -51812,45 +51549,45 @@ var log = utils_util["a" /* default */].getParams('console');
           if (typeof res === 'string') {
             res = res.split(',');
           }
-          _this11.setDefault(_this11.menus, res);
+          _this10.setDefault(_this10.menus, res);
         }
       }, false);
     },
 
     //开启weosocket
     initWebSocket: function initWebSocket() {
-      var _this12 = this;
+      var _this11 = this;
 
       utils_util["a" /* default */].socket().then(function (res, close) {
-        _this12.close = close;
+        _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) {
-              _this12.online = data[i];
+              _this11.online = data[i];
             }
             if (i === 'sysMsgNums') {
-              _this12.notice = data[i];
-              if (_this12.showMsg) {
-                _this12.$refs.message.getMsg(true);
+              _this11.notice = data[i];
+              if (_this11.showMsg) {
+                _this11.$refs.message.getMsg(true);
               }
             }
             if (i === 'menuTipsMap') {
-              _this12.menuTips = data[i];
+              _this11.menuTips = data[i];
             }
             if (i === 'sysMsgList') {
-              _this12.sysMsg = data[i];
+              _this11.sysMsg = data[i];
             }
             if (i === 'extraData') {
-              _this12.extraData = data[i];
+              _this11.extraData = data[i];
             }
           }
         }
-        if (_this12.$store) {
-          _this12.$store.commit('websocket', data);
+        if (_this11.$store) {
+          _this11.$store.commit('websocket', data);
         }
-        if (_this12.$eventBus) {
-          _this12.$eventBus.$emit('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);
@@ -51860,13 +51597,13 @@ var log = utils_util["a" /* default */].getParams('console');
       });
     },
     handleOpened: function handleOpened(res) {
-      var _this13 = this;
+      var _this12 = this;
 
       if (res === undefined) {
         this.sysMsg = [];
       } else if (res == false && this.sysMsg.length) {
         this.sysMsgOut = setTimeout(function () {
-          _this13.sysMsg = [];
+          _this12.sysMsg = [];
         }, 3000);
       } else if (this.sysMsgOut) {
         clearTimeout(this.sysMsgOut);
@@ -51887,7 +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);
@@ -51918,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) {
@@ -51993,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_cef5b378_render,
-  mainvue_type_template_id_cef5b378_staticRenderFns,
+  mainvue_type_template_id_e6267c3c_render,
+  mainvue_type_template_id_e6267c3c_staticRenderFns,
   false,
   null,
   null,
@@ -54360,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=0995e7f2&
-var mainvue_type_template_id_0995e7f2_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/radio-group/src/main.vue?vue&type=template&id=a0afa96c&
+var mainvue_type_template_id_a0afa96c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -54490,11 +54227,11 @@ var mainvue_type_template_id_0995e7f2_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_0995e7f2_staticRenderFns = []
-mainvue_type_template_id_0995e7f2_render._withStripped = true
+var mainvue_type_template_id_a0afa96c_staticRenderFns = []
+mainvue_type_template_id_a0afa96c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/radio-group/src/main.vue?vue&type=template&id=0995e7f2&
+// CONCATENATED MODULE: ./packages/radio-group/src/main.vue?vue&type=template&id=a0afa96c&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/radio-group/src/main.vue?vue&type=script&lang=js&
 var radio_group_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -54682,7 +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;
@@ -54806,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_0995e7f2_render,
-  mainvue_type_template_id_0995e7f2_staticRenderFns,
+  mainvue_type_template_id_a0afa96c_render,
+  mainvue_type_template_id_a0afa96c_staticRenderFns,
   false,
   null,
   null,
@@ -64942,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,
@@ -64984,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: {
@@ -65139,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',
@@ -65146,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,
@@ -65161,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);
@@ -65205,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,
@@ -65266,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=fdf72a6c&
-var tablevue_type_template_id_fdf72a6c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=template&id=3e2bccce&
+var tablevue_type_template_id_3e2bccce_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -65453,20 +65200,9 @@ var tablevue_type_template_id_fdf72a6c_render = function () {
                                           ? _c(
                                               "es-label",
                                               _vm._b(
-                                                {
-                                                  attrs: {
-                                                    contents: item.label,
-                                                    plain: item.plain,
-                                                    rules: item.rules,
-                                                  },
-                                                },
+                                                {},
                                                 "es-label",
-                                                item.label
-                                                  ? {
-                                                      event: item.label.event,
-                                                      events: item.label.events,
-                                                    }
-                                                  : {},
+                                                _vm.getLabel(item.label),
                                                 false
                                               )
                                             )
@@ -67928,23 +67664,15 @@ var tablevue_type_template_id_fdf72a6c_render = function () {
     2
   )
 }
-var tablevue_type_template_id_fdf72a6c_staticRenderFns = []
-tablevue_type_template_id_fdf72a6c_render._withStripped = true
+var tablevue_type_template_id_3e2bccce_staticRenderFns = []
+tablevue_type_template_id_3e2bccce_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=fdf72a6c&
+// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=3e2bccce&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=script&lang=js&
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
+var src_tablevue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 //
 //
 //
@@ -69168,6 +68896,9 @@ tablevue_type_template_id_fdf72a6c_render._withStripped = true
   },
 
   methods: {
+    getLabel: function getLabel(res) {
+      return typeof res === 'string' ? { contents: res } : src_tablevue_type_script_lang_js_extends({}, res, { plain: res.plain || res.name === undefined });
+    },
     getRules: function getRules(res) {
       if (res.rules && !res.hide) {
         if (Array.isArray(res.rules)) {
@@ -69297,8 +69028,8 @@ tablevue_type_template_id_fdf72a6c_render._withStripped = true
 
 var form_src_table_component = normalizeComponent(
   packages_form_src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_fdf72a6c_render,
-  tablevue_type_template_id_fdf72a6c_staticRenderFns,
+  tablevue_type_template_id_3e2bccce_render,
+  tablevue_type_template_id_3e2bccce_staticRenderFns,
   false,
   null,
   null,
@@ -71261,7 +70992,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.10',
+  version: '0.5.11',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,