eoss-mobiles 0.2.33 → 0.2.35

package/lib/selector.js

@@ -2168,8 +2168,8 @@ render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=3fb4f01a&
 
-// 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=09e7bd6b&
-var selector_treevue_type_template_id_09e7bd6b_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=e52199b2&
+var selector_treevue_type_template_id_e52199b2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2336,11 +2336,11 @@ var selector_treevue_type_template_id_09e7bd6b_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_09e7bd6b_staticRenderFns = []
-selector_treevue_type_template_id_09e7bd6b_render._withStripped = true
+var selector_treevue_type_template_id_e52199b2_staticRenderFns = []
+selector_treevue_type_template_id_e52199b2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=09e7bd6b&
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=e52199b2&
 
 // 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=33f22d0d&
 var treevue_type_template_id_33f22d0d_render = function () {
@@ -2960,6 +2960,8 @@ var util = __webpack_require__(0);
 var http = __webpack_require__(3);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=script&lang=js&
+var _methods;
+
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 //
@@ -3514,7 +3516,6 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   mounted: function mounted() {
     // typeof this.selectList != 'string' &&
     //   (this.list = $.deepClone(this.selectList));
-
     // this.$nextTick(() => {
     //   if (this.nodeList) {
     //     this.getNodeList();
@@ -3524,7 +3525,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     // });
   },
 
-  methods: {
+  methods: (_methods = {
     handleClick: function handleClick(index) {
       this.selectIndex = index;
       this.getContent();
@@ -3773,7 +3774,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       var _this8 = this;
 
       var _that = this;
-      var data = _that.$listeners[key] ? _that.$listeners[key](res.obj, !!res.obj.children) : undefined;
+      var data = [];
+      if (this.isDefaultNode) {
+        data = _that.$listeners[key] ? _that.$listeners[key](res.obj, !!res.obj.children) : undefined;
+      }
       if (!isStart) {
         if (res.obj.open) {
           this.$set(res.obj, 'open', false);
@@ -3850,7 +3854,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           this.getChiled(res, isStart, 'left-icon');
         } else if (this.showMore && this.$listeners['right-icon'] && key === 'node') {
           this.getChiled(res, isStart, 'right-icon');
-        } else if (!this.isDefaultNode && key === "title" || this.$listeners['node-click'] && this.$listeners['left-icon'] && !this.showMore && !this.isDefaultNode) {
+        } else if (!this.isDefaultNode && key === 'title' || this.$listeners['node-click'] && this.$listeners['left-icon'] && !this.showMore && !this.isDefaultNode) {
           _that.$listeners['node-click'](res.obj, !!res.obj.children);
         } else {
           this.getChiled(res, isStart, 'node-click');
@@ -3895,10 +3899,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           this.$set(res.obj, 'checked', false);
         }
       } else {
-        if (!this.multiple && this.list.length >= 1) {
-          this.$toast(this.promptText);
-          return;
-        }
+        // if (!this.multiple && this.list.length >= 1) {
+        //   this.$toast(this.promptText);
+        //   return;
+        // }
         if (res.obj.isAllCheck) {
           var _list;
 
@@ -3908,7 +3912,12 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           (_list = this.list).unshift.apply(_list, model.slice(1, model.length));
         } else {
           this.$set(res.obj, 'checked', true);
-          this.list.unshift(res.obj);
+          if (!this.multiple) {
+            this.list = [res.obj];
+            this.setChecked(this.personnel, res.obj);
+          } else {
+            this.list.unshift(res.obj);
+          }
         }
       }
       if (this.isAllCheck && this.multiple) {
@@ -3926,20 +3935,31 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           this.$set(model[0], 'checked', false);
         }
       }
-    },
-    dispose: function dispose() {
-      var obj = {
-        list: this.list,
-        label: this.label ? this.label : undefined
-      };
-      this.oldIsSearch = this.isSearch;
-      this.$emit('dispose', util["a" /* default */].deepClone(obj));
-      this.$parent.$emit('change', util["a" /* default */].deepClone(obj));
-    },
-    navigateBack: function navigateBack() {
-      this.$emit('close');
     }
-  }
+  }, _methods['setChecked'] = function setChecked(data, item) {
+    var _this10 = this;
+
+    data.map(function (x) {
+      if (x[_this10.valueKey] === item[_this10.valueKey]) {
+        _this10.$set(x, 'checked', true);
+      } else {
+        _this10.$set(x, 'checked', false);
+      }
+      if (x.children) {
+        _this10.setChecked(x.children, item);
+      }
+    });
+  }, _methods.dispose = function dispose() {
+    var obj = {
+      list: this.list,
+      label: this.label ? this.label : undefined
+    };
+    this.oldIsSearch = this.isSearch;
+    this.$emit('dispose', util["a" /* default */].deepClone(obj));
+    this.$parent.$emit('change', util["a" /* default */].deepClone(obj));
+  }, _methods.navigateBack = function navigateBack() {
+    this.$emit('close');
+  }, _methods)
 });
 // CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_selector_treevue_type_script_lang_js_ = (selector_treevue_type_script_lang_js_); 
