eoss-mobiles 0.3.22 → 0.3.23

package/lib/eoss-mobile.common.js

@@ -2150,8 +2150,8 @@ mainvue_type_template_id_17308961_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=17308961
 
-// 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=a36bef12
-var selector_treevue_type_template_id_a36bef12_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=237c573e
+var selector_treevue_type_template_id_237c573e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2331,14 +2331,14 @@ var selector_treevue_type_template_id_a36bef12_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_a36bef12_staticRenderFns = []
-selector_treevue_type_template_id_a36bef12_render._withStripped = true
+var selector_treevue_type_template_id_237c573e_staticRenderFns = []
+selector_treevue_type_template_id_237c573e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=a36bef12
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=237c573e
 
-// 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=4c8a9869
-var treevue_type_template_id_4c8a9869_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=d9c99060
+var treevue_type_template_id_d9c99060_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2670,11 +2670,6 @@ var treevue_type_template_id_4c8a9869_render = function () {
                           "\n          " +
                             _vm._s(
                               item.attr &&
-                                (!item.nocheck ||
-                                  _vm.enterprise ||
-                                  (_vm.selectType == _vm.departmentValueKey &&
-                                    item[_vm.departmentLabelKey] ==
-                                      _vm.departmentValueKey)) &&
                                 !_vm.showTree &&
                                 _vm.inputSearch &&
                                 _vm.selectType === "employee"
@@ -2733,11 +2728,11 @@ var treevue_type_template_id_4c8a9869_render = function () {
     0
   )
 }
-var treevue_type_template_id_4c8a9869_staticRenderFns = []
-treevue_type_template_id_4c8a9869_render._withStripped = true
+var treevue_type_template_id_d9c99060_staticRenderFns = []
+treevue_type_template_id_d9c99060_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=4c8a9869
+// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=d9c99060
 
 // 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
 //
@@ -3163,8 +3158,8 @@ treevue_type_template_id_4c8a9869_render._withStripped = true
 
 var tree_component = normalizeComponent(
   src_treevue_type_script_lang_js,
-  treevue_type_template_id_4c8a9869_render,
-  treevue_type_template_id_4c8a9869_staticRenderFns,
+  treevue_type_template_id_d9c99060_render,
+  treevue_type_template_id_d9c99060_staticRenderFns,
   false,
   null,
   null,
@@ -3593,6 +3588,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var _props, _methods;
 
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+
 //
 //
 //
@@ -4180,12 +4177,30 @@ var _props, _methods;
 
   methods: (_methods = {
     handleClick: function handleClick(index) {
-      this.selectIndex = index;
-      this.inputSearch = false;
-      this.getContent();
+      var _this3 = this;
+
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this3.selectIndex = index;
+                _context.next = 3;
+                return _this3.getContent();
+
+              case 3:
+                _this3.inputSearch = false;
+
+              case 4:
+              case 'end':
+                return _context.stop();
+            }
+          }
+        }, _callee, _this3);
+      }))();
     },
     getNodeList: function getNodeList(isSearch) {
-      var _this3 = this;
+      var _this4 = this;
 
       this.personnel = JSON.parse(JSON.stringify(this.nodeList));
       // !isSearch && (this.list = $.deepClone(this.selectList));
@@ -4212,7 +4227,7 @@ var _props, _methods;
       } else {
         _this.personnel.map(function (x) {
           if (x.children && x.children.length > 0) {
-            _this3.setChecked(x.children);
+            _this4.setChecked(x.children);
           } else {
             _this.$set(x, 'checked', false);
           }
@@ -4230,13 +4245,13 @@ var _props, _methods;
       });
     },
     setChecked: function setChecked(list) {
-      var _this4 = this;
+      var _this5 = this;
 
       list.map(function (x) {
         if (x.children && x.children.length > 0) {
-          _this4.setChecked(x.children);
+          _this5.setChecked(x.children);
         } else {
-          _this4.$set(x, 'checked', false);
+          _this5.$set(x, 'checked', false);
         }
       });
     },
