eoss-mobiles 0.2.24 → 0.2.26

package/packages/grid/src/main.vue

@@ -1,38 +1,43 @@
 <template>
-<div class="em-grid">
-  <van-grid v-bind="$attrs" v-on="$listeners" :column-num="columnNum">
-    <van-grid-item
-      v-bind="item"
-      :class="{'em-grid-ellipsis':textEllipsis}"
-      :style="`width:${100 / columnNum}%;`"
-      @click="goView($event,item)"
-      v-show="$attrs.data && $attrs.data.length > 0"
-      v-for="(item, index) of $attrs.data"
-      :key="index"
-    />
-    <slot v-show="$attrs.data && $attrs.data.length == 0" />
-  </van-grid>
+  <div class="em-grid">
+    <van-grid v-bind="$attrs" v-on="$listeners" :column-num="columnNum">
+      <van-grid-item
+        v-bind="item"
+        :class="{ 'em-grid-ellipsis': textEllipsis }"
+        :style="`width:${100 / columnNum}%;`"
+        @click="goView($event, item)"
+        v-show="$attrs.data && $attrs.data.length > 0"
+        v-for="(item, index) of $attrs.data"
+        :key="index"
+      />
+      <slot v-show="$attrs.data && $attrs.data.length == 0" />
+    </van-grid>
   </div>
 </template>
 
 <script>
 export default {
   name: 'EmGrid',
-  inheritAttrs:false,
-   props:{
-      columnNum:{
-        type:[Number,String],
-        default:4
-      },
-      textEllipsis:{
-        type:Boolean,
-        default:false
-      }
+  inheritAttrs: false,
+  props: {
+    columnNum: {
+      type: [Number, String],
+      default: 4
     },
-  methods:{
-    goView(event,val){
-      this.$emit('click',{event,info:val})
+    textEllipsis: {
+      type: Boolean,
+      default: false
     },
+    targetStop: {
+      type: Boolean,
+      default: true
+    }
+  },
+  methods: {
+    goView(event, val) {
+      this.$emit('click', val);
+      this.targetStop && event.stopPropagation();
+    }
   }
 };
 </script>

package/packages/selector/src/main.vue

@@ -13,6 +13,7 @@
       v-bind="$attrs"
       v-on="$listeners"
       :showTree="showTree"
+      :showMore="$listeners['left-icon'] == undefined"
       :isTreeIcon="$scopedSlots['tree-icon'] != undefined"
       :selectList="selectList"
       @dispose="handleDispose"
@@ -28,7 +29,8 @@
       v-bind="$attrs"
       v-on="$listeners"
       :showTree="showTree"
-      :isTreeIcon="$scopedSlots['tree-icon'] != undefined"
+      :showMore="$listeners['left-icon'] == undefined"
+      :isTreeIcon=" $scopedSlots['tree-icon'] != undefined"
       :selectList.sync="selectList"
       @dispose="handleDispose"
       @close="handleDispose()"
@@ -82,6 +84,7 @@ export default {
   },
   mounted() {
     // this.selectList = this.value
+    // console.log(this)
   },
   methods: {
     handleSelector() {

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

@@ -35,6 +35,7 @@
     <div class="em-tree-box">
       <em-tree
         v-if="personnel && personnel.length > 0"
+        ref="emTree"
         :model="personnel"
         :value-key="valueKey"
         :label-key="labelKey"
@@ -45,7 +46,9 @@
         :nodeKey="nodeKey"
         v-on="$listeners"
         @popen="open"
+        :isAllCheck="isAllCheck"
         :isTreeIcon="isTreeIcon"
+        :showMore="showMore"
         @checke="checked"
         :showTree="showTree"
         :oldIsSearch="oldIsSearch"
@@ -68,7 +71,7 @@
           <!--    r[labelKey].length > 6
                 ? r[labelKey].slice(0, 6) + '...'
                 : r[labelKey] -->
-          <div class="name" v-if="r[labelKey]  || r['showname']">
+          <div class="name" v-if="r[labelKey] || r['showname']">
             {{ r[labelKey] || r['showname'] }}
           </div>
           <div class="delte" @click="delteList(i)">
@@ -109,6 +112,10 @@ export default {
       type: [Array, String], //传入选中数组
       default: () => []
     },
+    isAllCheck: {
+      type: Boolean,
+      default: false
+    },
     // pid: {
     //   type: String, // 父id或者是空
     //   default: 'root'
@@ -180,6 +187,10 @@ export default {
       type: Boolean,
       default: true
     },
+    showMore: {
+      type: Boolean,
+      default: true
+    },
     isTreeIcon: {
       type: Boolean,
       default: false
@@ -208,6 +219,10 @@ export default {
       type: [String, Number],
       default: 0
     },
+    isDefaultNode: {
+      type: Boolean,
+      default: true
+    },
     nodeList: Array,
     baseUrl: String
   },
@@ -224,6 +239,7 @@ export default {
       newParam: {},
       oldIsSearch: false,
       selectIndex: 0,
+      checkObj: {},
       first: true
     };
   },
@@ -529,13 +545,13 @@ export default {
     typeof this.selectList != 'string' &&
       (this.list = $.deepClone(this.selectList));
 
-    this.$nextTick(() => {
-      if (this.nodeList) {
-        this.getNodeList();
-      } else {
-        this.getContent();
-      }
-    });
+    // this.$nextTick(() => {
+    //   if (this.nodeList) {
+    //     this.getNodeList();
+    //   } else {
+    //     this.getContent();
+    //   }
+    // });
   },
   methods: {
     handleClick(index) {
@@ -660,8 +676,8 @@ export default {
       ].param.selecttype;
       if (this.newParam.selecttype === 'persongroup') {
         this.newParam.pid = 'root';
-      }else{
-        this.newParam.pid = this.param.pid || 'root'
+      } else {
+        this.newParam.pid = this.param.pid || 'root';
       }
       request({
         url: this.url
@@ -733,6 +749,19 @@ export default {
         params: params
       }).then(res => {
         if (res.rCode == 0) {
+          if (
+            res.results.length > 0 &&
+            res.results[0].nocheck == false &&
+            this.isAllCheck
+          ) {
+            res.results.unshift({
+              showshortname: '全选',
+              checked: false,
+              isAllCheck: true,
+              id: $.generateUUID(),
+              parentshowid: res.results[0].parentshowid
+            });
+          }
           this.$set(obj, 'children', res.results);
           let _this = this;
           this.selectList.filter(r => {
@@ -742,13 +771,26 @@ export default {
               }
             });
           });
+          if (this.isAllCheck) {
+            let checkList = obj.children
+              .slice(1, obj.children.length)
+              .filter(x => x.checked);
+            if (
+              checkList.length ===
+              obj.children.slice(1, obj.children.length).length
+            ) {
+              _this.$set(obj.children[0], 'checked', true);
+            }
+          }
         }
         this.$toast.clear();
       });
     },
     getChiled(res, isStart, key) {
       const _that = this;
-      let data = _that.$listeners[key](res.obj, !!res.obj.children);
+      let 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);
@@ -822,14 +864,20 @@ export default {
       const _that = this;
       _that.oldIsSearch = _that.isSearch;
       // debugger
-      if (this.$listeners['node-click'] && this.$listeners['left-icon']) {
+      if (
+        this.$listeners['node-click'] &&
+        (this.$listeners['left-icon'] || (this.showMore && !this.isDefaultNode))
+      ) {
         if (this.$listeners['left-icon'] && !isNode) {
           this.getChiled(res, isStart, 'left-icon');
+        } else if (this.showMore && !isNode) {
+          this.getChiled(res, isStart, 'right-icon');
         }
         isNode && _that.$listeners['node-click'](res.obj, !!res.obj.children);
       } else if (
         this.$listeners['node-click'] ||
-        this.$listeners['left-icon']
+        this.$listeners['left-icon'] ||
+        (this.showMore && !this.isDefaultNode)
       ) {
         isNode &&
           this.$listeners['node-click'] &&
@@ -837,6 +885,10 @@ export default {
         this.$listeners['left-icon'] &&
           !isNode &&
           this.getChiled(res, isStart, 'left-icon');
+        this.showMore &&
+          !this.isDefaultNode &&
+          !isNode &&
+          this.getChiled(res, isStart, 'right-icon');
       } else {
         if (!isStart) {
           if (res.obj.open) {
@@ -850,23 +902,53 @@ export default {
         }
       }
     },
-    checked(res) {
+    checked(res, model) {
       this.oldIsSearch = this.isSearch;
       if (res.obj.checked) {
-        for (let i in this.list) {
-          if (this.list[i][this.valueKey] == res.obj[this.valueKey]) {
-            this.list.splice(i, 1);
+        if (res.obj.isAllCheck) {
+          model.map(x => {
+            for (let i in this.list) {
+              if (this.list[i][this.valueKey] == x[this.valueKey]) {
+                this.list.splice(i, 1);
+              }
+            }
+            this.$set(x, 'checked', false);
+          });
+        } else {
+          for (let i in this.list) {
+            if (this.list[i][this.valueKey] == res.obj[this.valueKey]) {
+              this.list.splice(i, 1);
+            }
           }
+          this.$set(res.obj, 'checked', false);
         }
-
-        this.$set(res.obj, 'checked', false);
       } else {
         if (!this.multiple && this.list.length >= 1) {
           this.$toast(this.promptText);
           return;
         }
-        this.$set(res.obj, 'checked', true);
-        this.list.unshift(res.obj);
+        if (res.obj.isAllCheck) {
+          model.map(x => {
+            this.$set(x, 'checked', true);
+          });
+          this.list.unshift(...model.slice(1, model.length));
+        } else {
+          this.$set(res.obj, 'checked', true);
+          this.list.unshift(res.obj);
+        }
+      }
+      if (this.isAllCheck) {
+        let checkList = model.slice(1, model.length).filter(x => x.checked);
+        var obj = {};
+        this.list = this.list.reduce((item, next) => {
+          obj[next.showid] ? '' : (obj[next.showid] = true && item.push(next));
+          return item;
+        }, []);
+        if (this.isAllCheck && model.length - 1 === checkList.length) {
+          this.$set(model[0], 'checked', true);
+        } else if (this.isAllCheck) {
+          this.$set(model[0], 'checked', false);
+        }
       }
     },
     dispose() {

package/packages/selector/src/tree.vue

@@ -20,12 +20,15 @@
                 ? item[labelKey].slice(0, 12) + '...'
                 : item[labelKey] -->
             </div>
-            <div v-if="isTreeIcon" v-tap="{ methods: handleClickIcon, obj: item }" >
-            <slot name="tree-icon"  :value="item"></slot>
+            <div
+              v-if="isTreeIcon"
+              v-tap="{ methods: handleClickIcon, obj: item }"
+            >
+              <slot name="tree-icon" :value="item"></slot>
             </div>
             {{ item[labelKey] }}
           </div>
-          <van-icon name="arrow" class="right" v-if="!isTreeIcon" />
+          <van-icon name="arrow"  v-tap="{ methods: handleClickIcon, obj: item }" class="right" v-if="showMore" />
           <i
             class="iconfont icon-gou select-icon"
             v-show="
@@ -58,9 +61,11 @@
             :nodeKey="nodeKey"
             :oldIsSearch="oldIsSearch"
             :isSearch="isSearch"
+            :isAllCheck="isAllCheck"
             :label-key="labelKey"
             :value-key="valueKey"
             :showTree="showTree"
+            :showMore="showMore"
             :enterprise="enterprise"
             :isTreeIcon="isTreeIcon"
             :department="department"
@@ -202,6 +207,14 @@ export default {
       type: String,
       default: 'showshortname'
     },
+    isAllCheck:{
+      type:Boolean,
+      default:false
+    },
+    showMore:{
+      type:Boolean,
+      default:true
+    },
     oldIsSearch: Boolean,
     isSearch: Boolean
   },
@@ -232,14 +245,16 @@ export default {
   },
   methods: {
     handleClickIcon(res, isStart){
-      if(!this.$listeners['left-icon']) return
+      if(!this.$listeners['left-icon'] && !this.showMore) return
        this.$emit('popen', res, res.isStart || isStart);
     },
     opened(res, isStart) {
       this.$emit('popen', res, res.isStart || isStart,true);
     },
     checke(res) {
-      this.$emit('checke', res);
+      let model = undefined
+      if(this.isAllCheck) model = this.model
+      this.$emit('checke', res,model);
     },
     isShowNode(id) {
       let isShow = true;

package/src/index.js

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

package/src/utils/http.js

@@ -1,6 +1,5 @@
 import base from './axios';
 const request = options => {
-  console.log(options, 'options');
   let fn;
   switch (options.type) {
     case 'post':