eoss-mobiles 0.2.28 → 0.2.29

package/lib/selector.js

@@ -2157,8 +2157,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=f80d1986&
-var selector_treevue_type_template_id_f80d1986_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=72ba252b&
+var selector_treevue_type_template_id_72ba252b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2325,14 +2325,14 @@ var selector_treevue_type_template_id_f80d1986_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_f80d1986_staticRenderFns = []
-selector_treevue_type_template_id_f80d1986_render._withStripped = true
+var selector_treevue_type_template_id_72ba252b_staticRenderFns = []
+selector_treevue_type_template_id_72ba252b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=f80d1986&
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=72ba252b&
 
-// 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=642d0eb9&
-var treevue_type_template_id_642d0eb9_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=33f22d0d&
+var treevue_type_template_id_33f22d0d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2379,13 +2379,14 @@ var treevue_type_template_id_642d0eb9_render = function () {
                                 directives: [
                                   {
                                     name: "tap",
-                                    rawName: "v-tap",
+                                    rawName: "v-tap.stop",
                                     value: {
                                       methods: _vm.handleClickIcon,
                                       obj: item,
                                     },
                                     expression:
                                       "{ methods: handleClickIcon, obj: item }",
+                                    modifiers: { stop: true },
                                   },
                                 ],
                               },
@@ -2414,13 +2415,14 @@ var treevue_type_template_id_642d0eb9_render = function () {
                             directives: [
                               {
                                 name: "tap",
-                                rawName: "v-tap",
+                                rawName: "v-tap.stop",
                                 value: {
                                   methods: _vm.handleClickIcon,
                                   obj: item,
                                 },
                                 expression:
                                   "{ methods: handleClickIcon, obj: item }",
+                                modifiers: { stop: true },
                               },
                             ],
                             staticClass: "right",
@@ -2632,11 +2634,11 @@ var treevue_type_template_id_642d0eb9_render = function () {
     0
   )
 }
-var treevue_type_template_id_642d0eb9_staticRenderFns = []
-treevue_type_template_id_642d0eb9_render._withStripped = true
+var treevue_type_template_id_33f22d0d_staticRenderFns = []
+treevue_type_template_id_33f22d0d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=642d0eb9&
+// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=33f22d0d&
 
 // 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&
 //
