eoss-ui 0.4.55 → 0.4.57

package/packages/theme-chalk/lib/retrial-auth.css

@@ -0,0 +1 @@
+@charset "UTF-8";.es-retrial-auth-msg .el-message-box__header{background-color:#eee;font-size:14px!important;border-bottom:1px solid #d9d9d9}.es-retrial-auth-msg .el-message-box__header .el-message-box__title{font-size:14px;line-height:18px}.es-retrial-auth .es-retrial-auth-form{padding:24px 12px 12px}.es-retrial-auth .el-input__suffix{right:0}.es-retrial-auth .es-button-submit{width:100%}.es-retrial-auth .es-login-switchs{padding-top:12px;text-align:center;color:#d9d9d9}.es-retrial-auth .es-login-switchs .es-icon{font-size:24px;cursor:pointer}.es-retrial-auth .es-login-switchs .es-icon+.es-icon{margin-left:12px}.es-retrial-auth .es-login-switchs .es-icon.es-active{color:#1890ff}

package/packages/theme-chalk/src/index.scss

@@ -33,6 +33,7 @@
 @import "./player.scss";
 @import "./qr-code.scss";
 @import "./radio-group.scss";
+@import "./retrial-auth.scss";
 @import "./select.scss";
 @import "./select-ganged.scss";
 @import "./selector.scss";

package/packages/theme-chalk/src/retrial-auth.scss

@@ -0,0 +1,38 @@
+@import './common/var.scss';
+.es-retrial-auth-msg {
+  .el-message-box__header {
+    background-color: #eee;
+    font-size: 14px !important;
+    border-bottom: $--border-base;
+    .el-message-box__title {
+      font-size: 14px;
+      line-height: 18px;
+    }
+  }
+}
+.es-retrial-auth {
+  .es-retrial-auth-form {
+    padding: 24px 12px 12px 12px;
+  }
+  .el-input__suffix {
+    right: 0;
+  }
+  .es-button-submit {
+    width: 100%;
+  }
+  .es-login-switchs {
+    padding-top: 12px;
+    text-align: center;
+    color: #d9d9d9;
+    .es-icon {
+      font-size: 24px;
+      cursor: pointer;
+      & + .es-icon {
+        margin-left: 12px;
+      }
+      &.es-active {
+        color: $--color-primary-light-6;
+      }
+    }
+  }
+}

package/packages/toolbar/src/main.vue

@@ -233,6 +233,7 @@ export default {
           checkbox: 'es-toolbar-item-checkbox',
           switch: 'es-toolbar-item-switch'
         };
+        console.log();
         search = [
           h('es-form', {
             class: [
@@ -241,12 +242,14 @@ export default {
               this.showFormBtn ? '' : 'es-form-search-nobtn'
             ],
             props: {
+              showButton: items.showButton,
+              formatSubmit: items.formatSubmit,
+              ...(items.config || {}),
               size: 'medium',
               showLabel: false,
               closeDialog: false,
               model: this.searchData,
               contents: items.contents,
-              showButton: items.showButton,
               itemClass: itemClass,
               inline: true,
               search: true,
@@ -325,6 +328,8 @@ export default {
                     class: 'es-form-search',
                     ref: 'filter',
                     props: {
+                      formatSubmit: items.formatSubmit,
+                      ...(items.config || {}),
                       size: 'medium',
                       closeDialog: false,
                       model: this.advancedData,

package/src/config/api.js

@@ -17,6 +17,10 @@ export const initModifyPassword = '/sso2/signIn/assembly/initModifyPassword'; //
 export const doWechatQrLogin = '/sso2/signIn/auth/doWechatQrLogin'; // 微信扫码登录
 export const getTwoFactorLoginCode = '/sso2/signIn/auth/getTwoFactorLoginCode'; // 双因素登录，通过消息中心发送登陆验证码给用户
 export const doTwoFactorLogin = '/sso2/signIn/auth/doTwoFactorLogin'; // 双因素登录
+export const initRetrialAuth = '/sso2/retrialAuth/initRetrialAuth'; // 初始化二级身份权限验证页面
+export const getRetrialAuthCode = '/sso2/retrialAuth/getRetrialAuthCode'; // 获取二级身份验证验证码
+export const scanCodeRetrialAuth = '/sso2/retrialAuth/scanCodeRetrialAuth';// 二维码扫码验证(二级权限验证)
+export const codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth';// 二级身份验证-验证码验证
 // 框架
 export const mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 export const initUserSet = '/main2/main/initUserSet'; // 获取用户信息

package/src/index.js

@@ -34,6 +34,7 @@ import Page from '../packages/page/index.js';
 import Player from '../packages/player/index.js';
 import QrCode from '../packages/qr-code/index.js';
 import RadioGroup from '../packages/radio-group/index.js';
+import RetrialAuth from '../packages/retrial-auth/index.js';
 import Select from '../packages/select/index.js';
 import SelectGanged from '../packages/select-ganged/index.js';
 import Selector from '../packages/selector/index.js';
@@ -87,6 +88,7 @@ const components = [
   Player,
   QrCode,
   RadioGroup,
+  RetrialAuth,
   Select,
   SelectGanged,
   Selector,
@@ -117,7 +119,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.55',
+  version: '0.4.57',
   install,
   Button,
   ButtonGroup,
@@ -153,6 +155,7 @@ export default {
   Player,
   QrCode,
   RadioGroup,
+  RetrialAuth,
   Select,
   SelectGanged,
   Selector,

package/src/utils/util.js

@@ -23,6 +23,7 @@ const $lightColorCount = 5;
 const $darkColorCount = 4;
 const publicKey = 'abcdefghijklmnopqrstuvwxyz12345678';
 let loginMsg;
+let initAuth;
 
 const JSONbigToString = JSONbig({ storeAsString: true });
 import { MessageBox, Loading } from 'eoss-element';
@@ -176,7 +177,9 @@ const ajax = function ({
             win.top.location.href.indexOf('/login.html') === -1
           ) {
             clearTimeout(loginMsg);
-            loginMsg = setTimeout(() => {
+            let remind = sessionStorage.getItem('remind');
+            !remind && (loginMsg = setTimeout(() => {
+              sessionStorage.setItem('remind', 1);
               MessageBox.confirm(
                 response.data.rCode === 69
                   ? '该账号在其他地方已登陆!'
@@ -219,13 +222,40 @@ const ajax = function ({
                 })
                 .catch(e => {
                 });
-            }, 1000);
+            }, 1000));
           }
-          return Promise.reject(response.data);
-        } else {
-          // eslint-disable-next-line no-undef
-          return Promise.resolve(response.data);
+        } else if (response.data.rCode === 61) {
+          clearTimeout(initAuth);
+          initAuth = setTimeout(() => {
+            MessageBox({
+              title: '请进行二次鉴权',
+              closeOnClickModal: false,
+              closeOnPressEscape: false,
+              showConfirmButton: false,
+              dangerouslyUseHTMLString: true,
+              scroll: false,
+              customClass: 'es-retrial-auth-msg',
+              render: (h, msgBox) => {
+                return h('es-retrial-auth', {
+                  ref: 'auth',
+                  props: {
+                    group: response.data.results.retrialAuthGroupIds,
+                    type: response.data.results.retrialAuthType,
+                    msgBox: msgBox
+                  }
+                });
+              },
+              callback: (res, obj) => {
+                obj.$children.forEach(item => {
+                  item.clearTimeouts && item.clearTimeouts();
+                  return;
+                });
+              }
+            });
+          }, 1000);
         }
+        // eslint-disable-next-line no-undef
+        return Promise.resolve(response.data);
       }
     },
     error => {