@@ -4276,21 +4291,41 @@ var _props, _methods;
      * @author liufan
      */
     onSearch: function onSearch() {
-      var _this5 = this;
+      var _this6 = 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);
-        } else {
-          _this5.inputSearch = true;
-          _this5.getContent();
-        }
-      }, 1000);
+      this.timer = setTimeout(_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                if (!_this6.$listeners.search) {
+                  _context2.next = 6;
+                  break;
+                }
+
+                _this6.oldIsSearch = _this6.isSearch;
+                _this6.isSearch = !_this6.isSearch;
+                _this6.$emit('search', _this6.namelike);
+                _context2.next = 9;
+                break;
+
+              case 6:
+                _context2.next = 8;
+                return _this6.getContent();
+
+              case 8:
+                _this6.inputSearch = !!_this6.namelike.trim();
+
+              case 9:
+              case 'end':
+                return _context2.stop();
+            }
+          }
+        }, _callee2, _this6);
+      })), 1000);
     },
 
     /**
@@ -4300,7 +4335,7 @@ var _props, _methods;
      * @author liufan
      */
     getContent: function getContent(name) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (name) {
         this.label = name;
@@ -4324,7 +4359,7 @@ var _props, _methods;
       }
       delete this.newParam.department;
       delete this.newParam.myemployee;
