eoss-ui 0.5.81-beta9 → 0.5.82

package/packages/main/src/simplicity/menu-list.vue

@@ -10,7 +10,7 @@
         v-for="(item, index) in data"
         class="es-simplicity-menus-item"
         :key="item.id"
-        :class="{ 'is-fold': fold }"
+        :class="{ 'is-fold': fold, 'is-active': active == item.id }"
         :title="fold ? item.text || item.name : ''"
         @click="handleClick(item)"
         @mouseenter="handleEnter(item)"
@@ -44,6 +44,7 @@
 </template>
 
 <script>
+import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'MenuList',
   components: {},
@@ -105,7 +106,7 @@ export default {
           util.win.open(res.url);
           return;
         } else if (res.urlopenmode == 2) {
-          util.win.location.href = res.url;
+          util.win.open(res.url, '_self');
           return;
         }
         this.$emit('command', res);

package/packages/main/src/simplicity/router-page.vue

@@ -18,32 +18,23 @@ export default {
       default() {
         return {};
       }
-    },
-    show: Boolean
+    }
   },
   data() {
-    return {
-      params: {}
-    };
+    return {};
   },
   computed: {},
-  watch: {
-    show(val) {
-      if (val) {
-        this.jump();
-      }
-    }
-  },
+  watch: {},
   created() {},
   mounted() {
-    this.params = util.getParams({ url: this.url });
     this.jump();
   },
   methods: {
     jump() {
+      let params = util.getParams({ url: this.url });
       this.$router.push({
         path: this.path,
-        query: { ...this.query, ...this.params }
+        query: { ...this.query, ...params }
       });
     }
   }

package/packages/main/src/simplicity/sub-menu.vue

@@ -11,7 +11,10 @@
     :wrapperClosable="false"
     :visible.sync="show"
   >
-    <div class="es-simplicity-menus">
+    <div
+      class="es-simplicity-menus"
+      :class="{ 'es-simplicity-menus-plus': mode == 'plus' }"
+    >
       <div class="es-simplicity-menus-box" :style="{ width: width + 'px' }">
         <div class="es-simplicity-menus-title">
           <span class="es-simplicity-menus-title-text" v-if="!fold">{{
@@ -29,7 +32,7 @@
           ></i>
         </div>
         <menu-list
-          :active="active"
+          :active="actives[0]"
           :data="menus"
           :menuIcon="menuIcon"
           :color="color"
@@ -67,7 +70,7 @@
             }}</span>
           </div>
           <menu-list
-            :active="active"
+            :active="actives[index + 1]"
             :data="[...item.children, ...item.fourthTabs]"
             :menuIcon="menuIcon"
             :color="color"
