eoss-ui 0.4.91 → 0.4.93

package/lib/form.js

@@ -92,13 +92,13 @@ module.exports =
 
 "use strict";
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
+/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
+/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
 /* 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; };
 
@@ -449,11 +449,11 @@ var ajax = function ajax(_ref) {
   }
   if (method === 'post' && format) {
     data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   } else {
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/json;charset=UTF-8';
     }
   }
@@ -1909,8 +1909,6 @@ var isFunction = function isFunction(obj) {
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
 var isLogined = function isLogined(_ref8) {
-  var _this = this;
-
   var to = _ref8.to,
       from = _ref8.from,
       next = _ref8.next,
@@ -1929,6 +1927,17 @@ var isLogined = function isLogined(_ref8) {
   if (logined || cookie == true || cookie == 1) {
     if (loginPage) {
       sessionStorage.setItem('loginPage', loginPage);
+      if (!startWith(loginPage, ['http', '/'], true)) {
+        var pathname = win.top.location.pathname;
+        if (pathname !== '/') {
+          pathname = pathname.split('/');
+          pathname.splice(pathname.length - 1);
+          pathname = pathname.join('/');
+          loginPage = pathname + '/' + loginPage.replace('./', '');
+        } else {
+          loginPage = pathname + loginPage.replace('./', '');
+        }
+      }
     }
     next();
   } else {
@@ -1941,7 +1950,7 @@ var isLogined = function isLogined(_ref8) {
             url = win.location.href;
             break;
           case 'blank':
-            url = win.location.href;
+            url = win.open(url);
             break;
           case 'parent':
             url = win.parent.location.href;
@@ -2000,31 +2009,41 @@ var isLogined = function isLogined(_ref8) {
               }
               break;
             case 4:
-              _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
-                type: 'error'
-              }).then(function () {
-                sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-                window.location.href = delUrlParam({ key: 'code' });
-                if (loginPage) {
-                  win.top.location.replace(loginPage);
-                } else if (document.referrer) {
-                  win.top.location.replace(document.referrer);
-                } else if (win.top.location.href.indexOf('main.html') > -1) {
-                  win.top.location.href = './login.html';
-                } else {
-                  next('/login');
+                type: 'error',
+                callback: function callback() {
+                  sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
+                  if (loginPage) {
+                    win.top.location.replace(loginPage);
+                  } else if (document.referrer) {
+                    win.top.location.replace(document.referrer);
+                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    win.top.location.href = './login.html';
+                  } else {
+                    next('/login');
+                  }
                 }
-              }).catch(function (e) {});
+              });
               break;
             default:
           }
         } else {
-          if (token) {
-            next();
-          } else {
-            alert(res.msg);
-          }
+          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
+            confirmButtonText: '确定',
+            type: 'error',
+            callback: function callback() {
+              if (loginPage) {
+                win.top.location.replace(loginPage);
+              } else if (document.referrer) {
+                win.top.location.replace(document.referrer);
+              } else if (win.top.location.href.indexOf('main.html') > -1) {
+                win.top.location.href = './login.html';
+              } else {
+                next('/login');
+              }
+            }
+          });
         }
       }).catch(function (e) {});
     } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
@@ -3305,6 +3324,13 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 /***/ }),
 
 /***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3407,19 +3433,12 @@ function normalizeComponent(
 }
 
 
-/***/ }),
-
-/***/ 3:
-/***/ (function(module, exports) {
-
-module.exports = require("qs");
-
 /***/ }),
 
 /***/ 4:
 /***/ (function(module, exports) {
 
-module.exports = require("axios");
+module.exports = require("qs");
 
 /***/ }),
 
@@ -19395,7 +19414,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 // CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_); 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(2);
+var componentNormalizer = __webpack_require__(3);
 
 // CONCATENATED MODULE: ./packages/form/src/main.vue
 
@@ -19431,7 +19450,7 @@ main.install = function (Vue) {
 /***/ 5:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss-element");
+module.exports = require("axios");
 
 /***/ }),
 

package/lib/handle-user.js

