eoss-mobiles 0.3.43 → 0.3.45

package/lib/selector.js

@@ -2268,8 +2268,8 @@ render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=17308961
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=73fa0cb0
-var selector_treevue_type_template_id_73fa0cb0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=42906bb4
+var selector_treevue_type_template_id_42906bb4_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2452,14 +2452,14 @@ var selector_treevue_type_template_id_73fa0cb0_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_73fa0cb0_staticRenderFns = []
-selector_treevue_type_template_id_73fa0cb0_render._withStripped = true
+var selector_treevue_type_template_id_42906bb4_staticRenderFns = []
+selector_treevue_type_template_id_42906bb4_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=73fa0cb0
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=42906bb4
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=3939a998
-var treevue_type_template_id_3939a998_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=53316a9f
+var treevue_type_template_id_53316a9f_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2849,11 +2849,11 @@ var treevue_type_template_id_3939a998_render = function () {
     0
   )
 }
-var treevue_type_template_id_3939a998_staticRenderFns = []
-treevue_type_template_id_3939a998_render._withStripped = true
+var treevue_type_template_id_53316a9f_staticRenderFns = []
+treevue_type_template_id_53316a9f_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=3939a998
+// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=53316a9f
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=script&lang=js
 //
@@ -3256,6 +3256,7 @@ treevue_type_template_id_3939a998_render._withStripped = true
       if (this.isDisabled(res.obj)) return;
       var model = undefined;
       if (this.isAllCheck) model = this.model;
+      console.log(res, model, 'resresresres');
       this.$emit('checke', res, model);
     },
     isShowNode: function isShowNode(id) {
@@ -3282,8 +3283,8 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_treevue_type_script_lang_js,
-  treevue_type_template_id_3939a998_render,
-  treevue_type_template_id_3939a998_staticRenderFns,
+  treevue_type_template_id_53316a9f_render,
+  treevue_type_template_id_53316a9f_staticRenderFns,
   false,
   null,
   null,
@@ -4288,13 +4289,15 @@ var _props, _methods;
           var _list;
 
           var selectData = [];
+          this.$set(res.obj, 'checked', true);
           model.map(function (x) {
-            if (!x.disabled && !x.nocheck && !x.isAllCheck && x.selecttype == _this10.newParam.selecttype) {
+            if (!x.disabled && !x.nocheck && !x.isAllCheck && (x.selecttype == _this10.newParam.selecttype || _this10.newParam.selecttype == 'persongroup' && x.selecttype == 'employee') && _this10.disableds.indexOf(x[_this10.valueKey]) == -1) {
               _this10.$set(x, 'checked', true);
               selectData.push(x);
             }
           });
           (_list = this.list).push.apply(_list, selectData);
+          //  this.$set(res.obj, 'checked', true);
         } else {
           this.$set(res.obj, 'checked', true);
           if (!this.multiple) {
@@ -4315,7 +4318,7 @@ var _props, _methods;
           return item;
         }, []);
         var newArr = model.filter(function (x) {
-          return !x.disabled && !x.nocheck && x.selecttype == _this10.newParam.selecttype;
+          return !x.disabled && !x.nocheck && (x.selecttype == _this10.newParam.selecttype || _this10.newParam.selecttype == 'persongroup' && x.selecttype == 'employee') && _this10.disableds.indexOf(x[_this10.valueKey]) == -1;
         });
         if (newArr.length === checkList.length) {
           model.map(function (x) {
@@ -4365,8 +4368,8 @@ var _props, _methods;
 
 var selector_tree_component = Object(componentNormalizer["a" /* default */])(
   src_selector_treevue_type_script_lang_js,
-  selector_treevue_type_template_id_73fa0cb0_render,
-  selector_treevue_type_template_id_73fa0cb0_staticRenderFns,
+  selector_treevue_type_template_id_42906bb4_render,
+  selector_treevue_type_template_id_42906bb4_staticRenderFns,
   false,
   null,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.3.43",
+  "version": "0.3.45",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/selector/src/selector-tree.vue

@@ -1046,13 +1046,15 @@ export default {
         // }
         if (res.obj.isAllCheck) {
           let selectData = [];
+          this.$set(res.obj, 'checked', true);
           model.map((x) => {
-            if(!x.disabled && !x.nocheck && !x.isAllCheck && x.selecttype == this.newParam.selecttype){
+            if(!x.disabled && !x.nocheck && !x.isAllCheck && (x.selecttype == this.newParam.selecttype || (this.newParam.selecttype == 'persongroup' && x.selecttype == 'employee')) && this.disableds.indexOf(x[this.valueKey]) == -1){
               this.$set(x, 'checked', true);
               selectData.push(x);
             }
           });
           this.list.push(...selectData);
+          //  this.$set(res.obj, 'checked', true);
         } else {
           this.$set(res.obj, 'checked', true);
           if (!this.multiple) {
@@ -1070,7 +1072,7 @@ export default {
           obj[next.showid] ? '' : (obj[next.showid] = true && item.push(next));
           return item;
         }, []);
-        let newArr = model.filter((x) => !x.disabled&&!x.nocheck&& x.selecttype == this.newParam.selecttype);
+        let newArr = model.filter((x) => !x.disabled&&!x.nocheck&& (x.selecttype == this.newParam.selecttype  || (this.newParam.selecttype == 'persongroup' && x.selecttype == 'employee')) && this.disableds.indexOf(x[this.valueKey]) == -1);
         if (newArr.length === checkList.length) {
           model.map((x) => {
             if (!x.disabled) {

package/packages/selector/src/tree.vue

@@ -393,6 +393,7 @@ export default {
       if (this.isDisabled(res.obj)) return;
       let model = undefined;
       if (this.isAllCheck) model = this.model;
+      console.log(res,model,'resresresres')
       this.$emit('checke', res, model);
     },
     isShowNode(id) {

package/src/index.js

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