eoss-ui 0.4.54 → 0.4.55

package/lib/tree-group.js

@@ -102,8 +102,6 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -207,7 +205,6 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
-    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);
@@ -364,7 +361,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    header: header
+    headers: header
   });
 };
 

package/lib/tree.js

@@ -102,8 +102,6 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -207,7 +205,6 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
-    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);
@@ -364,7 +361,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    header: header
+    headers: header
   });
 };
 

package/lib/upload.js

@@ -102,8 +102,6 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -207,7 +205,6 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
-    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);
@@ -364,7 +361,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    header: header
+    headers: header
   });
 };
 

package/lib/utils/util.js

@@ -2,8 +2,6 @@ exports.__esModule = true;
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
 var _api = require('../config/api');
 
 var _axios = require('axios');
@@ -122,7 +120,6 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
-    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);
@@ -279,7 +276,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    header: header
+    headers: header
   });
 };
 

package/lib/wujie.js

@@ -102,8 +102,6 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -207,7 +205,6 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
-    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);
@@ -364,7 +361,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    header: header
+    headers: header
   });
 };
 

package/lib/wxlogin.js

@@ -102,8 +102,6 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -207,7 +205,6 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
-    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);
@@ -364,7 +361,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    header: header
+    headers: header
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.54",
+  "version": "0.4.55",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/dialog/src/main.vue

@@ -6,7 +6,7 @@
     :width="wd"
     :height="ht"
     :close-on-click-modal="shadeClose"
-    :fullscreen="full"
+    :showScale="!full"
     :drag="drag"
     :modal-append-to-body="modalAppendToBody"
     v-bind="$attrs"
@@ -384,7 +384,7 @@ export default {
     ) {
       this.full = true;
       this.wd = '100%';
-      ht = '100%';
+      this.ht = '100%';
     } else {
       this.wd = this.width ? this.width : this.sizes[this.size]['width'];
       this.ht = this.height ? this.height : this.sizes[this.size]['height'];

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 ||active == 12)">
+          <template v-if="isShow(active) && (active == 0 || active == 2)">
             <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 || active == 12) && showVerifyCode"
+                      v-show="active == 2 && showVerifyCode"
                       :disabled="disabled"
                       @click.stop="getCode"
                       >{{ btnText }}</el-button
@@ -587,8 +587,7 @@ 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: '邮箱登录' },
-            12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
+            11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' }
           }
         : {
             0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
@@ -602,8 +601,7 @@ export default {
               type: '11',
               icon: 'es-icon-wodeyouxiang',
               name: '邮箱登录'
-            },
-            12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
+            }
           };
     },
     icons() {
@@ -915,7 +913,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,12';
+      // this.loginModel = '0,3,11,6,9,2';
       this.loginBackgroundImg = res.loginBackgroundUrl
         ? res.loginBackgroundUrl.split(',')
         : null;
@@ -980,7 +978,7 @@ export default {
       }
       let data = {};
       let flag = false;
-      if (this.active == 2 || this.active == 12) {
+      if (this.active == 2) {
         if (!this.formData.username) {
           this.$refs.login.validateField('username');
           return false;
@@ -1027,7 +1025,7 @@ export default {
         .ajax({
           method: 'post',
           url:
-            this.active == 12 ? this.getTwoFactorLoginCode : this.getLoginCode,
+            this.active == 2 ? this.getTwoFactorLoginCode : this.getLoginCode,
           data: data
         })
         .then((res) => {
@@ -1071,7 +1069,7 @@ export default {
                   identifyingCode: this.formData.identifyingCode,
                   identifyingId: this.identifyingId
                 }
-              : this.active == '12'
+              : this.active == '2'
               ? {
                 username: this.formData.username,
                   password:
@@ -1122,7 +1120,7 @@ export default {
           url:
             this.active == '0'
               ? this.actionUrl
-              : this.active == '12'
+              : this.active == '2'
               ? 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.54',
+  version: '0.4.55',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -94,8 +94,6 @@ 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);
@@ -309,7 +307,7 @@ const ajax = function ({
     url,
     data,
     params,
-    header
+    headers: header
   });
 };