eoss-mobiles 0.3.18 → 0.3.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/eoss-mobile.common.js +17 -11
  2. package/lib/index.js +1 -1
  3. package/lib/selector.js +16 -10
  4. package/package.json +1 -1
  5. package/packages/selector/src/tree.vue +25 -16
  6. package/src/index.js +1 -1
package/lib/selector.js CHANGED
@@ -2437,8 +2437,8 @@ selector_treevue_type_template_id_a36bef12_render._withStripped = true
2437
2437
 
2438
2438
  // CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=a36bef12
2439
2439
 
2440
- // 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=207ee6a0
2441
- var treevue_type_template_id_207ee6a0_render = function () {
2440
+ // 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
2441
+ var treevue_type_template_id_4c8a9869_render = function () {
2442
2442
  var _vm = this
2443
2443
  var _h = _vm.$createElement
2444
2444
  var _c = _vm._self._c || _h
@@ -2603,7 +2603,7 @@ var treevue_type_template_id_207ee6a0_render = function () {
2603
2603
  _vm.departmentValueKey)) &&
2604
2604
  !_vm.showTree,
2605
2605
  expression:
2606
- "\n (enterprise ||\n (selectType == departmentValueKey && \n item[departmentLabelKey] == departmentValueKey)) &&\n !showTree\n ",
2606
+ "\n (enterprise ||\n (selectType == departmentValueKey &&\n item[departmentLabelKey] == departmentValueKey)) &&\n !showTree\n ",
2607
2607
  },
2608
2608
  {
2609
2609
  name: "tap",
@@ -2631,7 +2631,7 @@ var treevue_type_template_id_207ee6a0_render = function () {
2631
2631
  _vm.departmentValueKey)) &&
2632
2632
  !_vm.showTree,
2633
2633
  expression:
2634
- "\n (enterprise ||\n (selectType == departmentValueKey && \n item[departmentLabelKey] == departmentValueKey)) &&\n !showTree\n ",
2634
+ "\n (enterprise ||\n (selectType == departmentValueKey &&\n item[departmentLabelKey] == departmentValueKey)) &&\n !showTree\n ",
2635
2635
  },
2636
2636
  {
2637
2637
  name: "tap",
@@ -2833,11 +2833,11 @@ var treevue_type_template_id_207ee6a0_render = function () {
2833
2833
  0
2834
2834
  )
2835
2835
  }
2836
- var treevue_type_template_id_207ee6a0_staticRenderFns = []
2837
- treevue_type_template_id_207ee6a0_render._withStripped = true
2836
+ var treevue_type_template_id_4c8a9869_staticRenderFns = []
2837
+ treevue_type_template_id_4c8a9869_render._withStripped = true
2838
2838
 
2839
2839
 
2840
- // CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=207ee6a0
2840
+ // CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=4c8a9869
2841
2841
 
2842
2842
  // 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
2843
2843
  //
@@ -3061,6 +3061,12 @@ treevue_type_template_id_207ee6a0_render._withStripped = true
3061
3061
  //
3062
3062
  //
3063
3063
  //
3064
+ //
3065
+ //
3066
+ //
3067
+ //
3068
+ //
3069
+ //
3064
3070
 
