eoss-ui 0.6.40 → 0.6.41

package/packages/handler/src/main.vue

@@ -22,7 +22,7 @@
             <div v-for="ele in item.content" :key="ele">{{ ele }}</div>
           </div>
         </div>
-        <div v-else-if="item.type === 'date'" class="es-handler-date">
+        <div v-else-if="item.type === 'dateTime'" class="es-handler-date">
           <div>
             {{ time }}
             <span v-if="show"
@@ -42,17 +42,17 @@
           trigger="hover"
           ref="system"
           :popper-class="
-            system.length > 4
+            systemData.length > 4
               ? 'es-popper-sub-system is-width'
               : 'es-popper-sub-system'
           "
           @show="showPopper = true"
           @hide="showPopper = false"
         >
-          <el-scrollbar :max-height="maxHeight" v-if="system.length">
+          <el-scrollbar :max-height="maxHeight" v-if="systemData.length">
             <ul class="es-sub-system">
               <li
-                v-for="ele in system"
+                v-for="ele in systemData"
                 class="es-sub-system-item"
                 :class="{
                   'es-disabled':
@@ -91,9 +91,9 @@
         <el-badge
           class="es-badge"
           v-else-if="item.type === 'notice'"
-          :value="notice"
+          :value="noticeNum"
           :max="99"
-          :hidden="notice < 1"
+          :hidden="noticeNum < 1"
         >
           <div
             class="es-handler-icon"
@@ -139,20 +139,12 @@ export default {
         return [];
       }
     },
-    notice: {
-      type: Number,
-      default: 0
-    },
     hide: {
       type: Object,
       default() {
-        return { system: true, new: true };
+        return {};
       }
     },
