eoss-ui 0.4.67 → 0.4.68

package/packages/main/src/main.vue

@@ -365,7 +365,10 @@ export default {
       type: String,
       default: '/main'
     },
-    setFirstAsDefault: Boolean,
+    setFirstAsDefault: {
+      type: Boolean,
+      default: true
+    },
     pathUrl: {
       type: String,
       default: '/primary'
@@ -641,8 +644,10 @@ export default {
     menuSuccess(res) {
       // this.menus
       this.menuType = 'custom';
-      this.customMenu = res;
-      this.setMenu(res);
+      if (res && res.length) {
+        this.customMenu = res;
+        this.setMenu(res);
+      }
     },
     //获取主题模板JSON
     getMainDetail(id) {
@@ -682,8 +687,10 @@ export default {
           if (_that.showDefault && _that.data === undefined) {
             _that.getMenu();
           } else if (_that.showDefault) {
-            _that.menus = JSON.parse(JSON.stringify(_that.data));
-            _that.setMenu(_that.data);
+            if (_that.data && _that.data.length) {
+              _that.menus = JSON.parse(JSON.stringify(_that.data));
+              _that.setMenu(_that.data);
+            }
           }
         })
         .catch((err) => {
@@ -838,7 +845,7 @@ export default {
         if (i === 'indexUrl') {
           this.homePage = results[i];
           if (this.isHomePage) {
-            if (this.menus) {
+            if (this.menus && this.menus.length) {
               let ids = null;
               this.homePage && (ids = this.getId(this.menus, this.homePage));
               if (ids) {
@@ -995,26 +1002,43 @@ export default {
         .ajax({ url: this.action, params: this.param ? this.param : {} })
         .then((res) => {
           if (res.rCode === 0) {
-            this.menus = JSON.parse(JSON.stringify(res.results));
-            let applicationid =
-              util.getParams('applicationid') ||
-              util.getParams('applicationId');
-            if (applicationid) {
-              let ids = this.getId(this.menus, applicationid);
-              if (ids) {
-                this.defaultActive = ids;
-              }
-            } else if (util.win.location.hash) {
-              let hash = util.win.location.hash;
-              if (hash) {
-                hash = hash.split('?')[0];
-              }
-              if (hash !== '#/' && hash !== '#/main') {
-                let ids = this.getId(this.menus, util.win.location.hash, true);
+            if (res.results && res.results.length) {
+              this.menus = JSON.parse(JSON.stringify(res.results));
+              let applicationid =
+                util.getParams('applicationid') ||
+                util.getParams('applicationId');
+              if (applicationid) {
+                let ids = this.getId(this.menus, applicationid);
                 if (ids) {
                   this.defaultActive = ids;
-                  this.navIds = ids;
-                  this.setTitle(ids[0]);
+                }
+              } else if (util.win.location.hash) {
+                let hash = util.win.location.hash;
+                if (hash) {
+                  hash = hash.split('?')[0];
+                }
+                if (hash !== '#/' && hash !== '#/main') {
+                  let ids = this.getId(
+                    this.menus,
+                    util.win.location.hash,
+                    true
+                  );
+                  if (ids) {
+                    this.defaultActive = ids;
+                    this.navIds = ids;
+                    this.setTitle(ids[0]);
+                  }
+                } else if (sessionStorage.getItem('jump') && this.history) {
+                  let ids = this.getId(
+                    this.menus,
+                    sessionStorage.getItem('jump'),
+                    true
+                  );
+                  if (ids) {
+                    this.defaultActive = ids;
+                    this.navIds = ids;
+                    this.setTitle(ids[0]);
+                  }
                 }
               } else if (sessionStorage.getItem('jump') && this.history) {
                 let ids = this.getId(
@@ -1028,21 +1052,12 @@ export default {
                   this.setTitle(ids[0]);
                 }
               }
-            } else if (sessionStorage.getItem('jump') && this.history) {
-              let ids = this.getId(
-                this.menus,
-                sessionStorage.getItem('jump'),
-                true
-              );
-              if (ids) {
-                this.defaultActive = ids;
-                this.navIds = ids;
-                this.setTitle(ids[0]);
-              }
+              this.setTips(this.menus);
+              store.set('nav', this.menus);
+              this.setMenu(this.menus);
+            } else {
+              this.$message.error('未分配菜单权限，请联系管理员！');
             }
-            this.setTips(this.menus);
-            store.set('nav', this.menus);
-            this.setMenu(this.menus);
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
             this.$message.error(msg);
@@ -1541,7 +1556,9 @@ export default {
           this.active = [];
           this.defaultActive = [];
           this.tabs = [];
-          this.setMenu(this.menus);
+          if (this.menus && this.menus.length) {
+            this.setMenu(this.menus);
+          }
           this.$nextTick(() => {
             this.reset = true;
           });

package/packages/main/src/message.vue

@@ -38,9 +38,7 @@
               </div>
             </el-card>
             <p class="es-msg-tips" v-if="loading">加载中...</p>
-            <p class="es-msg-tips" v-if="noMore && count > 0">
-              没有更多了
-            </p>
+            <p class="es-msg-tips" v-if="noMore && count > 0">没有更多了</p>
           </div>
         </el-scrollbar>
       </div>
@@ -100,6 +98,7 @@ export default {
       return this.msgs.length >= this.count;
     },
     disabled() {
+      console.log(this.loading, this.noMore);
       return this.loading || this.noMore;
     }
   },
@@ -145,7 +144,7 @@ export default {
               pageSize: this.pageSize
             }
           })
-          .then(res => {
+          .then((res) => {
             if (res && res.rCode === 0) {
               this.pageCount = res.results.pageCount;
               this.loading = false;
@@ -160,7 +159,7 @@ export default {
               this.$message.error(msg);
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.loading = false;
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
@@ -177,7 +176,7 @@ export default {
             id: res.id
           }
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode == 0) {
             this.count -= 1;
             this.msgs.splice(i, 1);
@@ -193,12 +192,12 @@ export default {
         .ajax({
           url: ignoreAllSysMsg
         })
-        .then(res => {
+        .then((res) => {
           this.count = 0;
           this.msgs = [];
           this.$emit('ignore', { type: 'ignore', value: 'all' });
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }

package/packages/menu/src/main.vue

@@ -196,6 +196,9 @@ export default {
                     'es-dot-right': item.tips && typeof item.tips === 'boolean'
                   }
                 ],
+                attrs:{
+                  title: item.text.length > 18 ? item.text : undefined,
+                },
                 props:
                   typeof item.tips === 'boolean' && item.tips
                     ? {