eoss-ui 0.5.67 → 0.5.69

package/packages/main/src/main.vue

@@ -23,6 +23,8 @@
           class="es-fourth-tabs"
           mode="horizontal"
           :icons="icons"
+          :menu-icon="menuIcon"
+          :sub-icon="subIcon"
           :popperClass="`el-menu--popup-${layout}`"
           :data="navs"
           :deep="layout === 'topnav'"
@@ -82,6 +84,7 @@
           </div>
           <es-handle-user
             :data="{ type: 'user' }"
+            :userModel="userModel"
             @click="handleClick"
           ></es-handle-user>
         </div>
@@ -115,13 +118,17 @@
           :is-top="layout == 'topside'"
           :data="menu"
           :default-active="active"
-          :width="navWidth"
+          :width="navsWidth"
+          :nav-width="navWidth"
           :icons="icons"
+          :menu-icon="menuIcon"
+          :sub-icon="subIcon"
           :biserial="biserial"
           :title="showNavTitle ? title : false"
           :showCollapse="showNavTitle"
           :menu-tips="menuTips"
           :is-default="isDefault"
+          :paddingLeft="navPaddingLeft"
           @open="
             (res) => {
               handleSelect(res, 'menu', true);
@@ -147,6 +154,7 @@
             :data="tabs"
             :titleIcons="false"
             :default-active="tabsId"
+            :menu-icon="menuIcon"
             :menu-tips="menuTips"
             @select="
               (res) => {
@@ -288,8 +296,15 @@ export default {
     maxHeight: String,
     //菜单导航地址
     menuUrl: String,
-    //菜单展开关闭
+    //菜单展开关闭图标
     icons: Object,
+    //菜单前置默认图标
+    menuIcon: String,
+    //子菜单是否显示前置图标
+    subIcon: {
+      type: Boolean,
+      default: true
+    },
     //logo
     logo: String,
     //菜单显示类型
@@ -413,7 +428,10 @@ export default {
       type: [Boolean, String],
       default: true
     },
-    appCode: String
+    appCode: String,
+    //菜单左边距
+    navPaddingLeft: Number,
+    navWidth: String
   },
   computed: {
     showHeader() {
@@ -444,7 +462,7 @@ export default {
       }
       return true;
     },
-    navWidth() {
+    navsWidth() {
       return this.layout === 'topside' ? '230px' : undefined;
     },
     showNavTitle() {
@@ -1852,8 +1870,12 @@ export default {
                 }
               }
             } else {
-              console.error('缺少路由配置');
-              return;
+              this.method = 'iframe';
+              this.refresh = false;
+              this.page = util.handlerUrl(page, param);
+              this.$nextTick(() => {
+                this.refresh = true;
+              });
             }
           }
         }

package/packages/menu/src/main.vue

@@ -1,4 +1,5 @@
 <script>
+import { debounce } from 'throttle-debounce';
 export default {
   name: 'EsMenu',
   inheritAttrs: false,
@@ -38,6 +39,15 @@ export default {
     paddingLeft: {
       type: Number,
       default: 14
+    },
+    menuIcon: {
+      type: String,
+      default: 'es-icon-application'
+    },
+    icons: Object,
+    subIcon: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
@@ -45,37 +55,18 @@ export default {
       return this.height === undefined ? this.maxH : this.height;
     },
     maxWidth() {
-      if (this.mode === 'vertical') {
-        return this.width;
-      }
       return this.maxW;
     }
   },
   watch: {
     data: {
-      immediate: true,
       deep: true,
       handler() {
-        if (this.mode === 'vertical') {
-          this.$nextTick(() => {
-            this.maxH =
-              this.$refs.esMenu.$el.getBoundingClientRect().height + 'px';
-          });
-        } else {
-          this.$nextTick(() => {
-            let w = 0;
-            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) {
-              this.maxW = w + 'px';
-            }
-          });
-        }
+        this.getMaxWidth();
       }
+    },
+    width() {
+      this.getMaxWidth();
     }
   },
   data() {
@@ -87,8 +78,44 @@ export default {
       isChange: false
     };
   },
-  mounted() {},
+  created() {
+    this.getMaxWidth = debounce(300, () => {
+      this.getWidth();
+    });
+  },
+  mounted() {
+    this.getMaxWidth();
+  },
   methods: {
+    getWidth() {
+      if (this.mode === 'vertical') {
+        this.$nextTick(() => {
+          this.maxH =
+            this.$refs.esMenu.$el.getBoundingClientRect().height + 'px';
+          const styles = window.getComputedStyle(
+            this.$refs.menu.$el.parentNode
+          );
+          this.maxW = this.width
+            ? parseInt(this.width, 10) -
+              parseInt(styles.marginLeft, 10) -
+              parseInt(styles.marginRight, 10) +
+              'px'
+            : '';
+        });
+      } else {
+        this.$nextTick(() => {
+          let w = 0;
+          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) {
+            this.maxW = w + 'px';
+          }
+        });
+      }
+    },
     handleReady() {
       if (this.mode === 'horizontal') {
         this.$refs.esMenu.wrap.onmouseover = (e) => {
@@ -221,7 +248,7 @@ export default {
         mode: this.mode
       });
     },
-    getSub(item, h, popper, fourthTabs) {
+    getSub(item, h, popper, fourthTabs, subIcon) {
       if (popper) {
         popper +=
           this.popperClass !== undefined
@@ -233,21 +260,18 @@ export default {
             ? this.popperClass
             : ` es-menu-popper-${this.mode}`;
       }
-      const title = [
-        h('i', {
-          class: [
-            item.icons
-              ? this.unicode(item.icons)
-                ? item.icons
-                : 'es-icon iconfont'
-              : 'es-icon-application',
-            'es-menu-item-icon'
-          ],
-          domProps:
-            item.icons === '' || this.unicode(item.icons)
-              ? {}
-              : { innerHTML: item.icons }
-        }),
+      let title = [];
+      if (subIcon) {
+        title.push(
+          h('es-icon', {
+            props: {
+              contents: item.icons || this.menuIcon
+            },
+            class: ['es-menu-item-icon']
+          })
+        );
+      }
+      title.push(
         h(
           'div',
           {
@@ -284,7 +308,7 @@ export default {
             )
           ]
         )
-      ];
+      );
       let doms = [
         h('template', { slot: 'title' }, this.titleIcons ? title : [title[1]])
       ];
@@ -299,7 +323,7 @@ export default {
             if (!ele) {
               console.error(`对象子数据中第[${index}]条数据错误`, item);
             } else {
-              return this.getSub(ele, h, popper);
+              return this.getSub(ele, h, popper, false, this.subIcon);
             }
           })
         );
@@ -337,7 +361,7 @@ export default {
             if (!ele) {
               console.error(`对象子数据中第[${index}]条数据错误`, item);
             } else {
-              return this.getSub(ele, h, popper, true);
+              return this.getSub(ele, h, popper, true, this.subIcon);
             }
           })
         );
@@ -386,13 +410,6 @@ export default {
           )
         ];
       }
