合并分支 'dev/1.0' 到 'master'

Dev/1.0

查看合并请求 minio/saturn-minio-console!18

.gitignore

@@ -21,4 +21,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-/.vscode
\ No newline at end of file
+/.vscode
+/loadZH

config-mf.js

@@ -24,16 +24,16 @@ const isDev = process.env.NODE_ENV !== "production";
 
 const remoteOrigin = isDev ? "http://localhost:9000" : process.env.REMOTE_URL;
 
-if (!remoteOrigin) {
-  throw new Error(
-    "打包失败：土星云远程模块地址不存在, 请在环境变量中设置 REMOTE_URL 为远程模块地址"
-  );
-}
 // 模块联邦
 module.exports = function (config, env) {
   if (process.env.REACT_APP_SATURN_ENV === "private") {
     return config;
   }
+  if (!remoteOrigin) {
+    throw new Error(
+      "打包失败：土星云远程模块地址不存在, 请在环境变量中设置 REMOTE_URL 为远程模块地址"
+    );
+  }
   // config.output.crossOriginLoading = "use-credentials";
   config.output.crossOriginLoading = "anonymous";
   console.log(`土星云业务远程地址为：${remoteOrigin}`);

src/saturnCloud/Blank.tsx

+export default function Blank() {
+  return null;
+}

src/saturnCloud/index.tsx

@@ -4,19 +4,28 @@ import LoadingComponent from "../common/LoadingComponent";
 import history from "../history";
 import MenuItem from "../screens/Console/Menu/MenuItem";
 
-// 对 lazy 包装一层，在私有部署环境中没有模块联邦，直接返回 null
-const _lazy: typeof lazy = (factory) => {
-  if (process.env.REACT_APP_SATURN_ENV === "private") {
-    return null;
-  }
-  return lazy(factory);
-};
+const RemoteSaturnTenant = lazy(() => {
+  return import(
+    process.env.REACT_APP_SATURN_ENV === "private"
+      ? "./Blank"
+      : "saturn_tenant/App"
+  );
+});
 
-const RemoteSaturnTenant = _lazy(() => import("saturn_tenant/App"));
-const RemoteSaturnTenantFullscreen = _lazy(
-  () => import("saturn_tenant/AppFullscreen")
-);
-const RemoteMenuContainer = _lazy(() => import("saturn_tenant/MenuContainer"));
+const RemoteSaturnTenantFullscreen = lazy(() => {
+  return import(
+    process.env.REACT_APP_SATURN_ENV === "private"
+      ? "./Blank"
+      : "saturn_tenant/AppFullscreen"
+  );
+});
+const RemoteMenuContainer = lazy(() => {
+  return import(
+    process.env.REACT_APP_SATURN_ENV === "private"
+      ? "./Blank"
+      : "saturn_tenant/MenuContainer"
+  );
+});
 
 /** 在 Layout 下展示的内容 */
 export function SaturnTenant() {

src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx

@@ -862,7 +862,7 @@ const ListObjects = ({
               xhr.upload.addEventListener("progress", (event) => {
                 const progress = Math.floor((event.loaded * 100) / event.total) - 2;
 
-                updateProgress(identity, progress);
+                updateProgress(identity, progress > 0 ? progress : 0);
               });
 
               xhr.onerror = () => {

src/screens/LoginPage/LoginPage.tsx

@@ -585,10 +585,10 @@ const TenantLogin = () => {
   return null;
 };
 
-export default connector(withStyles(styles)(Login));
+// export default connector(withStyles(styles)(Login));
 
-// export default connector(
-//   withStyles(styles)(
-//     process.env.REACT_APP_SATURN_ENV === "private" ? Login : TenantLogin
-//   )
-// );
+export default connector(
+  withStyles(styles)(
+    process.env.REACT_APP_SATURN_ENV === "private" ? Login : TenantLogin
+  )
+);