eoss-ui 0.4.48 → 0.4.50

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.
package/lib/data-table.js CHANGED
@@ -2852,8 +2852,8 @@ module.exports = require("vue");
2852
2852
  // ESM COMPAT FLAG
2853
2853
  __webpack_require__.r(__webpack_exports__);
2854
2854
 
2855
- // 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=7c8f1565&
2856
- var mainvue_type_template_id_7c8f1565_render = function () {
2855
+ // 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=59cbc514&
2856
+ var mainvue_type_template_id_59cbc514_render = function () {
2857
2857
  var _vm = this
2858
2858
  var _h = _vm.$createElement
2859
2859
  var _c = _vm._self._c || _h
@@ -3188,10 +3188,10 @@ var mainvue_type_template_id_7c8f1565_render = function () {
3188
3188
  )
3189
3189
  }
3190
3190
  var staticRenderFns = []
3191
- mainvue_type_template_id_7c8f1565_render._withStripped = true
3191
+ mainvue_type_template_id_59cbc514_render._withStripped = true
3192
3192
 
3193
3193
 
3194
- // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7c8f1565&
3194
+ // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=59cbc514&
3195
3195
 
3196
3196
  // EXTERNAL MODULE: ./src/config/api.js
3197
3197
  var api = __webpack_require__(1);
@@ -5756,6 +5756,10 @@ var mainvue_type_script_lang_js_components;
5756
5756
  type: [Boolean, Array],
5757
5757
  default: false
5758
5758
  },
5759
+ checkedKey: {
5760
+ type: String,
5761
+ default: 'id'
5762
+ },
5759
5763
  sizer: {
5760
5764
  type: Boolean,
5761
5765
  default: true
@@ -5844,7 +5848,10 @@ var mainvue_type_script_lang_js_components;
5844
5848
  },
5845
5849
  checkboxParseData: Function,
5846
5850
  checkboxParse: Object,
5847
- display: Boolean,
5851
+ display: {
5852
+ type: Boolean,
5853
+ default: true
5854
+ },
5848
5855
  showFormBtn: {
5849
5856
  type: Boolean,
5850
5857
  default: true
@@ -5956,6 +5963,7 @@ var mainvue_type_script_lang_js_components;
5956
5963
  handler: function handler(val) {
5957
5964
  if (this.tableHeight != 'auto' && this.display) {
5958
5965
  this.resetHeight();
5966
+ this.doLayout();
5959
5967
  }
5960
5968
  }
5961
5969
  },
@@ -5963,11 +5971,12 @@ var mainvue_type_script_lang_js_components;
5963
5971
  handler: function handler(val) {
5964
5972
  if (this.tableHeight != 'auto' && this.display) {
5965
5973
  this.resetHeight();
5974
+ this.doLayout();
5966
5975
  }
5967
5976
  }
5968
5977
  },
5969
5978
  checked: function checked(newVal) {
5970
- this.checkSelect(newVal);
5979
+ this.datas.length && this.checkSelect(newVal);
5971
5980
  },
5972
5981
 
5973
5982
  thead: {
@@ -6019,6 +6028,7 @@ var mainvue_type_script_lang_js_components;
6019
6028
  display: function display(val) {
6020
6029
  if (val) {
6021
6030
  this.resetHeight();
6031
+ this.doLayout();
6022
6032
  }
6023
6033
  }
6024
6034
  },
@@ -6026,13 +6036,13 @@ var mainvue_type_script_lang_js_components;
6026
6036
  this.immediate && this.getTableData();
6027
6037
  },
6028
6038
  mounted: function mounted() {
6029
- this.checkSelect(this.checked);
6039
+ this.datas.length && this.checkSelect(this.checked);
6030
6040
  this.resetHeight();
6031
6041
  },
6032
6042
 