-    },
-    unicode(res) {
-      if (!res) {
-        return false;
-      }
-      var reg = new RegExp(/^es-\S+/, 'g');
-      return res.match(reg) ? res.match(reg).length : 0;
     }
   },
   render(h) {
@@ -403,22 +420,14 @@ export default {
         item.children.length &&
         (!item.extendData || item.extendData.businessStatus != 0)
       ) {
-        doms = doms.concat(this.getSub(item, h, 'es-sub-menu'));
+        doms = doms.concat(this.getSub(item, h, 'es-sub-menu', false, true));
       } else {
         const title = [
-          h('i', {
-            class: [
-              item.icons
-                ? this.unicode(item.icons)
-                  ? item.icons
-                  : 'es-icon iconfont'
-                : 'es-icon-application',
-              'es-menu-item-icon'
-            ],
-            domProps:
-              item.icons === '' || this.unicode(item.icons)
-                ? {}
-                : { innerHTML: item.icons }
+          h('es-icon', {
+            props: {
+              contents: item.icons || this.menuIcon
+            },
+            class: ['es-menu-item-icon']
           }),
           h(
             'div',
@@ -501,7 +510,8 @@ export default {
               defaultActive: this.defaultActive,
               collapse: this.collapse,
               mode: this.mode,
-              uniqueOpened: this.uniqueOpened
+              uniqueOpened: this.uniqueOpened,
+              icons: this.icons
             },
             style: { width: this.maxWidth },
             attrs: { ...this.$attrs },

package/packages/nav/src/main.vue

@@ -14,11 +14,15 @@
         :deep="false"
         :default-active="subActive"
         :biserial="biserial"
+        :menu-icons="menuIcon"
+        :icons="icons"
+        :sub-icon="subIcon"
         @select="handleTrigger"
       ></es-menu>
     </div>
     <div
       class="es-nav-main"
+      :biserial="biserial"
       :style="{ width: biserial ? width : boxWidth }"
       v-show="biserial ? subMenu.length : menu.length"
     >
@@ -47,6 +51,10 @@
         :style="{ height: menuHeight }"
         :is-default="isDefault"
         :biserial="biserial"
+        :paddingLeft="paddingLeft"
+        :menu-icon="menuIcon"
+        :icons="icons"
+        :sub-icon="subIcon"
         @select="handleSelect"
         @open="handleOpen"
         @close="handleClose"
@@ -73,6 +81,10 @@ export default {
       type: String,
       default: '200px'
     },
+    navWidth: {
+      type: String,
+      default: '70px'
+    },
     showCollapse: {
       type: Boolean,
       default: true
@@ -84,7 +96,14 @@ export default {
     //是否双列导航
     biserial: Boolean,
     defaultActive: [String, Array],
-    isDefault: Boolean
+    isDefault: Boolean,
+    paddingLeft: Number,
+    menuIcon: String,
+    icons: Object,
+    subIcon: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     menu() {
@@ -119,12 +138,12 @@ export default {
         if (this.isShow) {
           return this.width;
         } else {
-          return '70px';
+          return this.navWidth;
         }
       }
       return this.subMenu && this.subMenu.length && this.isShow
-        ? parseInt(this.width, 10) + 70 + 'px'
-        : '70px';
+        ? parseInt(this.width, 10) + parseInt(this.navWidth, 10) + 'px'
+        : this.navWidth;
     }
   },
   watch: {

package/packages/selector/src/main.vue

@@ -1,11 +1,12 @@
 <template>
   <div
+    v-if="isRender"
     class="es-selector"
     ref="esSelector"
     :class="{ 'es-pointer': !readonly && !filterable }"
     v-clickoutside="handleClose"
   >
-    <el-button v-if="button" v-bind="button" @click.stop="openDialog"
+    <el-button v-if="button" v-bind="button" @click="openDialog"
       ><slot>选择</slot></el-button
     >
     <template v-else>
@@ -105,7 +106,6 @@
               readonly
               :name="name"
               type="text"
-              wqwq
               v-show="false"
             ></el-input>
           </template>
@@ -188,6 +188,7 @@
       class="es-selector-dialog"
     >
       <es-selector-panel
+        v-if="isReset"
         v-model="selected"
         v-bind="$attrs"
         :multiple="multiple"
@@ -329,6 +330,13 @@ export default {
     emptySerach: {
       type: Boolean,
       default: false
+    },
+    reset: Boolean,
+    useCaseCode: String,
+    businessData: [String, Array, Object],
+    inputHeight: {
+      type: Number,
+      default: 40
     }
   },
   data() {
@@ -348,6 +356,16 @@ export default {
     };
   },
   computed: {
+    isRender() {
+      let useCaseCodes = util.getStorage('useCaseCodes');
+      if (useCaseCodes && this.useCaseCode) {
+        return useCaseCodes.indexOf(this.useCaseCode) > -1;
+      }
+      return true;
+    },
+    isReset() {
+      return this.reset ? this.visible : true;
+    },
     _elFormItemSize() {
       return (this.elFormItem || {}).elFormItemSize;
     },
@@ -413,7 +431,11 @@ export default {
     selected: {
       deep: true,
       handler(val) {
-        this.$emit('change', Array.isArray(val) ? val : [val]);
+        this.$emit(
+          'change',
+          Array.isArray(val) ? val : [val],
+          this.businessData
+        );
         if (this.multiple) {
           this.resetInputHeight();
         }
@@ -551,10 +573,11 @@ export default {
       this.visible = false;
       if (util.isObject(res)) {
         this.$emit('input', [res]);
+        this.$emit('confirm', [res], this.businessData);
       } else {
         this.$emit('input', res);
+        this.$emit('confirm', res, this.businessData);
       }
-      this.$emit('confirm', res);
       let inputChildNodes = this.$refs.reference
         ? this.$refs.reference.$el.childNodes
         : null;
@@ -565,6 +588,9 @@ export default {
         input.focus();
         input.blur();
       }
+      if (this.reset) {
+        this.selected = [];
+      }
     },
     handleClear() {
       this.$emit('input', []);
@@ -584,7 +610,7 @@ export default {
       if (this.collapseTags) return;
       this.$nextTick(() => {
         if (!this.$refs.reference) return;
-        const sizeInMap = this.initialInputHeight || 40;
+        const sizeInMap = this.inputHeight;
         let height = '';
         if (this.selected !== undefined && this.selected.length === 0) {
           height = sizeInMap + 'px';