eoss-ui 0.5.29 → 0.5.31
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/button-group.js +20 -3
- package/lib/button.js +20 -3
- package/lib/cascader.js +18 -15
- package/lib/checkbox-group.js +39 -11
- package/lib/data-table-form.js +20 -3
- package/lib/data-table.js +34 -16
- package/lib/date-picker.js +20 -3
- package/lib/dialog.js +20 -3
- package/lib/eoss-ui.common.js +1810 -1809
- package/lib/flow-group.js +22 -5
- package/lib/flow-list.js +20 -3
- package/lib/flow.js +20 -3
- package/lib/form.js +50 -14
- package/lib/handle-user.js +20 -3
- package/lib/handler.js +20 -3
- package/lib/index.js +1 -1
- package/lib/input-number.js +20 -3
- package/lib/input.js +36 -10
- package/lib/login.js +45 -126
- package/lib/main.js +29 -12
- package/lib/nav.js +20 -3
- package/lib/page.js +20 -3
- package/lib/player.js +20 -3
- package/lib/qr-code.js +20 -3
- package/lib/radio-group.js +23 -6
- package/lib/retrial-auth.js +20 -3
- package/lib/select-ganged.js +20 -3
- package/lib/select.js +20 -3
- package/lib/selector-panel.js +20 -3
- package/lib/selector.js +23 -6
- package/lib/sizer.js +20 -3
- package/lib/steps.js +20 -3
- package/lib/switch.js +20 -3
- package/lib/table-form.js +20 -3
- package/lib/tabs.js +1626 -1570
- package/lib/tips.js +20 -3
- package/lib/tree-group.js +20 -3
- package/lib/tree.js +20 -3
- package/lib/upload.js +20 -3
- package/lib/utils/util.js +20 -3
- package/lib/wujie.js +20 -3
- package/lib/wxlogin.js +20 -3
- package/package.json +2 -2
- package/packages/cascader/src/main.vue +24 -19
- package/packages/checkbox-group/src/main.vue +14 -9
- package/packages/data-table/src/column.vue +9 -7
- package/packages/flow-group/src/main.vue +1 -1
- package/packages/form/src/main.vue +8 -1
- package/packages/input/src/main.vue +20 -16
- package/packages/login/src/main.vue +8 -3
- package/packages/login/src/resetPassword.vue +11 -114
- package/packages/main/src/userinfo.vue +5 -2
- package/packages/radio-group/src/main.vue +1 -1
- package/packages/selector/src/main.vue +1 -1
- package/packages/tabs/src/main.vue +563 -542
- package/src/index.js +1 -1
- package/src/utils/util.js +23 -3
|
@@ -16,7 +16,9 @@
|
|
|
16
16
|
>
|
|
17
17
|
<el-menu-item index="6">短信验证</el-menu-item>
|
|
18
18
|
<el-menu-item index="11">邮箱验证</el-menu-item>
|
|
19
|
-
<el-menu-item index="0" v-if="this.operationCheckCode"
|
|
19
|
+
<el-menu-item index="0" v-if="this.operationCheckCode"
|
|
20
|
+
>原密码验证</el-menu-item
|
|
21
|
+
>
|
|
20
22
|
</el-menu>
|
|
21
23
|
<es-form
|
|
22
24
|
ref="pwdForm"
|
|
@@ -338,119 +340,6 @@ export default {
|
|
|
338
340
|
}
|
|
339
341
|
];
|
|
340
342
|
}
|
|
341
|
-
// return [
|
|
342
|
-
// this.activeIndex == '6'
|
|
343
|
-
// ? {
|
|
344
|
-
// type: 'text',
|
|
345
|
-
// name: 'target',
|
|
346
|
-
// label: '手机号',
|
|
347
|
-
// placeholder: '请输入手机号',
|
|
348
|
-
// rules: [
|
|
349
|
-
// {
|
|
350
|
-
// required: true,
|
|
351
|
-
// message: '请输入手机号',
|
|
352
|
-
// trigger: 'blur'
|
|
353
|
-
// },
|
|
354
|
-
// {
|
|
355
|
-
// ...rules.phone,
|
|
356
|
-
// trigger: 'blur'
|
|
357
|
-
// }
|
|
358
|
-
// ]
|
|
359
|
-
// }
|
|
360
|
-
// : {
|
|
361
|
-
// type: 'text',
|
|
362
|
-
// name: 'target',
|
|
363
|
-
// label: '邮箱地址',
|
|
364
|
-
// placeholder: '请输入邮箱地址',
|
|
365
|
-
// rules: [
|
|
366
|
-
// {
|
|
367
|
-
// required: true,
|
|
368
|
-
// message: '请输入邮箱地址',
|
|
369
|
-
// trigger: 'blur'
|
|
370
|
-
// },
|
|
371
|
-
// {
|
|
372
|
-
// type: 'email',
|
|
373
|
-
// message: '请输入正确的邮箱地址',
|
|
374
|
-
// trigger: 'blur'
|
|
375
|
-
// }
|
|
376
|
-
// ]
|
|
377
|
-
// },
|
|
378
|
-
// {
|
|
379
|
-
// type: 'password',
|
|
380
|
-
// name: 'password',
|
|
381
|
-
// label: '新密码',
|
|
382
|
-
// placeholder: '请输入新密码',
|
|
383
|
-
// showPassword: true,
|
|
384
|
-
// rules: [
|
|
385
|
-
// this.checkPassword
|
|
386
|
-
// ? {
|
|
387
|
-
// pattern: this.checkPassword,
|
|
388
|
-
// message: this.checkPasswordMsg
|
|
389
|
-
// ? this.checkPasswordMsg
|
|
390
|
-
// : '密码格式不合法',
|
|
391
|
-
// trigger: 'blur'
|
|
392
|
-
// }
|
|
393
|
-
// : {},
|
|
394
|
-
// {
|
|
395
|
-
// required: true,
|
|
396
|
-
// message: '请输入新密码',
|
|
397
|
-
// trigger: 'blur'
|
|
398
|
-
// }
|
|
399
|
-
// ]
|
|
400
|
-
// },
|
|
401
|
-
// {
|
|
402
|
-
// type: 'password',
|
|
403
|
-
// name: 'repassword',
|
|
404
|
-
// placeholder: '请确认新密码',
|
|
405
|
-
// label: '确认新密码',
|
|
406
|
-
// showPassword: true,
|
|
407
|
-
// rules: [
|
|
408
|
-
// this.checkPassword
|
|
409
|
-
// ? {
|
|
410
|
-
// pattern: this.checkPassword,
|
|
411
|
-
// message: this.checkPasswordMsg
|
|
412
|
-
// ? this.checkPasswordMsg
|
|
413
|
-
// : '密码格式不合法',
|
|
414
|
-
// trigger: 'blur'
|
|
415
|
-
// }
|
|
416
|
-
// : {},
|
|
417
|
-
// {
|
|
418
|
-
// required: true,
|
|
419
|
-
// message: '请输入新密码',
|
|
420
|
-
// trigger: 'blur'
|
|
421
|
-
// },
|
|
422
|
-
// { validator: this.reregExpValidate, trigger: 'blur' }
|
|
423
|
-
// ]
|
|
424
|
-
// },
|
|
425
|
-
// {
|
|
426
|
-
// type: 'text',
|
|
427
|
-
// name: 'verificationCode',
|
|
428
|
-
// placeholder: '请输入验证码',
|
|
429
|
-
// label: '验证码',
|
|
430
|
-
// append: {
|
|
431
|
-
// text: this.btnText,
|
|
432
|
-
// attrs: { disabled: this.disabled },
|
|
433
|
-
// event: this.getVerificationCode
|
|
434
|
-
// },
|
|
435
|
-
// rules: [
|
|
436
|
-
// {
|
|
437
|
-
// required: true,
|
|
438
|
-
// message: '请输入验证码',
|
|
439
|
-
// trigger: 'blur'
|
|
440
|
-
// }
|
|
441
|
-
// ]
|
|
442
|
-
// },
|
|
443
|
-
// {
|
|
444
|
-
// type: 'submit',
|
|
445
|
-
// contents: [
|
|
446
|
-
// {
|
|
447
|
-
// type: 'primary',
|
|
448
|
-
// text: '提交',
|
|
449
|
-
// event: 'confirm'
|
|
450
|
-
// }
|
|
451
|
-
// ]
|
|
452
|
-
// }
|
|
453
|
-
// ];
|
|
454
343
|
},
|
|
455
344
|
show() {
|
|
456
345
|
if (this.type) {
|
|
@@ -608,6 +497,10 @@ export default {
|
|
|
608
497
|
} else {
|
|
609
498
|
let msg = res.msg || '系统错误，请联系管理员！';
|
|
610
499
|
this.$message.error(msg);
|
|
500
|
+
this.btnText = '获取验证码';
|
|
501
|
+
this.disabled = false;
|
|
502
|
+
delete this.formData.verificationCode;
|
|
503
|
+
clearInterval(this.timer);
|
|
611
504
|
}
|
|
612
505
|
})
|
|
613
506
|
.catch((err) => {
|
|
@@ -634,6 +527,10 @@ export default {
|
|
|
634
527
|
this.$emit('success');
|
|
635
528
|
} else {
|
|
636
529
|
let msg = res.msg || '系统错误，请联系管理员！';
|
|
530
|
+
this.btnText = '获取验证码';
|
|
531
|
+
this.disabled = false;
|
|
532
|
+
clearInterval(this.timer);
|
|
533
|
+
delete this.formData.verificationCode;
|
|
637
534
|
this.$message.error(msg);
|
|
638
535
|
}
|
|
639
536
|
})
|
|
@@ -316,13 +316,16 @@ export default {
|
|
|
316
316
|
key: 'userId',
|
|
317
317
|
value: value.value
|
|
318
318
|
});
|
|
319
|
-
util.removeStorage('mainConfig');
|
|
319
|
+
util.removeStorage(['mainConfig', 'jump']);
|
|
320
320
|
this.$message({
|
|
321
321
|
message: res.msg,
|
|
322
322
|
type: 'success',
|
|
323
323
|
duration: 500,
|
|
324
324
|
onClose: () => {
|
|
325
|
-
if (
|
|
325
|
+
if (
|
|
326
|
+
util.win.location.href.indexOf('#/main') > -1 ||
|
|
327
|
+
util.win.location.href.indexOf('/main.html') > -1
|
|
328
|
+
) {
|
|
326
329
|
location.reload();
|
|
327
330
|
} else {
|
|
328
331
|
this.$router.replace('/main');
|
|
@@ -173,7 +173,7 @@ export default {
|
|
|
173
173
|
return this.options ? this.options : this.data;
|
|
174
174
|
},
|
|
175
175
|
labelVal() {
|
|
176
|
-
if (this.readonly && this.model
|
|
176
|
+
if (this.readonly && util.isExist(this.model) && this.results.length) {
|
|
177
177
|
if (typeof this.model !== 'object') {
|
|
178
178
|
if (util.isObject(this.results[0])) {
|
|
179
179
|
let val;
|