cloud-web-corejs 1.0.280 → 1.1.0-dev.10

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

@@ -594,7 +594,7 @@ export default {
           let userInfo = res.objx;
           this.headPhotoUrl = userInfo.headPhotoUrl
             ? userInfo.headPhotoUrl
-            : require("@/resources/images" + "/default-header.png");
+            : (require("@/resources/images/default-header.png").default || require("@/resources/images/default-header.png"));
 
           this.userInfo = userInfo;
         },

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

@@ -1,101 +1,103 @@
-<template>
-  <div>
-    <component
-      v-if="homeContent && showHomeContent"
-      :is="homeContent"
-      visible-key="showHomeContent"
-      :parent-target="_self"
-      @reload="$reloadHandle"
-    ></component>
-  </div>
-</template>
-
-<script>
-import corejsConfig from "@/corejsConfig";
-import settingConfig from "@/settings";
-import { loadViewComponent } from "@base/utils/resolveViewComponent";
-
-export default {
-  name: 'home',
-  components: {},
-  data() {
-    return {
-      flag: 0,
-      homeContent: null,
-      showHomeContent: false,
-      userInfo: {}
-    };
-  },
-  created() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.$http({
-        url: USER_PREFIX + '/user/currentUser',
-        method: 'post',
-        success: res => {
-          let userInfo = res.objx;
-          this.userInfo = userInfo;
-          let flag = userInfo.flag;
-          this.initHome();
-        }
-      });
-    },
-    getIsDistributor(userInfo) {
-      this.$http({
-        url: USER_PREFIX + '/userb/getUserRole',
-        method: `post`,
-        data: {id: userInfo.id},
-        success: res2 => {
-          let rows = res2.objx || [];
-          let codes = rows.map(row => row.roleCode);
-          if (codes.includes('distributor')) {
-            this.flag = 2;
-          } else {
-            this.initHome();
-          }
-        }
-      });
-    },
-    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: {},
-        method: 'post',
-        success: res => {
-          let menus = res.objx || [];
-          let homeMenu = menus.find(menu => menu.type == 2 && menu.enabled);
-          let menuUrl = homeMenu?.url;
-
-          let userInfo = this.userInfo;
-          let flag = userInfo.flag;
-
-          if (menuUrl && flag !== 1) {
-            //超级管理员不使用角色首页
-            url = menuUrl + '.vue';
-          } else {
-            let defaultHomePage = this.userInfo.defaultHomePage;
-            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;
-        }
-      });
-    }
-
-  }
-};
-</script>
+<template>
+  <div>
+    <component
+      v-if="homeContent && showHomeContent"
+      :is="homeContent"
+      visible-key="showHomeContent"
+      :parent-target="_self"
+      @reload="$reloadHandle"
+    ></component>
+  </div>
+</template>
+
+<script>
+import corejsConfig from "@/corejsConfig";
+import settingConfig from "@/settings";
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
+
+export default {
+  name: 'home',
+  components: {},
+  data() {
+    return {
+      flag: 0,
+      homeContent: null,
+      showHomeContent: false,
+      userInfo: {}
+    };
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    init() {
+      this.$http({
+        url: USER_PREFIX + '/user/currentUser',
+        method: 'post',
+        success: res => {
+          let userInfo = res.objx;
+          this.userInfo = userInfo;
+          let flag = userInfo.flag;
+          this.initHome();
+        }
+      });
+    },
+    getIsDistributor(userInfo) {
+      this.$http({
+        url: USER_PREFIX + '/userb/getUserRole',
+        method: `post`,
+        data: {id: userInfo.id},
+        success: res2 => {
+          let rows = res2.objx || [];
+          let codes = rows.map(row => row.roleCode);
+          if (codes.includes('distributor')) {
+            this.flag = 2;
+          } else {
+            this.initHome();
+          }
+        }
+      });
+    },
+    async initHome() {
+      let url = null;
+      let userInfo = this.userInfo;
+      let flag = userInfo.flag;
+      if (flag == 6 || flag == 7 || flag == 8) {
+        // 路径是常量，用字面量 import：生成普通 ImportDependency，不参与 views context
+        this.homeContent = (
+          await import("@base/views/user/home/dev.vue")
+        ).default;
+        this.showHomeContent = true;
+        return
+      }
+      this.$http({
+        url: USER_PREFIX + '/menu/currentList',
+        data: {},
+        method: 'post',
+        success: async res => {
+          let menus = res.objx || [];
+          let homeMenu = menus.find(menu => menu.type == 2 && menu.enabled);
+          let menuUrl = homeMenu?.url;
+
+          let userInfo = this.userInfo;
+          let flag = userInfo.flag;
+
+          if (menuUrl && flag !== 1) {
+            //超级管理员不使用角色首页
+            url = menuUrl + '.vue';
+          } else {
+            let defaultHomePage = this.userInfo.defaultHomePage;
+            url =  defaultHomePage || settingConfig.defaultHomePage || '@base/views/user/home/default.vue'
+          }
+          // 首页菜单不会归属别的子应用，无需 remote 兜底；归属解析见 @base/utils/resolveViewComponent
+          this.homeContent = (await loadViewComponentAsync(url)).component;
+
+          this.showHomeContent = true;
+          this.flag = 1;
+        }
+      });
+    }
+
+  }
+};
+</script>