@4399ywkf/core 5.0.23 → 5.0.25

package/dist/index.js

@@ -560,21 +560,47 @@ var ConventionalRouteGenerator = class {
     const errorImports = [];
     const loadingImports = [];
     this.collectImports(routes, lazyImports, errorImports, loadingImports);
-    return `// \u6B64\u6587\u4EF6\u7531 @4399ywkf/core \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u52FF\u624B\u52A8\u4FEE\u6539
-// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}
-
-import React, { lazy, Suspense } from "react";
-import { createBrowserRouter, type RouteObject } from "react-router";
-
-// \u61D2\u52A0\u8F7D\u9875\u9762\u7EC4\u4EF6
-${lazyImports.join("\n")}
-${errorImports.length > 0 ? `
-// \u9519\u8BEF\u8FB9\u754C\u7EC4\u4EF6
-${errorImports.join("\n")}` : ""}
-${loadingImports.length > 0 ? `
-// \u52A0\u8F7D\u72B6\u6001\u7EC4\u4EF6
-${loadingImports.join("\n")}` : ""}
+    const { loading } = this.options;
+    const hasCustomLoading = loading && typeof loading === "object" && loading.component;
+    const loadingDisabled = loading === false;
+    let loadingSection;
+    if (loadingDisabled) {
+      loadingSection = `
+// \u61D2\u52A0\u8F7D\u5305\u88C5\uFF08\u52A0\u8F7D\u72B6\u6001\u5DF2\u7981\u7528\uFF09
+function LazyRoute({
+  Component,
+  Loading,
+}: {
+  Component: React.LazyExoticComponent<React.ComponentType<unknown>>;
+  Loading?: React.ComponentType;
+}) {
+  const fallback = Loading ? <Loading /> : null;
+  return (
+    <Suspense fallback={fallback}>
+      <Component />
+    </Suspense>
+  );
+}`;
+    } else if (hasCustomLoading) {
+      loadingSection = `
+import CustomDefaultLoading from "${loading.component}";
 
+// \u61D2\u52A0\u8F7D\u5305\u88C5\uFF08\u4F7F\u7528\u81EA\u5B9A\u4E49\u9ED8\u8BA4\u52A0\u8F7D\u7EC4\u4EF6\uFF09
+function LazyRoute({
+  Component,
+  Loading = CustomDefaultLoading,
+}: {
+  Component: React.LazyExoticComponent<React.ComponentType<unknown>>;
+  Loading?: React.ComponentType;
+}) {
+  return (
+    <Suspense fallback={<Loading />}>
+      <Component />
+    </Suspense>
+  );
+}`;
+    } else {
+      loadingSection = `
 // \u9ED8\u8BA4\u52A0\u8F7D\u72B6\u6001
 const DefaultLoading = () => <div style={{ padding: 24, textAlign: "center" }}>\u52A0\u8F7D\u4E2D...</div>;
 
@@ -591,7 +617,23 @@ function LazyRoute({
       <Component />
     </Suspense>
   );
-}
+}`;
+    }
+    return `// \u6B64\u6587\u4EF6\u7531 @4399ywkf/core \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u52FF\u624B\u52A8\u4FEE\u6539
+// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}
+
+import React, { lazy, Suspense } from "react";
+import { createBrowserRouter, type RouteObject } from "react-router";
+
+// \u61D2\u52A0\u8F7D\u9875\u9762\u7EC4\u4EF6
+${lazyImports.join("\n")}
+${errorImports.length > 0 ? `
+// \u9519\u8BEF\u8FB9\u754C\u7EC4\u4EF6
+${errorImports.join("\n")}` : ""}
+${loadingImports.length > 0 ? `
+// \u52A0\u8F7D\u72B6\u6001\u7EC4\u4EF6
+${loadingImports.join("\n")}` : ""}
+${loadingSection}
 
 // \u8DEF\u7531\u914D\u7F6E
 export const routes: RouteObject[] = ${this.emitRouteArray(routes)};
@@ -3677,6 +3719,7 @@ function buildImports(opts) {
   ];
   return `
 import React, { ${reactImports.join(", ")} } from "react";
+import { ConfigProvider } from "antd";
 import { ${antdStyleImports.join(", ")} } from "antd-style";
 import { createWithEqualityFn } from "zustand/traditional";
 import { shallow } from "zustand/shallow";
@@ -3921,15 +3964,18 @@ function buildWrapperCode(opts) {
   const childrenSlot = cssVar ? `<div ref={containerRef} style={{ display: "contents" }}>
         {children}
       </div>` : "{children}";
-  const getPopupContainerProp = scopePopupContainer ? "\n      getPopupContainer={getPopupContainer}" : "";
+  const innerContent = scopePopupContainer ? `<ConfigProvider getPopupContainer={getPopupContainer}>
+      ${globalReset ? "<GlobalReset />" : ""}
+      ${childrenSlot}
+    </ConfigProvider>` : `${globalReset ? "<GlobalReset />" : ""}
+      ${childrenSlot}`;
   const antdProvider = `<AntdThemeProvider
       prefixCls={RUNTIME_PREFIX_CLS}
       appearance={resolvedAppearance}
       themeMode={appearance}
-      theme={theme}${cssVar ? "\n      customToken={{ cssVar: true }}" : ""}${getPopupContainerProp}
+      theme={theme}${cssVar ? "\n      customToken={{ cssVar: true }}" : ""}
     >
-      ${globalReset ? "<GlobalReset />" : ""}
-      ${childrenSlot}
+      ${innerContent}
     </AntdThemeProvider>`;
   const wrapperOpen = scopePopupContainer ? `<div
     ref={popupContainerRef}