eoss-ui 0.4.91 → 0.4.92

package/lib/input-number.js

@@ -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';
     }
   }

package/lib/input.js

@@ -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';
     }
   }

package/lib/login.js

@@ -448,11 +448,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';
     }
   }

package/lib/main.js

@@ -448,11 +448,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';
     }
   }
@@ -3484,7 +3484,7 @@ module.exports = require("stompjs");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=6641fcac&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=08b696ec&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3914,7 +3914,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6641fcac&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=08b696ec&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -6454,32 +6454,32 @@ var log = util["a" /* default */].getParams('console');
             this.navIds = ids;
             this.setTitle(ids[0]);
           }
+        } else if (sessionStorage.getItem('jump') && this.history) {
+          var _ids = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+          if (_ids) {
+            this.defaultActive = _ids;
+            this.navIds = _ids;
+            this.setTitle(_ids[0]);
+          }
         } else if (util["a" /* default */].win.location.hash) {
           var hash = util["a" /* default */].win.location.hash;
           if (hash) {
             hash = hash.split('?')[0];
           }
           if (hash !== '#/' && hash !== '#/main') {
-            var _ids = this.getId(this.menus, util["a" /* default */].win.location.hash, true);
-            if (_ids) {
-              this.defaultActive = _ids;
-              this.navIds = _ids;
-              this.setTitle(_ids[0]);
-            }
-          } else if (sessionStorage.getItem('jump') && this.history) {
-            var _ids2 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+            var _ids2 = this.getId(this.menus, util["a" /* default */].win.location.hash, true);
             if (_ids2) {
               this.defaultActive = _ids2;
               this.navIds = _ids2;
               this.setTitle(_ids2[0]);
             }
-          }
-        } else if (sessionStorage.getItem('jump') && this.history) {
-          var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
-          if (_ids3) {
-            this.defaultActive = _ids3;
-            this.navIds = _ids3;
-            this.setTitle(_ids3[0]);
+          } else if (sessionStorage.getItem('jump') && this.history) {
+            var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+            if (_ids3) {
+              this.defaultActive = _ids3;
+              this.navIds = _ids3;
+              this.setTitle(_ids3[0]);
+            }
           }
         }
         this.setMenu(this.menus);
@@ -6718,32 +6718,32 @@ var log = util["a" /* default */].getParams('console');
               if (ids) {
                 _this5.defaultActive = ids;
               }
+            } else if (sessionStorage.getItem('jump') && _this5.history) {
+              var _ids4 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+              if (_ids4) {
+                _this5.defaultActive = _ids4;
+                _this5.navIds = _ids4;
+                _this5.setTitle(_ids4[0]);
+              }
             } else if (util["a" /* default */].win.location.hash) {
               var hash = util["a" /* default */].win.location.hash;
               if (hash) {
                 hash = hash.split('?')[0];
               }
               if (hash !== '#/' && hash !== '#/main') {
-                var _ids4 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
-                if (_ids4) {
-                  _this5.defaultActive = _ids4;
-                  _this5.navIds = _ids4;
-                  _this5.setTitle(_ids4[0]);
-                }
-              } else if (sessionStorage.getItem('jump') && _this5.history) {
-                var _ids5 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+                var _ids5 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
                 if (_ids5) {
                   _this5.defaultActive = _ids5;
                   _this5.navIds = _ids5;
                   _this5.setTitle(_ids5[0]);
                 }
-              }
-            } else if (sessionStorage.getItem('jump') && _this5.history) {
-              var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
-              if (_ids6) {
-                _this5.defaultActive = _ids6;
-                _this5.navIds = _ids6;
-                _this5.setTitle(_ids6[0]);
+              } else if (sessionStorage.getItem('jump') && _this5.history) {
+                var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+                if (_ids6) {
+                  _this5.defaultActive = _ids6;
+                  _this5.navIds = _ids6;
+                  _this5.setTitle(_ids6[0]);
+                }
               }
             }
             _this5.setTips(_this5.menus);

