eoss-ui 0.5.81-beta4 → 0.5.81-beta6

package/packages/main/src/simplicity/user.vue

@@ -58,15 +58,15 @@
       修改密码 <i class="es-icon-arrow-right"></i>
     </div>
     <es-dialog title="修改密码" :visible.sync="visible">
-      <userinfo v-if="visible" :contents="contents" :value="userInfo">
-      </userinfo>
+      <user-info v-if="visible" :contents="contents" :value="userInfo">
+      </user-info>
     </es-dialog>
   </div>
 </template>
 
 <script>
 import avatar from './avatar.vue';
-import userinfo from './userinfo.vue';
+import userInfo from './userinfo.vue';
 import util from 'eoss-ui/src/utils/util';
 import { debounce } from 'throttle-debounce';
 import {
@@ -76,7 +76,7 @@ import {
 } from 'eoss-ui/src/config/api.js';
 export default {
   name: 'User',
-  components: { avatar, userinfo },
+  components: { avatar, userInfo },
   props: {
     notify: String,
     notifyList: Array,

package/packages/main/src/simplicity/userinfo.vue

@@ -16,6 +16,7 @@ import { updateUserInfo } from 'eoss-ui/src/config/api.js';
 import util from 'eoss-ui/src/utils/util';
 
 export default {
+  name: 'UserInfo',
   props: {
     showNotify: {
       type: Boolean,

package/packages/selector/src/main.vue

@@ -86,7 +86,7 @@
                 'es-pointer': !filterable,
                 'es-zindex-2': focus
               }"
-              :tabindex="multiple ? '-1' : null"
+              :tabindex="tabindex"
               v-popover:popover
               @dblclick.native="openDialog"
               @focus="handleFocus"
@@ -129,7 +129,7 @@
               'es-plain': this.plain,
               'es-pointer': !filterable
             }"
-            :tabindex="multiple ? '-1' : null"
+            :tabindex="tabindex"
             @dblclick.native="openDialog"
             @clear="handleClear"
           >
@@ -296,6 +296,10 @@ export default {
         return ['enterprise', 'person'];
       }
     },
+    tabindex: {
+      type: [String, Number],
+      default: -1
+    },
     filterable: {
       type: Boolean,
       default: false

package/packages/selector-panel/src/main.vue

@@ -30,6 +30,9 @@
             class="es-selector-selection-toolbar"
             v-if="multiple || isShowTree"
           >
+            <el-form-item>
+              <es-switch v-model="showDisabled" :data="options"></es-switch>
+            </el-form-item>
             <el-form-item>
               <el-checkbox
                 v-show="multiple && !max"
@@ -78,6 +81,7 @@
             :label-key="labelKey"
             :multiple="mix ? mix : multiple"
             :max="max"
+            :showDisabled="showDisabled"
           ></selection>
           <selection
             v-model="checkeds"
@@ -223,7 +227,18 @@ export default {
       activeName: '',
       selections: [],
       checkboxs: [],
-      checkeds: null
+      checkeds: null,
+      showDisabled: true,
+      options: [
+        {
+          value: true,
+          name: '展示'
+        },
+        {
+          value: false,
+          name: '过滤'
+        }
+      ]
     };
   },
   computed: {
@@ -810,7 +825,11 @@ export default {
         if (res) {
           if (this.isShowTree) {
             this.nodeData.checkAll = true;
-            let checkeds = this.checkeds.concat(this.checkboxs);
+            let checkeds = this.checkeds.concat(
+              this.checkboxs.filter((item) => {
+                return item.disabled !== true;
+              })
+            );
             if (checkeds.length > 0) {
               this.checkeds = util.arrUnique(
                 checkeds,

package/packages/selector-panel/src/selection.vue

@@ -11,6 +11,7 @@
         <el-radio
           v-for="(item, index) in data"
           :key="index"
+          v-show="item.disabled ? showDisabled : true"
           v-bind="getprops($attrs, item)"
           :label="isObject || typeof item == 'string' ? item : item[valKey]"
           :disabled="typeof item == 'string' ? false : item.disabled"
@@ -33,6 +34,7 @@
         <el-checkbox
           v-for="(item, index) in data"
           :key="index"
+          v-show="item.disabled ? showDisabled : true"
           v-bind="getprops($attrs, item)"
           :label="isObject || typeof item == 'string' ? item : item[valKey]"
           :disabled="typeof item == 'string' ? false : item.disabled"
@@ -54,6 +56,10 @@ export default {
   name: 'Selection',
   props: {
     value: [String, Array, Object],
+    showDisabled: {
+      type: Boolean,
+      default: true
+    },
     genre: String,
     valueKey: {
       type: String,