eoss-ui 0.5.14 → 0.5.16

package/lib/button-group.js

@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({

package/lib/button.js

@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({

package/lib/checkbox-group.js

@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({

package/lib/data-table-form.js

@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({

package/lib/data-table.js

@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
@@ -3855,8 +3859,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=2d512d7f&
-var mainvue_type_template_id_2d512d7f_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=55ef7929&
+var mainvue_type_template_id_55ef7929_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4103,10 +4107,10 @@ var mainvue_type_template_id_2d512d7f_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_2d512d7f_render._withStripped = true
+mainvue_type_template_id_55ef7929_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=2d512d7f&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=55ef7929&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4154,8 +4158,8 @@ childrenvue_type_template_id_29bcbc72_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
 
-// 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=7363f6a6&
-var columnvue_type_template_id_7363f6a6_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=c4b1a5d6&
+var columnvue_type_template_id_c4b1a5d6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4768,10 +4772,7 @@ var columnvue_type_template_id_7363f6a6_render = function () {
                         },
                         "es-button-group",
                         _vm.exclAttribute({
-                          data: Object.assign({}, _vm.config, {
-                            prop: this.prop,
-                            field: this.field,
-                          }),
+                          data: _vm.config,
                           attrs: [
                             "contents",
                             "events",
@@ -4787,10 +4788,7 @@ var columnvue_type_template_id_7363f6a6_render = function () {
                   : _vm.render
                   ? _c("expand-dom", {
                       attrs: {
-                        column: Object.assign({}, _vm.config, {
-                          prop: this.prop,
-                          field: this.field,
-                        }),
+                        column: _vm.config,
                         row: scope.row,
                         render: _vm.render,
                         index: _vm.indexs,
@@ -4831,11 +4829,11 @@ var columnvue_type_template_id_7363f6a6_render = function () {
     2
   )
 }
-var columnvue_type_template_id_7363f6a6_staticRenderFns = []
-columnvue_type_template_id_7363f6a6_render._withStripped = true
+var columnvue_type_template_id_c4b1a5d6_staticRenderFns = []
+columnvue_type_template_id_c4b1a5d6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=7363f6a6&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=c4b1a5d6&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(12);
@@ -5321,8 +5319,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     labelClassName: String,
     type: String,
     required: Boolean,
-    width: String,
-    minWidth: String,
+    width: [Number, String],
+    minWidth: [Number, String],
     hide: Boolean,
     showOverflowTooltip: Boolean,
     render: [Function, String],
@@ -5380,9 +5378,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         sortable: this.sortable || this.sort,
         minWidth: this.minWidth || this.table.minWidth || minWidth,
         className: [this.className ? this.className : '', this.type ? ' es-table-' + this.type + '-box' : '', this.showOverflowTooltip ? ' es-text-ellipsis' : ''].join(' '),
-        labelClassName: [this.labelClassName ? this.labelClassName : '', this.required ? 'es-required' : ''].join(' ')
+        labelClassName: [this.labelClassName ? this.labelClassName : '', this.required ? 'es-required' : ''].join(' '),
+        prop: this.field || this.prop,
+        field: this.field
       }, this.$attrs);
-      return _extends({}, config, { prop: this.field || this.prop, field: this.field });
+      return config;
     },
     formOption: function formOption() {
       return _extends({
@@ -5664,8 +5664,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_7363f6a6_render,
-  columnvue_type_template_id_7363f6a6_staticRenderFns,
+  columnvue_type_template_id_c4b1a5d6_render,
+  columnvue_type_template_id_c4b1a5d6_staticRenderFns,
   false,
   null,
   null,
@@ -5983,7 +5983,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
 var 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; };
 
-var mainvue_type_script_lang_js_components;
+var mainvue_type_script_lang_js_components, _watch;
 
 //
 //
@@ -6306,7 +6306,7 @@ var mainvue_type_script_lang_js_components;
     height: [Number, String],
     maxHeight: [Number, String],
     response: Function,
-    minWidth: String,
+    minWidth: [Number, String],
     border: {
       type: Boolean,
       default: false
@@ -6461,7 +6461,16 @@ var mainvue_type_script_lang_js_components;
       }
     }
   },
-  watch: {
+  watch: (_watch = {
+    showToolbar: function showToolbar() {
+      this.resetHeight();
+      this.doLayout();
+    },
+    page: function page() {
+      this.resetHeight();
+      this.doLayout();
+    },
+
     scale: {
       deep: true,
       handler: function handler(val) {
@@ -6504,51 +6513,45 @@ var mainvue_type_script_lang_js_components;
       handler: function handler(val) {
         this.getTableData();
       }
-    },
-    page: {
-      immediate: true,
-      deep: true,
-      handler: function handler(val) {
-        if ((typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object') {
-          this.config = util["a" /* default */].extend({}, this.config, val);
-        } else {
-          this.config = {
-            pageNum: 1,
-            pageSize: 20,
-            totalCount: 0
-          };
-        }
-      }
-    },
-    'config.pageNum': function configPageNum() {
-      if (this.data.length) {
-        this.$refs.oaTable && this.$refs.oaTable.resetScroll && this.$refs.oaTable.resetScroll(0, 0);
-      }
-    },
-
-    height: {
-      immediate: true,
-      handler: function handler(val) {
-        if (val) {
-          this.tableHeight = val;
-        }
-      }
-    },
-    maxHeight: {
-      immediate: true,
-      handler: function handler(val) {
-        if (val && this.height === undefined) {
-          this.tableHeight = val;
-        }
+    }
+  }, _watch['page'] = {
+    immediate: true,
+    deep: true,
+    handler: function handler(val) {
+      if ((typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object') {
+        this.config = util["a" /* default */].extend({}, this.config, val);
+      } else {
+        this.config = {
+          pageNum: 1,
+          pageSize: 20,
+          totalCount: 0
+        };
       }
-    },
-    display: function display(val) {
+    }
+  }, _watch['config.pageNum'] = function configPageNum() {
+    if (this.data.length) {
+      this.$refs.oaTable && this.$refs.oaTable.resetScroll && this.$refs.oaTable.resetScroll(0, 0);
+    }
+  }, _watch.height = {
+    immediate: true,
+    handler: function handler(val) {
       if (val) {
-        this.resetHeight();
-        this.doLayout();
+        this.tableHeight = val;
       }
     }
-  },
+  }, _watch.maxHeight = {
+    immediate: true,
+    handler: function handler(val) {
+      if (val && this.height === undefined) {
+        this.tableHeight = val;
+      }
+    }
+  }, _watch.display = function display(val) {
+    if (val) {
+      this.resetHeight();
+      this.doLayout();
+    }
+  }, _watch),
   created: function created() {
     if (Array.isArray(this.thead) && this.thead.length) {
       this.getOptions(this.thead);
@@ -6763,7 +6766,7 @@ var mainvue_type_script_lang_js_components;
       }).then(function (res) {
         _this6.tableLoading = false;
         if (res.rCode === 0 || res.status === 'success') {
-          _this6.$refs.oaTable.resetScroll(0, 0);
+          _this6.$refs.oaTable && _this6.$refs.oaTable.resetScroll && _this6.$refs.oaTable.resetScroll(0, 0);
           var results = _this6.parseData !== undefined ? _this6.parseData(res.results || res.data || res) : res.results || res.data;
           _this6.list = results.data || results.records || results.list || [];
           _this6.config.totalCount = results.count || results.total || results.totalCount;
@@ -7260,7 +7263,7 @@ var mainvue_type_script_lang_js_components;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_2d512d7f_render,
+  mainvue_type_template_id_55ef7929_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.js

@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({

package/lib/dialog.js

@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({

package/lib/eoss-ui.common.js

@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
@@ -5529,8 +5533,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=2d512d7f&
-var mainvue_type_template_id_2d512d7f_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=55ef7929&
+var mainvue_type_template_id_55ef7929_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5776,11 +5780,11 @@ var mainvue_type_template_id_2d512d7f_render = function () {
     1
   )
 }
-var mainvue_type_template_id_2d512d7f_staticRenderFns = []
-mainvue_type_template_id_2d512d7f_render._withStripped = true
+var mainvue_type_template_id_55ef7929_staticRenderFns = []
+mainvue_type_template_id_55ef7929_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=2d512d7f&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=55ef7929&
 
 // 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=29bcbc72&
 var childrenvue_type_template_id_29bcbc72_render = function () {
@@ -5825,8 +5829,8 @@ childrenvue_type_template_id_29bcbc72_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
 
-// 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=7363f6a6&
-var columnvue_type_template_id_7363f6a6_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=c4b1a5d6&
+var columnvue_type_template_id_c4b1a5d6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6439,10 +6443,7 @@ var columnvue_type_template_id_7363f6a6_render = function () {
                         },
                         "es-button-group",
                         _vm.exclAttribute({
-                          data: Object.assign({}, _vm.config, {
-                            prop: this.prop,
-                            field: this.field,
-                          }),
+                          data: _vm.config,
                           attrs: [
                             "contents",
                             "events",
@@ -6458,10 +6459,7 @@ var columnvue_type_template_id_7363f6a6_render = function () {
                   : _vm.render
                   ? _c("expand-dom", {
                       attrs: {
-                        column: Object.assign({}, _vm.config, {
-                          prop: this.prop,
-                          field: this.field,
-                        }),
+                        column: _vm.config,
                         row: scope.row,
                         render: _vm.render,
                         index: _vm.indexs,
@@ -6502,11 +6500,11 @@ var columnvue_type_template_id_7363f6a6_render = function () {
     2
   )
 }
-var columnvue_type_template_id_7363f6a6_staticRenderFns = []
-columnvue_type_template_id_7363f6a6_render._withStripped = true
+var columnvue_type_template_id_c4b1a5d6_staticRenderFns = []
+columnvue_type_template_id_c4b1a5d6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=7363f6a6&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=c4b1a5d6&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(2);
@@ -6989,8 +6987,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     labelClassName: String,
     type: String,
     required: Boolean,
-    width: String,
-    minWidth: String,
+    width: [Number, String],
+    minWidth: [Number, String],
     hide: Boolean,
     showOverflowTooltip: Boolean,
     render: [Function, String],
@@ -7048,9 +7046,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         sortable: this.sortable || this.sort,
         minWidth: this.minWidth || this.table.minWidth || minWidth,
         className: [this.className ? this.className : '', this.type ? ' es-table-' + this.type + '-box' : '', this.showOverflowTooltip ? ' es-text-ellipsis' : ''].join(' '),
-        labelClassName: [this.labelClassName ? this.labelClassName : '', this.required ? 'es-required' : ''].join(' ')
+        labelClassName: [this.labelClassName ? this.labelClassName : '', this.required ? 'es-required' : ''].join(' '),
+        prop: this.field || this.prop,
+        field: this.field
       }, this.$attrs);
-      return columnvue_type_script_lang_js_extends({}, config, { prop: this.field || this.prop, field: this.field });
+      return config;
     },
     formOption: function formOption() {
       return columnvue_type_script_lang_js_extends({
@@ -7329,8 +7329,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_7363f6a6_render,
-  columnvue_type_template_id_7363f6a6_staticRenderFns,
+  columnvue_type_template_id_c4b1a5d6_render,
+  columnvue_type_template_id_c4b1a5d6_staticRenderFns,
   false,
   null,
   null,
@@ -7847,7 +7847,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
 
 var data_table_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; };
 
-var mainvue_type_script_lang_js_components;
+var mainvue_type_script_lang_js_components, _watch;
 
 //
 //
@@ -8170,7 +8170,7 @@ var mainvue_type_script_lang_js_components;
     height: [Number, String],
     maxHeight: [Number, String],
     response: Function,
-    minWidth: String,
+    minWidth: [Number, String],
     border: {
       type: Boolean,
       default: false
@@ -8325,7 +8325,16 @@ var mainvue_type_script_lang_js_components;
       }
     }
   },
-  watch: {
+  watch: (_watch = {
+    showToolbar: function showToolbar() {
+      this.resetHeight();
+      this.doLayout();
+    },
+    page: function page() {
+      this.resetHeight();
+      this.doLayout();
+    },
+
     scale: {
       deep: true,
       handler: function handler(val) {
@@ -8368,51 +8377,45 @@ var mainvue_type_script_lang_js_components;
       handler: function handler(val) {
         this.getTableData();
       }
-    },
-    page: {
-      immediate: true,
-      deep: true,
-      handler: function handler(val) {
-        if ((typeof val === 'undefined' ? 'undefined' : mainvue_type_script_lang_js_typeof(val)) === 'object') {
-          this.config = utils_util["a" /* default */].extend({}, this.config, val);
-        } else {
-          this.config = {
-            pageNum: 1,
-            pageSize: 20,
-            totalCount: 0
-          };
-        }
-      }
-    },
-    'config.pageNum': function configPageNum() {
-      if (this.data.length) {
-        this.$refs.oaTable && this.$refs.oaTable.resetScroll && this.$refs.oaTable.resetScroll(0, 0);
-      }
-    },
-
-    height: {
-      immediate: true,
-      handler: function handler(val) {
-        if (val) {
-          this.tableHeight = val;
-        }
-      }
-    },
-    maxHeight: {
-      immediate: true,
-      handler: function handler(val) {
-        if (val && this.height === undefined) {
-          this.tableHeight = val;
-        }
+    }
+  }, _watch['page'] = {
+    immediate: true,
+    deep: true,
+    handler: function handler(val) {
+      if ((typeof val === 'undefined' ? 'undefined' : mainvue_type_script_lang_js_typeof(val)) === 'object') {
+        this.config = utils_util["a" /* default */].extend({}, this.config, val);
+      } else {
+        this.config = {
+          pageNum: 1,
+          pageSize: 20,
+          totalCount: 0
+        };
       }
-    },
-    display: function display(val) {
+    }
+  }, _watch['config.pageNum'] = function configPageNum() {
+    if (this.data.length) {
+      this.$refs.oaTable && this.$refs.oaTable.resetScroll && this.$refs.oaTable.resetScroll(0, 0);
+    }
+  }, _watch.height = {
+    immediate: true,
+    handler: function handler(val) {
       if (val) {
-        this.resetHeight();
-        this.doLayout();
+        this.tableHeight = val;
       }
     }
-  },
+  }, _watch.maxHeight = {
+    immediate: true,
+    handler: function handler(val) {
+      if (val && this.height === undefined) {
+        this.tableHeight = val;
+      }
+    }
+  }, _watch.display = function display(val) {
+    if (val) {
+      this.resetHeight();
+      this.doLayout();
+    }
+  }, _watch),
   created: function created() {
     if (Array.isArray(this.thead) && this.thead.length) {
       this.getOptions(this.thead);
@@ -8627,7 +8630,7 @@ var mainvue_type_script_lang_js_components;
       }).then(function (res) {
         _this6.tableLoading = false;
         if (res.rCode === 0 || res.status === 'success') {
-          _this6.$refs.oaTable.resetScroll(0, 0);
+          _this6.$refs.oaTable && _this6.$refs.oaTable.resetScroll && _this6.$refs.oaTable.resetScroll(0, 0);
           var results = _this6.parseData !== undefined ? _this6.parseData(res.results || res.data || res) : res.results || res.data;
           _this6.list = results.data || results.records || results.list || [];
           _this6.config.totalCount = results.count || results.total || results.totalCount;
@@ -9124,8 +9127,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_2d512d7f_render,
-  mainvue_type_template_id_2d512d7f_staticRenderFns,
+  mainvue_type_template_id_55ef7929_render,
+  mainvue_type_template_id_55ef7929_staticRenderFns,
   false,
   null,
   null,
@@ -70589,7 +70592,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.14',
+  version: '0.5.16',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-group.js

@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({

package/lib/flow-list.js

@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({

package/lib/flow.js

@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({