loadable/component

public/react/config-overrides.js

@@ -14,7 +14,7 @@ const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
 
 module.exports = override(
   disableEsLint(),
-  //addBundleVisualizer(),
+  addBundleVisualizer(),
   addWebpackAlias({
     "educoder": path.resolve(__dirname, 'src/common/educoder.js')
   }),

public/react/src/CustomLoadable.js

@@ -1,12 +0,0 @@
-import { Loadable } from 'educoder';
-
-import Loading from "./Loading";
-
-const CustomLoadable = (loader, loading = Loading) => {
-  return Loadable({
-    loader,
-    loading
-  })
-}
-
-export default CustomLoadable

public/react/src/common/educoder.js

@@ -73,8 +73,9 @@ export { default as NoneData } from '../modules/courses/coursesPublic/NoneData'
 export { default as WordNumberTextarea } from '../modules/modals/WordNumberTextarea'
 
 import loadable from '@loadable/component'
+import defaultLoading from '../Loading'
 
-export function Loadable({ loader, loading }) {
+export function Loadable({ loader, loading = defaultLoading }) {
 	return loadable(loader, {
 		fallback: loading
 	})

public/react/src/modules/ecs/EcSetting/index.js

@@ -5,7 +5,6 @@ import axios from 'axios';
 
 import './index.less';
 
-import CustomLoadable from "../../../CustomLoadable";
 import { Loadable } from 'educoder';
 import Loading from "../../../Loading";
 const { Step } = Steps;

public/react/src/modules/ecs/Ecs.js

@@ -2,12 +2,12 @@ import React from 'react';
 import { Switch, Route } from 'react-router-dom';
 import { SnackbarHOC } from 'educoder';
 
-import CustomLoadable from "../../CustomLoadable";
+import { Loadable } from 'educoder'
 import TPMIndexHOC from "../tpm/TPMIndexHOC";
 
-const Home = CustomLoadable(() => import('./Home/index'));
-const EcYear = CustomLoadable(() => import('./EcYear/index'));
-const EcSetting = CustomLoadable(() => import('./EcSetting/index'));
+const Home = Loadable({ loader: () => import('./Home/index') });
+const EcYear = Loadable({ loader: () => import('./EcYear/index') });
+const EcSetting = Loadable({ loader: () => import('./EcSetting/index') });
 
 const $ = window.$
 //工程认证各个页面的查看详情弹层

public/react/src/modules/help/Help.js

@@ -1,20 +1,18 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Switch, Route, Link } from 'react-router-dom';
 import { Affix, Menu, Row, Col } from "antd";
 import { SnackbarHOC } from 'educoder';
 
 import './Help.css';
-
-import CustomLoadable from "../../CustomLoadable";
+import { Loadable } from 'educoder'
 import TPMIndexHOC from "../tpm/TPMIndexHOC";
 
-const AboutUs = CustomLoadable(() => import('./AboutUs'));
-const ContactUs = CustomLoadable(() => import('./ContactUs'));
-const Cooperatives = CustomLoadable(() => import('./Cooperatives'));
-const Agreement = CustomLoadable(() => import('./Agreement'));
-const HelpCenter = CustomLoadable(() => import('./HelpCenter'));
-const Feedback = CustomLoadable(() => import('./Feedback'));
+const AboutUs = Loadable({ loader: () => import('./AboutUs') });
+const ContactUs = Loadable({ loader: () => import('./ContactUs') });
+const Cooperatives = Loadable({ loader: () => import('./Cooperatives') });
+const Agreement = Loadable({ loader: () => import('./Agreement') });
+const HelpCenter = Loadable({ loader: () => import('./HelpCenter') });
+const Feedback = Loadable({ loader: () => import('./Feedback') });
 
 class Help extends React.Component {
   constructor(props) {