eoss-mobiles 0.2.26 → 0.2.28

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=f38968a6&
-var selector_treevue_type_template_id_f38968a6_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=f80d1986&
+var selector_treevue_type_template_id_f80d1986_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_f38968a6_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_f38968a6_staticRenderFns = []
-selector_treevue_type_template_id_f38968a6_render._withStripped = true
+var selector_treevue_type_template_id_f80d1986_staticRenderFns = []
+selector_treevue_type_template_id_f80d1986_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=f38968a6&
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=f80d1986&
 
-// 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=62cbe65e&
-var treevue_type_template_id_62cbe65e_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=642d0eb9&
+var treevue_type_template_id_642d0eb9_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2359,8 +2359,8 @@ var treevue_type_template_id_62cbe65e_render = function () {
                         {
                           name: "tap",
                           rawName: "v-tap",
-                          value: { methods: _vm.opened, obj: item },
-                          expression: "{ methods: opened, obj: item }",
+                          value: { methods: _vm.handleClickIcon, obj: item },
+                          expression: "{ methods: handleClickIcon, obj: item }",
                         },
                       ],
                       staticClass: "title",
@@ -2393,10 +2393,20 @@ var treevue_type_template_id_62cbe65e_render = function () {
                               2
                             )
                           : _vm._e(),
-                        _vm._v(
-                          "\n          " +
-                            _vm._s(item[_vm.labelKey]) +
-                            "\n        "
+                        _c(
+                          "span",
+                          {
+                            directives: [
+                              {
+                                name: "tap",
+                                rawName: "v-tap.stop",
+                                value: { methods: _vm.opened, obj: item },
+                                expression: "{ methods: opened, obj: item }",
+                                modifiers: { stop: true },
+                              },
+                            ],
+                          },
+                          [_vm._v(_vm._s(item[_vm.labelKey]))]
                         ),
                       ]),
                       _vm.showMore
@@ -2622,11 +2632,11 @@ var treevue_type_template_id_62cbe65e_render = function () {
     0
   )
 }
-var treevue_type_template_id_62cbe65e_staticRenderFns = []
-treevue_type_template_id_62cbe65e_render._withStripped = true
+var treevue_type_template_id_642d0eb9_staticRenderFns = []
+treevue_type_template_id_642d0eb9_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=62cbe65e&
+// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=642d0eb9&
 
 // 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&
 //
