eoss-ui 0.5.81-beta2 → 0.5.81-beta21

package/packages/selector/src/main.vue

@@ -6,91 +6,133 @@
     :class="{ 'es-pointer': !readonly && !filterable }"
     v-clickoutside="handleClose"
   >
-    <el-button v-if="button" v-bind="button" @click="openDialog"
-      ><slot>选择</slot></el-button
-    >
-    <template v-else>
-      <div
-        :class="[
-          selectorSize ? 'el-select--' + selectorSize : 'es-selector-box',
-          { 'es-selector-search': filterable }
-        ]"
-        @click.stop="toggleMenu"
+    <template v-if="form">
+      <el-button v-if="button" v-bind="button" @click="openDialog"
+        ><slot>选择</slot></el-button
       >
+      <template v-else>
         <div
-          v-if="multiple"
-          ref="tags"
-          class="el-select__tags"
-          :class="{ 'es-selector-edit': !readonly }"
+          :class="[
+            selectorSize ? 'el-select--' + selectorSize : 'es-selector-box',
+            { 'es-selector-search': filterable }
+          ]"
+          @click.stop="toggleMenu"
         >
           <div
-            v-if="collapseTags && selected.length"
-            class="es-selector-tags"
-            :class="{ 'es-selector-more': selected.length > 1 }"
+            v-if="multiple"
+            ref="tags"
+            class="el-select__tags"
+            :class="{ 'es-selector-edit': !readonly }"
           >
-            <el-tag
-              :closable="!selectorDisabled && !readonly"
-              type="info"
-              disable-transitions
-              @close="deleteTag($event, selected[0])"
-            >
-              <span class="el-select__tags-text">
-                {{
-                  isObject(selected[0]) ? selected[0][labelKey] : selected[0]
-                }}
-              </span>
-            </el-tag>
-            <el-tag
-              v-if="selected.length > 1"
-              :closable="false"
-              type="info"
-              disable-transitions
-              class="es-tags-more"
+            <div
+              v-if="collapseTags && selected.length"
+              class="es-selector-tags"
+              :class="{ 'es-selector-more': selected.length > 1 }"
             >
-              <span class="el-select__tags-text"
-                >+ {{ selected.length - 1 }}</span
+              <el-tag
+                :closable="!selectorDisabled && !readonly"
+                type="info"
+                disable-transitions
+                @close="deleteTag($event, selected[0])"
+              >
+                <span class="el-select__tags-text">
+                  {{
+                    isObject(selected[0]) ? selected[0][labelKey] : selected[0]
+                  }}
+                </span>
+              </el-tag>
+              <el-tag
+                v-if="selected.length > 1"
+                :closable="false"
+                type="info"
+                disable-transitions
+                class="es-tags-more"
+              >
+                <span class="el-select__tags-text"
+                  >+ {{ selected.length - 1 }}</span
+                >
+              </el-tag>
+            </div>
+            <transition-group @after-leave="resetInputHeight">
+              <el-tag
+                v-for="(item, index) in selected"
+                :key="getValueKey(item)"
+                :closable="!selectorDisabled && !readonly"
+                type="info"
+                disable-transitions
+                @close="deleteTag($event, item, index)"
               >
-            </el-tag>
+                <span class="el-select__tags-text">{{ getLabel(item) }}</span>
+              </el-tag>
+            </transition-group>
           </div>
-          <transition-group @after-leave="resetInputHeight">
-            <el-tag
-              v-for="(item, index) in selected"
-              :key="getValueKey(item)"
-              :closable="!selectorDisabled && !readonly"
-              type="info"
-              disable-transitions
-              @close="deleteTag($event, item, index)"
-            >
-              <span class="el-select__tags-text">{{ getLabel(item) }}</span>
-            </el-tag>
-          </transition-group>
-        </div>
-        <div ref="reference" class="es-input__inner" v-if="readonly">
-          <template v-if="!multiple">{{ selectedLabel }}</template>
-        </div>
-        <template v-else>
-          <template v-if="multiple">
+          <div ref="reference" class="es-input__inner" v-if="readonly">
+            <template v-if="!multiple">{{ selectedLabel }}</template>
+          </div>
+          <template v-else>
+            <template v-if="multiple">
+              <el-input
+                type="text"
+                ref="reference"
+                autocomplete="off"
+                v-model="words"
+                :readonly="filterable ? false : true"
+                :id="id"
+                :placeholder="currentPlaceholder"
+                :size="selectorSize"
+                :disabled="selectorDisabled"
+                :class="{
+                  'is-focus': visible,
+                  'es-plain': plain,
+                  'es-pointer': !filterable,
+                  'es-zindex-2': focus
+                }"
+                :tabindex="tabindex"
+                v-popover:popover
+                @dblclick.native="openDialog"
+                @focus="handleFocus"
+                @blur="handleBlur"
+              >
+                <template slot="append">
+                  <el-button
+                    ref="openDialog"
+                    v-if="filterable || showButton"
+                    @click.stop="openDialog"
+                    ><slot>选择</slot></el-button
+                  >
+                </template>
+              </el-input>
+              <el-input
+                v-model="selectedLabel"
+                readonly
+                :name="name"
+                type="text"
+                v-show="false"
+              ></el-input>
+            </template>
             <el-input
