eoss-ui 0.4.52 → 0.4.54

package/packages/flow/src/main.vue

@@ -213,6 +213,7 @@
                 />
               </el-form-item>
               <el-form-item
+              v-if="isNextUser"
                 :prop="isShowNextUser ? 'nextUserId' : 'nextOrgId'"
                 :label="isShowNextUser ? '下步办理人' : '办理对象'"
               >
@@ -242,7 +243,7 @@
                   :tabs="nextUserTabs"
                 />
               </el-form-item>
-              <el-form-item
+              <!-- <el-form-item
                 v-if="isHideCurrentOrg"
                 prop="nextCurrentOrgObj"
                 :label="currentOrgName ? currentOrgName : '本单位'"
@@ -256,7 +257,7 @@
                   :types="['department', 'employee']"
                   :params="{ filid: userModel.orgId }"
                 />
-              </el-form-item>
+              </el-form-item> -->
               <TimeLimit
                 v-if="nodeType !== 0 && isLimitedTimeHandling === 1"
                 :newsList="newsList"
@@ -598,7 +599,6 @@ import {
   taskHandleHtml
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
-import qs from 'qs';
 export default {
   name: 'EsFlow',
   componentName: 'EsFlow',
@@ -970,13 +970,10 @@ export default {
               url: taskReadHtml,
               params: { taskAction: 'complete' },
               headers: {
-                Accept: 'application/json,text/plain',
-                'Content-Type':
-                  ' application/x-www-form-urlencoded; charset=UTF-8'
+                Accept: 'application/json,text/plain'
               },
               method: 'post',
-              format:false,
-              data: qs.stringify(params)
+              data: params
             })
             .then((res) => {
               const { status, message } = res;
@@ -1969,6 +1966,7 @@ export default {
             this.getNodeInfo();
           } else {
             if (res.status === 'taskCompleted') {
+              this.$emit('shrink', true)
               this.shrinkAbled = true;
               this.$message.warning(res.message || '系统错误，请联系管理员！');
             } else {
@@ -2149,7 +2147,7 @@ export default {
             this.nextNode.isRemoveSign != '1' &&
             this.isSpecial &&
             !this.isReject &&
-            this.nodeInfos.length != 0
+            this.nodeInfos.length != 0 && this.isNextUser
           ) {
             if (this.isShowNextUser) {
               if (

package/packages/flow/src/startTaskRead.vue

@@ -152,7 +152,6 @@ import {
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
 import SelectUser from './selectUser.vue';
-import qs from 'qs';
 export default {
   name: 'StartTaskRead',
   components: {
@@ -497,13 +496,10 @@ export default {
                 url: taskReadHtml,
                 params: { taskAction: this.type },
                 headers: {
-                  Accept: 'application/json,text/plain',
-                  'Content-Type':
-                    ' application/x-www-form-urlencoded; charset=UTF-8'
+                  Accept: 'application/json,text/plain'
                 },
                 method: 'post',
-                format: false,
-                data: qs.stringify(params)
+                data: params
               })
               .then((res) => {
                 const { message, status } = res;

package/packages/login/src/main.vue

@@ -45,7 +45,7 @@
           ></i>
         </div>
         <div class="es-login-form-box">
-          <template v-if="isShow(active) && (active == 0 || active == 2)">
+          <template v-if="isShow(active) && (active == 0 || active == 2 ||active == 12)">
             <el-form ref="login" class="es-login-form" :model="formData">
               <div class="es-login-title">
                 <span class="es-login-title-content">{{ title }}</span>
@@ -110,7 +110,7 @@
                     <el-button
                       class="es-get-code"
                       type="primary"
-                      v-show="active == 2 && showVerifyCode"
+                      v-show="(active == 2 || active == 12) && showVerifyCode"
                       :disabled="disabled"
                       @click.stop="getCode"
                       >{{ btnText }}</el-button
@@ -587,7 +587,8 @@ export default {
             6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
             7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
             9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-            11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' }
+            11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' },
+            12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
           }
         : {
             0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
@@ -601,7 +602,8 @@ export default {
               type: '11',
               icon: 'es-icon-wodeyouxiang',
               name: '邮箱登录'
-            }
+            },
+            12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
           };
     },
     icons() {
@@ -913,7 +915,7 @@ export default {
       this.app = res.appName || res.subsystemName;
       this.qrimg = res.qrimg || res.qrImg;
       this.loginModel = res.loginModel;
-      // this.loginModel = '0,3,11,6,9,2';
+      // this.loginModel = '0,3,11,6,9,12';
       this.loginBackgroundImg = res.loginBackgroundUrl
         ? res.loginBackgroundUrl.split(',')
         : null;
@@ -978,7 +980,7 @@ export default {
       }
       let data = {};
       let flag = false;
-      if (this.active == 2) {
+      if (this.active == 2 || this.active == 12) {
         if (!this.formData.username) {
           this.$refs.login.validateField('username');
           return false;
@@ -1025,7 +1027,7 @@ export default {
         .ajax({
           method: 'post',
           url:
-            this.active == 2 ? this.getTwoFactorLoginCode : this.getLoginCode,
+            this.active == 12 ? this.getTwoFactorLoginCode : this.getLoginCode,
           data: data
         })
         .then((res) => {
@@ -1069,7 +1071,7 @@ export default {
                   identifyingCode: this.formData.identifyingCode,
                   identifyingId: this.identifyingId
                 }
-              : this.active == '2'
+              : this.active == '12'
               ? {
                 username: this.formData.username,
                   password:
@@ -1120,7 +1122,7 @@ export default {
           url:
             this.active == '0'
               ? this.actionUrl
-              : this.active == '2'
+              : this.active == '12'
               ? this.doTwoFactorLogin
               : this.doCodeLogin,
           data: extUserBindHandleId

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.52',
+  version: '0.4.54',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -94,6 +94,8 @@ const ajax = function ({
   // 请求拦截
   http.interceptors.request.use(
     config => {
+      config.header &&
+        (config.headers = { ...config.headers, ...config.header });
       config.headers.common = getStorage();
       // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
       let requestKey = getRequestKey(config);