package/lib/nav.js

@@ -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';
     }
   }

package/lib/page.js

@@ -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';
     }
   }

package/lib/player.js

@@ -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';
     }
   }

package/lib/qr-code.js

@@ -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';
     }
   }

package/lib/radio-group.js

@@ -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';
     }
   }

package/lib/retrial-auth.js

@@ -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';
     }
   }

package/lib/select-ganged.js

@@ -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';
     }
   }

package/lib/select.js

@@ -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';
     }
   }

package/lib/selector-panel.js

@@ -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';
     }
   }

package/lib/selector.js

@@ -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';
     }
   }

package/lib/sizer.js

@@ -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';
     }
   }

package/lib/steps.js

@@ -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';
     }
   }

package/lib/switch.js

@@ -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';
     }
   }

package/lib/table-form.js

@@ -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';
     }
   }

package/lib/tabs.js

@@ -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';
     }
   }

package/lib/tips.js

@@ -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';
     }
   }

package/lib/tree-group.js

@@ -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';
     }
   }

package/lib/tree.js

@@ -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';
     }
   }

package/lib/upload.js

@@ -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';
     }
   }

package/lib/utils/util.js

@@ -364,11 +364,11 @@ var ajax = function ajax(_ref) {
   }
   if (method === 'post' && format) {
     data = _qs2.default.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';
     }
   }

package/lib/wujie.js

@@ -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';
     }
   }

package/lib/wxlogin.js

@@ -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';
     }
   }

package/package.json

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

package/packages/main/src/main.vue

@@ -740,6 +740,17 @@ export default {
             this.navIds = ids;
             this.setTitle(ids[0]);
           }
+        } else if (sessionStorage.getItem('jump') && this.history) {
+          let ids = this.getId(
+            this.menus,
+            sessionStorage.getItem('jump'),
+            true
+          );
+          if (ids) {
+            this.defaultActive = ids;
+            this.navIds = ids;
+            this.setTitle(ids[0]);
+          }
         } else if (util.win.location.hash) {
           let hash = util.win.location.hash;
           if (hash) {
@@ -764,17 +775,6 @@ export default {
               this.setTitle(ids[0]);
             }
           }
-        } else if (sessionStorage.getItem('jump') && this.history) {
-          let ids = this.getId(
-            this.menus,
-            sessionStorage.getItem('jump'),
-            true
-          );
-          if (ids) {
-            this.defaultActive = ids;
-            this.navIds = ids;
-            this.setTitle(ids[0]);
-          }
         }
         this.setMenu(this.menus);
       }
@@ -1027,6 +1027,17 @@ export default {
                 if (ids) {
                   this.defaultActive = ids;
                 }
+              } else if (sessionStorage.getItem('jump') && this.history) {
+                let ids = this.getId(
+                  this.menus,
+                  sessionStorage.getItem('jump'),
+                  true
+                );
+                if (ids) {
+                  this.defaultActive = ids;
+                  this.navIds = ids;
+                  this.setTitle(ids[0]);
+                }
               } else if (util.win.location.hash) {
                 let hash = util.win.location.hash;
                 if (hash) {
@@ -1055,17 +1066,6 @@ export default {
                     this.setTitle(ids[0]);
                   }
                 }
-              } else if (sessionStorage.getItem('jump') && this.history) {
-                let ids = this.getId(
-                  this.menus,
-                  sessionStorage.getItem('jump'),
-                  true
-                );
-                if (ids) {
-                  this.defaultActive = ids;
-                  this.navIds = ids;
-                  this.setTitle(ids[0]);
-                }
               }
               this.setTips(this.menus);
               store.set('nav', this.menus);

package/src/index.js

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

package/src/utils/util.js

@@ -393,11 +393,11 @@ const ajax = function ({
   }
   if (method === 'post' && format) {
     data = qs.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';
     }
   }