@@ -97,8 +100,10 @@ export default {
   name: 'SubMenu',
   components: { MenuList },
   props: {
+    mode: String,
     title: String,
     active: String,
+    closed: Boolean,
     color: {
       type: [String, Array],
       default: '#fff'
@@ -138,11 +143,12 @@ export default {
   },
   data() {
     return {
-      fold: false,
+      fold: this.closed,
       width: this.size,
       subMenus: [],
       isEnter: false,
-      timer: null
+      timer: null,
+      actives: []
     };
   },
   computed: {
@@ -159,7 +165,16 @@ export default {
       }
     }
   },
-  watch: {},
+  watch: {
+    closed(val) {
+      this.fold = val;
+      if (val) {
+        this.width = 48;
+      } else {
+        this.width = this.size;
+      }
+    }
+  },
   created() {},
   mounted() {},
   methods: {
@@ -170,15 +185,20 @@ export default {
       } else {
         this.width = this.size;
       }
-      this.$emit('update:fold', res);
+      this.$emit('update:closed', res);
     },
     handleCommand(res) {
-      console.log(res);
       this.$emit('command', res);
     },
     getData(res, n, is) {
       this.isEnter = is;
       if (is) {
+        this.actives.splice(n);
+        if (this.actives[n]) {
+          this.actives[n] = res.id;
+        } else {
+          this.actives.push(res.id);
+        }
         this.subMenus.splice(n);
         let { children, fourthTabs } = res;
         if (
@@ -193,8 +213,9 @@ export default {
           this.timer = setTimeout(() => {
             if (res && !this.isEnter) {
               this.subMenus = [];
+              this.actives = [];
             }
-          }, 200);
+          }, 300);
         }
       }
     },
@@ -208,6 +229,7 @@ export default {
     },
     handleLeave() {
       this.subMenus = [];
+      this.actives = [];
     },
     handleEnter() {
       this.isEnter = true;

package/packages/menu/src/main.vue

@@ -109,9 +109,10 @@ export default {
       } else {
         this.$nextTick(() => {
           let w = 0;
-          Array.from(this.$refs.menu.$el.children).forEach((item) => {
-            w += item.getBoundingClientRect().width;
-          });
+          this.$refs.menu &&
+            Array.from(this.$refs.menu.$el.children).forEach((item) => {
+              w += item.getBoundingClientRect().width;
+            });
           const styles = window.getComputedStyle(this.$refs.menu.$el);
           w += parseFloat(styles.paddingLeft) + parseFloat(styles.paddingRight);
           if (w > this.$refs.esMenu.$el.getBoundingClientRect().width) {

package/packages/pagination/src/main.vue

@@ -1,6 +1,7 @@
 <template>
   <el-pagination
     class="es-pagination"
+    :class="{ 'es-pagination-complete': isComplete && position != 'center' }"
     v-bind="$attrs"
     :current-page="pageNum"
     :page-size="pageSize"
@@ -18,10 +19,28 @@
   </el-pagination>
 </template>
 <script>
+import util from 'eoss-ui/src/utils/util';
+const paginationLayout =
+  util.win.top.tableLayout ||
+  util.win.tableLayout ||
+  'prev, pager, next, sizes, total';
 export default {
   name: 'EsPagination',
   inheritAttrs: false,
+  computed: {
+    isComplete() {
+      return (
+        this.layout.indexOf('total') > -1 &&
+        this.layout.indexOf('sizes') > -1 &&
+        this.layout.indexOf('prev') > -1 &&
+        this.layout.indexOf('pager') > -1 &&
+        this.layout.indexOf('next') > -1 &&
+        this.layout.indexOf('jumper') > -1
+      );
+    }
+  },
   props: {
+    position: String,
     // 当前页码
     pageNum: {
       type: Number,
@@ -46,7 +65,7 @@ export default {
     // 自定义排版
     layout: {
       type: String,
-      default: 'prev, pager, next, sizes, total'
+      default: paginationLayout
     },
     // 只有一页时是否隐藏
     hideOnSinglePage: {

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,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="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"
       :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
@@ -656,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

@@ -266,6 +266,7 @@ export default {
       }
     },
     newTabs() {
+      const orgId = util.getStorage('orgId');
       const tabs = {
         enterprise: {
           label: '选择单位',
@@ -320,7 +321,7 @@ export default {
           param: {
             showarea: 2,
             id: 0,
-            filid: 'all'
+            filid: orgId
           }
         },
         otheremployee: {
@@ -366,7 +367,7 @@ export default {
           }
         },
         persongroup: {
-          label: '员工群组成员',
+          label: '选择群组成员',
           name: 'persongroup',
           url: getSelectorOrgTree,
           data: [],

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

@@ -13,7 +13,7 @@
           :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"
@@ -36,7 +36,7 @@
           :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"

package/packages/tabs/src/main.vue

@@ -19,25 +19,35 @@
           :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">
+            <component
+              v-if="items.component || items.type == 'component'"
+              :is="contents.is || contents.type"
+              v-bind="
+                handleExclAttribute({
+                  data: contents,
+                  attrs: ['is', 'type']
+                })
+              "
+            ></component>
+            <es-tabs-panel v-else v-bind="items" :show="loaded">
               <template
                 slot-scope="{ contents, average, data, title, show, isShow }"
               >