eoss-mobiles 0.3.19 → 0.3.20

package/lib/selector.js

@@ -2437,8 +2437,8 @@ selector_treevue_type_template_id_a36bef12_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=a36bef12
 
-// 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=1cb2fc03
-var treevue_type_template_id_1cb2fc03_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=4c8a9869
+var treevue_type_template_id_4c8a9869_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2603,7 +2603,7 @@ var treevue_type_template_id_1cb2fc03_render = function () {
                                             _vm.departmentValueKey)) &&
                                       !_vm.showTree,
                                     expression:
-                                      "\n              (enterprise ||\n                (selectType == departmentValueKey && \n                  item[departmentLabelKey] == departmentValueKey)) &&\n              !showTree\n            ",
+                                      "\n              (enterprise ||\n                (selectType == departmentValueKey &&\n                  item[departmentLabelKey] == departmentValueKey)) &&\n              !showTree\n            ",
                                   },
                                   {
                                     name: "tap",
@@ -2631,7 +2631,7 @@ var treevue_type_template_id_1cb2fc03_render = function () {
                                             _vm.departmentValueKey)) &&
                                       !_vm.showTree,
                                     expression:
-                                      "\n              (enterprise ||\n                (selectType == departmentValueKey && \n                  item[departmentLabelKey] == departmentValueKey)) &&\n              !showTree\n            ",
+                                      "\n              (enterprise ||\n                (selectType == departmentValueKey &&\n                  item[departmentLabelKey] == departmentValueKey)) &&\n              !showTree\n            ",
                                   },
                                   {
                                     name: "tap",
@@ -2833,11 +2833,11 @@ var treevue_type_template_id_1cb2fc03_render = function () {
     0
   )
 }
-var treevue_type_template_id_1cb2fc03_staticRenderFns = []
-treevue_type_template_id_1cb2fc03_render._withStripped = true
+var treevue_type_template_id_4c8a9869_staticRenderFns = []
+treevue_type_template_id_4c8a9869_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=1cb2fc03
+// CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=4c8a9869
 
 // 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
 //
@@ -3061,6 +3061,12 @@ treevue_type_template_id_1cb2fc03_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 /* harmony default export */ var treevue_type_script_lang_js = ({
   name: 'em-tree',
@@ -3210,11 +3216,10 @@ treevue_type_template_id_1cb2fc03_render._withStripped = true
 
   methods: {
     isDisabled: function isDisabled(item) {
-      return false;
       if (this.disableds && this.disableds.length > 0) {
         return this.disableds.includes(item[this.valueKey]);
       }
-      return item.disabled;
+      return this.selectType != 'department' && this.selectType != 'enterprise' ? item.disabled : item.disabled || item.nocheck;
     },
     getUserInfo: function getUserInfo(attr) {
       var info = JSON.parse(attr);
@@ -3261,8 +3266,8 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_treevue_type_script_lang_js,
-  treevue_type_template_id_1cb2fc03_render,
-  treevue_type_template_id_1cb2fc03_staticRenderFns,
+  treevue_type_template_id_4c8a9869_render,
+  treevue_type_template_id_4c8a9869_staticRenderFns,
   false,
   null,
   null,

package/package.json

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

package/packages/selector/src/tree.vue

@@ -68,10 +68,12 @@
               v-if="showMore"
             />
             <i
-              :class="`iconfont icon-gou select-icon ${isDisabled(item) ? 'disabled' : '' }`"
+              :class="`iconfont icon-gou select-icon ${
+                isDisabled(item) ? 'disabled' : ''
+              }`"
               v-show="
                 (enterprise ||
-                  (selectType == departmentValueKey && 
+                  (selectType == departmentValueKey &&
                     item[departmentLabelKey] == departmentValueKey)) &&
                 !showTree
               "
@@ -79,10 +81,12 @@
               v-if="item.checked"
             ></i>
             <i
-              :class="`iconfont icon-quan select-icon ${isDisabled(item) ? 'disabled' : '' }`"
+              :class="`iconfont icon-quan select-icon ${
+                isDisabled(item) ? 'disabled' : ''
+              }`"
               v-show="
                 (enterprise ||
-                  (selectType == departmentValueKey && 
+                  (selectType == departmentValueKey &&
                     item[departmentLabelKey] == departmentValueKey)) &&
                 !showTree
               "
@@ -184,7 +188,7 @@
               item.attr &&
               (!item.nocheck ||
                 enterprise ||
-                (selectType == departmentValueKey && 
+                (selectType == departmentValueKey &&
                   item[departmentLabelKey] == departmentValueKey)) &&
               !showTree &&
               inputSearch &&
@@ -197,18 +201,20 @@
             v-if="
               (!item.nocheck ||
                 enterprise ||
-                (selectType == departmentValueKey && 
+                (selectType == departmentValueKey &&
                   item[departmentLabelKey] == departmentValueKey)) &&
               !showTree
             "
           >
             <i
-              :class="`iconfont icon-gou ${isDisabled(item) ? 'disabled' : '' }`"
+              :class="`iconfont icon-gou ${isDisabled(item) ? 'disabled' : ''}`"
               v-tap="{ methods: checke, obj: item }"
               v-if="item.checked"
             ></i>
             <i
-              :class="`iconfont icon-quan ${isDisabled(item) ? 'disabled' : '' }`"
+              :class="`iconfont icon-quan ${
+                isDisabled(item) ? 'disabled' : ''
+              }`"
               v-tap="{ methods: checke, obj: item }"
               v-else
             ></i>
@@ -322,9 +328,9 @@ export default {
       type: Boolean,
       default: true
     },
-    selectLabel:{
-      type:Boolean,
-      default:false
+    selectLabel: {
+      type: Boolean,
+      default: false
     },
     disableds: {
       type: Array,
@@ -360,11 +366,13 @@ export default {
   },
   methods: {
     isDisabled(item) {
-      return false
-      if(this.disableds && this.disableds.length>0){
+      if (this.disableds && this.disableds.length > 0) {
         return this.disableds.includes(item[this.valueKey]);
       }
-      return item.disabled
+      return this.selectType != 'department' &&
+        this.selectType != 'enterprise'
+        ? item.disabled
+        :  (item.disabled || item.nocheck);
     },
     getUserInfo(attr) {
       let info = JSON.parse(attr);
@@ -375,9 +383,9 @@ export default {
       this.$emit('popen', res, res.isStart || isStart, true, 'node');
     },
     opened(res, isStart) {
-      if(res.isStart && this.selectLabel){
-        this.checke({obj:res.obj})
-        return
+      if (res.isStart && this.selectLabel) {
+        this.checke({ obj: res.obj });
+        return;
       }
       this.$emit('popen', res, res.isStart || isStart, true, 'title');
     },

package/src/index.js

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