eoss-ui 0.5.81-beta18 → 0.5.81-beta19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.81-beta18",
+  "version": "0.5.81-beta19",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -97,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.13",
+    "eoss-element": "^0.3.15",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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

@@ -234,8 +234,8 @@
             v-if="(isIE && item.method !== 'router') || item.method == 'iframe'"
           >
             <iframe
-              :id="iframeId"
-              :name="iframeId"
+              :id="activeName == item.id ? iframeId : ''"
+              :name="activeName == item.id ? iframeId : ''"
               frameborder="0"
               width="100%"
               height="100%"

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="tabindex"
-              v-popover:popover
               @dblclick.native="openDialog"
-              @focus="handleFocus"
-              @blur="handleBlur"
+              @clear="handleClear"
             >
               <template slot="append">
                 <el-button
@@ -101,81 +143,41 @@
                 >
               </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="tabindex"
-            @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"
@@ -224,6 +226,10 @@ export default {
   },
   directives: { Clickoutside },
   props: {
+    form: {
+      type: Boolean,
+      default: true
+    },
     isShowLevel3: {
       type: Boolean,
       default: true
@@ -656,6 +662,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

@@ -366,7 +366,7 @@ export default {
           }
         },
         persongroup: {
-          label: '员工群组成员',
+          label: '选择群组成员',
           name: 'persongroup',
           url: getSelectorOrgTree,
           data: [],

package/packages/theme-chalk/src/common/var.scss

@@ -566,10 +566,11 @@ $--select-option-disabled-color: $--color-text-placeholder !default;
 $--select-option-disabled-background: $--color-white !default;
 /// height||Other|4
 $--select-option-height: 34px !default;
+$--select-option-hover-color: $--color-text-regular !default;
 $--select-option-hover-background: $--background-color-base !default;
 /// color||Color|0
-$--select-option-selected-font-color: $--color-primary !default;
-$--select-option-selected-hover: $--background-color-base !default;
+$--select-option-selected-color: $--color-primary !default;
+$--select-option-selected-background: $--background-color-base !default;
 
 $--select-group-color: $--color-info !default;
 $--select-group-height: 30px !default;