@@ -2882,10 +2892,12 @@ treevue_type_template_id_62cbe65e_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);
     },
     opened: function opened(res, isStart) {
+      console.log('点击了open');
       this.$emit('popen', res, res.isStart || isStart, true);
     },
     checke: function checke(res) {
@@ -2917,8 +2929,8 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_treevue_type_script_lang_js_,
-  treevue_type_template_id_62cbe65e_render,
-  treevue_type_template_id_62cbe65e_staticRenderFns,
+  treevue_type_template_id_642d0eb9_render,
+  treevue_type_template_id_642d0eb9_staticRenderFns,
   false,
   null,
   null,
@@ -3706,7 +3718,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         params: params
       }).then(function (res) {
         if (res.rCode == 0) {
-          if (res.results.length > 0 && res.results[0].nocheck == false && _this7.isAllCheck) {
+          if (res.results.length > 0 && res.results[0].nocheck == false && _this7.isAllCheck && _this7.multiple) {
             res.results.unshift({
               showshortname: '全选',
               checked: false,
@@ -3717,14 +3729,14 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           }
           _this7.$set(obj, 'children', res.results);
           var _this = _this7;
-          _this7.selectList.filter(function (r) {
+          _this7.list.filter(function (r) {
             obj.children.find(function (i) {
               if (i[_this.valueKey] === r[_this.valueKey]) {
                 _this.$set(i, 'checked', true);
               }
             });
           });
-          if (_this7.isAllCheck) {
+          if (_this7.isAllCheck && _this7.multiple) {
             var checkList = obj.children.slice(1, obj.children.length).filter(function (x) {
               return x.checked;
             });
@@ -3875,7 +3887,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           this.list.unshift(res.obj);
         }
       }
-      if (this.isAllCheck) {
+      if (this.isAllCheck && this.multiple) {
         var checkList = model.slice(1, model.length).filter(function (x) {
           return x.checked;
         });
@@ -3884,9 +3896,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           obj[next.showid] ? '' : obj[next.showid] =  true && item.push(next);
           return item;
         }, []);
-        if (this.isAllCheck && model.length - 1 === checkList.length) {
+        if (model.length - 1 === checkList.length) {
           this.$set(model[0], 'checked', true);
-        } else if (this.isAllCheck) {
+        } else {
           this.$set(model[0], 'checked', false);
         }
       }
@@ -3917,8 +3929,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_f38968a6_render,
-  selector_treevue_type_template_id_f38968a6_staticRenderFns,
+  selector_treevue_type_template_id_f80d1986_render,
+  selector_treevue_type_template_id_f80d1986_staticRenderFns,
   false,
   null,
   null,

package/package.json

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

package/packages/flow/src/components/Handle.vue

@@ -60,6 +60,7 @@
               label="增加办理人"
               required
               multiple
+              :isAllCheck="isAllCheck"
               :baseUrl="apiBaseUrl"
               :paddingTop="paddingTop"
               :objType="objType"
@@ -90,6 +91,7 @@
           >
             <em-selector
               label="减少办理人"
+              :isAllCheck="isAllCheck"
               required
               :paddingTop="paddingTop"
               multiple
@@ -184,9 +186,10 @@
             <!-- 下一步办理人 -->
             <div class="item item-user" v-if="isNextUser">
               <em-selector
-                v-model="nextUserSelectList"
                 :multiple="!isRadio"
+                v-model="nextUserSelectList"
                 :objType="objType"
+                :isAllCheck="isAllCheck"
                 required
                 :paddingTop="paddingTop"
                 :nextUserList="nextUserList"
@@ -228,6 +231,7 @@
               <em-selector
                 v-model="nextCurrentOrgObjSelect"
                 multiple
+                :isAllCheck="isAllCheck"
                 :paddingTop="paddingTop"
                 :objType="'enterprise'"
                 :tabs="'department,myemployee'"
@@ -246,6 +250,7 @@
               <em-selector
                 v-model="nextOtherOrgObjSelect"
                 multiple
+                :isAllCheck="isAllCheck"
                 :paddingTop="paddingTop"
                 :objType="'enterprise'"
                 :param="{
@@ -297,6 +302,7 @@
               <em-selector
                 v-model="nextReadUserSelectList"
                 multiple
+                :isAllCheck="isAllCheck"
                 :objType="objType"
                 :param="{
                   pid: pid
@@ -460,6 +466,10 @@ export default {
       type: [String, Number],
       default: 0
     },
+    isAllCheck:{
+      type:Boolean,
+      default:false
+    },
     esign: {
       type: Boolean,
       default: false

package/packages/flow/src/components/StartFlow.vue

@@ -65,6 +65,7 @@
             <em-selector
               v-model="nextUserSelectList"
               :multiple="!isRadio"
+              :isAllCheck="isAllCheck"
               required
               :param="{
                 pid: pid,
@@ -136,6 +137,10 @@ export default {
       type: [String, Number],
       default: 0
     },
+    isAllCheck:{
+      type:Boolean,
+      default:false
+    },
     esign: {
       type: Boolean,
       default: false

package/packages/flow/src/components/TaskRead.vue

@@ -20,6 +20,7 @@
             label="分阅人员"
             required
             :multiple="multiple"
+            :isAllCheck="isAllCheck"
             :param="params"
             :baseUrl="apiBaseUrl"
             :paddingTop="paddingTop"
@@ -33,6 +34,7 @@
             required
             :multiple="multiple"
             :param="params"
+            :isAllCheck="isAllCheck"
             :baseUrl="apiBaseUrl"
             :paddingTop="paddingTop"
             v-model="nextReadUserSelectList"
@@ -134,6 +136,10 @@ export default {
     userId:{
       type:String,
       default:''
+    },
+    isAllCheck:{
+      type:Boolean,
+      default:false
     }
   },
   computed: {

package/packages/flow/src/components/taskUnionExamine.vue

@@ -15,6 +15,7 @@
           <em-selector
             v-model="takeAdviceUser"
             :multiple="newMultiple"
+            :isAllCheck="isAllCheck"
             :tabs="
               type == 'takeAdvice'
                 ? 'department,employee'
@@ -54,6 +55,7 @@
           <em-selector
             v-model="nextOtherOrgObj"
             :multiple="newMultiple"
+            :isAllCheck="isAllCheck"
             :tabs="
               isChoiceOtherOrgDept == 'true'
                 ? 'enterprise,department'
@@ -122,6 +124,10 @@ export default {
     esign: {
       type: Boolean,
       default: false
+    },
+    isAllCheck:{
+      type:Boolean,
+      default:false
     }
   },
   data() {

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

@@ -752,7 +752,7 @@ export default {
           if (
             res.results.length > 0 &&
             res.results[0].nocheck == false &&
-            this.isAllCheck
+            this.isAllCheck && this.multiple
           ) {
             res.results.unshift({
               showshortname: '全选',
@@ -764,14 +764,14 @@ export default {
           }
           this.$set(obj, 'children', res.results);
           let _this = this;
-          this.selectList.filter(r => {
+          this.list.filter(r => {
             obj.children.find(i => {
               if (i[_this.valueKey] === r[_this.valueKey]) {
                 _this.$set(i, 'checked', true);
               }
             });
           });
-          if (this.isAllCheck) {
+          if (this.isAllCheck  && this.multiple) {
             let checkList = obj.children
               .slice(1, obj.children.length)
               .filter(x => x.checked);
@@ -937,16 +937,16 @@ export default {
           this.list.unshift(res.obj);
         }
       }
-      if (this.isAllCheck) {
+      if (this.isAllCheck && this.multiple) {
         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) {
+        if (model.length - 1 === checkList.length) {
           this.$set(model[0], 'checked', true);
-        } else if (this.isAllCheck) {
+        } else{
           this.$set(model[0], 'checked', false);
         }
       }

package/packages/selector/src/tree.vue

@@ -7,7 +7,7 @@
       :class="{ active: item.open }"
     >
       <div v-if="item[nodeKey] && isShowNode(item[valueKey])">
-        <div v-tap="{ methods: opened, obj: item }" class="title">
+        <div v-tap="{ methods: handleClickIcon, obj: item }"  class="title">
           <div class="text">
             <div
               class="label"
@@ -26,7 +26,7 @@
             >
               <slot name="tree-icon" :value="item"></slot>
             </div>
-            {{ item[labelKey] }}
+           <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" />
           <i
@@ -245,10 +245,12 @@ export default {
   },
   methods: {
     handleClickIcon(res, isStart){
+      console.log('点击了open2')
       if(!this.$listeners['left-icon'] && !this.showMore) return
        this.$emit('popen', res, res.isStart || isStart);
     },
     opened(res, isStart) {
+      console.log('点击了open')
       this.$emit('popen', res, res.isStart || isStart,true);
     },
     checke(res) {

package/src/index.js

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