-      utils_http({
+      return utils_http({
         url: this.url ? this.url : this.baseUrl ? this.baseUrl + selectObject : selectObject,
         params: _extends({
           objType: this.objType,
@@ -4333,45 +4368,40 @@ var _props, _methods;
           filid: this.filid
         }, this.newParam)
       }).then(function (res) {
-        _this6.$toast.clear();
+        _this7.$toast.clear();
         var rCode = res.rCode,
             msg = res.msg;
 
         if (rCode == 0) {
-          if (_this6.inputSearch && !_this6.namelike) {
-            _this6.inputSearch = false;
-          } else if (_this6.namelike.trim()) {
-            _this6.inputSearch = true;
+          if (typeof _this7.selectList == 'string') {
+            _this7.selectData = [];
+            _this7.list = _this7.getSelectData(JSON.parse(JSON.stringify(res.results)));
+            _this7.$emit('update:selectList', _this7.list);
           }
-          if (typeof _this6.selectList == 'string') {
-            _this6.selectData = [];
-            _this6.list = _this6.getSelectData(JSON.parse(JSON.stringify(res.results)));
-            _this6.$emit('update:selectList', _this6.list);
-          }
-          _this6.personnel = JSON.parse(JSON.stringify(res.results));
-          var _this = _this6;
-          _this6.list.filter(function (r) {
+          _this7.personnel = JSON.parse(JSON.stringify(res.results));
+          var _this = _this7;
+          _this7.list.filter(function (r) {
             _this.personnel.find(function (i) {
               if (i[_this.valueKey] === r[_this.valueKey]) {
                 _this.$set(i, 'checked', true);
               }
             });
           });
-          _this6.genre = JSON.parse(JSON.stringify(res.results));
+          _this7.genre = JSON.parse(JSON.stringify(res.results));
         } else {
-          _this6.$toast(msg);
+          _this7.$toast(msg);
         }
       });
     },
     getSelectData: function getSelectData(data) {
-      var _this7 = this;
+      var _this8 = 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);
+            _this8.selectData.push(i);
           } else if (i.children) {
             _this.getSelectData(i.children);
           }
@@ -4380,7 +4410,7 @@ var _props, _methods;
       return this.selectData;
     },
     getData: function getData(obj) {
-      var _this8 = this;
+      var _this9 = this;
 
       var params = _extends({}, this.newParam, {
         pid: obj[this.valueKey],
@@ -4399,7 +4429,7 @@ var _props, _methods;
         params: params
       }).then(function (res) {
         if (res.rCode == 0) {
-          if (res.results.length > 0 && res.results[0].nocheck == false && _this8.isAllCheck && _this8.multiple) {
+          if (res.results.length > 0 && res.results[0].nocheck == false && _this9.isAllCheck && _this9.multiple) {
             res.results.unshift({
               showshortname: '全选',
               checked: false,
@@ -4408,16 +4438,16 @@ var _props, _methods;
               parentshowid: res.results[0].parentshowid
             });
           }
-          _this8.$set(obj, 'children', res.results);
-          var _this = _this8;
-          _this8.list.filter(function (r) {
+          _this9.$set(obj, 'children', res.results);
+          var _this = _this9;
+          _this9.list.filter(function (r) {
             obj.children.find(function (i) {
               if (i[_this.valueKey] === r[_this.valueKey]) {
                 _this.$set(i, 'checked', true);
               }
             });
           });
-          if (_this8.isAllCheck && _this8.multiple && obj.children.length > 0) {
+          if (_this9.isAllCheck && _this9.multiple && obj.children.length > 0) {
             var checkList = obj.children.slice(1, obj.children.length).filter(function (x) {
               return x.checked;
             });
@@ -4426,11 +4456,11 @@ var _props, _methods;
             }
           }
         }
-        _this8.$toast.clear();
+        _this9.$toast.clear();
       });
     },
     getChiled: function getChiled(res, isStart, key) {
-      var _this9 = this;
+      var _this10 = this;
 
       var _that = this;
       var data = [];
@@ -4473,9 +4503,9 @@ var _props, _methods;
                   _that.$set(i, 'checked', false);
                 });
               }
-              _this9.$toast.clear();
+              _this10.$toast.clear();
             }).catch(function (err) {
-              _this9.$toast('数据返回错误');
+              _this10.$toast('数据返回错误');
             });
           } else {
             data.map(function (x) {
@@ -4536,7 +4566,7 @@ var _props, _methods;
       }
     },
     checked: function checked(res, model) {
-      var _this10 = this;
+      var _this11 = this;
 
       this.oldIsSearch = this.isSearch;
       if (!res.obj.mixType) {
@@ -4545,12 +4575,12 @@ var _props, _methods;
       if (res.obj.checked) {
         if (res.obj.isAllCheck) {
           model.map(function (x) {
-            for (var i in _this10.list) {
-              if (_this10.list[i][_this10.valueKey] == x[_this10.valueKey]) {
-                _this10.list.splice(i, 1);
+            for (var i in _this11.list) {
+              if (_this11.list[i][_this11.valueKey] == x[_this11.valueKey]) {
+                _this11.list.splice(i, 1);
               }
             }
-            _this10.$set(x, 'checked', false);
+            _this11.$set(x, 'checked', false);
           });
         } else {
           for (var i in this.list) {
@@ -4570,8 +4600,8 @@ var _props, _methods;
 
           var selectData = [];
           model.map(function (x) {
-            if (!x.disabled && !x.nocheck && !x.isAllCheck) {
-              _this10.$set(x, 'checked', true);
+            if (!x.disabled && !x.nocheck && !x.isAllCheck && x.selecttype == _this11.newParam.selecttype) {
+              _this11.$set(x, 'checked', true);
               selectData.push(x);
             }
           });
@@ -4595,10 +4625,13 @@ var _props, _methods;
           obj[next.showid] ? '' : obj[next.showid] =  true && item.push(next);
           return item;
         }, []);
-        if (model.length - 1 === checkList.length) {
+        var newArr = model.filter(function (x) {
+          return !x.disabled && !x.nocheck && x.selecttype == _this11.newParam.selecttype;
+        });
+        if (newArr.length === checkList.length) {
           model.map(function (x) {
             if (!x.disabled) {
-              _this10.$set(model[0], 'checked', true);
+              _this11.$set(model[0], 'checked', true);
             }
           });
         } else {
@@ -4607,16 +4640,16 @@ var _props, _methods;
       }
     }
   }, _methods['setChecked'] = function setChecked(data, item) {
-    var _this11 = this;
+    var _this12 = this;
 
     data.map(function (x) {
-      if (x[_this11.valueKey] === item[_this11.valueKey]) {
-        _this11.$set(x, 'checked', true);
+      if (x[_this12.valueKey] === item[_this12.valueKey]) {
+        _this12.$set(x, 'checked', true);
       } else {
-        _this11.$set(x, 'checked', false);
+        _this12.$set(x, 'checked', false);
       }
       if (x.children) {
-        _this11.setChecked(x.children, item);
+        _this12.setChecked(x.children, item);
       }
     });
   }, _methods.dispose = function dispose() {
@@ -4643,8 +4676,8 @@ var _props, _methods;
 
 var selector_tree_component = normalizeComponent(
   src_selector_treevue_type_script_lang_js,
-  selector_treevue_type_template_id_a36bef12_render,
-  selector_treevue_type_template_id_a36bef12_staticRenderFns,
+  selector_treevue_type_template_id_237c573e_render,
+  selector_treevue_type_template_id_237c573e_staticRenderFns,
   false,
   null,
   null,
@@ -28147,7 +28180,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.3.22',
+  version: '0.3.23',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,