Merge pull request umijs#662 from umijs/fix/dva-loading-component

fix(umi-plugin-dva): opts.loading don't work with umi-plugin-dva
wangxue16292016 · Jun 26, 2018 · 747073c · 747073c
2 parents 0c08f60 + d715e20
commit 747073c
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/packages/umi-plugin-dva/src/index.js b/packages/umi-plugin-dva/src/index.js
@@ -201,10 +201,18 @@ ${ROUTER_MODIFIER}
         return memo;
       }
 
+      const { loading } = config;
+      let loadingOpts = '';
+      if (loading) {
+        loadingOpts = `LoadingComponent: require('${winPath(
+          join(paths.cwd, loading),
+        )}').default,`;
+      }
       let ret = `
 _dvaDynamic({
   <%= MODELS %>
   component: () => import(/* webpackChunkName: '${webpackChunkName}' */'${pageJSFile}'),
+  ${loadingOpts}
 })
       `.trim();
       const models = getPageModels(