eoss-ui 0.4.89 → 0.4.91

package/lib/main.js

@@ -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=5d84af02&
+// 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&
 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=5d84af02&
+// CONCATENATED MODULE: ./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/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -7263,6 +7263,7 @@ var log = util["a" /* default */].getParams('console');
     handleJump: function handleJump(page, type, res) {
       var _this9 = this;
 
+      var prevPage = sessionStorage.getItem('jump');
       console.log(page);
       sessionStorage.setItem('jump', page);
       if (res) {
@@ -7272,7 +7273,7 @@ var log = util["a" /* default */].getParams('console');
           this.pid = res.pid;
         }
       }
-      if (util["a" /* default */].win.location.hash === page) {
+      if (util["a" /* default */].win.location.hash === page && prevPage === page) {
         this.refresh = true;
         return;
       }

package/lib/tree-group.js

@@ -3419,7 +3419,7 @@ module.exports = require("json-bigint");
 // 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/tree-group/src/main.vue?vue&type=template&id=11d86630&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=29d92df1&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3462,6 +3462,10 @@ var render = function () {
                   },
                 },
                 _vm._l(_vm.tabs, function (item, index) {
+                  var arguments$1 = arguments
+                  var i = arguments.length,
+                    argsArray = Array(i)
+                  while (i--) argsArray[i] = arguments[i]
                   return _c(
                     "el-tab-pane",
                     {
@@ -3477,9 +3481,24 @@ var render = function () {
                               ref: item.ref ? item.ref : "groupTree" + index,
                               refInFor: true,
                               on: {
-                                "node-click": _vm.handleNodeClick,
-                                "check-change": _vm.handleCheckChange,
-                                "current-first": _vm.handleCurrentFirst,
+                                "node-click": function (data, node) {
+                                  _vm.handleNodeClick(data, node, item)
+                                },
+                                "check-change": function () {
+                                  _vm.handleCheckChange.apply(
+                                    void 0,
+                                    arguments$1.concat([item])
+                                  )
+                                },
+                                results: function (res) {
+                                  _vm.handleResults(res, item)
+                                },
+                                "sub-results": function (res) {
+                                  _vm.handleSubResults(res, item)
+                                },
+                                "current-first": function (type, res) {
+                                  _vm.handleCurrentFirst(type, res, item)
+                                },
                               },
                             },
                             "es-tree",
@@ -3537,6 +3556,7 @@ var render = function () {
                         "check-change": _vm.handleCheckChange,
                         results: _vm.handleResults,
                         "sub-results": _vm.handleSubResults,
+                        "current-first": _vm.handleCurrentFirst,
                       },
                     },
                     "es-tree",
@@ -3732,7 +3752,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=11d86630&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=29d92df1&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3888,6 +3908,29 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -4128,14 +4171,14 @@ var util = __webpack_require__(0);
     handleSelect: function handleSelect() {
       this.$emit('tab-click', this.tabs[parseInt(this.active, 10)]);
     },
-    handleNodeClick: function handleNodeClick(data, node) {
+    handleNodeClick: function 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: function handleCheckChange() {
@@ -4157,14 +4200,14 @@ var util = __webpack_require__(0);
       this.checkeds = res;
       this.$emit('enterprise-confirm', res);
     },
-    handleResults: function handleResults(res) {
+    handleResults: function handleResults(res, tabs) {
       if (this.tree.showCheckbox && this.tree.checkedFirst && this.checkedAsSearch || this.tree.currentFirst) {
         this.checkeds = res[0];
       }
-      this.$emit('results', res);
+      this.$emit('results', res, tabs);
     },
-    handleSubResults: function handleSubResults(res) {
-      this.$emit('sub-results', res);
+    handleSubResults: function handleSubResults(res, tabs) {
+      this.$emit('sub-results', res, tabs);
     },
     setCurrentKey: function setCurrentKey(keys, leafOnly) {
       var _this2 = this;
@@ -4177,6 +4220,9 @@ var util = __webpack_require__(0);
     getTree: function getTree() {
       var ref = this.tabs && this.tabs.length ? this.tabs[Number(this.active)].ref ? this.tabs[Number(this.active)].ref : 'groupTree' + this.active : 'groupTree';
       return this.$refs[ref];
+    },
+    handleCurrentFirst: function handleCurrentFirst(type, res, tabs) {
+      this.$emit('current-first', type, res, tabs);
     }
   }
 });

package/lib/tree.js

@@ -3419,7 +3419,7 @@ module.exports = require("json-bigint");
 // 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/tree/src/main.vue?vue&type=template&id=1caf3025&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=ad13099c&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3613,7 +3613,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=1caf3025&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=ad13099c&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3781,10 +3781,6 @@ var util = __webpack_require__(0);
       type: String,
       default: api["H" /* getOrgMainTree */]
     },
-    currentFirstNode: {
-      type: Boolean,
-      default: false
-    },
     system: {
       type: Boolean,
       default: false
@@ -4014,6 +4010,7 @@ var util = __webpack_require__(0);
           if (_this.currentFirst) {
             var currentNode = treeList[0].id;
             if (!_this.currentNodeKey && _this.currentNodeKey != 0) {
+              _this.$emit('current-first', 'current', treeList[0]);
               _this.$nextTick(function () {
                 _this.$refs.oaTree.setCurrentKey(currentNode);
               });
@@ -4022,6 +4019,7 @@ var util = __webpack_require__(0);
           if (_this.checkedFirst) {
             var checkedNode = treeList[0].id;
             if (_this.defaultCheckedKeys && _this.defaultCheckedKeys.indexOf(checkedNode) == -1) {
+              _this.$emit('current-first', 'checked', treeList[0]);
               _this.checkedKeys = [checkedNode];
             }
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.89",
+  "version": "0.4.91",
   "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

@@ -1614,6 +1614,7 @@ export default {
     },
     //跳转页面
     handleJump(page, type, res) {
+      let prevPage = sessionStorage.getItem('jump');
       console.log(page);
       sessionStorage.setItem('jump', page);
       if (res) {
@@ -1623,7 +1624,7 @@ export default {
           this.pid = res.pid;
         }
       }
-      if (util.win.location.hash === page) {
+      if (util.win.location.hash === page && prevPage === page) {
         this.refresh = true;
         return;
       }

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.89',
+  version: '0.4.91',
   install,
   Button,
   ButtonGroup,