eoss-ui 0.4.90 → 0.4.92

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.90",
+  "version": "0.4.92",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -95,7 +95,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.71",
+    "eoss-element": "^0.2.73",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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/packages/tree/src/main.vue

@@ -175,10 +175,6 @@ export default {
       type: String,
       default: getOrgMainTree
     },
-    currentFirstNode: {
-      type: Boolean,
-      default: false
-    },
     system: {
       type: Boolean,
       default: false
@@ -405,6 +401,7 @@ export default {
             if (this.currentFirst) {
               let currentNode = treeList[0].id;
               if (!this.currentNodeKey && this.currentNodeKey != 0) {
+                this.$emit('current-first', 'current', treeList[0]);
                 this.$nextTick(() => {
                   this.$refs.oaTree.setCurrentKey(currentNode);
                 });
@@ -416,6 +413,7 @@ export default {
                 this.defaultCheckedKeys &&
                 this.defaultCheckedKeys.indexOf(checkedNode) == -1
               ) {
+                this.$emit('current-first', 'checked', treeList[0]);
                 this.checkedKeys = [checkedNode];
               }
             }

package/packages/tree-group/src/main.vue

@@ -23,9 +23,31 @@
           <es-tree
             v-bind="item.tree"
             :ref="item.ref ? item.ref : 'groupTree' + index"
-            @node-click="handleNodeClick"
-            @check-change="handleCheckChange"
-            @current-first="handleCurrentFirst"
+            @node-click="
+              (data, node) => {
+                handleNodeClick(data, node, item);
+              }
+            "
+            @check-change="
+              () => {
+                handleCheckChange(...arguments, item);
+              }
+            "
+            @results="
+              (res) => {
+                handleResults(res, item);
+              }
+            "
+            @sub-results="
+              (res) => {
+                handleSubResults(res, item);
+              }
+            "
+            @current-first="
+              (type, res) => {
+                handleCurrentFirst(type, res, item);
+              }
+            "
             v-on="item.tree && item.tree.events ? item.tree.events : {}"
           >
             <template v-if="item.enterprise" slot="filtrate">
@@ -51,6 +73,7 @@
         @check-change="handleCheckChange"
         @results="handleResults"
         @sub-results="handleSubResults"
+        @current-first="handleCurrentFirst"
         v-on="tree.events ? tree.events : {}"
       >
         <template v-if="enterprise" slot="filtrate">
@@ -413,14 +436,14 @@ export default {
     handleSelect() {
       this.$emit('tab-click', this.tabs[parseInt(this.active, 10)]);
     },
-    handleNodeClick(data, node) {
+    handleNodeClick(data, node, tabs) {
       if (this.clickedAsSearch) {
         this.checkeds = data;
       }
       if (this.onNodeClick) {
-        this.onNodeClick(this, data, node);
+        this.onNodeClick(this, data, node, tabs);
       } else {
-        this.$emit('node-click', this, data, node);
+        this.$emit('node-click', this, data, node, tabs);
       }
     },
     handleCheckChange() {
@@ -447,7 +470,7 @@ export default {
       this.checkeds = res;
       this.$emit('enterprise-confirm', res);
     },
-    handleResults(res) {
+    handleResults(res, tabs) {
       if (
         (this.tree.showCheckbox &&
           this.tree.checkedFirst &&
@@ -456,10 +479,10 @@ export default {
       ) {
         this.checkeds = res[0];
       }
-      this.$emit('results', res);
+      this.$emit('results', res, tabs);
     },
-    handleSubResults(res) {
-      this.$emit('sub-results', res);
+    handleSubResults(res, tabs) {
+      this.$emit('sub-results', res, tabs);
     },
     setCurrentKey(keys, leafOnly) {
       let ref =
@@ -480,6 +503,9 @@ export default {
             : 'groupTree' + this.active
           : 'groupTree';
       return this.$refs[ref];
+    },
+    handleCurrentFirst(type, res, tabs) {
+      this.$emit('current-first', type, res, tabs);
     }
   }
 };

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.90',
+  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';
     }
   }