eoss-ui 0.4.70 → 0.4.71

package/lib/tree-group.js

@@ -2886,7 +2886,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=8d1a3b86&
+// 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=2522b075&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3002,7 +3002,8 @@ var render = function () {
                       on: {
                         "node-click": _vm.handleNodeClick,
                         "check-change": _vm.handleCheckChange,
-                        "current-first": _vm.handleCurrentFirst,
+                        results: _vm.handleResults,
+                        "sub-results": _vm.handleSubResults,
                       },
                     },
                     "es-tree",
@@ -3198,7 +3199,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=8d1a3b86&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=2522b075&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3353,6 +3354,7 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -3397,7 +3399,11 @@ var util = __webpack_require__(0);
       type: String,
       default: '#/empty'
     },
-    zoom: false
+    zoom: false,
+    checkedsAsSearch: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     wujieName: function wujieName() {
@@ -3595,11 +3601,14 @@ var util = __webpack_require__(0);
     },
     handleCheckChange: function handleCheckChange() {
       var ref = this.tabs && this.tabs.length ? this.tabs[Number(this.active)].ref ? this.tabs[Number(this.active)].ref : 'groupTree' + this.active : 'groupTree';
-      this.checkeds = this.$refs[ref].getCheckedNodes();
+      var checkeds = this.$refs[ref].getCheckedNodes();
+      if (this.checkedsAsSearch) {
+        this.checkeds = checkeds;
+      }
       if (this.onCheckChange) {
-        this.onCheckChange.apply(this, [this].concat(Array.prototype.slice.call(arguments)));
+        this.onCheckChange.apply(this, [checkeds].concat(Array.prototype.slice.call(arguments), [this]));
       } else {
-        this.$emit.apply(this, ['check-change', this].concat(Array.prototype.slice.call(arguments)));
+        this.$emit.apply(this, ['check-change', checkeds].concat(Array.prototype.slice.call(arguments), [this]));
       }
     },
     handleChange: function handleChange(res) {
@@ -3609,9 +3618,14 @@ var util = __webpack_require__(0);
       this.checkeds = res;
       this.$emit('enterprise-confirm', res);
     },
-    handleCurrentFirst: function handleCurrentFirst(res) {
-      this.checkeds = res.children[0];
-      this.$emit('current-first', res);
+    handleResults: function handleResults(res) {
+      if (this.tree.showCheckbox && this.tree.checkedFirst && this.checkedsAsSearch || this.tree.currentFirst) {
+        this.checkeds = res.children[0];
+      }
+      this.$emit('results', res);
+    },
+    handleSubResults: function handleSubResults(res) {
+      this.$emit('sub-results', res);
     },
     setCurrentKey: function setCurrentKey(keys, leafOnly) {
       var _this2 = this;

package/package.json

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

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

@@ -49,7 +49,8 @@
         ref="groupTree"
         @node-click="handleNodeClick"
         @check-change="handleCheckChange"
-        @current-first="handleCurrentFirst"
+        @results="handleResults"
+        @sub-results="handleSubResults"
         v-on="tree.events ? tree.events : {}"
       >
         <template v-if="enterprise" slot="filtrate">
@@ -191,7 +192,11 @@ export default {
       type: String,
       default: '#/empty'
     },
-    zoom: false
+    zoom: false,
+    checkedsAsSearch: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     wujieName() {
@@ -419,11 +424,14 @@ export default {
             ? this.tabs[Number(this.active)].ref
             : 'groupTree' + this.active
           : 'groupTree';
-      this.checkeds = this.$refs[ref].getCheckedNodes();
+      let checkeds = this.$refs[ref].getCheckedNodes();
+      if (this.checkedsAsSearch) {
+        this.checkeds = checkeds;
+      }
       if (this.onCheckChange) {
-        this.onCheckChange(this, ...arguments);
+        this.onCheckChange(checkeds, ...arguments, this);
       } else {
-        this.$emit('check-change', this, ...arguments);
+        this.$emit('check-change', checkeds, ...arguments, this);
       }
     },
     handleChange(res) {
@@ -433,9 +441,19 @@ export default {
       this.checkeds = res;
       this.$emit('enterprise-confirm', res);
     },
-    handleCurrentFirst(res) {
-      this.checkeds = res.children[0];
-      this.$emit('current-first', res);
+    handleResults(res) {
+      if (
+        (this.tree.showCheckbox &&
+          this.tree.checkedFirst &&
+          this.checkedsAsSearch) ||
+        this.tree.currentFirst
+      ) {
+        this.checkeds = res.children[0];
+      }
+      this.$emit('results', res);
+    },
+    handleSubResults(res) {
+      this.$emit('sub-results', res);
     },
     setCurrentKey(keys, leafOnly) {
       let ref =

package/src/index.js

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