+              v-else
+              v-model="selectedLabel"
               type="text"
               ref="reference"
               autocomplete="off"
-              v-model="words"
+              :clearable="clearable"
+              showClearIcon
+              :name="name"
               :readonly="filterable ? false : true"
+              :active="actived"
               :id="id"
               :placeholder="currentPlaceholder"
               :size="selectorSize"
               :disabled="selectorDisabled"
               :class="{
                 'is-focus': visible,
-                'es-plain': plain,
-                'es-pointer': !filterable,
-                'es-zindex-2': focus
+                'es-plain': this.plain,
+                'es-pointer': !filterable
               }"
-              :tabindex="multiple ? '-1' : null"
-              v-popover:popover
+              :tabindex="tabindex"
               @dblclick.native="openDialog"
-              @focus="handleFocus"
-              @blur="handleBlur"
+              @clear="handleClear"
             >
               <template slot="append">
                 <el-button
@@ -101,87 +143,48 @@
                 >
               </template>
             </el-input>
-            <el-input
-              v-model="selectedLabel"
-              readonly
-              :name="name"
-              type="text"
-              v-show="false"
-            ></el-input>
           </template>
-          <el-input
-            v-else
-            v-model="selectedLabel"
-            type="text"
-            ref="reference"
-            autocomplete="off"
-            :clearable="clearable"
-            showClearIcon
-            :name="name"
-            :readonly="filterable ? false : true"
-            :active="actived"
-            :id="id"
-            :placeholder="currentPlaceholder"
-            :size="selectorSize"
-            :disabled="selectorDisabled"
-            :class="{
-              'is-focus': visible,
-              'es-plain': this.plain,
-              'es-pointer': !filterable
-            }"
-            :tabindex="multiple ? '-1' : null"
-            @dblclick.native="openDialog"
-            @clear="handleClear"
-          >
-            <template slot="append">
-              <el-button
-                ref="openDialog"
-                v-if="filterable || showButton"
-                @click.stop="openDialog"
-                ><slot>选择</slot></el-button
-              >
-            </template>
-          </el-input>
-        </template>
-      </div>
-      <el-popover
-        v-model="show"
-        placement="bottom-start"
-        trigger="manual"
-        popper-class="es-selector-popover"
-        :width="minWidth"
-        :queryParent="true"
-        :reference="reference"
-        :arrow-offset="20"
-      >
-        <el-scrollbar
-          tag="ul"
-          wrap-class="es-selector-dropdown__wrap"
-          view-class="es-selector-dropdown__list"
-          ref="scrollbar"
-          v-show="options.length"
-          maxHeight="228"
+        </div>
+        <el-popover
+          v-model="show"
+          placement="bottom-start"
+          trigger="manual"
+          popper-class="es-selector-popover"
+          :width="minWidth"
+          :queryParent="true"
+          :reference="reference"
+          :arrow-offset="20"
         >
-          <li
-            v-for="item in options"
-            :key="item.id"
-            @click="handleSelect(item)"
-            class="es-selector-dropdown-item"
-            :class="{ 'es-selected': item.selected }"
+          <el-scrollbar
+            tag="ul"
+            wrap-class="es-selector-dropdown__wrap"
+            view-class="es-selector-dropdown__list"
+            ref="scrollbar"
+            v-show="options.length"
+            maxHeight="228"
           >
