eoss-ui 0.5.84 → 0.5.85

package/packages/handler/src/main.vue

@@ -225,6 +225,11 @@ export default {
           icon: 'es-icon-tongzhi',
           title: '通知消息'
         },
+        {
+          type: 'index',
+          icon: 'es-icon-home',
+          title: '门户'
+        },
         {
           type: 'refresh',
           icon: 'es-icon-shuaxin',

package/packages/login/src/main.vue

@@ -390,6 +390,7 @@ import {
   doCaLogin,
   doAssistanceQrLogin
 } from 'eoss-ui/src/config/api.js';
+const ceshi = util.getParams('ceshi');
 export default {
   name: 'EsLogin',
   inheritAttrs: false,
@@ -817,6 +818,9 @@ export default {
     ]);
   },
   created() {
+    if (ceshi == 'true' || ceshi == true) {
+      this.loginModel = '0';
+    }
     if (this.isScale) {
       util.setScale();
       window.addEventListener('resize', this.setScale);
@@ -1021,6 +1025,7 @@ export default {
               key: 'initLogin',
               value: JSON.stringify(res.results)
             });
+            this.$emit('initLogin', res.results);
             this.setConfig(res.results);
           } else {
             this.$message({
@@ -1069,7 +1074,7 @@ export default {
       if (res.qrimg || res.qrImg) {
         this.qrimg = res.qrimg || res.qrImg;
       }
-      if (res.loginModel) {
+      if (res.loginModel && ceshi !== 'true' && ceshi !== true) {
         this.loginModel = res.loginModel;
       }
       if (res.loginBackgroundUrl) {
@@ -1087,6 +1092,12 @@ export default {
         if (res.subsystemExtend.login_url) {
           this.actionUrl = res.subsystemExtend.login_url;
         }
+        if (
+          res.subsystemExtend.loginModel &&
+          (ceshi == 'true' || ceshi == true)
+        ) {
+          this.loginModel = res.subsystemExtend.loginModel;
+        }
         if (res.subsystemExtend.applicationName) {
           localStorage.setItem('appcode', res.subsystemExtend.applicationName);
         }

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

@@ -297,7 +297,12 @@ export default {
     //主题颜色选择颜色集合
     themes: Array,
     //需要隐藏的头部功能
-    hides: Object,
+    hides: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
     //储存数据
     storage: {
       type: String,
@@ -467,66 +472,29 @@ export default {
     },
     //隐藏操作按键
     hide() {
-      let mainConfig = util.getStorage('mainConfig');
-      mainConfig = mainConfig ? JSON.parse(mainConfig) : mainConfig;
-      let topRightToolHide = '';
-      if (
-        mainConfig &&
-        mainConfig.subsystemExtend &&
-        mainConfig.subsystemExtend.topRightToolHide
-      ) {
+      let topRightToolHide = {};
+      if (this.topRightToolHide) {
         topRightToolHide = JSON.parse(
-          mainConfig.subsystemExtend.topRightToolHide.replace(
+          this.topRightToolHide.replace(
             /(['"])?([a-zA-Z0-9_]+)(['"])?:/g,
             '"$2":'
           )
         );
       }
+      let hides = {
+        set: !this.set,
+        index: this.doorIndex ? false : true,
+        system: true,
+        home: this.homePage ? false : true
+      };
+
       if (this.layout === 'subsystem' || this.application) {
-        if (this.hides && Object.keys(this.hides).length) {
-          return { ...this.hides, set: !this.set, system: false };
-        } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
-          return { ...topRightToolHide, set: !this.set, system: false };
-        } else {
-          return { set: !this.set, system: false };
-        }
-      } else if (this.layout === 'topside' || this.layout === 'side') {
-        if (this.hides && Object.keys(this.hides).length) {
-          return {
-            ...this.hides,
-            set: !this.set,
-            system: true,
-            user: true
-          };
-        } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
-          return {
-            ...topRightToolHide,
-            set: !this.set,
-            system: true,
-            user: true
-          };
-        } else {
-          return { set: !this.set, system: true, user: true };
-        }
-      } else {
-        if (this.hides && Object.keys(this.hides).length) {
-          return {
-            ...this.hides,
-            set: !this.set,
-            system: true,
-            user: true
-          };
-        } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
-          return {
-            ...topRightToolHide,
-            set: !this.set,
-            system: true,
-            user: true
-          };
-        } else {
-          return { set: !this.set, system: true };
-        }
+        hides.system = false;
+      }
+      if (this.layout === 'topside' || this.layout === 'side') {
+        hides.user = true;
       }
+      return { ...hides, ...this.hides, ...topRightToolHide };
     },
     logoUrl() {
       if (this.mainLogo) {
@@ -664,7 +632,9 @@ export default {
       showPage: false,
       webSocket: null,
       dialog: {},
-      hideSubMenu: false
+      hideSubMenu: false,
+      doorIndex: '',
+      topRightToolHide: ''
     };
   },
   created() {
@@ -683,6 +653,7 @@ export default {
         this.init(results);
       }
     }
+    this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted() {
     this.handleListener();
@@ -878,6 +849,7 @@ export default {
         }
         if (i === 'doorIndex' && results[i]) {
           window.open(results[i]);
+          this.doorIndex = results[i];
         }
         if (i === 'subsystemName' && results[i]) {
           document.title = results[i];
@@ -916,6 +888,12 @@ export default {
           if (results[i].loginPage) {
             util.setStorage('loginPage', results[i].loginPage);
           }
+          if (results[i].portalPage || results[i].portalpage) {
+            this.doorIndex = results[i].portalPage || results[i].portalpage;
+          }
+          if (results[i].topRightToolHide) {
+            this.topRightToolHide = results[i].topRightToolHide;
+          }
         }
         store.set(i, results[i]);
       }
@@ -1707,6 +1685,9 @@ export default {
             this.reset = true;
           });
           break;
+        case 'index':
+          util.win.open(this.doorIndex, '_self');
+          break;
         case 'user':
           this.showUserInfo = true;
           break;

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

@@ -29,14 +29,15 @@
                   v-for="ele in item.records.slice(0, 3)"
                   class="es-public-search-list-item"
                   :key="ele.id"
+                  @click="handleClick(ele, item)"
                 >
                   <es-icon
                     class="es-public-search-item-icon"
-                    v-bind="getIcon(ele, index)"
+                    v-bind="getIcon(ele, item)"
                     :style="setStyle(ele, index)"
                   ></es-icon>
                   <div class="es-public-search-item-name">
-                    {{ ele.name || ele.title }}
+                    {{ ele.name || ele.title || ele.text }}
                   </div>
                   <div class="es-public-search-item-texts" v-if="ele.summary">
                     {{ ele.summary }}
@@ -74,15 +75,16 @@
         :label="item.name"
         :name="item.id || String(index + 1)"
         :key="item.id"
-        v-loading="loadings[item.id || String(index + 1)]"
+        v-loading="loadings[item.id || String(index)]"
         element-loading-background="rgba(0, 0, 0, 0.01)"
         element-loading-text="加载中..."
+        v-show="hides.includes(item.name)"
       >
         <el-scrollbar
-          class="es-scrollbar"
+          class="es-scrollbar es-public-search-scrollbar"
           :infinite-scroll="
             () => {
-              handleSearch(item, index);
+              handleSearchd(item, index);
             }
           "
           :infinite-scroll-disabled="disabled"
@@ -99,14 +101,15 @@
               v-for="ele in item.records"
               class="es-public-search-list-item"
               :key="ele.id"
+              @click="handleClick(ele, item)"
             >
               <es-icon
                 class="es-public-search-item-icon"
-                v-bind="getIcon(ele)"
+                v-bind="getIcon(ele, item)"
                 :style="setStyle(ele, index)"
               ></es-icon>
               <div class="es-public-search-item-name">
-                {{ ele.name || ele.title }}
+                {{ ele.name || ele.title || ele.text }}
               </div>
               <div class="es-public-search-item-texts" v-if="ele.summary">
                 {{ ele.summary }}
@@ -124,7 +127,12 @@
               </div>
             </li>
           </ul>
-          <p v-if="noMore[item.id || String(index + 1)]">没有更多了</p>
+          <p
+            class="es-public-search-no-more"
+            v-if="noMore[item.id || String(index)]"
+          >
+            没有更多了
+          </p>
         </el-scrollbar>
       </el-tab-pane>
     </el-tabs>
@@ -139,6 +147,22 @@ export default {
   name: 'Search',
   components: {},
   props: {
+    menuIcon: {
+      type: String,
+      default: 'es-icon-application'
+    },
+    menus: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
+    apps: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
     searchType: {
       type: String,
       default: searchType
@@ -146,6 +170,12 @@ export default {
     pageSize: {
       type: Number,
       default: 10
+    },
+    hides: {
+      type: Array,
+      default() {
+        return [];
+      }
     }
   },
   data() {
@@ -204,39 +234,47 @@ export default {
     this.handleSearchAll = debounce(500, (res) => {
       this.searchAll(res);
     });
+    this.handleSearchd = debounce(500, (obj, index) => {
+      this.handleSearch(obj, index);
+    });
   },
   created() {
     this.getTypes();
   },
   mounted() {},
   methods: {
-    getIcon(res) {
+    getIcon(res, item) {
       let icon;
       let cls;
-      if (res.icon) {
-        icon = this.icons[res.icon.toLowerCase()];
+      if (res.icon || res.icons) {
+        icon = this.icons[(res.icon || res.icons).toLowerCase()];
         if (!icon) {
-          if (res.icon == '#last') {
-            icon = res.title.substr(-1, 1);
+          if (res.icon == '#last' || res.icons == '#last') {
+            let title = res.title || res.name || res.text;
+            icon = title.substr(-1, 1);
             cls = 'es-public-search-item-icon-text';
           } else {
             cls = 'es-public-search-item-icons';
-            icon = res.icon;
+            icon = res.icon || res.icons;
           }
         }
       } else {
-        let key = res.title.split('.')[1];
+        let title = res.title || res.name || res.text;
+        let key = title.split('.')[1];
         icon = key ? this.icons[key.toLowerCase()] : '';
         if (!icon) {
-          icon = res.title.substr(-1, 1);
+          icon =
+            item.name == '菜单' || item.name == '应用'
+              ? this.menuIcon
+              : title.substr(-1, 1);
           cls = 'es-public-search-item-icon-text';
         }
       }
       return { class: cls, contents: icon };
     },
     setStyle(res, index) {
-      if (res.icon) {
-        let icon = this.icons[res.icon.toLowerCase()];
+      if (res.icon || res.icons) {
+        let icon = this.icons[(res.icon || res.icons).toLowerCase()];
         if (!icon && res.icon != '#last') {
           return { backgroundColor: this.colors[index % this.colors.length] };
         }
@@ -249,8 +287,10 @@ export default {
       util
         .ajax({
           url: this.searchType,
-          params: {
-            terminalType: 'web,pc'
+          method: 'post',
+          format: false,
+          data: {
+            terminalType: 'web'
           }
         })
         .then((res) => {
@@ -258,9 +298,9 @@ export default {
             let { results } = res;
             let loadings = {};
             let noMore = {};
-            let types = results.catelog.map((item, index) => {
-              loadings[item.id || String(index + 1)] = false;
-              noMore[item.id || String(index + 1)] = false;
+            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: [] };
             });
             this.types = types;
@@ -272,33 +312,83 @@ export default {
     searchAll(keyWords) {
       for (let i = 0; i < this.types.length; i++) {
         if (keyWords) {
-          this.handleSearch(this.types[i], i);
+          let item = this.types[i];
+          if (item.name == '菜单' && this.menus.length) {
+            this.isLoading = false;
+            this.types[i].records = this.searchData(this.menus, keyWords);
+            this.types[i].totalCount = this.types[i].records.length;
+            this.types[i].pageCount = Math.ceil(
+              this.types[i].records.length / this.pageSize
+            );
+            this.types[i].pageNum = 0;
+            this.$set(this.loadings, item.id || String(i), false);
+            this.$set(this.noMore, item.id || String(i), true);
+          } else if (item.name == '应用' && this.apps.length) {
+            this.isLoading = false;
+            this.types[i].records = this.searchData(this.apps, keyWords);
+            this.types[i].totalCount = this.types[i].records.length;
+            this.types[i].pageCount = Math.ceil(
+              this.types[i].records.length / this.pageSize
+            );
+            this.types[i].pageNum = 0;
+            this.$set(this.loadings, item.id || String(i), false);
+            this.$set(this.noMore, item.id || String(i), true);
+          } else if (item.dataRequestUrl) {
+            this.isLoading = true;
+            this.handleSearch(item, i);
+          } else {
+            this.types[i].records = [];
+            this.types[i].totalCount = 0;
+            this.types[i].pageCount = 1;
+            this.types[i].pageNum = 0;
+            this.$set(this.loadings, item.id || String(i), false);
+            this.$set(this.noMore, item.id || String(i), true);
+          }
         } else {
           this.isLoading = false;
           this.types[i].records = [];
           this.types[i].totalCount = 0;
           this.types[i].pageCount = 1;
           this.types[i].pageNum = 0;
+          this.$set(this.loadings, item.id || String(i), false);
+          this.$set(this.noMore, item.id || String(i), true);
         }
       }
     },
+    searchData(data, name) {
+      let records = [];
+      data.forEach((item) => {
+        let words = item.name || item.text;
+        if (words.indexOf(name) > -1 && item.permission !== false) {
+          records.push(item);
+        }
+        if (item.children && item.children.length) {
+          records = records.concat(this.searchData(item.children, name));
+        }
+        if (item.fourthTabs && item.fourthTabs.length) {
+          records = records.concat(this.searchData(item.fourthTabs, name));
+        }
+      });
+      return records;
+    },
     handleSearch(obj, index) {
-      if (obj.pageNum < obj.pageCount) {
-        this.$set(this.loadings, obj.id || String(index + 1), true);
+      if (obj.pageNum < obj.pageCount && this.keyWords) {
+        this.$set(this.loadings, obj.id || String(index), true);
         if (this.active == '0') {
           this.isLoading = true;
         }
         util
           .ajax({
             url: obj.dataRequestUrl,
-            params: {
+            method: 'post',
+            data: {
               pageNum: obj.pageNum + 1,
               pageSize: this.pageSize,
               keyWords: this.keyWords
             }
           })
           .then((res) => {
-            this.$set(this.loadings, obj.id || String(index + 1), false);
+            this.$set(this.loadings, obj.id || String(index), false);
             let flag = false;
             for (let i in this.loadings) {
               if (this.loadings[i]) {
@@ -306,7 +396,9 @@ export default {
                 break;
               }
             }
-            !flag && (this.isLoading = false);
+            if (!flag) {
+              this.isLoading = false;
+            }
             if (res.rCode == 0) {
               let { results } = res;
               obj.totalCount = results.totalCount;
@@ -315,14 +407,26 @@ export default {
               obj.records = obj.records.concat(results.records);
               this.$set(
                 this.noMore,
-                obj.id || String(index + 1),
+                obj.id || String(index),
                 results.pageNum >= results.pageCount
               );
+            } else {
+              this.types[index].records = [];
+              this.types[index].totalCount = 0;
+              this.types[index].pageCount = 1;
+              this.types[index].pageNum = 0;
+              this.$set(this.loadings, obj.id || String(index), false);
+              this.$set(this.noMore, obj.id || String(index), true);
             }
           })
           .catch((err) => {
             this.isLoading = false;
-            this.$set(this.loadings, obj.id || String(index + 1), false);
+            this.types[index].records = [];
+            this.types[index].totalCount = 0;
+            this.types[index].pageCount = 1;
+            this.types[index].pageNum = 0;
+            this.$set(this.loadings, obj.id || String(index), false);
+            this.$set(this.noMore, obj.id || String(index), true);
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -331,6 +435,9 @@ export default {
     },
     handleTabs(res, index) {
       this.active = res.id || String(index + 1);
+    },
+    handleClick(res, parent) {
+      this.$emit('select', res, parent);
     }
   }
 };

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

@@ -192,10 +192,12 @@
 
 <script>
 import { debounce } from 'throttle-debounce';
+import { recordUserApp } from 'eoss-ui/src/config/api.js';
 export default {
   name: 'Apps',
   components: {},
   props: {
+    user: Object,
     visible: Boolean,
     //菜单、应用默认图标
     menuIcon: String,
@@ -348,6 +350,16 @@ export default {
       }
     },
     handleClick(res) {
+      util
+        .ajax({
+          url: recordUserApp,
+          params: {
+            userId: this.user.userId,
+            appId: res.id
+          }
+        })
+        .then(() => {})
+        .catch(() => {});
       this.$emit('click', res);
     },
     /**

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

@@ -47,7 +47,6 @@
 
 <script>
 import util from 'eoss-ui/src/utils/util';
-let doorIndex = sessionStorage.getItem('doorIndex');
 export default {
   name: 'Handler',
   components: {},
@@ -67,7 +66,6 @@ export default {
       default() {
         return {
           type: 'index',
-          link: doorIndex,
           icon: 'es-icon-home',
           title: '门户'
         };