6033
6043
  methods: {
6034
6044
  getIcon: function getIcon(res) {
6035
- if (this.icon && res !== 'right' && !this.$slots.prepend && !this.$slots.append && !this.$slots.default && !this.form) {
6045
+ if (this.sizer && this.icon && res !== 'right' && !this.$slots.prepend && !this.$slots.append && !this.$slots.default && !this.form) {
6036
6046
  this.icon = false;
6037
6047
  return 'es-icon-biao';
6038
6048
  }
@@ -6123,16 +6133,22 @@ var mainvue_type_script_lang_js_components;
6123
6133
  checkSelect: function checkSelect(newVal) {
6124
6134
  var _this4 = this;
6125
6135
 
6126
- if (!this.isFirsetCheck && newVal) {
6136
+ this.$nextTick(function () {
6127
6137
  if (util["a" /* default */].getObjectType(newVal) === 'array') {
6128
6138
  newVal.forEach(function (row) {
6129
- _this4.$refs.oaTable.toggleRowSelection(row, true);
6139
+ if (util["a" /* default */].isObject(row)) {
6140
+ _this4.$refs.oaTable.toggleRowSelection(row, true);
6141
+ } else _this4.datas.forEach(function (item) {
6142
+ if (item[_this4.checkedKey] === row) {
6143
+ _this4.$refs.oaTable.toggleRowSelection(item, true);
6144
+ return;
6145
+ }
6146
+ });
6130
6147
  });
6131
6148
  } else if (newVal === true) {
6132
- this.toggleAllSelection();
6149
+ _this4.toggleAllSelection();
6133
6150
  }
6134
- this.isFirsetCheck = true;
6135
- }
6151
+ });
6136
6152
  },
6137
6153
  getTheads: function getTheads() {
6138
6154
  var _this5 = this;
@@ -6201,6 +6217,9 @@ var mainvue_type_script_lang_js_components;
6201
6217
  var results = _this6.parseData !== undefined ? _this6.parseData(res.results || res.data || res) : res.results || res.data;
6202
6218
  _this6.list = results.data || results.records || results.list || [];
6203
6219
  _this6.config.totalCount = results.count || results.total || results.totalCount;
6220
+ _this6.checked && _this6.$nextTick(function () {
6221
+ _this6.checkSelect(_this6.checked);
6222
+ });
6204
6223
  } else {
6205
6224
  _this6.list = [];
6206
6225
  var msg = res.msg || '系统错误,请联系管理员!';
@@ -6661,7 +6680,7 @@ var mainvue_type_script_lang_js_components;
6661
6680
 
6662
6681
  var main_component = Object(componentNormalizer["a" /* default */])(
6663
6682
  src_mainvue_type_script_lang_js_,
6664
- mainvue_type_template_id_7c8f1565_render,
6683
+ mainvue_type_template_id_59cbc514_render,
6665
6684
  staticRenderFns,
6666
6685
  false,
6667
6686
  null,
@@ -4599,8 +4599,8 @@ clients_src_main.install = function (Vue) {
4599
4599
  };
4600
4600
 
4601
4601
  /* harmony default export */ var clients = (clients_src_main);
4602
- // 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=7c8f1565&
4603
- var mainvue_type_template_id_7c8f1565_render = function () {
4602
+ // 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=59cbc514&
4603
+ var mainvue_type_template_id_59cbc514_render = function () {
4604
4604
  var _vm = this
4605
4605
  var _h = _vm.$createElement
4606
4606
  var _c = _vm._self._c || _h
@@ -4934,11 +4934,11 @@ var mainvue_type_template_id_7c8f1565_render = function () {
4934
4934
  1
4935
4935
  )
4936
4936
  }
4937
- var mainvue_type_template_id_7c8f1565_staticRenderFns = []
4938
- mainvue_type_template_id_7c8f1565_render._withStripped = true
4937
+ var mainvue_type_template_id_59cbc514_staticRenderFns = []
4938
+ mainvue_type_template_id_59cbc514_render._withStripped = true
4939
4939
 
4940
4940
 
4941
- // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7c8f1565&
4941
+ // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=59cbc514&
4942
4942
 
4943
4943
  // 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&
4944
4944
  var childrenvue_type_template_id_796433ee_render = function () {
@@ -7499,6 +7499,10 @@ var mainvue_type_script_lang_js_components;
7499
7499
  type: [Boolean, Array],
7500
7500
  default: false
7501
7501
  },
7502
+ checkedKey: {
7503
+ type: String,
7504
+ default: 'id'
7505
+ },
7502
7506
  sizer: {
7503
7507
  type: Boolean,
7504
7508
  default: true
@@ -7587,7 +7591,10 @@ var mainvue_type_script_lang_js_components;
7587
7591
  },
7588
7592
  checkboxParseData: Function,
7589
7593
  checkboxParse: Object,
7590
- display: Boolean,
7594
+ display: {
7595
+ type: Boolean,
7596
+ default: true
7597
+ },
7591
7598
  showFormBtn: {
7592
7599
  type: Boolean,
7593
7600
  default: true
@@ -7699,6 +7706,7 @@ var mainvue_type_script_lang_js_components;
7699
7706
  handler: function handler(val) {
7700
7707
  if (this.tableHeight != 'auto' && this.display) {
7701
7708
  this.resetHeight();
7709
+ this.doLayout();
7702
7710
  }
7703
7711
  }
7704
7712
  },
@@ -7706,11 +7714,12 @@ var mainvue_type_script_lang_js_components;
7706
7714
  handler: function handler(val) {
7707
7715
  if (this.tableHeight != 'auto' && this.display) {
7708
7716
  this.resetHeight();
7717
+ this.doLayout();
7709
7718
  }
7710
7719
  }
7711
7720
  },
7712
7721
  checked: function checked(newVal) {
7713
- this.checkSelect(newVal);
7722
+ this.datas.length && this.checkSelect(newVal);
7714
7723
  },
7715
7724
 
7716
7725
  thead: {
@@ -7762,6 +7771,7 @@ var mainvue_type_script_lang_js_components;
7762
7771
  display: function display(val) {
7763
7772
  if (val) {
7764
7773
  this.resetHeight();
7774
+ this.doLayout();
7765
7775
  }
7766
7776
  }
7767
7777
  },
@@ -7769,13 +7779,13 @@ var mainvue_type_script_lang_js_components;
7769
7779
  this.immediate && this.getTableData();
7770
7780
  },
7771
7781
  mounted: function mounted() {
7772
- this.checkSelect(this.checked);
7782
+ this.datas.length && this.checkSelect(this.checked);
7773
7783
  this.resetHeight();
7774
7784
  },
7775
7785
 
7776
7786
  methods: {
7777
7787
  getIcon: function getIcon(res) {
7778
- if (this.icon && res !== 'right' && !this.$slots.prepend && !this.$slots.append && !this.$slots.default && !this.form) {
7788
+ if (this.sizer && this.icon && res !== 'right' && !this.$slots.prepend && !this.$slots.append && !this.$slots.default && !this.form) {
7779
7789
  this.icon = false;
7780
7790
  return 'es-icon-biao';
7781
7791
  }
@@ -7866,16 +7876,22 @@ var mainvue_type_script_lang_js_components;
7866
7876
  checkSelect: function checkSelect(newVal) {
7867
7877
  var _this4 = this;
7868
7878
 
7869
- if (!this.isFirsetCheck && newVal) {
7879
+ this.$nextTick(function () {
7870
7880
  if (utils_util["a" /* default */].getObjectType(newVal) === 'array') {
7871
7881
  newVal.forEach(function (row) {
7872
- _this4.$refs.oaTable.toggleRowSelection(row, true);
7882
+ if (utils_util["a" /* default */].isObject(row)) {
7883
+ _this4.$refs.oaTable.toggleRowSelection(row, true);
7884
+ } else _this4.datas.forEach(function (item) {
7885
+ if (item[_this4.checkedKey] === row) {
7886
+ _this4.$refs.oaTable.toggleRowSelection(item, true);
7887
+ return;
7888
+ }
7889
+ });
7873
7890
  });
7874
7891
  } else if (newVal === true) {
7875
- this.toggleAllSelection();
7892
+ _this4.toggleAllSelection();
7876
7893
  }
7877
- this.isFirsetCheck = true;
7878
- }
7894
+ });
7879
7895
  },
7880
7896
  getTheads: function getTheads() {
7881
7897
  var _this5 = this;
@@ -7944,6 +7960,9 @@ var mainvue_type_script_lang_js_components;
7944
7960
  var results = _this6.parseData !== undefined ? _this6.parseData(res.results || res.data || res) : res.results || res.data;
7945
7961
  _this6.list = results.data || results.records || results.list || [];
7946
7962
  _this6.config.totalCount = results.count || results.total || results.totalCount;
7963
+ _this6.checked && _this6.$nextTick(function () {
7964
+ _this6.checkSelect(_this6.checked);
7965
+ });
7947
7966
  } else {
7948
7967
  _this6.list = [];
7949
7968
  var msg = res.msg || '系统错误,请联系管理员!';
@@ -8404,8 +8423,8 @@ var mainvue_type_script_lang_js_components;
8404
8423
 
8405
8424
  var data_table_src_main_component = normalizeComponent(
8406
8425
  packages_data_table_src_mainvue_type_script_lang_js_,
8407
- mainvue_type_template_id_7c8f1565_render,
8408
- mainvue_type_template_id_7c8f1565_staticRenderFns,
8426
+ mainvue_type_template_id_59cbc514_render,
8427
+ mainvue_type_template_id_59cbc514_staticRenderFns,
8409
8428
  false,
8410
8429
  null,
8411
8430
  null,
@@ -12926,8 +12945,8 @@ error_page_src_main.install = function (Vue) {
12926
12945
  };
12927
12946
 
12928
12947
  /* harmony default export */ var error_page = (error_page_src_main);
12929
- // 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=3481f0aa&
12930
- var mainvue_type_template_id_3481f0aa_render = function () {
12948
+ // 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=7011090d&
12949
+ var mainvue_type_template_id_7011090d_render = function () {
12931
12950
  var _vm = this
12932
12951
  var _h = _vm.$createElement
12933
12952
  var _c = _vm._self._c || _h
@@ -23213,11 +23232,11 @@ var mainvue_type_template_id_3481f0aa_render = function () {
23213
23232
  )
23214
23233
  : _vm._e()
23215
23234
  }
23216
- var mainvue_type_template_id_3481f0aa_staticRenderFns = []
23217
- mainvue_type_template_id_3481f0aa_render._withStripped = true
23235
+ var mainvue_type_template_id_7011090d_staticRenderFns = []
23236
+ mainvue_type_template_id_7011090d_render._withStripped = true
23218
23237
 
23219
23238
 
23220
- // CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=3481f0aa&
23239
+ // CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7011090d&
23221
23240
 
23222
23241
  // CONCATENATED MODULE: ./src/utils/rules.js
23223
23242
  // 手机号
@@ -26969,7 +26988,10 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
26969
26988
  formatTable: Object,
26970
26989
  full: Boolean,
26971
26990
  within: [String, Object],
26972
- display: Boolean,
26991
+ display: {
26992
+ type: Boolean,
26993
+ default: true
26994
+ },
26973
26995
  submitLoading: {
26974
26996
  type: Boolean,
26975
26997
  default: true
@@ -28020,8 +28042,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
28020
28042
 
28021
28043
  var form_src_main_component = normalizeComponent(
28022
28044
  packages_form_src_mainvue_type_script_lang_js_,
28023
- mainvue_type_template_id_3481f0aa_render,
28024
- mainvue_type_template_id_3481f0aa_staticRenderFns,
28045
+ mainvue_type_template_id_7011090d_render,
28046
+ mainvue_type_template_id_7011090d_staticRenderFns,
28025
28047
  false,
28026
28048
  null,
28027
28049
  null,
@@ -43204,8 +43226,8 @@ label_src_main.install = function (Vue) {
43204
43226
  };
43205
43227
 
43206
43228
  /* harmony default export */ var packages_label = (label_src_main);
43207
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=5756d38e&
43208
- var mainvue_type_template_id_5756d38e_render = function () {
43229
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=9885b762&
43230
+ var mainvue_type_template_id_9885b762_render = function () {
43209
43231
  var _vm = this
43210
43232
  var _h = _vm.$createElement
43211
43233
  var _c = _vm._self._c || _h
@@ -43305,7 +43327,8 @@ var mainvue_type_template_id_5756d38e_render = function () {
43305
43327
  "div",
43306
43328
  { staticClass: "es-login-form-box" },
43307
43329
  [
43308
- _vm.isShow(_vm.active) && _vm.active == 0
43330
+ _vm.isShow(_vm.active) &&
43331
+ (_vm.active == 0 || _vm.active == 2)
43309
43332
  ? [
43310
43333
  _c(
43311
43334
  "el-form",
@@ -43414,7 +43437,7 @@ var mainvue_type_template_id_5756d38e_render = function () {
43414
43437
  ],
43415
43438
  1
43416
43439
  ),
43417
- _vm.imgCode
43440
+ _vm.imgCode || _vm.showVerifyCode
43418
43441
  ? _c(
43419
43442
  "el-form-item",
43420
43443
  {
@@ -43462,20 +43485,66 @@ var mainvue_type_template_id_5756d38e_render = function () {
43462
43485
  "es-icon-yanzheng es-label-code-image",
43463
43486
  }),
43464
43487
  ]),
43465
- _c("template", { slot: "suffix" }, [
43466
- _c("img", {
43467
- staticClass: "es-img-code",
43468
- attrs: { src: _vm.imageCode },
43469
- on: {
43470
- click: function ($event) {
43471
- $event.stopPropagation()
43472
- return _vm.getImgCode(
43473
- $event
43474
- )
43488
+ _c(
43489
+ "template",
43490
+ { slot: "suffix" },
43491
+ [
43492
+ _c(
43493
+ "el-button",
43494
+ {
43495
+ directives: [
43496
+ {
43497
+ name: "show",
43498
+ rawName: "v-show",
43499
+ value:
43500
+ _vm.active == 2 &&
43501
+ _vm.showVerifyCode,
43502
+ expression:
43503
+ "active == 2 && showVerifyCode",
43504
+ },
43505
+ ],
43506
+ staticClass: "es-get-code",
43507
+ attrs: {
43508
+ type: "primary",
43509
+ disabled: _vm.disabled,
43510
+ },
43511
+ on: {
43512
+ click: function ($event) {
43513
+ $event.stopPropagation()
43514
+ return _vm.getCode(
43515
+ $event
43516
+ )
43517
+ },
43518
+ },
43475
43519
  },
43476
- },
43477
- }),
43478
- ]),
43520
+ [_vm._v(_vm._s(_vm.btnText))]
43521
+ ),
43522
+ _c("img", {
43523
+ directives: [
43524
+ {
43525
+ name: "show",
43526
+ rawName: "v-show",
43527
+ value:
43528
+ _vm.imgCode &&
43529
+ _vm.active == 0,
43530
+ expression:
43531
+ "imgCode && active == 0",
43532
+ },
43533
+ ],
43534
+ staticClass: "es-img-code",
43535
+ attrs: { src: _vm.imageCode },
43536
+ on: {
43537
+ click: function ($event) {
43538
+ $event.stopPropagation()
43539
+ return _vm.getImgCode(
43540
+ $event
43541
+ )
43542
+ },
43543
+ },
43544
+ }),
43545
+ ],
43546
+ 1
43547
+ ),
43479
43548
  ],
43480
43549
  2
43481
43550
  ),
@@ -44002,11 +44071,11 @@ var mainvue_type_template_id_5756d38e_render = function () {
44002
44071
  )
44003
44072
  : _vm._e()
44004
44073
  }
44005
- var mainvue_type_template_id_5756d38e_staticRenderFns = []
44006
- mainvue_type_template_id_5756d38e_render._withStripped = true
44074
+ var mainvue_type_template_id_9885b762_staticRenderFns = []
44075
+ mainvue_type_template_id_9885b762_render._withStripped = true
44007
44076
 
44008
44077
 
44009
- // CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=5756d38e&
44078
+ // CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=9885b762&
44010
44079
 
44011
44080
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=4f5da52e&
44012
44081
  var resetPasswordvue_type_template_id_4f5da52e_render = function () {
@@ -44711,6 +44780,15 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
44711
44780
  //
44712
44781
  //
44713
44782
  //
44783
+ //
44784
+ //
44785
+ //
44786
+ //
44787
+ //
44788
+ //
44789
+ //
44790
+ //
44791
+ //
44714
44792
 
44715
44793
 
44716
44794
 
@@ -44944,6 +45022,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
44944
45022
  return types.length > 2 ? {
44945
45023
  0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
44946
45024
  1: { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
45025
+ 2: { type: '2', icon: 'es-icon-shuru', name: '账号登录' },
44947
45026
  3: { type: '3', icon: 'es-icon-saoma', name: '扫码登录' },
44948
45027
  6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
44949
45028
  7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
@@ -44952,6 +45031,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
44952
45031
  } : {
44953
45032
  0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
44954
45033
  1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
45034
+ 2: { type: '2', icon: 'es-icon-jianpan', name: '账号登录' },
44955
45035
  3: { type: '3', icon: 'es-icon-qrcode', name: '扫码登录' },
44956
45036
  6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
44957
45037
  7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
@@ -44978,6 +45058,9 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
44978
45058
  this.copyrightBgColor && (style['background-color'] = this.copyrightBgColor);
44979
45059
  this.copyrightColor && (style['color'] = this.copyrightColor);
44980
45060
  return login_src_mainvue_type_script_lang_js_extends({}, this.copyrightStyle, style);
45061
+ },
45062
+ showVerifyCode: function showVerifyCode() {
45063
+ return this.passModifyModel.indexOf('6') > -1 || this.passModifyModel.indexOf('11') > -1;
44981
45064
  }
44982
45065
  },
44983
45066
  watch: {
@@ -45213,6 +45296,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
45213
45296
  this.active = res;
45214
45297
  this.formData = JSON.parse(JSON.stringify(this.defaultModel));
45215
45298
  }
45299
+ this.countdown = 0;
45216
45300
  this.$emit('change-type', res, this.identifyingId);
45217
45301
  },
45218
45302
  isShow: function isShow(res) {
@@ -45312,58 +45396,72 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
45312
45396
  if (this.countdown) {
45313
45397
  return false;
45314
45398
  }
45315
- if (!this.formData.target) {
45316
- this.$refs.login.validateField('target');
45317
- return false;
45399
+ var data = {};
45400
+ var flag = false;
45401
+ if (this.active == 2) {
45402
+ if (!this.formData.username) {
45403
+ this.$refs.login.validateField('username');
45404
+ return false;
45405
+ }
45406
+ this.$refs.login.validateField('username', function (res) {
45407
+ flag = res != '';
45408
+ });
45409
+ if (flag) {
45410
+ return false;
45411
+ }
45412
+ data = {
45413
+ target: this.formData.username,
45414
+ targetType: this.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS'
45415
+ };
45318
45416
  } else {
45319
- var flag = false;
45417
+ if (!this.formData.target) {
45418
+ this.$refs.login.validateField('target');
45419
+ return false;
45420
+ }
45320
45421
  this.$refs.login.validateField('target', function (res) {
45321
45422
  flag = res != '';
45322
45423
  });
45323
45424
  if (flag) {
45324
45425
  return false;
45325
45426
  }
45326
- var data = {
45427
+ data = {
45327
45428
  target: this.formData.target,
45328
45429
  targetType: this.active == '6' ? 'SMS' : 'EMAIL'
45329
45430
  };
45330
- this.countdown = 60;
45331
- this.timer = setInterval(function () {
45332
- if (_this4.countdown > 0) {
45333
- _this4.countdown--;
45334
- _this4.disabled = true;
45335
- _this4.btnText = '重新获取' + _this4.countdown + 's';
45336
- } else {
45337
- _this4.btnText = '重新获取';
45338
- _this4.disabled = false;
45339
- }
45340
- }, 1000);
45341
- utils_util["a" /* default */].ajax({
45342
- method: 'post',
45343
- url: this.getLoginCode,
45344
- data: data
45345
- }).then(function (res) {
45346
- _this4.$message({
45347
- message: res.msg,
45348
- duration: 2000,
45349
- type: res.rCode == 0 ? 'success' : 'error'
45350
- });
45351
-
45352
- if (res.rCode === 2) {
45353
- _this4.btnText = '获取验证码';
45354
- _this4.disabled = false;
45355
- _this4.countdown = 0;
45356
- clearInterval(_this4.timer);
45357
- }
45358
- // if (res.rCode) {
45359
- // clearInterval(this.timer);
45360
- // }
45361
- }).catch(function (err) {
45362
- if (err.message && err.message !== 'canceled') {
45363
- _this4.$message.error(err.message);
45364
- }
45365
- });
45366
45431
  }
45432
+ this.countdown = 60;
45433
+ this.timer = setInterval(function () {
45434
+ if (_this4.countdown > 0) {
45435
+ _this4.countdown--;
45436
+ _this4.disabled = true;
45437
+ _this4.btnText = '重新获取' + _this4.countdown + 's';
45438
+ } else {
45439
+ _this4.btnText = '重新获取';
45440
+ _this4.disabled = false;
45441
+ }
45442
+ }, 1000);
45443
+ utils_util["a" /* default */].ajax({
45444
+ method: 'post',
45445
+ url: this.getLoginCode,
45446
+ data: data
45447
+ }).then(function (res) {
45448
+ _this4.$message({
45449
+ message: res.msg,
45450
+ duration: 2000,
45451
+ type: res.rCode == 0 ? 'success' : 'error'
45452
+ });
45453
+
45454
+ if (res.rCode === 2) {
45455
+ _this4.btnText = '获取验证码';
45456
+ _this4.disabled = false;
45457
+ _this4.countdown = 0;
45458
+ clearInterval(_this4.timer);
45459
+ }
45460
+ }).catch(function (err) {
45461
+ if (err.message && err.message !== 'canceled') {
45462
+ _this4.$message.error(err.message);
45463
+ }
45464
+ });
45367
45465
  },
45368
45466
  handleLogin: function handleLogin() {
45369
45467
  var _this5 = this;
@@ -45639,8 +45737,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
45639
45737
 
45640
45738
  var login_src_main_component = normalizeComponent(
45641
45739
  packages_login_src_mainvue_type_script_lang_js_,
45642
- mainvue_type_template_id_5756d38e_render,
45643
- mainvue_type_template_id_5756d38e_staticRenderFns,
45740
+ mainvue_type_template_id_9885b762_render,
45741
+ mainvue_type_template_id_9885b762_staticRenderFns,
45644
45742
  false,
45645
45743
  null,
45646
45744
  null,
@@ -71324,7 +71422,7 @@ if (typeof window !== 'undefined' && window.Vue) {
71324
71422
  }
71325
71423
 
71326
71424
  /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
71327
- version: '0.4.48',
71425
+ version: '0.4.50',
71328
71426
  install: install,
71329
71427
  Button: packages_button,
71330
71428
  ButtonGroup: button_group,
package/lib/form.js CHANGED
@@ -2822,7 +2822,7 @@ module.exports = require("qs");
2822
2822
  // ESM COMPAT FLAG
2823
2823
  __webpack_require__.r(__webpack_exports__);
2824
2824
 
2825
- // 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=3481f0aa&
2825
+ // 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=7011090d&
2826
2826
  var render = function () {
2827
2827
  var _vm = this
2828
2828
  var _h = _vm.$createElement
@@ -13113,7 +13113,7 @@ var staticRenderFns = []
13113
13113
  render._withStripped = true
13114
13114
 
13115
13115
 
13116
- // CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=3481f0aa&
13116
+ // CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7011090d&
13117
13117
 
13118
13118
  // EXTERNAL MODULE: external "babel-runtime/regenerator"
13119
13119
  var regenerator_ = __webpack_require__(9);
@@ -16859,7 +16859,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
16859
16859
  formatTable: Object,
16860
16860
  full: Boolean,
16861
16861
  within: [String, Object],
16862
- display: Boolean,
16862
+ display: {
16863
+ type: Boolean,
16864
+ default: true
16865
+ },
16863
16866
  submitLoading: {
16864
16867
  type: Boolean,
16865
16868
  default: true