eoss-mobiles 0.2.25 → 0.2.26

package/lib/checkbox.js

@@ -1914,7 +1914,6 @@ var base = {
 // CONCATENATED MODULE: ./src/utils/http.js
 
 var http_request = function request(options) {
-  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':

package/lib/eoss-mobile.common.js

@@ -594,8 +594,8 @@ button_group_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var button_group = (button_group_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=73ff2f1c&
-var mainvue_type_template_id_73ff2f1c_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/main.vue?vue&type=template&id=3fb4f01a&
+var mainvue_type_template_id_3fb4f01a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -625,6 +625,7 @@ var mainvue_type_template_id_73ff2f1c_render = function () {
                 {
                   attrs: {
                     showTree: _vm.showTree,
+                    showMore: _vm.$listeners["left-icon"] == undefined,
                     isTreeIcon: _vm.$scopedSlots["tree-icon"] != undefined,
                     selectList: _vm.selectList,
                   },
@@ -677,6 +678,7 @@ var mainvue_type_template_id_73ff2f1c_render = function () {
                       ],
                       attrs: {
                         showTree: _vm.showTree,
+                        showMore: _vm.$listeners["left-icon"] == undefined,
                         isTreeIcon: _vm.$scopedSlots["tree-icon"] != undefined,
                         selectList: _vm.selectList,
                       },
@@ -722,14 +724,14 @@ var mainvue_type_template_id_73ff2f1c_render = function () {
     2
   )
 }
-var mainvue_type_template_id_73ff2f1c_staticRenderFns = []
-mainvue_type_template_id_73ff2f1c_render._withStripped = true
+var mainvue_type_template_id_3fb4f01a_staticRenderFns = []
+mainvue_type_template_id_3fb4f01a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=73ff2f1c&
+// 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=389241ee&
-var selector_treevue_type_template_id_389241ee_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=f38968a6&
+var selector_treevue_type_template_id_f38968a6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -810,6 +812,7 @@ var selector_treevue_type_template_id_389241ee_render = function () {
                 "em-tree",
                 _vm._g(
                   {
+                    ref: "emTree",
                     attrs: {
                       model: _vm.personnel,
                       "value-key": _vm.valueKey,
@@ -819,7 +822,9 @@ var selector_treevue_type_template_id_389241ee_render = function () {
                       departmentLabelKey: _vm.departmentLabelKey,
                       departmentValueKey: _vm.departmentValueKey,
                       nodeKey: _vm.nodeKey,
+                      isAllCheck: _vm.isAllCheck,
                       isTreeIcon: _vm.isTreeIcon,
+                      showMore: _vm.showMore,
                       showTree: _vm.showTree,
                       oldIsSearch: _vm.oldIsSearch,
                       isSearch: _vm.isSearch,
@@ -893,14 +898,14 @@ var selector_treevue_type_template_id_389241ee_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_389241ee_staticRenderFns = []
-selector_treevue_type_template_id_389241ee_render._withStripped = true
+var selector_treevue_type_template_id_f38968a6_staticRenderFns = []
+selector_treevue_type_template_id_f38968a6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=389241ee&
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=f38968a6&
 
-// 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=491fd81b&
-var treevue_type_template_id_491fd81b_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=62cbe65e&
+var treevue_type_template_id_62cbe65e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -967,8 +972,20 @@ var treevue_type_template_id_491fd81b_render = function () {
                             "\n        "
                         ),
                       ]),
-                      !_vm.isTreeIcon
+                      _vm.showMore
                         ? _c("van-icon", {
+                            directives: [
+                              {
+                                name: "tap",
+                                rawName: "v-tap",
+                                value: {
+                                  methods: _vm.handleClickIcon,
+                                  obj: item,
+                                },
+                                expression:
+                                  "{ methods: handleClickIcon, obj: item }",
+                              },
+                            ],
                             staticClass: "right",
                             attrs: { name: "arrow" },
                           })
@@ -1038,9 +1055,11 @@ var treevue_type_template_id_491fd81b_render = function () {
                                 nodeKey: _vm.nodeKey,
                                 oldIsSearch: _vm.oldIsSearch,
                                 isSearch: _vm.isSearch,
+                                isAllCheck: _vm.isAllCheck,
                                 "label-key": _vm.labelKey,
                                 "value-key": _vm.valueKey,
                                 showTree: _vm.showTree,
+                                showMore: _vm.showMore,
                                 enterprise: _vm.enterprise,
                                 isTreeIcon: _vm.isTreeIcon,
                                 department: _vm.department,
@@ -1176,11 +1195,11 @@ var treevue_type_template_id_491fd81b_render = function () {
     0
   )
 }
-var treevue_type_template_id_491fd81b_staticRenderFns = []
-treevue_type_template_id_491fd81b_render._withStripped = true
+var treevue_type_template_id_62cbe65e_staticRenderFns = []
+treevue_type_template_id_62cbe65e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=491fd81b&
+// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=62cbe65e&
 
 // 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&
 //
@@ -1336,6 +1355,11 @@ treevue_type_template_id_491fd81b_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
 
 /* harmony default export */ var treevue_type_script_lang_js_ = ({
   name: 'em-tree',
@@ -1387,6 +1411,14 @@ treevue_type_template_id_491fd81b_render._withStripped = true
       type: String,
       default: 'showshortname'
     },
+    isAllCheck: {
+      type: Boolean,
+      default: false
+    },
+    showMore: {
+      type: Boolean,
+      default: true
+    },
     oldIsSearch: Boolean,
     isSearch: Boolean
   },
@@ -1423,14 +1455,16 @@ treevue_type_template_id_491fd81b_render._withStripped = true
 
   methods: {
     handleClickIcon: function 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: function opened(res, isStart) {
       this.$emit('popen', res, res.isStart || isStart, true);
     },
     checke: function checke(res) {
-      this.$emit('checke', res);
+      var model = undefined;
+      if (this.isAllCheck) model = this.model;
+      this.$emit('checke', res, model);
     },
     isShowNode: function isShowNode(id) {
       var isShow = true;
@@ -1453,8 +1487,8 @@ treevue_type_template_id_491fd81b_render._withStripped = true
 
 var tree_component = normalizeComponent(
   src_treevue_type_script_lang_js_,
-  treevue_type_template_id_491fd81b_render,
-  treevue_type_template_id_491fd81b_staticRenderFns,
+  treevue_type_template_id_62cbe65e_render,
+  treevue_type_template_id_62cbe65e_staticRenderFns,
   false,
   null,
   null,
@@ -3132,7 +3166,6 @@ var base = {
 // CONCATENATED MODULE: ./src/utils/http.js
 
 var http_request = function request(options) {
-  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':
@@ -3290,6 +3323,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
+//
+//
 
 
 
@@ -3318,6 +3354,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         return [];
       }
     },
+    isAllCheck: {
+      type: Boolean,
+      default: false
+    },
     // pid: {
     //   type: String, // 父id或者是空
     //   default: 'root'
@@ -3389,6 +3429,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       type: Boolean,
       default: true
     },
+    showMore: {
+      type: Boolean,
+      default: true
+    },
     isTreeIcon: {
       type: Boolean,
       default: false
@@ -3417,6 +3461,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       type: [String, Number],
       default: 0
     },
+    isDefaultNode: {
+      type: Boolean,
+      default: true
+    },
     nodeList: Array,
     baseUrl: String
   },
@@ -3433,6 +3481,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       newParam: {},
       oldIsSearch: false,
       selectIndex: 0,
+      checkObj: {},
       first: true
     };
   },
@@ -3739,17 +3788,15 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     }
   },
   mounted: function mounted() {
-    var _this2 = this;
-
     typeof this.selectList != 'string' && (this.list = util.deepClone(this.selectList));
 
-    this.$nextTick(function () {
-      if (_this2.nodeList) {
-        _this2.getNodeList();
-      } else {
-        _this2.getContent();
-      }
-    });
+    // this.$nextTick(() => {
+    //   if (this.nodeList) {
+    //     this.getNodeList();
+    //   } else {
+    //     this.getContent();
+    //   }
+    // });
   },
 
   methods: {
@@ -3758,7 +3805,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       this.getContent();
     },
     getNodeList: function getNodeList(isSearch) {
-      var _this3 = this;
+      var _this2 = this;
 
       this.personnel = this.nodeList;
 
@@ -3779,7 +3826,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       } else {
         _this.personnel.map(function (x) {
           if (x.children && x.children.length > 0) {
-            _this3.setChecked(x.children);
+            _this2.setChecked(x.children);
           } else {
             _this.$set(x, 'checked', false);
           }
@@ -3799,13 +3846,13 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       });
     },
     setChecked: function setChecked(list) {
-      var _this4 = this;
+      var _this3 = this;
 
       list.map(function (x) {
         if (x.children && x.children.length > 0) {
-          _this4.setChecked(x.children);
+          _this3.setChecked(x.children);
         } else {
-          _this4.$set(x, 'checked', false);
+          _this3.$set(x, 'checked', false);
         }
       });
     },
@@ -3845,18 +3892,18 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
      * @author liufan
      */
     onSearch: function onSearch() {
-      var _this5 = this;
+      var _this4 = this;
 
       if (this.timer != null) {
         clearTimeout(this.timer);
       }
       this.timer = setTimeout(function () {
-        if (_this5.$listeners.search) {
-          _this5.oldIsSearch = _this5.isSearch;
-          _this5.isSearch = !_this5.isSearch;
-          _this5.$emit('search', _this5.namelike);
+        if (_this4.$listeners.search) {
+          _this4.oldIsSearch = _this4.isSearch;
+          _this4.isSearch = !_this4.isSearch;
+          _this4.$emit('search', _this4.namelike);
         } else {
-          _this5.getContent();
+          _this4.getContent();
         }
       }, 1000);
     },
@@ -3868,7 +3915,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
      * @author liufan
      */
     getContent: function getContent(name) {
-      var _this6 = this;
+      var _this5 = this;
 
       if (name) {
         this.label = name;
@@ -3897,40 +3944,40 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           filid: this.filid
         }, this.newParam)
       }).then(function (res) {
-        _this6.$toast.clear();
+        _this5.$toast.clear();
         var rCode = res.rCode,
             msg = res.msg;
 
         if (rCode == 0) {
-          if (typeof _this6.selectList == 'string') {
-            _this6.selectData = [];
-            _this6.list = _this6.getSelectData(res.results);
-            _this6.$emit('update:selectList', _this6.list);
+          if (typeof _this5.selectList == 'string') {
+            _this5.selectData = [];
+            _this5.list = _this5.getSelectData(res.results);
+            _this5.$emit('update:selectList', _this5.list);
           }
-          _this6.personnel = res.results;
-          var _this = _this6;
-          _this6.list.filter(function (r) {
+          _this5.personnel = res.results;
+          var _this = _this5;
+          _this5.list.filter(function (r) {
             _this.personnel.find(function (i) {
               if (i[_this.valueKey] === r[_this.valueKey]) {
                 _this.$set(i, 'checked', true);
               }
             });
           });
-          _this6.genre = res.results;
+          _this5.genre = res.results;
         } else {
-          _this6.$toast(msg);
+          _this5.$toast(msg);
         }
       });
     },
     getSelectData: function getSelectData(data) {
-      var _this7 = this;
+      var _this6 = this;
 
       var _this = this;
       var user = this.selectList.split(',');
       user.map(function (x) {
         data.map(function (i) {
           if (i[_this.valueKey] == x) {
-            _this7.selectData.push(i);
+            _this6.selectData.push(i);
           } else if (i.children) {
             _this.getSelectData(i.children);
           }
@@ -3939,7 +3986,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       return this.selectData;
     },
     getData: function getData(obj) {
-      var _this8 = this;
+      var _this7 = this;
 
       var params = _extends({}, this.newParam, {
         pid: obj[this.valueKey],
@@ -3958,24 +4005,41 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         params: params
       }).then(function (res) {
         if (res.rCode == 0) {
-          _this8.$set(obj, 'children', res.results);
-          var _this = _this8;
-          _this8.selectList.filter(function (r) {
+          if (res.results.length > 0 && res.results[0].nocheck == false && _this7.isAllCheck) {
+            res.results.unshift({
+              showshortname: '全选',
+              checked: false,
+              isAllCheck: true,
+              id: util.generateUUID(),
+              parentshowid: res.results[0].parentshowid
+            });
+          }
+          _this7.$set(obj, 'children', res.results);
+          var _this = _this7;
+          _this7.selectList.filter(function (r) {
             obj.children.find(function (i) {
               if (i[_this.valueKey] === r[_this.valueKey]) {
                 _this.$set(i, 'checked', true);
               }
             });
           });
+          if (_this7.isAllCheck) {
+            var checkList = obj.children.slice(1, obj.children.length).filter(function (x) {
+              return x.checked;
+            });
+            if (checkList.length === obj.children.slice(1, obj.children.length).length) {
+              _this.$set(obj.children[0], 'checked', true);
+            }
+          }
         }
-        _this8.$toast.clear();
+        _this7.$toast.clear();
       });
     },
     getChiled: function getChiled(res, isStart, key) {
-      var _this9 = this;
+      var _this8 = this;
 
       var _that = this;
-      var data = _that.$listeners[key](res.obj, !!res.obj.children);
+      var 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);
@@ -4012,9 +4076,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
                   _that.$set(i, 'checked', false);
                 });
               }
-              _this9.$toast.clear();
+              _this8.$toast.clear();
             }).catch(function (err) {
-              _this9.$toast('数据返回错误');
+              _this8.$toast('数据返回错误');
             });
           } else {
             data.map(function (x) {
@@ -4047,14 +4111,17 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       var _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']) {
+      } 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');
+        this.showMore && !this.isDefaultNode && !isNode && this.getChiled(res, isStart, 'right-icon');
       } else {
         if (!isStart) {
           if (res.obj.open) {
@@ -4068,23 +4135,59 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         }
       }
     },
-    checked: function checked(res) {
+    checked: function checked(res, model) {
+      var _this9 = this;
+
       this.oldIsSearch = this.isSearch;
       if (res.obj.checked) {
-        for (var 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(function (x) {
+            for (var i in _this9.list) {
+              if (_this9.list[i][_this9.valueKey] == x[_this9.valueKey]) {
+                _this9.list.splice(i, 1);
+              }
+            }
+            _this9.$set(x, 'checked', false);
+          });
+        } else {
+          for (var 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) {
+          var _list;
+
+          model.map(function (x) {
+            _this9.$set(x, 'checked', true);
+          });
+          (_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.isAllCheck) {
+        var checkList = model.slice(1, model.length).filter(function (x) {
+          return x.checked;
+        });
+        var obj = {};
+        this.list = this.list.reduce(function (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: function dispose() {
@@ -4113,8 +4216,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selector_tree_component = normalizeComponent(
   src_selector_treevue_type_script_lang_js_,
-  selector_treevue_type_template_id_389241ee_render,
-  selector_treevue_type_template_id_389241ee_staticRenderFns,
+  selector_treevue_type_template_id_f38968a6_render,
+  selector_treevue_type_template_id_f38968a6_staticRenderFns,
   false,
   null,
   null,
@@ -4594,6 +4697,8 @@ var selector_field_component = normalizeComponent(
 //
 //
 //
+//
+//
 
 
 
@@ -4639,6 +4744,7 @@ var selector_field_component = normalizeComponent(
   },
   mounted: function mounted() {
     // this.selectList = this.value
+    // console.log(this)
   },
 
   methods: {
@@ -4687,8 +4793,8 @@ var selector_field_component = normalizeComponent(
 
 var selector_src_main_component = normalizeComponent(
   packages_selector_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_73ff2f1c_render,
-  mainvue_type_template_id_73ff2f1c_staticRenderFns,
+  mainvue_type_template_id_3fb4f01a_render,
+  mainvue_type_template_id_3fb4f01a_staticRenderFns,
   false,
   null,
   null,
@@ -20365,7 +20471,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.2.25',
+  version: '0.2.26',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -1910,7 +1910,6 @@ var base = {
 // CONCATENATED MODULE: ./src/utils/http.js
 
 var http_request = function request(options) {
-  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':