eoss-ui 0.4.53 → 0.4.54
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/eoss-ui.common.js +21 -18
- package/lib/index.js +1 -1
- package/lib/login.js +15 -12
- package/package.json +1 -1
- package/packages/login/src/main.vue +11 -9
- package/src/index.js +1 -1
package/lib/login.js
CHANGED
|
@@ -2822,7 +2822,7 @@ function normalizeComponent(
|
|
|
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/login/src/main.vue?vue&type=template&id=
|
|
2825
|
+
// 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=9df7b90c&
|
|
2826
2826
|
var render = function () {
|
|
2827
2827
|
var _vm = this
|
|
2828
2828
|
var _h = _vm.$createElement
|
|
@@ -2924,7 +2924,7 @@ var render = function () {
|
|
|
2924
2924
|
{ staticClass: "es-login-form-box" },
|
|
2925
2925
|
[
|
|
2926
2926
|
_vm.isShow(_vm.active) &&
|
|
2927
|
-
(_vm.active == 0 || _vm.active == 2)
|
|
2927
|
+
(_vm.active == 0 || _vm.active == 2 || _vm.active == 12)
|
|
2928
2928
|
? [
|
|
2929
2929
|
_c(
|
|
2930
2930
|
"el-form",
|
|
@@ -3093,10 +3093,11 @@ var render = function () {
|
|
|
3093
3093
|
name: "show",
|
|
3094
3094
|
rawName: "v-show",
|
|
3095
3095
|
value:
|
|
3096
|
-
_vm.active == 2
|
|
3096
|
+
(_vm.active == 2 ||
|
|
3097
|
+
_vm.active == 12) &&
|
|
3097
3098
|
_vm.showVerifyCode,
|
|
3098
3099
|
expression:
|
|
3099
|
-
"active == 2 && showVerifyCode",
|
|
3100
|
+
"(active == 2 || active == 12) && showVerifyCode",
|
|
3100
3101
|
},
|
|
3101
3102
|
],
|
|
3102
3103
|
staticClass: "es-get-code",
|
|
@@ -3671,7 +3672,7 @@ var staticRenderFns = []
|
|
|
3671
3672
|
render._withStripped = true
|
|
3672
3673
|
|
|
3673
3674
|
|
|
3674
|
-
// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=
|
|
3675
|
+
// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=9df7b90c&
|
|
3675
3676
|
|
|
3676
3677
|
// 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&
|
|
3677
3678
|
var resetPasswordvue_type_template_id_4f5da52e_render = function () {
|
|
@@ -4646,7 +4647,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
|
|
|
4646
4647
|
6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
|
|
4647
4648
|
7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
|
|
4648
4649
|
9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
|
|
4649
|
-
11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' }
|
|
4650
|
+
11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' },
|
|
4651
|
+
12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
|
|
4650
4652
|
} : {
|
|
4651
4653
|
0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
|
|
4652
4654
|
1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
|
|
@@ -4659,7 +4661,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
|
|
|
4659
4661
|
type: '11',
|
|
4660
4662
|
icon: 'es-icon-wodeyouxiang',
|
|
4661
4663
|
name: '邮箱登录'
|
|
4662
|
-
}
|
|
4664
|
+
},
|
|
4665
|
+
12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
|
|
4663
4666
|
};
|
|
4664
4667
|
},
|
|
4665
4668
|
icons: function icons() {
|
|
@@ -4967,7 +4970,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
|
|
|
4967
4970
|
this.app = res.appName || res.subsystemName;
|
|
4968
4971
|
this.qrimg = res.qrimg || res.qrImg;
|
|
4969
4972
|
this.loginModel = res.loginModel;
|
|
4970
|
-
// this.loginModel = '0,3,11,6,9,
|
|
4973
|
+
// this.loginModel = '0,3,11,6,9,12';
|
|
4971
4974
|
this.loginBackgroundImg = res.loginBackgroundUrl ? res.loginBackgroundUrl.split(',') : null;
|
|
4972
4975
|
this.loginLogoImg = res.loginLogoUrl ? res.loginLogoUrl : null;
|
|
4973
4976
|
if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
|
|
@@ -5018,7 +5021,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
|
|
|
5018
5021
|
}
|
|
5019
5022
|
var data = {};
|
|
5020
5023
|
var flag = false;
|
|
5021
|
-
if (this.active == 2) {
|
|
5024
|
+
if (this.active == 2 || this.active == 12) {
|
|
5022
5025
|
if (!this.formData.username) {
|
|
5023
5026
|
this.$refs.login.validateField('username');
|
|
5024
5027
|
return false;
|
|
@@ -5063,7 +5066,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
|
|
|
5063
5066
|
}, 1000);
|
|
5064
5067
|
util["a" /* default */].ajax({
|
|
5065
5068
|
method: 'post',
|
|
5066
|
-
url: this.active ==
|
|
5069
|
+
url: this.active == 12 ? this.getTwoFactorLoginCode : this.getLoginCode,
|
|
5067
5070
|
data: data
|
|
5068
5071
|
}).then(function (res) {
|
|
5069
5072
|
_this4.$message({
|
|
@@ -5101,7 +5104,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
|
|
|
5101
5104
|
}) : _this5.formData.password,
|
|
5102
5105
|
identifyingCode: _this5.formData.identifyingCode,
|
|
5103
5106
|
identifyingId: _this5.identifyingId
|
|
5104
|
-
} : _this5.active == '
|
|
5107
|
+
} : _this5.active == '12' ? {
|
|
5105
5108
|
username: _this5.formData.username,
|
|
5106
5109
|
password: _this5.secret && _this5.isEncrypt ? util["a" /* default */].esmEncrypt({
|
|
5107
5110
|
data: _this5.formData.password,
|
|
@@ -5145,7 +5148,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
|
|
|
5145
5148
|
var extUserBindHandleId = sessionStorage.getItem('extUserBindHandleId');
|
|
5146
5149
|
util["a" /* default */].ajax({
|
|
5147
5150
|
method: 'post',
|
|
5148
|
-
url: this.active == '0' ? this.actionUrl : this.active == '
|
|
5151
|
+
url: this.active == '0' ? this.actionUrl : this.active == '12' ? this.doTwoFactorLogin : this.doCodeLogin,
|
|
5149
5152
|
data: extUserBindHandleId ? mainvue_type_script_lang_js_extends({}, data, { extUserBindHandleId: extUserBindHandleId }) : data
|
|
5150
5153
|
}).then(function (res) {
|
|
5151
5154
|
_this6.submit = false;
|
package/package.json
CHANGED
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
></i>
|
|
46
46
|
</div>
|
|
47
47
|
<div class="es-login-form-box">
|
|
48
|
-
<template v-if="isShow(active) && (active == 0 || active == 2)">
|
|
48
|
+
<template v-if="isShow(active) && (active == 0 || active == 2 ||active == 12)">
|
|
49
49
|
<el-form ref="login" class="es-login-form" :model="formData">
|
|
50
50
|
<div class="es-login-title">
|
|
51
51
|
<span class="es-login-title-content">{{ title }}</span>
|
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
<el-button
|
|
111
111
|
class="es-get-code"
|
|
112
112
|
type="primary"
|
|
113
|
-
v-show="active == 2 && showVerifyCode"
|
|
113
|
+
v-show="(active == 2 || active == 12) && showVerifyCode"
|
|
114
114
|
:disabled="disabled"
|
|
115
115
|
@click.stop="getCode"
|
|
116
116
|
>{{ btnText }}</el-button
|
|
@@ -587,7 +587,8 @@ export default {
|
|
|
587
587
|
6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
|
|
588
588
|
7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
|
|
589
589
|
9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
|
|
590
|
-
11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' }
|
|
590
|
+
11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' },
|
|
591
|
+
12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
|
|
591
592
|
}
|
|
592
593
|
: {
|
|
593
594
|
0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
|
|
@@ -601,7 +602,8 @@ export default {
|
|
|
601
602
|
type: '11',
|
|
602
603
|
icon: 'es-icon-wodeyouxiang',
|
|
603
604
|
name: '邮箱登录'
|
|
604
|
-
}
|
|
605
|
+
},
|
|
606
|
+
12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
|
|
605
607
|
};
|
|
606
608
|
},
|
|
607
609
|
icons() {
|
|
@@ -913,7 +915,7 @@ export default {
|
|
|
913
915
|
this.app = res.appName || res.subsystemName;
|
|
914
916
|
this.qrimg = res.qrimg || res.qrImg;
|
|
915
917
|
this.loginModel = res.loginModel;
|
|
916
|
-
// this.loginModel = '0,3,11,6,9,
|
|
918
|
+
// this.loginModel = '0,3,11,6,9,12';
|
|
917
919
|
this.loginBackgroundImg = res.loginBackgroundUrl
|
|
918
920
|
? res.loginBackgroundUrl.split(',')
|
|
919
921
|
: null;
|
|
@@ -978,7 +980,7 @@ export default {
|
|
|
978
980
|
}
|
|
979
981
|
let data = {};
|
|
980
982
|
let flag = false;
|
|
981
|
-
if (this.active == 2) {
|
|
983
|
+
if (this.active == 2 || this.active == 12) {
|
|
982
984
|
if (!this.formData.username) {
|
|
983
985
|
this.$refs.login.validateField('username');
|
|
984
986
|
return false;
|
|
@@ -1025,7 +1027,7 @@ export default {
|
|
|
1025
1027
|
.ajax({
|
|
1026
1028
|
method: 'post',
|
|
1027
1029
|
url:
|
|
1028
|
-
this.active ==
|
|
1030
|
+
this.active == 12 ? this.getTwoFactorLoginCode : this.getLoginCode,
|
|
1029
1031
|
data: data
|
|
1030
1032
|
})
|
|
1031
1033
|
.then((res) => {
|
|
@@ -1069,7 +1071,7 @@ export default {
|
|
|
1069
1071
|
identifyingCode: this.formData.identifyingCode,
|
|
1070
1072
|
identifyingId: this.identifyingId
|
|
1071
1073
|
}
|
|
1072
|
-
: this.active == '
|
|
1074
|
+
: this.active == '12'
|
|
1073
1075
|
? {
|
|
1074
1076
|
username: this.formData.username,
|
|
1075
1077
|
password:
|
|
@@ -1120,7 +1122,7 @@ export default {
|
|
|
1120
1122
|
url:
|
|
1121
1123
|
this.active == '0'
|
|
1122
1124
|
? this.actionUrl
|
|
1123
|
-
: this.active == '
|
|
1125
|
+
: this.active == '12'
|
|
1124
1126
|
? this.doTwoFactorLogin
|
|
1125
1127
|
: this.doCodeLogin,
|
|
1126
1128
|
data: extUserBindHandleId
|