@@ -3953,8 +3973,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selector_tree_component = Object(componentNormalizer["a" /* default */])(
   src_selector_treevue_type_script_lang_js_,
-  selector_treevue_type_template_id_09e7bd6b_render,
-  selector_treevue_type_template_id_09e7bd6b_staticRenderFns,
+  selector_treevue_type_template_id_e52199b2_render,
+  selector_treevue_type_template_id_e52199b2_staticRenderFns,
   false,
   null,
   null,

package/package.json

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

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

@@ -544,7 +544,6 @@ export default {
   mounted() {
     // typeof this.selectList != 'string' &&
     //   (this.list = $.deepClone(this.selectList));
-
     // this.$nextTick(() => {
     //   if (this.nodeList) {
     //     this.getNodeList();
@@ -798,9 +797,12 @@ export default {
     },
     getChiled(res, isStart, key) {
       const _that = this;
-      let data = _that.$listeners[key]
-        ? _that.$listeners[key](res.obj, !!res.obj.children)
-        : undefined;
+      let data = [];
+      if (this.isDefaultNode) {
+        data = _that.$listeners[key]
+          ? _that.$listeners[key](res.obj, !!res.obj.children)
+          : undefined;
+      }
       if (!isStart) {
         if (res.obj.open) {
           this.$set(res.obj, 'open', false);
@@ -870,7 +872,7 @@ export default {
         }
       }
     },
-    open(res, isStart, isNode,key) {
+    open(res, isStart, isNode, key) {
       const _that = this;
       _that.oldIsSearch = _that.isSearch;
       // debugger
@@ -880,11 +882,21 @@ export default {
       ) {
         if (this.$listeners['left-icon'] && key === 'node') {
           this.getChiled(res, isStart, 'left-icon');
-        } else if (this.showMore && this.$listeners['right-icon'] && key === 'node') {
+        } else if (
+          this.showMore &&
+          this.$listeners['right-icon'] &&
+          key === 'node'
+        ) {
           this.getChiled(res, isStart, 'right-icon');
-        }else if((!this.isDefaultNode && key==="title") || (this.$listeners['node-click'] && this.$listeners['left-icon'] && !this.showMore && !this.isDefaultNode)){
-_that.$listeners['node-click'](res.obj, !!res.obj.children);
-        }else{
+        } else if (
+          (!this.isDefaultNode && key === 'title') ||
+          (this.$listeners['node-click'] &&
+            this.$listeners['left-icon'] &&
+            !this.showMore &&
+            !this.isDefaultNode)
+        ) {
+          _that.$listeners['node-click'](res.obj, !!res.obj.children);
+        } else {
           this.getChiled(res, isStart, 'node-click');
         }
       } else if (
@@ -936,10 +948,10 @@ _that.$listeners['node-click'](res.obj, !!res.obj.children);
           this.$set(res.obj, 'checked', false);
         }
       } else {
-        if (!this.multiple && this.list.length >= 1) {
-          this.$toast(this.promptText);
-          return;
-        }
+        // if (!this.multiple && this.list.length >= 1) {
+        //   this.$toast(this.promptText);
+        //   return;
+        // }
         if (res.obj.isAllCheck) {
           model.map(x => {
             this.$set(x, 'checked', true);
@@ -947,7 +959,12 @@ _that.$listeners['node-click'](res.obj, !!res.obj.children);
           this.list.unshift(...model.slice(1, model.length));
         } else {
           this.$set(res.obj, 'checked', true);
-          this.list.unshift(res.obj);
+          if (!this.multiple) {
+            this.list = [res.obj];
+            this.setChecked(this.personnel, res.obj);
+          } else {
+            this.list.unshift(res.obj);
+          }
         }
       }
       if (this.isAllCheck && this.multiple) {
@@ -964,6 +981,18 @@ _that.$listeners['node-click'](res.obj, !!res.obj.children);
         }
       }
     },
+    setChecked(data, item) {
+      data.map(x => {
+        if (x[this.valueKey] === item[this.valueKey]) {
+          this.$set(x, 'checked', true);
+        } else {
+          this.$set(x, 'checked', false);
+        }
+        if (x.children) {
+          this.setChecked(x.children, item);
+        }
+      });
+    },
     dispose() {
       let obj = {
         list: this.list,

package/src/index.js

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