-            <span>{{ item[labelKey] }}</span>
-          </li>
-        </el-scrollbar>
-        <p v-if="options.length == 0" class="el-select-dropdown__empty">
-          {{ noMatchText }}
-        </p>
-      </el-popover>
+            <li
+              v-for="item in options"
+              :key="item.id"
+              @click="handleSelect(item)"
+              class="es-selector-dropdown-item"
+              :class="{ 'es-selected': item.selected }"
+            >
+              <span>{{ item[labelKey] }}</span>
+            </li>
+          </el-scrollbar>
+          <p v-if="options.length == 0" class="el-select-dropdown__empty">
+            {{ noMatchText }}
+          </p>
+        </el-popover>
+      </template>
     </template>
     <es-dialog
       v-if="!readonly"
       :title="title"
       :visible.sync="visible"
       :width="width"
+      :height="height"
       :css="false"
       :append-to-body="true"
       :close-on-click-modal="false"
@@ -224,6 +227,10 @@ export default {
   },
   directives: { Clickoutside },
   props: {
+    form: {
+      type: Boolean,
+      default: true
+    },
     isShowLevel3: {
       type: Boolean,
       default: true
@@ -296,6 +303,10 @@ export default {
         return ['enterprise', 'person'];
       }
     },
+    tabindex: {
+      type: [String, Number],
+      default: -1
+    },
     filterable: {
       type: Boolean,
       default: false
@@ -652,6 +663,11 @@ export default {
   },
   beforeDestroy() {
     this.$el.removeEventListener('keyup', this.doSearch);
+    if (this.$refs.openDialog) {
+      this.$refs.openDialog.$el.parentNode.removeEventListener('click', () => {
+        this.openDialog();
+      });
+    }
   }
 };
 </script>

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"
@@ -158,12 +162,7 @@ export default {
       default: false
     },
     //页签
-    tabs: {
-      type: Object,
-      default() {
-        return;
-      }
-    },
+    tabs: Object,
     filtrate: {
       type: [Boolean, Object],
       default() {
@@ -228,7 +227,18 @@ export default {
       activeName: '',
       selections: [],
       checkboxs: [],
-      checkeds: null
+      checkeds: null,
+      showDisabled: true,
+      options: [
+        {
+          value: true,
+          name: '展示'
+        },
+        {
+          value: false,
+          name: '过滤'
+        }
+      ]
     };
   },
   computed: {
@@ -356,7 +366,7 @@ export default {
           }
         },
         persongroup: {
-          label: '员工群组成员',
+          label: '选择群组成员',
           name: 'persongroup',
           url: getSelectorOrgTree,
           data: [],
@@ -815,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,8 +11,9 @@
         <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]"
+          :label="isObject || typeof item == 'string' ? item : item[valueKey]"
           :disabled="typeof item == 'string' ? false : item.disabled"
           :class="{ 'es-radio-delete': genre === 'delete' }"
           :value-key="valueKey"
@@ -33,8 +34,9 @@
         <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]"
+          :label="isObject || typeof item == 'string' ? item : item[valueKey]"
           :disabled="typeof item == 'string' ? false : item.disabled"
           :class="{ 'es-checkbox-delete': genre === 'delete' }"
           :value-key="valueKey"
@@ -54,6 +56,10 @@ export default {
   name: 'Selection',
   props: {
     value: [String, Array, Object],
+    showDisabled: {
+      type: Boolean,
+      default: true
+    },
     genre: String,
     valueKey: {
       type: String,

package/packages/tabs/src/main.vue

@@ -19,22 +19,22 @@
           :name="items.name || String(indexs)"
         >
           <template slot="label" v-if="items.title">
-            <span>
-              <template v-if="typeof items.title === 'object'">
-                <i v-if="items.title.icon" :class="items.title.icon"></i>
-                <el-badge
-                  v-if="
-                    Object.prototype.hasOwnProperty.call(items.title, 'count')
-                  "
-                  type="primary"
-                  :value="items.title.count"
-                  :max="99"
-                >
-                </el-badge>
+            <template v-if="typeof items.title === 'object'">
+              <i v-if="items.title.icon" :class="items.title.icon"></i>
+              <template v-if="items.title.text">
                 {{ items.title.text }}
               </template>
-              <template v-else>{{ items.title }}</template>
-            </span>
+              <el-badge
+                v-if="
+                  Object.prototype.hasOwnProperty.call(items.title, 'count')
+                "
+                type="primary"
+                :value="items.title.count"
+                :max="99"
+              >
+              </el-badge>
+            </template>
+            <template v-else>{{ items.title }}</template>
           </template>
           <template slot-scope="{ loaded }">
             <es-tabs-panel v-bind="items" :show="loaded">