cloud-web-corejs 1.0.54-dev.81 → 1.0.54-dev.810

package/src/views/user/home/dev.vue

@@ -0,0 +1,29 @@
+<template>
+  <div id="containt" class="index-home-sys">
+    <i class="iconfont icon-a-kaifa1"></i>
+    <span>{{$t1('开发管理平台')}}</span>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+
+};
+</script>
+<style scoped lang="scss">
+.index-home-sys{
+  background-color: #DEE9F2 !important;margin-top: 10px !important;height: calc(100vh - 52px);border-radius: 12px !important;text-align: center;line-height: calc(100vh - 60px);letter-spacing: 2px;
+  font-size: 48px;font-weight: 600;
+  i{vertical-align: middle;font-weight: 400;margin-right: 24px;color:#225076;font-size:48px;}
+  span{position: relative;
+    &:before{content: "";position: absolute;bottom:0;left:0;width: 223px;height: 16px;background: #96B4CD;z-index: -1;opacity: 0.8;}
+  }
+}
+</style>

package/src/views/user/home/index.vue

@@ -12,6 +12,8 @@
 
 <script>
 import corejsConfig from "@/corejsConfig";
+import settingConfig from "@/settings";
+import { loadViewComponent } from "@base/utils/resolveViewComponent";
 
 export default {
   name: 'home',
@@ -36,9 +38,7 @@ export default {
           let userInfo = res.objx;
           this.userInfo = userInfo;
           let flag = userInfo.flag;
-          if (flag !== 6 && flag !== 7 && flag !== 8) {
-            this.initHome();
-          }
+          this.initHome();
         }
       });
     },
@@ -59,6 +59,15 @@ export default {
       });
     },
     initHome() {
+      let url = null;
+      let userInfo = this.userInfo;
+      let flag = userInfo.flag;
+      if (flag == 6 || flag == 7 || flag == 8) {
+        let url = '/user/home/dev.vue'
+        this.homeContent = require('@base/views' + url).default;
+        this.showHomeContent = true;
+        return
+      }
       this.$http({
         url: USER_PREFIX + '/menu/currentList',
         data: {},
@@ -68,23 +77,18 @@ export default {
           let homeMenu = menus.find(menu => menu.type == 2 && menu.enabled);
           let menuUrl = homeMenu?.url;
 
-          let str1 = "@base/views";
-          let str2 = "@/views";
-          let url = null;
-          if (menuUrl) {
+          let userInfo = this.userInfo;
+          let flag = userInfo.flag;
+
+          if (menuUrl && flag !== 1) {
+            //超级管理员不使用角色首页
             url = menuUrl + '.vue';
           } else {
             let defaultHomePage = this.userInfo.defaultHomePage;
-            url = defaultHomePage ? defaultHomePage : '@base/views/user/home/default.vue'
-          }
-          if (url.startsWith(str1)) {
-            let a = url.slice(str1.length);
-            this.homeContent = require('@base/views' + url.slice(str1.length)).default;
-          } else if (url.startsWith(str2)) {
-            this.homeContent = require('@/views' + url.slice(str2.length)).default;
-          } else {
-            this.homeContent = require('@/views' + url).default;
+            url =  defaultHomePage || settingConfig.defaultHomePage || '@base/views/user/home/default.vue'
           }
+          // 首页菜单不会归属别的子应用，无需 remote 兜底；归属解析见 @base/utils/resolveViewComponent
+          this.homeContent = loadViewComponent(url).component;
 
           this.showHomeContent = true;
           this.flag = 1;