eoss-ui 0.5.15 → 0.5.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1965,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- if (to.path === '/main' || to.path === '/login') {
1969
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
- } else {
1971
- next && next();
1972
- }
1968
+ next && next();
1973
1969
  } else {
1974
1970
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1975
1971
  ajax({
package/lib/button.js CHANGED
@@ -1966,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- if (to.path === '/main' || to.path === '/login') {
1970
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
- } else {
1972
- next && next();
1973
- }
1969
+ next && next();
1974
1970
  } else {
1975
1971
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1976
1972
  ajax({
@@ -1965,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- if (to.path === '/main' || to.path === '/login') {
1969
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
- } else {
1971
- next && next();
1972
- }
1968
+ next && next();
1973
1969
  } else {
1974
1970
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1975
1971
  ajax({
@@ -1965,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- if (to.path === '/main' || to.path === '/login') {
1969
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
- } else {
1971
- next && next();
1972
- }
1968
+ next && next();
1973
1969
  } else {
1974
1970
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1975
1971
  ajax({
package/lib/data-table.js CHANGED
@@ -1965,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- if (to.path === '/main' || to.path === '/login') {
1969
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
- } else {
1971
- next && next();
1972
- }
1968
+ next && next();
1973
1969
  } else {
1974
1970
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1975
1971
  ajax({
@@ -3859,8 +3855,8 @@ var component = Object(componentNormalizer["a" /* default */])(
3859
3855
  // ESM COMPAT FLAG
3860
3856
  __webpack_require__.r(__webpack_exports__);
3861
3857
 
3862
- // 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&
3863
- var mainvue_type_template_id_2d512d7f_render = function () {
3858
+ // 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&
3859
+ var mainvue_type_template_id_55ef7929_render = function () {
3864
3860
  var _vm = this
3865
3861
  var _h = _vm.$createElement
3866
3862
  var _c = _vm._self._c || _h
@@ -4107,10 +4103,10 @@ var mainvue_type_template_id_2d512d7f_render = function () {
4107
4103
  )
4108
4104
  }
4109
4105
  var staticRenderFns = []
4110
- mainvue_type_template_id_2d512d7f_render._withStripped = true
4106
+ mainvue_type_template_id_55ef7929_render._withStripped = true
4111
4107
 
4112
4108
 
4113
- // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=2d512d7f&
4109
+ // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=55ef7929&
4114
4110
 
4115
4111
  // EXTERNAL MODULE: ./src/config/api.js
4116
4112
  var api = __webpack_require__(1);
@@ -4158,8 +4154,8 @@ childrenvue_type_template_id_29bcbc72_render._withStripped = true
4158
4154
 
4159
4155
  // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
4160
4156
 
4161
- // 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=cd703de2&
4162
- var columnvue_type_template_id_cd703de2_render = function () {
4157
+ // 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&
4158
+ var columnvue_type_template_id_c4b1a5d6_render = function () {
4163
4159
  var _vm = this
4164
4160
  var _h = _vm.$createElement
4165
4161
  var _c = _vm._self._c || _h
@@ -4829,11 +4825,11 @@ var columnvue_type_template_id_cd703de2_render = function () {
4829
4825
  2
4830
4826
  )
4831
4827
  }
4832
- var columnvue_type_template_id_cd703de2_staticRenderFns = []
4833
- columnvue_type_template_id_cd703de2_render._withStripped = true
4828
+ var columnvue_type_template_id_c4b1a5d6_staticRenderFns = []
4829
+ columnvue_type_template_id_c4b1a5d6_render._withStripped = true
4834
4830
 
4835
4831
 
4836
- // CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=cd703de2&
4832
+ // CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=c4b1a5d6&
4837
4833
 
4838
4834
  // EXTERNAL MODULE: external "babel-runtime/regenerator"
4839
4835
  var regenerator_ = __webpack_require__(12);
@@ -5319,8 +5315,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
5319
5315
  labelClassName: String,
5320
5316
  type: String,
5321
5317
  required: Boolean,
5322
- width: String,
5323
- minWidth: String,
5318
+ width: [Number, String],
5319
+ minWidth: [Number, String],
5324
5320
  hide: Boolean,
5325
5321
  showOverflowTooltip: Boolean,
5326
5322
  render: [Function, String],
@@ -5664,8 +5660,8 @@ var componentNormalizer = __webpack_require__(3);
5664
5660
 
5665
5661
  var component = Object(componentNormalizer["a" /* default */])(
5666
5662
  src_columnvue_type_script_lang_js_,
5667
- columnvue_type_template_id_cd703de2_render,
5668
- columnvue_type_template_id_cd703de2_staticRenderFns,
5663
+ columnvue_type_template_id_c4b1a5d6_render,
5664
+ columnvue_type_template_id_c4b1a5d6_staticRenderFns,
5669
5665
  false,
5670
5666
  null,
5671
5667
  null,
@@ -5983,7 +5979,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
5983
5979
 
5984
5980
  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; };
5985
5981
 
5986
- var mainvue_type_script_lang_js_components;
5982
+ var mainvue_type_script_lang_js_components, _watch;
5987
5983
 
5988
5984
  //
5989
5985
  //
@@ -6306,7 +6302,7 @@ var mainvue_type_script_lang_js_components;
6306
6302
  height: [Number, String],
6307
6303
  maxHeight: [Number, String],
6308
6304
  response: Function,
6309
- minWidth: String,
6305
+ minWidth: [Number, String],
6310
6306
  border: {
6311
6307
  type: Boolean,
6312
6308
  default: false
@@ -6461,7 +6457,16 @@ var mainvue_type_script_lang_js_components;
6461
6457
  }
6462
6458
  }
6463
6459
  },
6464
- watch: {
6460
+ watch: (_watch = {
6461
+ showToolbar: function showToolbar() {
6462
+ this.resetHeight();
6463
+ this.doLayout();
6464
+ },
6465
+ page: function page() {
6466
+ this.resetHeight();
6467
+ this.doLayout();
6468
+ },
6469
+
6465
6470
  scale: {
6466
6471
  deep: true,
6467
6472
  handler: function handler(val) {
@@ -6504,51 +6509,45 @@ var mainvue_type_script_lang_js_components;
6504
6509
  handler: function handler(val) {
6505
6510
  this.getTableData();
6506
6511
  }
6507
- },
6508
- page: {
6509
- immediate: true,
6510
- deep: true,
6511
- handler: function handler(val) {
6512
- if ((typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object') {
6513
- this.config = util["a" /* default */].extend({}, this.config, val);
6514
- } else {
6515
- this.config = {
6516
- pageNum: 1,
6517
- pageSize: 20,
6518
- totalCount: 0
6519
- };
6520
- }
6521
- }
6522
- },
6523
- 'config.pageNum': function configPageNum() {
6524
- if (this.data.length) {
6525
- this.$refs.oaTable && this.$refs.oaTable.resetScroll && this.$refs.oaTable.resetScroll(0, 0);
6526
- }
6527
- },
6528
-
6529
- height: {
6530
- immediate: true,
6531
- handler: function handler(val) {
6532
- if (val) {
6533
- this.tableHeight = val;
6534
- }
6535
- }
6536
- },
6537
- maxHeight: {
6538
- immediate: true,
6539
- handler: function handler(val) {
6540
- if (val && this.height === undefined) {
6541
- this.tableHeight = val;
6542
- }
6512
+ }
6513
+ }, _watch['page'] = {
6514
+ immediate: true,
6515
+ deep: true,
6516
+ handler: function handler(val) {
6517
+ if ((typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object') {
6518
+ this.config = util["a" /* default */].extend({}, this.config, val);
6519
+ } else {
6520
+ this.config = {
6521
+ pageNum: 1,
6522
+ pageSize: 20,
6523
+ totalCount: 0
6524
+ };
6543
6525
  }
6544
- },
6545
- display: function display(val) {
6526
+ }
6527
+ }, _watch['config.pageNum'] = function configPageNum() {
6528
+ if (this.data.length) {
6529
+ this.$refs.oaTable && this.$refs.oaTable.resetScroll && this.$refs.oaTable.resetScroll(0, 0);
6530
+ }
6531
+ }, _watch.height = {
6532
+ immediate: true,
6533
+ handler: function handler(val) {
6546
6534
  if (val) {
6547
- this.resetHeight();
6548
- this.doLayout();
6535
+ this.tableHeight = val;
6549
6536
  }
6550
6537
  }
6551
- },
6538
+ }, _watch.maxHeight = {
6539
+ immediate: true,
6540
+ handler: function handler(val) {
6541
+ if (val && this.height === undefined) {
6542
+ this.tableHeight = val;
6543
+ }
6544
+ }
6545
+ }, _watch.display = function display(val) {
6546
+ if (val) {
6547
+ this.resetHeight();
6548
+ this.doLayout();
6549
+ }
6550
+ }, _watch),
6552
6551
  created: function created() {
6553
6552
  if (Array.isArray(this.thead) && this.thead.length) {
6554
6553
  this.getOptions(this.thead);
@@ -6763,7 +6762,7 @@ var mainvue_type_script_lang_js_components;
6763
6762
  }).then(function (res) {
6764
6763
  _this6.tableLoading = false;
6765
6764
  if (res.rCode === 0 || res.status === 'success') {
6766
- _this6.$refs.oaTable.resetScroll(0, 0);
6765
+ _this6.$refs.oaTable && _this6.$refs.oaTable.resetScroll && _this6.$refs.oaTable.resetScroll(0, 0);
6767
6766
  var results = _this6.parseData !== undefined ? _this6.parseData(res.results || res.data || res) : res.results || res.data;
6768
6767
  _this6.list = results.data || results.records || results.list || [];
6769
6768
  _this6.config.totalCount = results.count || results.total || results.totalCount;
@@ -7260,7 +7259,7 @@ var mainvue_type_script_lang_js_components;
7260
7259
 
7261
7260
  var main_component = Object(componentNormalizer["a" /* default */])(
7262
7261
  src_mainvue_type_script_lang_js_,
7263
- mainvue_type_template_id_2d512d7f_render,
7262
+ mainvue_type_template_id_55ef7929_render,
7264
7263
  staticRenderFns,
7265
7264
  false,
7266
7265
  null,
@@ -1966,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- if (to.path === '/main' || to.path === '/login') {
1970
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
- } else {
1972
- next && next();
1973
- }
1969
+ next && next();
1974
1970
  } else {
1975
1971
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1976
1972
  ajax({
package/lib/dialog.js CHANGED
@@ -1965,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- if (to.path === '/main' || to.path === '/login') {
1969
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
- } else {
1971
- next && next();
1972
- }
1968
+ next && next();
1973
1969
  } else {
1974
1970
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1975
1971
  ajax({
@@ -1965,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- if (to.path === '/main' || to.path === '/login') {
1969
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
- } else {
1971
- next && next();
1972
- }
1968
+ next && next();
1973
1969
  } else {
1974
1970
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1975
1971
  ajax({
@@ -5533,8 +5529,8 @@ clients_src_main.install = function (Vue) {
5533
5529
  };
5534
5530
 
5535
5531
  /* harmony default export */ var clients = (clients_src_main);
5536
- // 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&
5537
- var mainvue_type_template_id_2d512d7f_render = function () {
5532
+ // 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&
5533
+ var mainvue_type_template_id_55ef7929_render = function () {
5538
5534
  var _vm = this
5539
5535
  var _h = _vm.$createElement
5540
5536
  var _c = _vm._self._c || _h
@@ -5780,11 +5776,11 @@ var mainvue_type_template_id_2d512d7f_render = function () {
5780
5776
  1
5781
5777
  )
5782
5778
  }
5783
- var mainvue_type_template_id_2d512d7f_staticRenderFns = []
5784
- mainvue_type_template_id_2d512d7f_render._withStripped = true
5779
+ var mainvue_type_template_id_55ef7929_staticRenderFns = []
5780
+ mainvue_type_template_id_55ef7929_render._withStripped = true
5785
5781
 
5786
5782
 
5787
- // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=2d512d7f&
5783
+ // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=55ef7929&
5788
5784
 
5789
5785
  // 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&
5790
5786
  var childrenvue_type_template_id_29bcbc72_render = function () {
@@ -5829,8 +5825,8 @@ childrenvue_type_template_id_29bcbc72_render._withStripped = true
5829
5825
 
5830
5826
  // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
5831
5827
 
5832
- // 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=cd703de2&
5833
- var columnvue_type_template_id_cd703de2_render = function () {
5828
+ // 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&
5829
+ var columnvue_type_template_id_c4b1a5d6_render = function () {
5834
5830
  var _vm = this
5835
5831
  var _h = _vm.$createElement
5836
5832
  var _c = _vm._self._c || _h
@@ -6500,11 +6496,11 @@ var columnvue_type_template_id_cd703de2_render = function () {
6500
6496
  2
6501
6497
  )
6502
6498
  }
6503
- var columnvue_type_template_id_cd703de2_staticRenderFns = []
6504
- columnvue_type_template_id_cd703de2_render._withStripped = true
6499
+ var columnvue_type_template_id_c4b1a5d6_staticRenderFns = []
6500
+ columnvue_type_template_id_c4b1a5d6_render._withStripped = true
6505
6501
 
6506
6502
 
6507
- // CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=cd703de2&
6503
+ // CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=c4b1a5d6&
6508
6504
 
6509
6505
  // EXTERNAL MODULE: external "babel-runtime/regenerator"
6510
6506
  var regenerator_ = __webpack_require__(2);
@@ -6987,8 +6983,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
6987
6983
  labelClassName: String,
6988
6984
  type: String,
6989
6985
  required: Boolean,
6990
- width: String,
6991
- minWidth: String,
6986
+ width: [Number, String],
6987
+ minWidth: [Number, String],
6992
6988
  hide: Boolean,
6993
6989
  showOverflowTooltip: Boolean,
6994
6990
  render: [Function, String],
@@ -7329,8 +7325,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
7329
7325
 
7330
7326
  var column_component = normalizeComponent(
7331
7327
  src_columnvue_type_script_lang_js_,
7332
- columnvue_type_template_id_cd703de2_render,
7333
- columnvue_type_template_id_cd703de2_staticRenderFns,
7328
+ columnvue_type_template_id_c4b1a5d6_render,
7329
+ columnvue_type_template_id_c4b1a5d6_staticRenderFns,
7334
7330
  false,
7335
7331
  null,
7336
7332
  null,
@@ -7847,7 +7843,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
7847
7843
 
7848
7844
  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; };
7849
7845
 
7850
- var mainvue_type_script_lang_js_components;
7846
+ var mainvue_type_script_lang_js_components, _watch;
7851
7847
 
7852
7848
  //
7853
7849
  //
@@ -8170,7 +8166,7 @@ var mainvue_type_script_lang_js_components;
8170
8166
  height: [Number, String],
8171
8167
  maxHeight: [Number, String],
8172
8168
  response: Function,
8173
- minWidth: String,
8169
+ minWidth: [Number, String],
8174
8170
  border: {
8175
8171
  type: Boolean,
8176
8172
  default: false
@@ -8325,7 +8321,16 @@ var mainvue_type_script_lang_js_components;
8325
8321
  }
8326
8322
  }
8327
8323
  },
8328
- watch: {
8324
+ watch: (_watch = {
8325
+ showToolbar: function showToolbar() {
8326
+ this.resetHeight();
8327
+ this.doLayout();
8328
+ },
8329
+ page: function page() {
8330
+ this.resetHeight();
8331
+ this.doLayout();
8332
+ },
8333
+
8329
8334
  scale: {
8330
8335
  deep: true,
8331
8336
  handler: function handler(val) {
@@ -8368,51 +8373,45 @@ var mainvue_type_script_lang_js_components;
8368
8373
  handler: function handler(val) {
8369
8374
  this.getTableData();
8370
8375
  }
8371
- },
8372
- page: {
8373
- immediate: true,
8374
- deep: true,
8375
- handler: function handler(val) {
8376
- if ((typeof val === 'undefined' ? 'undefined' : mainvue_type_script_lang_js_typeof(val)) === 'object') {
8377
- this.config = utils_util["a" /* default */].extend({}, this.config, val);
8378
- } else {
8379
- this.config = {
8380
- pageNum: 1,
8381
- pageSize: 20,
8382
- totalCount: 0
8383
- };
8384
- }
8385
- }
8386
- },
8387
- 'config.pageNum': function configPageNum() {
8388
- if (this.data.length) {
8389
- this.$refs.oaTable && this.$refs.oaTable.resetScroll && this.$refs.oaTable.resetScroll(0, 0);
8390
- }
8391
- },
8392
-
8393
- height: {
8394
- immediate: true,
8395
- handler: function handler(val) {
8396
- if (val) {
8397
- this.tableHeight = val;
8398
- }
8399
- }
8400
- },
8401
- maxHeight: {
8402
- immediate: true,
8403
- handler: function handler(val) {
8404
- if (val && this.height === undefined) {
8405
- this.tableHeight = val;
8406
- }
8376
+ }
8377
+ }, _watch['page'] = {
8378
+ immediate: true,
8379
+ deep: true,
8380
+ handler: function handler(val) {
8381
+ if ((typeof val === 'undefined' ? 'undefined' : mainvue_type_script_lang_js_typeof(val)) === 'object') {
8382
+ this.config = utils_util["a" /* default */].extend({}, this.config, val);
8383
+ } else {
8384
+ this.config = {
8385
+ pageNum: 1,
8386
+ pageSize: 20,
8387
+ totalCount: 0
8388
+ };
8407
8389
  }
8408
- },
8409
- display: function display(val) {
8390
+ }
8391
+ }, _watch['config.pageNum'] = function configPageNum() {
8392
+ if (this.data.length) {
8393
+ this.$refs.oaTable && this.$refs.oaTable.resetScroll && this.$refs.oaTable.resetScroll(0, 0);
8394
+ }
8395
+ }, _watch.height = {
8396
+ immediate: true,
8397
+ handler: function handler(val) {
8410
8398
  if (val) {
8411
- this.resetHeight();
8412
- this.doLayout();
8399
+ this.tableHeight = val;
8413
8400
  }
8414
8401
  }
8415
- },
8402
+ }, _watch.maxHeight = {
8403
+ immediate: true,
8404
+ handler: function handler(val) {
8405
+ if (val && this.height === undefined) {
8406
+ this.tableHeight = val;
8407
+ }
8408
+ }
8409
+ }, _watch.display = function display(val) {
8410
+ if (val) {
8411
+ this.resetHeight();
8412
+ this.doLayout();
8413
+ }
8414
+ }, _watch),
8416
8415
  created: function created() {
8417
8416
  if (Array.isArray(this.thead) && this.thead.length) {
8418
8417
  this.getOptions(this.thead);
@@ -8627,7 +8626,7 @@ var mainvue_type_script_lang_js_components;
8627
8626
  }).then(function (res) {
8628
8627
  _this6.tableLoading = false;
8629
8628
  if (res.rCode === 0 || res.status === 'success') {
8630
- _this6.$refs.oaTable.resetScroll(0, 0);
8629
+ _this6.$refs.oaTable && _this6.$refs.oaTable.resetScroll && _this6.$refs.oaTable.resetScroll(0, 0);
8631
8630
  var results = _this6.parseData !== undefined ? _this6.parseData(res.results || res.data || res) : res.results || res.data;
8632
8631
  _this6.list = results.data || results.records || results.list || [];
8633
8632
  _this6.config.totalCount = results.count || results.total || results.totalCount;
@@ -9124,8 +9123,8 @@ var mainvue_type_script_lang_js_components;
9124
9123
 
9125
9124
  var data_table_src_main_component = normalizeComponent(
9126
9125
  packages_data_table_src_mainvue_type_script_lang_js_,
9127
- mainvue_type_template_id_2d512d7f_render,
9128
- mainvue_type_template_id_2d512d7f_staticRenderFns,
9126
+ mainvue_type_template_id_55ef7929_render,
9127
+ mainvue_type_template_id_55ef7929_staticRenderFns,
9129
9128
  false,
9130
9129
  null,
9131
9130
  null,
@@ -70589,7 +70588,7 @@ if (typeof window !== 'undefined' && window.Vue) {
70589
70588
  }
70590
70589
 
70591
70590
  /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
70592
- version: '0.5.15',
70591
+ version: '0.5.17',
70593
70592
  install: install,
70594
70593
  Button: packages_button,
70595
70594
  ButtonGroup: button_group,
package/lib/flow-group.js CHANGED
@@ -1966,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- if (to.path === '/main' || to.path === '/login') {
1970
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
- } else {
1972
- next && next();
1973
- }
1969
+ next && next();
1974
1970
  } else {
1975
1971
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1976
1972
  ajax({
package/lib/flow-list.js CHANGED
@@ -1966,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- if (to.path === '/main' || to.path === '/login') {
1970
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
- } else {
1972
- next && next();
1973
- }
1969
+ next && next();
1974
1970
  } else {
1975
1971
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1976
1972
  ajax({
package/lib/flow.js CHANGED
@@ -1965,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- if (to.path === '/main' || to.path === '/login') {
1969
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
- } else {
1971
- next && next();
1972
- }
1968
+ next && next();
1973
1969
  } else {
1974
1970
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1975
1971
  ajax({
package/lib/form.js CHANGED
@@ -1965,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- if (to.path === '/main' || to.path === '/login') {
1969
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
- } else {
1971
- next && next();
1972
- }
1968
+ next && next();
1973
1969
  } else {
1974
1970
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1975
1971
  ajax({
@@ -1966,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- if (to.path === '/main' || to.path === '/login') {
1970
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
- } else {
1972
- next && next();
1973
- }
1969
+ next && next();
1974
1970
  } else {
1975
1971
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1976
1972
  ajax({
package/lib/handler.js CHANGED
@@ -1966,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- if (to.path === '/main' || to.path === '/login') {
1970
- window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
- } else {
1972
- next && next();
1973
- }
1969
+ next && next();
1974
1970
  } else {
1975
1971
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1976
1972
  ajax({