@@ -2892,13 +2894,11 @@ treevue_type_template_id_642d0eb9_render._withStripped = true
 
   methods: {
     handleClickIcon: function handleClickIcon(res, isStart) {
-      console.log('点击了open2');
       if (!this.$listeners['left-icon'] && !this.showMore) return;
-      this.$emit('popen', res, res.isStart || isStart);
+      this.$emit('popen', res, res.isStart || isStart, true, 'node');
     },
     opened: function opened(res, isStart) {
-      console.log('点击了open');
-      this.$emit('popen', res, res.isStart || isStart, true);
+      this.$emit('popen', res, res.isStart || isStart, true, 'title');
     },
     checke: function checke(res) {
       var model = undefined;
@@ -2929,8 +2929,8 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_treevue_type_script_lang_js_,
-  treevue_type_template_id_642d0eb9_render,
-  treevue_type_template_id_642d0eb9_staticRenderFns,
+  treevue_type_template_id_33f22d0d_render,
+  treevue_type_template_id_33f22d0d_staticRenderFns,
   false,
   null,
   null,
@@ -3501,7 +3501,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     }
   },
   mounted: function mounted() {
-    typeof this.selectList != 'string' && (this.list = util["a" /* default */].deepClone(this.selectList));
+    // typeof this.selectList != 'string' &&
+    //   (this.list = $.deepClone(this.selectList));
 
     // this.$nextTick(() => {
     //   if (this.nodeList) {
@@ -3522,7 +3523,16 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
       this.personnel = this.nodeList;
 
-      !isSearch && (this.list = util["a" /* default */].deepClone(this.selectList));
+      // !isSearch && (this.list = $.deepClone(this.selectList));
+      if (!isSearch) {
+        if (typeof this.selectList == 'string') {
+          this.selectData = [];
+          this.list = this.getSelectData(this.personnel);
+          this.$emit('update:selectList', this.list);
+        } else {
+          this.list = util["a" /* default */].deepClone(this.selectList);
+        }
+      }
       var _this = this;
       if (this.list && this.list.length > 0) {
         this.list.filter(function (r) {
@@ -3820,17 +3830,20 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         }
       }
     },
-    open: function open(res, isStart, isNode) {
+    open: function open(res, isStart, isNode, key) {
       var _that = this;
       _that.oldIsSearch = _that.isSearch;
       // debugger
       if (this.$listeners['node-click'] && (this.$listeners['left-icon'] || this.showMore && !this.isDefaultNode)) {
-        if (this.$listeners['left-icon'] && !isNode) {
+        if (this.$listeners['left-icon'] && key === 'node') {
           this.getChiled(res, isStart, 'left-icon');
-        } else if (this.showMore && !isNode) {
+        } 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 {
+          this.getChiled(res, isStart, 'node-click');
         }
-        isNode && _that.$listeners['node-click'](res.obj, !!res.obj.children);
       } else if (this.$listeners['node-click'] || this.$listeners['left-icon'] || this.showMore && !this.isDefaultNode) {
         isNode && this.$listeners['node-click'] && this.getChiled(res, isStart, 'node-click');
         this.$listeners['left-icon'] && !isNode && this.getChiled(res, isStart, 'left-icon');
@@ -3929,8 +3942,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_f80d1986_render,
-  selector_treevue_type_template_id_f80d1986_staticRenderFns,
+  selector_treevue_type_template_id_72ba252b_render,
+  selector_treevue_type_template_id_72ba252b_staticRenderFns,
   false,
   null,
   null,

package/package.json

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

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

@@ -542,8 +542,8 @@ export default {
     }
   },
   mounted() {
-    typeof this.selectList != 'string' &&
-      (this.list = $.deepClone(this.selectList));
+    // typeof this.selectList != 'string' &&
+    //   (this.list = $.deepClone(this.selectList));
 
     // this.$nextTick(() => {
     //   if (this.nodeList) {
@@ -561,7 +561,16 @@ export default {
     getNodeList(isSearch) {
       this.personnel = this.nodeList;
 
-      !isSearch && (this.list = $.deepClone(this.selectList));
+      // !isSearch && (this.list = $.deepClone(this.selectList));
+      if (!isSearch) {
+        if (typeof this.selectList == 'string') {
+          this.selectData = [];
+          this.list = this.getSelectData(this.personnel);
+          this.$emit('update:selectList', this.list);
+        } else {
+          this.list = $.deepClone(this.selectList);
+        }
+      }
       let _this = this;
       if (this.list && this.list.length > 0) {
         this.list.filter(r => {
@@ -752,7 +761,8 @@ export default {
           if (
             res.results.length > 0 &&
             res.results[0].nocheck == false &&
-            this.isAllCheck && this.multiple
+            this.isAllCheck &&
+            this.multiple
           ) {
             res.results.unshift({
               showshortname: '全选',
@@ -771,7 +781,7 @@ export default {
               }
             });
           });
-          if (this.isAllCheck  && this.multiple) {
+          if (this.isAllCheck && this.multiple) {
             let checkList = obj.children
               .slice(1, obj.children.length)
               .filter(x => x.checked);
@@ -860,7 +870,7 @@ export default {
         }
       }
     },
-    open(res, isStart, isNode) {
+    open(res, isStart, isNode,key) {
       const _that = this;
       _that.oldIsSearch = _that.isSearch;
       // debugger
@@ -868,12 +878,15 @@ export default {
         this.$listeners['node-click'] &&
         (this.$listeners['left-icon'] || (this.showMore && !this.isDefaultNode))
       ) {
-        if (this.$listeners['left-icon'] && !isNode) {
+        if (this.$listeners['left-icon'] && key === 'node') {
           this.getChiled(res, isStart, 'left-icon');
-        } else if (this.showMore && !isNode) {
+        } 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{
+          this.getChiled(res, isStart, 'node-click');
         }
-        isNode && _that.$listeners['node-click'](res.obj, !!res.obj.children);
       } else if (
         this.$listeners['node-click'] ||
         this.$listeners['left-icon'] ||
@@ -946,7 +959,7 @@ export default {
         }, []);
         if (model.length - 1 === checkList.length) {
           this.$set(model[0], 'checked', true);
-        } else{
+        } else {
           this.$set(model[0], 'checked', false);
         }
       }

package/packages/selector/src/tree.vue

@@ -22,13 +22,13 @@
             </div>
             <div
               v-if="isTreeIcon"
-              v-tap="{ methods: handleClickIcon, obj: item }"
+              v-tap.stop="{ methods: handleClickIcon, obj: item }"
             >
               <slot name="tree-icon" :value="item"></slot>
             </div>
            <span v-tap.stop="{ methods: opened, obj: item }">{{ item[labelKey] }}</span> 
           </div>
-          <van-icon name="arrow"  v-tap="{ methods: handleClickIcon, obj: item }" class="right" v-if="showMore" />
+          <van-icon name="arrow"  v-tap.stop="{ methods: handleClickIcon, obj: item }" class="right" v-if="showMore" />
           <i
             class="iconfont icon-gou select-icon"
             v-show="
@@ -245,13 +245,11 @@ export default {
   },
   methods: {
     handleClickIcon(res, isStart){
-      console.log('点击了open2')
       if(!this.$listeners['left-icon'] && !this.showMore) return
-       this.$emit('popen', res, res.isStart || isStart);
+       this.$emit('popen', res, res.isStart || isStart,true,'node');
     },
     opened(res, isStart) {
-      console.log('点击了open')
-      this.$emit('popen', res, res.isStart || isStart,true);
+      this.$emit('popen', res, res.isStart || isStart,true,'title');
     },
     checke(res) {
       let model = undefined

package/src/index.js

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