@@ -92,13 +92,13 @@ module.exports =
 
 "use strict";
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
+/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
+/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
 /* 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; };
 
@@ -449,11 +449,11 @@ var ajax = function ajax(_ref) {
   }
   if (method === 'post' && format) {
     data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   } else {
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/json;charset=UTF-8';
     }
   }
@@ -1909,8 +1909,6 @@ var isFunction = function isFunction(obj) {
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
 var isLogined = function isLogined(_ref8) {
-  var _this = this;
-
   var to = _ref8.to,
       from = _ref8.from,
       next = _ref8.next,
@@ -1929,6 +1927,17 @@ var isLogined = function isLogined(_ref8) {
   if (logined || cookie == true || cookie == 1) {
     if (loginPage) {
       sessionStorage.setItem('loginPage', loginPage);
+      if (!startWith(loginPage, ['http', '/'], true)) {
+        var pathname = win.top.location.pathname;
+        if (pathname !== '/') {
+          pathname = pathname.split('/');
+          pathname.splice(pathname.length - 1);
+          pathname = pathname.join('/');
+          loginPage = pathname + '/' + loginPage.replace('./', '');
+        } else {
+          loginPage = pathname + loginPage.replace('./', '');
+        }
+      }
     }
     next();
   } else {
@@ -1941,7 +1950,7 @@ var isLogined = function isLogined(_ref8) {
             url = win.location.href;
             break;
           case 'blank':
-            url = win.location.href;
+            url = win.open(url);
             break;
           case 'parent':
             url = win.parent.location.href;
@@ -2000,31 +2009,41 @@ var isLogined = function isLogined(_ref8) {
               }
               break;
             case 4:
-              _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
-                type: 'error'
-              }).then(function () {
-                sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-                window.location.href = delUrlParam({ key: 'code' });
-                if (loginPage) {
-                  win.top.location.replace(loginPage);
-                } else if (document.referrer) {
-                  win.top.location.replace(document.referrer);
-                } else if (win.top.location.href.indexOf('main.html') > -1) {
-                  win.top.location.href = './login.html';
-                } else {
-                  next('/login');
+                type: 'error',
+                callback: function callback() {
+                  sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
+                  if (loginPage) {
+                    win.top.location.replace(loginPage);
+                  } else if (document.referrer) {
+                    win.top.location.replace(document.referrer);
+                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    win.top.location.href = './login.html';
+                  } else {
+                    next('/login');
+                  }
                 }
-              }).catch(function (e) {});
+              });
               break;
             default:
           }
         } else {
-          if (token) {
-            next();
-          } else {
-            alert(res.msg);
-          }
+          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
+            confirmButtonText: '确定',
+            type: 'error',
+            callback: function callback() {
+              if (loginPage) {
+                win.top.location.replace(loginPage);
+              } else if (document.referrer) {
+                win.top.location.replace(document.referrer);
+              } else if (win.top.location.href.indexOf('main.html') > -1) {
+                win.top.location.href = './login.html';
+              } else {
+                next('/login');
+              }
+            }
+          });
         }
       }).catch(function (e) {});
     } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
@@ -3280,6 +3299,13 @@ var formContents = '/config/admin/online/onlineForm/render';
 /***/ }),
 
 /***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3382,19 +3408,12 @@ function normalizeComponent(
 }
 
 
-/***/ }),
-
-/***/ 3:
-/***/ (function(module, exports) {
-
-module.exports = require("qs");
-
 /***/ }),
 
 /***/ 4:
 /***/ (function(module, exports) {
 
-module.exports = require("axios");
+module.exports = require("qs");
 
 /***/ }),
 
@@ -3627,7 +3646,7 @@ var util = __webpack_require__(0);
 // CONCATENATED MODULE: ./packages/handle-user/src/main.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_); 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(2);
+var componentNormalizer = __webpack_require__(3);
 
 // CONCATENATED MODULE: ./packages/handle-user/src/main.vue
 
@@ -3663,7 +3682,7 @@ main.install = function (Vue) {
 /***/ 5:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss-element");
+module.exports = require("axios");
 
 /***/ }),
 

package/lib/handler.js