-    online: {
-      type: [Number, Boolean],
-      default: 1
-    },
     photo: String,
     storage: String,
     application: {
@@ -162,6 +154,134 @@ export default {
     maxHeight: {
       type: String,
       default: '100%'
+    },
+    user: {
+      type: Object,
+      default() {
+        return {
+          type: 'user'
+        };
+      }
+    },
+    dateTime: {
+      type: Object,
+      default() {
+        return {
+          type: 'dateTime'
+        };
+      }
+    },
+    system: {
+      type: Object,
+      default() {
+        return {
+          type: 'system',
+          icon: 'es-icon-yingyong',
+          title: '切换子系统'
+        };
+      }
+    },
+    home: {
+      type: Object,
+      default() {
+        return {
+          type: 'home',
+          icon: 'es-icon-zuomian',
+          title: '个人工作台'
+        };
+      }
+    },
+    search: {
+      type: Object,
+      default() {
+        return {
+          type: 'search',
+          icon: 'es-icon-magnifier',
+          title: '搜索'
+        };
+      }
+    },
+    im: {
+      type: Object,
+      default() {
+        return {
+          type: 'im',
+          icon: 'es-icon-liaotian',
+          title: 'IM'
+        };
+      }
+    },
+    index: {
+      type: Object,
+      default() {
+        return {
+          type: 'index',
+          icon: 'es-icon-home',
+          title: '门户'
+        };
+      }
+    },
+    home: {
+      type: Object,
+      default() {
+        return {
+          type: 'home',
+          icon: 'es-icon-zuomian',
+          title: '个人工作台'
+        };
+      }
+    },
+    notice: {
+      type: Object,
+      default() {
+        return {
+          type: 'notice',
+          icon: 'es-icon-tongzhi',
+          title: '通知消息'
+        };
+      }
+    },
+    refresh: {
+      type: Object,
+      default() {
+        return {
+          type: 'refresh',
+          icon: 'es-icon-shuaxin',
+          title: '刷新'
+        };
+      }
+    },
+    quit: {
+      type: Object,
+      default() {
+        return {
+          type: 'quit',
+          icon: 'es-icon-guanji',
+          title: '退出'
+        };
+      }
+    },
+    set: {
+      type: Object,
+      default() {
+        return {
+          type: 'set',
+          icon: 'es-icon-xitongguanli',
+          title: '设置'
+        };
+      }
+    },
+    msgNum: {
+      type: Number,
+      default: 0
+    },
+    noticeNum: {
+      type: Number,
+      default: 0
+    },
+    online: {
+      type: Number,
+      default: 1
     }
   },
   watch: {
@@ -176,69 +296,35 @@ export default {
   },
   computed: {
     lists() {
-      if (this.data === undefined) {
-        let list = [
-          {
-            type: 'user'
-          },
-          this.contact ? { ...this.contact, type: 'contact' } : {},
-          {
-            type: 'date'
-          },
-          {
-            type: 'system',
-            icon: 'es-icon-yingyong',
-            title: '切换子系统'
-          },
-          {
-            type: 'home',
-            icon: 'es-icon-zuomian',
-            title: '个人工作台'
-          },
-          {
-            type: 'index',
-            icon: 'es-icon-home',
-            title: '门户'
-          },
-          {
-            type: 'notice',
-            icon: 'es-icon-tongzhi',
-            title: '通知消息'
-          },
-          {
-            type: 'refresh',
-            icon: 'es-icon-shuaxin',
-            title: '刷新'
-          },
-          {
-            type: 'quit',
-            icon: 'es-icon-guanji',
-            title: '退出'
-          },
-          {
-            type: 'set',
-            icon: 'es-icon-xitongguanli',
-            title: '设置'
-          }
-        ].filter((item) => {
-          return Object.keys(item).length;
-        });
-        if (Object.keys(this.hide).length) {
-          list.forEach((item) => {
-            item.hide = this.hide[item.type];
-          });
-        }
-        return list;
-      } else {
-        if (Object.keys(this.hide).length) {
-          this.data.forEach((item) => {
-            item.hide = this.hide[item.type];
-          });
-        }
-      }
-      return this.data;
+      let hide = {
+        system: true,
+        new: true,
+        im: true,
+        ...this.hide
+      };
+      let data = this.data
+        ? this.data
+        : [
+            this.user,
+            this.contact ? { ...this.contact, type: 'contact' } : {},
+            this.dateTime,
+            this.system,
+            this.search,
+            this.im,
+            this.index,
+            this.home,
+            this.notice,
+            this.refresh,
+            this.quit,
+            this.set
+          ];
+      return data.filter((item) => {
+        return (
+          item && Object.keys(item).length && !item.hide && !hide[item.type]
+        );
+      });
     },
-    system() {
+    systemData() {
       return this.subSystem;
     },
     show() {

package/packages/icons/src/icon.json

@@ -1 +1 @@
-["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan","home","tiyanxinban","shiyongjiuban","zhuomian","scan","youbian","zuobian","saomadenglu","zhanghaodenglu","zhengfangti","tingzhi"]
+["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan","home","tiyanxinban","shiyongjiuban","zhuomian","scan","youbian","zuobian","saomadenglu","zhanghaodenglu","zhengfangti","tingzhi","youxiangdenglu","duanxindenglu","liaotian","zhixiangyou","zhixiangshang","zhixiangxia","zhixiangzuo"]

package/packages/login/src/main.vue

@@ -49,11 +49,13 @@
             'es-login-model': modelLength == 2 || mode == 'complex'
           }"
         >
-          <template v-if="this.mode == 'complex'">
+          <template
+            v-if="this.mode == 'complex' && loginModel.indexOf('3') > -1"
+          >
             <template v-for="item in switchs">
               <div
                 v-if="item.tips"
-                v-show="active != item.type"
+                v-show="switchActive != item.type"
                 class="es-login-model-tips"
                 :key="item.type + '_0'"
                 :style="getBackground(item.background)"
@@ -72,17 +74,25 @@
             </template>
           </template>
           <template v-else>
-            <span
-              v-for="(item, index) in icons"
-              v-show="modelLength > 2 || active != item.type"
-              class="es-icon-box"
-              @click="switchLogin(item)"
-              :title="modelLength > 2 ? item.name : ''"
-              :key="index"
-              :class="[{ 'es-icon-active': active == item.type }]"
-            >
-              <i :class="[item.icon, 'es-icon']"></i>
-            </span>
+            <template v-for="item in icons">
+              <div
+                class="es-login-model-item-tips"
+                v-show="modelLength == 2 && active != item.type && modelTips"
+                :key="item.type"
+              >
+                {{ item.name }}点这里<i class="es-icon-zhixiangyou"></i>
+              </div>
+              <span
+                v-show="modelLength > 2 || active != item.type"
+                class="es-icon-box"
+                @click="switchLogin(item)"
+                :title="item.name"
+                :key="item.name"
+                :class="[{ 'es-icon-active': active == item.type }]"
+              >
+                <i :class="[item.icon, 'es-icon']"></i>
+              </span>
+            </template>
           </template>
         </div>
         <div v-if="loginTitleImg" class="es-login-title-image">
@@ -284,7 +294,14 @@
                   </span>
                 </div>
               </div>
-              <div v-if="active == 3 && mode == 'complex'" class="es-to-login">
+              <div
+                v-if="
+                  active == 3 &&
+                  loginModel.indexOf('0') > -1 &&
+                  mode == 'complex'
+                "
+                class="es-to-login"
+              >
                 <span class="es-pointer" @click="switchLoginType()"
                   >账号登录<i class="es-icon-youbian"></i
                 ></span>
@@ -526,6 +543,7 @@ export default {
       type: Boolean,
       default: true
     },
+    modelTips: Boolean,
     model: {
       type: Object,
       default() {
@@ -795,10 +813,14 @@ export default {
             0: { type: '0', icon: 'es-icon-zhanghaodenglu', name: '账号登录' },
             1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
             3: { type: '3', icon: 'es-icon-saomadenglu', name: '扫码登录' },
-            6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
+            6: { type: '6', icon: 'es-icon-duanxindenglu', name: '短信登录' },
             7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
             9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-            11: { type: '11', icon: 'es-icon-wodeyouxiang', name: '邮箱登录' },
+            11: {
+              type: '11',
+              icon: 'es-icon-youxiangdenglu',
+              name: '邮箱登录'
+            },
             12: { type: '12', icon: 'es-icon-zhanghaodenglu', name: '账号登录' } //双因素
           };
     },
@@ -842,6 +864,12 @@ export default {
       handler(val) {
         this.active = val.split(',')[0];
         this.title = this.iconfonts[this.active].name;
+        this.switchs.forEach((item) => {
+          if (item.type == this.active) {
+            this.switchActive = item.type;
+            return;
+          }
+        });
       }
     },
     active: {
@@ -1185,9 +1213,24 @@ export default {
     switchLoginType(res) {
       this.countdown = 0;
       if (res) {
-        this.active = res.type;
-        this.title = res.name || '';
         this.switchActive = res.type;
+        this.title = res.name || '';
+        if (this.loginModel.indexOf(res.type) > -1) {
+          this.active = res.type;
+        } else {
+          let other = this.switchs.filter((item) => {
+            return item.type != res.type;
+          })[0];
+          let model = this.loginModel.split(',').filter((item) => {
+            return item != res.type && item != other.type;
+          })[0];
+          if (model) {
+            this.active = model;
+            this.title = this.iconfonts[model].name;
+          } else {
+            console.error('complex风格的登录方式，loginModel配置错误！');
+          }
+        }
       } else {
         this.active = this.switchs[0].type;
         this.title = '';

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

@@ -39,7 +39,7 @@
         :online="online"
         :application="application"
         :storage="storage"
-        :notice="notice"
+        :noticeNum="notice"
         :data="handleData"
         :max-height="_maxHeight"
         @visible-change="handleVisibleChange"
@@ -195,6 +195,17 @@
       </slot>
     </es-dialog>
     <notice :data="sysMsg" :winopen="winopen" @opened="handleOpened"></notice>
+    <es-dialog
+      class="es-public-search-dialog"
+      :visible.sync="showSearch"
+      size="lg"
+    >
+      <search
+        :menus="menus"
+        :menuIcon="menuIcon"
+        @select="handleOnSearch"
+      ></search>
+    </es-dialog>
     <es-dialog :title="dialog.title" :visible.sync="dialog.show" size="md">
       <template v-if="dialog.title == '查看在线人员' && !dialog.src">
         <online></online>
@@ -215,6 +226,7 @@ import settings from '../public/settings.vue';
 import message from './message.vue';
 import notice from './notice.vue';
 import online from '../public/online.vue';
+import search from '../public/search.vue';
 import {
   //authCenter,
   wss,
@@ -244,7 +256,8 @@ export default {
     settings,
     message,
     notice,
-    online
+    online,
+    search
   },
   props: {
     jobScrollbar: Boolean,
@@ -254,7 +267,10 @@ export default {
     //菜单展开关闭图标
     icons: Object,
     //菜单前置默认图标
-    menuIcon: String,
+    menuIcon: {
+      type: String,
+      default: 'es-icon-application'
+    },
     //子菜单是否显示前置图标
     subIcon: {
       type: Boolean,
@@ -605,6 +621,8 @@ export default {
       showMsg: false,
       //即时消息
       sysMsg: [],
+      //搜索
+      showSearch: false,
       //定时关闭及时消息对象
       sysMsgOut: null,
       //额外信息数据
@@ -1727,6 +1745,10 @@ export default {
         case 'set':
           this.handleSet();
           break;
+        case 'search':
+          this.showSearch = true;
+          this.showMsg = false;
+          break;
         case 'goView':
           util.win.open(res.path, '_blank');
           break;
@@ -2048,6 +2070,13 @@ export default {
         let n = parseInt(this.menuTips[id], 10) - 1;
         this.$set(this.menuTips, id, n);
       }
+    },
+    //搜索
+    handleOnSearch(res, parent) {
+      this.showSearch = false;
+      if (parent.name === '菜单') {
+        this.jumpMenu(res.appCode);
+      }
     }
   },
   beforeDestroy() {

package/packages/main/src/public/search.vue

@@ -20,9 +20,9 @@
               <div class="es-public-search-title">{{ item.name }}</div>
               <ul class="es-public-search-list">
                 <li
-                  v-for="ele in item.records.slice(0, 3)"
+                  v-for="(ele, idx) in item.records.slice(0, 3)"
                   class="es-public-search-list-item"
-                  :key="ele.id || ele.title"
+                  :key="ele.id || `${item.id}_${ele.title}_${idx}`"
                   @click="handleClick(ele, item)"
                 >
                   <es-icon
@@ -71,7 +71,7 @@
           v-loading="loadings[item.id || String(index)]"
           element-loading-background="rgba(0, 0, 0, 0.01)"
           element-loading-text="加载中..."
-          v-if="!hides.includes(item.name)"
+          v-if="!hides.includes(item.name) && !item.hide"
         >
           <el-scrollbar
             class="es-scrollbar es-public-search-scrollbar"
@@ -91,9 +91,9 @@
             </div>
             <ul class="es-public-search-lists">
               <li
-                v-for="ele in item.records"
+                v-for="(ele, idx) in item.records"
                 class="es-public-search-list-item"
-                :key="ele.id || ele.title"
+                :key="ele.id || `${item.id}_${ele.title}_${idx}`"
                 @click="handleClick(ele, item)"
               >
                 <es-icon
@@ -301,7 +301,14 @@ export default {
             let types = results.catalog.map((item, index) => {
               loadings[item.id || String(index)] = false;
               noMore[item.id || String(index)] = false;
-              return { ...item, pageNum: 0, pageCount: 1, records: [] };
+              return {
+                ...item,
+                pageNum: 0,
+                pageCount: 1,
+                records: [],
+                hide:
+                  item.name == '应用' && this.apps.length == 0 ? true : false
+              };
             });
             this.types = types;
             this.loadings = loadings;
@@ -312,7 +319,7 @@ export default {
     searchAll(keyWords) {
       for (let i = 0; i < this.types.length; i++) {
         let item = this.types[i];
-        if (keyWords) {
+        if (keyWords && !this.hides.includes(item.name) && !item.hide) {
           if (item.name == '菜单' && this.menus.length) {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.menus, keyWords);