3065
3071
  /* harmony default export */ var treevue_type_script_lang_js = ({
3066
3072
  name: 'em-tree',
@@ -3213,7 +3219,7 @@ treevue_type_template_id_207ee6a0_render._withStripped = true
3213
3219
  if (this.disableds && this.disableds.length > 0) {
3214
3220
  return this.disableds.includes(item[this.valueKey]);
3215
3221
  }
3216
- return item.disabled;
3222
+ return this.selectType != 'department' && this.selectType != 'enterprise' ? item.disabled : item.disabled || item.nocheck;
3217
3223
  },
3218
3224
  getUserInfo: function getUserInfo(attr) {
3219
3225
  var info = JSON.parse(attr);
@@ -3260,8 +3266,8 @@ var componentNormalizer = __webpack_require__(1);
3260
3266
 
3261
3267
  var component = Object(componentNormalizer["a" /* default */])(
3262
3268
  src_treevue_type_script_lang_js,
3263
- treevue_type_template_id_207ee6a0_render,
3264
- treevue_type_template_id_207ee6a0_staticRenderFns,
3269
+ treevue_type_template_id_4c8a9869_render,
3270
+ treevue_type_template_id_4c8a9869_staticRenderFns,
3265
3271
  false,
3266
3272
  null,
3267
3273
  null,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-mobiles",
3
- "version": "0.3.18",
3
+ "version": "0.3.20",
4
4
  "description": "eoss内部移动端业务组件",
5
5
  "main": "lib/eoss-mobile.common.js",
6
6
  "files": [
package/packages/selector/src/tree.vue CHANGED
@@ -68,10 +68,12 @@
68
68
  v-if="showMore"
69
69
  />
70
70
  <i
71
- :class="`iconfont icon-gou select-icon ${isDisabled(item) ? 'disabled' : '' }`"
71
+ :class="`iconfont icon-gou select-icon ${
72
+ isDisabled(item) ? 'disabled' : ''
73
+ }`"
72
74
  v-show="
73
75
  (enterprise ||
74
- (selectType == departmentValueKey &&
76
+ (selectType == departmentValueKey &&
75
77
  item[departmentLabelKey] == departmentValueKey)) &&
76
78
  !showTree
77
79
  "
@@ -79,10 +81,12 @@
79
81
  v-if="item.checked"
80
82
  ></i>
81
83
  <i
82
- :class="`iconfont icon-quan select-icon ${isDisabled(item) ? 'disabled' : '' }`"
84
+ :class="`iconfont icon-quan select-icon ${
85
+ isDisabled(item) ? 'disabled' : ''
86
+ }`"
83
87
  v-show="
84
88
  (enterprise ||
85
- (selectType == departmentValueKey &&
89
+ (selectType == departmentValueKey &&
86
90
  item[departmentLabelKey] == departmentValueKey)) &&
87
91
  !showTree
88
92
  "
@@ -184,7 +188,7 @@
184
188
  item.attr &&
185
189
  (!item.nocheck ||
186
190
  enterprise ||
187
- (selectType == departmentValueKey &&
191
+ (selectType == departmentValueKey &&
188
192
  item[departmentLabelKey] == departmentValueKey)) &&
189
193
  !showTree &&
190
194
  inputSearch &&
@@ -197,18 +201,20 @@
197
201
  v-if="
198
202
  (!item.nocheck ||
199
203
  enterprise ||
200
- (selectType == departmentValueKey &&
204
+ (selectType == departmentValueKey &&
201
205
  item[departmentLabelKey] == departmentValueKey)) &&
202
206
  !showTree
203
207
  "
204
208
  >
205
209
  <i
206
- :class="`iconfont icon-gou ${isDisabled(item) ? 'disabled' : '' }`"
210
+ :class="`iconfont icon-gou ${isDisabled(item) ? 'disabled' : ''}`"
207
211
  v-tap="{ methods: checke, obj: item }"
208
212
  v-if="item.checked"
209
213
  ></i>
210
214
  <i
211
- :class="`iconfont icon-quan ${isDisabled(item) ? 'disabled' : '' }`"
215
+ :class="`iconfont icon-quan ${
216
+ isDisabled(item) ? 'disabled' : ''
217
+ }`"
212
218
  v-tap="{ methods: checke, obj: item }"
213
219
  v-else
214
220
  ></i>
@@ -322,9 +328,9 @@ export default {
322
328
  type: Boolean,
323
329
  default: true
324
330
  },
325
- selectLabel:{
326
- type:Boolean,
327
- default:false
331
+ selectLabel: {
332
+ type: Boolean,
333
+ default: false
328
334
  },
329
335
  disableds: {
330
336
  type: Array,
@@ -360,10 +366,13 @@ export default {
360
366
  },
361
367
  methods: {
362
368
  isDisabled(item) {
363
- if(this.disableds && this.disableds.length>0){
369
+ if (this.disableds && this.disableds.length > 0) {
364
370
  return this.disableds.includes(item[this.valueKey]);
365
371
  }
366
- return item.disabled
372
+ return this.selectType != 'department' &&
373
+ this.selectType != 'enterprise'
374
+ ? item.disabled
375
+ : (item.disabled || item.nocheck);
367
376
  },
368
377
  getUserInfo(attr) {
369
378
  let info = JSON.parse(attr);
@@ -374,9 +383,9 @@ export default {
374
383
  this.$emit('popen', res, res.isStart || isStart, true, 'node');
375
384
  },
376
385
  opened(res, isStart) {
377
- if(res.isStart && this.selectLabel){
378
- this.checke({obj:res.obj})
379
- return
386
+ if (res.isStart && this.selectLabel) {
387
+ this.checke({ obj: res.obj });
388
+ return;
380
389
  }
381
390
  this.$emit('popen', res, res.isStart || isStart, true, 'title');
382
391
  },
package/src/index.js CHANGED
@@ -105,7 +105,7 @@ if (typeof window !== 'undefined' && window.Vue) {
105
105
  }
106
106
 
107
107
  export default {
108
- version: '0.3.18',
108
+ version: '0.3.20',
109
109
  install,
110
110
  Button,
111
111
  ButtonGroup,