@@ -92,13 +92,13 @@ module.exports =
 
 "use strict";
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
+/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
+/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
 /* 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; };
 
@@ -449,11 +449,11 @@ var ajax = function ajax(_ref) {
   }
   if (method === 'post' && format) {
     data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   } else {
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/json;charset=UTF-8';
     }
   }
@@ -1909,8 +1909,6 @@ var isFunction = function isFunction(obj) {
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
 var isLogined = function isLogined(_ref8) {
-  var _this = this;
-
   var to = _ref8.to,
       from = _ref8.from,
       next = _ref8.next,
@@ -1929,6 +1927,17 @@ var isLogined = function isLogined(_ref8) {
   if (logined || cookie == true || cookie == 1) {
     if (loginPage) {
       sessionStorage.setItem('loginPage', loginPage);
+      if (!startWith(loginPage, ['http', '/'], true)) {
+        var pathname = win.top.location.pathname;
+        if (pathname !== '/') {
+          pathname = pathname.split('/');
+          pathname.splice(pathname.length - 1);
+          pathname = pathname.join('/');
+          loginPage = pathname + '/' + loginPage.replace('./', '');
+        } else {
+          loginPage = pathname + loginPage.replace('./', '');
+        }
+      }
     }
     next();
   } else {
@@ -1941,7 +1950,7 @@ var isLogined = function isLogined(_ref8) {
             url = win.location.href;
             break;
           case 'blank':
-            url = win.location.href;
+            url = win.open(url);
             break;
           case 'parent':
             url = win.parent.location.href;
@@ -2000,31 +2009,41 @@ var isLogined = function isLogined(_ref8) {
               }
               break;
             case 4:
-              _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
-                type: 'error'
-              }).then(function () {
-                sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-                window.location.href = delUrlParam({ key: 'code' });
-                if (loginPage) {
-                  win.top.location.replace(loginPage);
-                } else if (document.referrer) {
-                  win.top.location.replace(document.referrer);
-                } else if (win.top.location.href.indexOf('main.html') > -1) {
-                  win.top.location.href = './login.html';
-                } else {
-                  next('/login');
+                type: 'error',
+                callback: function callback() {
+                  sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
+                  if (loginPage) {
+                    win.top.location.replace(loginPage);
+                  } else if (document.referrer) {
+                    win.top.location.replace(document.referrer);
+                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    win.top.location.href = './login.html';
+                  } else {
+                    next('/login');
+                  }
                 }
-              }).catch(function (e) {});
+              });
               break;
             default:
           }
         } else {
-          if (token) {
-            next();
-          } else {
-            alert(res.msg);
-          }
+          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
+            confirmButtonText: '确定',
+            type: 'error',
+            callback: function callback() {
+              if (loginPage) {
+                win.top.location.replace(loginPage);
+              } else if (document.referrer) {
+                win.top.location.replace(document.referrer);
+              } else if (win.top.location.href.indexOf('main.html') > -1) {
+                win.top.location.href = './login.html';
+              } else {
+                next('/login');
+              }
+            }
+          });
         }
       }).catch(function (e) {});
     } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
@@ -3280,6 +3299,13 @@ var formContents = '/config/admin/online/onlineForm/render';
 /***/ }),
 
 /***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3382,19 +3408,12 @@ function normalizeComponent(
 }
 
 
-/***/ }),
-
-/***/ 3:
-/***/ (function(module, exports) {
-
-module.exports = require("qs");
-
 /***/ }),
 
 /***/ 4:
 /***/ (function(module, exports) {
 
-module.exports = require("axios");
+module.exports = require("qs");
 
 /***/ }),
 
@@ -3894,7 +3913,7 @@ var util = __webpack_require__(0);
 // CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_); 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(2);
+var componentNormalizer = __webpack_require__(3);
 
 // CONCATENATED MODULE: ./packages/handler/src/main.vue
 
@@ -3930,7 +3949,7 @@ main.install = function (Vue) {
 /***/ 5:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss-element");
+module.exports = require("axios");
 
 /***/ }),
 

package/lib/icons.js

@@ -94,7 +94,7 @@ module.exports = JSON.parse("[\"zuomian\",\"monitor\",\"maximize\",\"pointer-up\
 
 /***/ }),
 
-/***/ 2:
+/***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -408,7 +408,7 @@ var icon = __webpack_require__(17);
 // CONCATENATED MODULE: ./packages/icons/src/main.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_); 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(2);
+var componentNormalizer = __webpack_require__(3);
 
 // CONCATENATED MODULE: ./packages/icons/src/main.vue