@gz-fronted/gz-pc 0.1.1-beta.2 → 0.1.1-beta.3

package/README.md

@@ -313,22 +313,26 @@ configureGzFetch({
 | `modalMessage`   | `string`     | `当前登录状态已失效，请重新登录。`      |
 | `onUnauthorized` | `() => void` | 无；确认后使用 `window.location.assign` |
 
-为了让弹窗继承宿主项目当前的 gg-ui 主题，需要在应用根部的 `ConfigProvider` 内挂载一次
-`GzFetchUnauthorizedModal`：
+为了让普通错误消息和 401 弹窗都继承宿主项目当前的 gg-ui 主题，需要在应用根部的
+`ConfigProvider` 内挂载一次 `GzFetchFeedbackProvider`：
 
 ```tsx
-import { GzFetchUnauthorizedModal } from '@gz-fronted/gz-pc/fetch';
+import { GzFetchFeedbackProvider } from '@gz-fronted/gz-pc/fetch';
 import { ConfigProvider } from '@chenhui996/gg-ui';
 
 <ConfigProvider themeMode={themeMode}>
-  <GzFetchUnauthorizedModal />
-  <App />
+  <GzFetchFeedbackProvider>
+    <App />
+  </GzFetchFeedbackProvider>
 </ConfigProvider>;
 ```
 
-该组件使用受控 gg-ui `Modal`，不会调用脱离 React 上下文的静态
-`Modal.confirm`，因此主题切换时会继续读取宿主 `ConfigProvider` 的主题 Token，
-无需复制亮色或暗色样式。业务页面不需要维护 401 状态或重复渲染弹窗。
+该 Provider 使用 `message.useMessage()` 和受控 gg-ui `Modal`，不会在已接入的项目中
+调用脱离 React 上下文的静态反馈 API。因此主题切换时，普通错误消息和 401 弹窗都会
+继续读取宿主 `ConfigProvider` 的主题 Token，无需复制亮色或暗色样式。业务页面不需要
+维护反馈状态。未挂载该 Provider 的已有项目仍会回退到原来的静态 `message.error`，
+不会产生 breaking change。`GzFetchUnauthorizedModal` 继续保留为兼容 API，但新项目
+优先使用统一 Provider。
 
 所有由同一份 gz-pc 包创建的默认客户端和独立客户端共享一个 401 管理器。首个 401
 打开弹窗，后续并发 401 不会创建新弹窗；取消或弹窗关闭动画结束后会释放状态，后续

package/dist/fetch/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var ggUi = require('@chenhui996/gg-ui');
 var axios = require('axios');
+var ggUi = require('@chenhui996/gg-ui');
 var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
 
@@ -11,8 +11,8 @@ var axios__default = /*#__PURE__*/_interopDefault(axios);
 
 // src/fetch/client.ts
 var GzFetchError = class extends Error {
-  constructor(message2, options) {
-    super(message2);
+  constructor(message3, options) {
+    super(message3);
     this.name = "GzFetchError";
     this.type = options.type;
     this.status = options.status;
@@ -71,6 +71,28 @@ function toGzFetchError(error) {
     originalError: error
   });
 }
+var feedbackHosts = /* @__PURE__ */ new Map();
+var activeHostId;
+var registerFeedbackHost = (hostId, host) => {
+  feedbackHosts.set(hostId, host);
+  activeHostId != null ? activeHostId : activeHostId = hostId;
+  return () => {
+    feedbackHosts.delete(hostId);
+    if (activeHostId !== hostId) {
+      return;
+    }
+    const nextHost = feedbackHosts.keys().next();
+    activeHostId = nextHost.done ? void 0 : nextHost.value;
+  };
+};
+var showFetchErrorMessage = (content) => {
+  const activeHost = activeHostId === void 0 ? void 0 : feedbackHosts.get(activeHostId);
+  if (activeHost) {
+    activeHost.showErrorMessage(content);
+    return;
+  }
+  ggUi.message.error(content);
+};
 
 // src/fetch/middleware.ts
 async function runRequestMiddlewares(initialConfig, middlewares) {
@@ -263,7 +285,7 @@ function createGzFetch(options = {}) {
       await runErrorMiddlewares(error, { config: currentConfig }, middlewares);
       const shouldShowError = (_a2 = currentConfig.showErrorMessage) != null ? _a2 : showInstanceErrorMessage;
       if (shouldShowError && error.type !== "CANCELED_ERROR" && !shouldHandleUnauthorized) {
-        ggUi.message.error(error.message);
+        showFetchErrorMessage(error.message);
       }
       throw error;
     }
@@ -303,40 +325,60 @@ var GzFetchUnauthorizedModal = () => {
   const hostIdRef = react.useRef(void 0);
   (_a = hostIdRef.current) != null ? _a : hostIdRef.current = /* @__PURE__ */ Symbol("gz-fetch-unauthorized-modal-host");
   const hostId = hostIdRef.current;
+  const [messageApi, messageContextHolder] = ggUi.message.useMessage();
+  const showErrorMessage = react.useCallback(
+    (content) => {
+      void messageApi.error(content);
+    },
+    [messageApi]
+  );
   const snapshot2 = react.useSyncExternalStore(
     subscribeUnauthorized,
     getUnauthorizedSnapshot,
     getUnauthorizedServerSnapshot
   );
   react.useEffect(() => registerUnauthorizedModalHost(hostId), [hostId]);
-  if (snapshot2.activeHostId !== hostId) {
-    return null;
-  }
+  react.useEffect(
+    () => registerFeedbackHost(hostId, { showErrorMessage }),
+    [hostId, showErrorMessage]
+  );
   const handleConfirm = () => {
     const options = confirmUnauthorizedModal();
     if (options) {
       executeUnauthorizedAction(options);
     }
   };
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    ggUi.Modal,
-    {
-      afterClose: completeUnauthorizedModal,
-      cancelText: "取消",
-      closable: true,
-      okText: "重新登录",
-      open: snapshot2.phase === "open",
-      title: (_b = snapshot2.options) == null ? void 0 : _b.modalTitle,
-      onCancel: cancelUnauthorizedModal,
-      onOk: handleConfirm,
-      children: (_c = snapshot2.options) == null ? void 0 : _c.modalMessage
-    }
-  );
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    messageContextHolder,
+    snapshot2.activeHostId === hostId && /* @__PURE__ */ jsxRuntime.jsx(
+      ggUi.Modal,
+      {
+        afterClose: completeUnauthorizedModal,
+        cancelText: "取消",
+        closable: true,
+        okText: "重新登录",
+        open: snapshot2.phase === "open",
+        title: (_b = snapshot2.options) == null ? void 0 : _b.modalTitle,
+        onCancel: cancelUnauthorizedModal,
+        onOk: handleConfirm,
+        children: (_c = snapshot2.options) == null ? void 0 : _c.modalMessage
+      }
+    )
+  ] });
 };
 GzFetchUnauthorizedModal.displayName = "GzFetchUnauthorizedModal";
 var GzFetchUnauthorizedModal_default = GzFetchUnauthorizedModal;
+var GzFetchFeedbackProvider = ({ children }) => {
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(GzFetchUnauthorizedModal_default, {}),
+    children
+  ] });
+};
+GzFetchFeedbackProvider.displayName = "GzFetchFeedbackProvider";
+var GzFetchFeedbackProvider_default = GzFetchFeedbackProvider;
 
 exports.GzFetchError = GzFetchError;
+exports.GzFetchFeedbackProvider = GzFetchFeedbackProvider_default;
 exports.GzFetchUnauthorizedModal = GzFetchUnauthorizedModal_default;
 exports.configureGzFetch = configureGzFetch;
 exports.createGzFetch = createGzFetch;

package/dist/fetch/index.d.cts

@@ -1,5 +1,5 @@
 import { AxiosHeaders } from 'axios';
-import { FC } from 'react';
+import { FC, PropsWithChildren } from 'react';
 
 type GzFetchErrorType = 'HTTP_ERROR' | 'NETWORK_ERROR' | 'TIMEOUT_ERROR' | 'CANCELED_ERROR' | 'UNKNOWN_ERROR';
 interface GzFetchErrorOptions {
@@ -86,6 +86,8 @@ declare function createGzFetch(options?: CreateGzFetchOptions): GzFetchClient;
 declare function configureGzFetch(options: CreateGzFetchOptions): void;
 declare function gzFetch<TResponse, TRequestParams = unknown>(config: GzRequestConfig<TRequestParams>): Promise<TResponse>;
 
+declare const GzFetchFeedbackProvider: FC<PropsWithChildren>;
+
 declare const GzFetchUnauthorizedModal: FC;
 
-export { type CreateGzFetchOptions, type GzErrorContext, type GzFetch, type GzFetchAuthOptions, type GzFetchClient, GzFetchError, type GzFetchErrorOptions, type GzFetchErrorType, type GzFetchMiddleware, GzFetchUnauthorizedModal, type GzFetchUnauthorizedOptions, type GzInternalRequestConfig, type GzRequestConfig, type GzRequestHeaders, type GzRequestMethod, type GzRequestOptions, type GzRequestParams, type GzResponseContext, type GzResponseType, configureGzFetch, createGzFetch, getResponseMessage, gzFetch, toGzFetchError };
+export { type CreateGzFetchOptions, type GzErrorContext, type GzFetch, type GzFetchAuthOptions, type GzFetchClient, GzFetchError, type GzFetchErrorOptions, type GzFetchErrorType, GzFetchFeedbackProvider, type GzFetchMiddleware, GzFetchUnauthorizedModal, type GzFetchUnauthorizedOptions, type GzInternalRequestConfig, type GzRequestConfig, type GzRequestHeaders, type GzRequestMethod, type GzRequestOptions, type GzRequestParams, type GzResponseContext, type GzResponseType, configureGzFetch, createGzFetch, getResponseMessage, gzFetch, toGzFetchError };

package/dist/fetch/index.d.ts

@@ -1,5 +1,5 @@
 import { AxiosHeaders } from 'axios';
-import { FC } from 'react';
+import { FC, PropsWithChildren } from 'react';
 
 type GzFetchErrorType = 'HTTP_ERROR' | 'NETWORK_ERROR' | 'TIMEOUT_ERROR' | 'CANCELED_ERROR' | 'UNKNOWN_ERROR';
 interface GzFetchErrorOptions {
@@ -86,6 +86,8 @@ declare function createGzFetch(options?: CreateGzFetchOptions): GzFetchClient;
 declare function configureGzFetch(options: CreateGzFetchOptions): void;
 declare function gzFetch<TResponse, TRequestParams = unknown>(config: GzRequestConfig<TRequestParams>): Promise<TResponse>;
 
+declare const GzFetchFeedbackProvider: FC<PropsWithChildren>;
+
 declare const GzFetchUnauthorizedModal: FC;
 
-export { type CreateGzFetchOptions, type GzErrorContext, type GzFetch, type GzFetchAuthOptions, type GzFetchClient, GzFetchError, type GzFetchErrorOptions, type GzFetchErrorType, type GzFetchMiddleware, GzFetchUnauthorizedModal, type GzFetchUnauthorizedOptions, type GzInternalRequestConfig, type GzRequestConfig, type GzRequestHeaders, type GzRequestMethod, type GzRequestOptions, type GzRequestParams, type GzResponseContext, type GzResponseType, configureGzFetch, createGzFetch, getResponseMessage, gzFetch, toGzFetchError };
+export { type CreateGzFetchOptions, type GzErrorContext, type GzFetch, type GzFetchAuthOptions, type GzFetchClient, GzFetchError, type GzFetchErrorOptions, type GzFetchErrorType, GzFetchFeedbackProvider, type GzFetchMiddleware, GzFetchUnauthorizedModal, type GzFetchUnauthorizedOptions, type GzInternalRequestConfig, type GzRequestConfig, type GzRequestHeaders, type GzRequestMethod, type GzRequestOptions, type GzRequestParams, type GzResponseContext, type GzResponseType, configureGzFetch, createGzFetch, getResponseMessage, gzFetch, toGzFetchError };

package/dist/fetch/index.js

@@ -1,12 +1,12 @@
-import { Modal, message } from '@chenhui996/gg-ui';
 import axios, { AxiosError, AxiosHeaders } from 'axios';
-import { useRef, useSyncExternalStore, useEffect } from 'react';
-import { jsx } from 'react/jsx-runtime';
+import { message, Modal } from '@chenhui996/gg-ui';
+import { useRef, useCallback, useSyncExternalStore, useEffect } from 'react';
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 
 // src/fetch/client.ts
 var GzFetchError = class extends Error {
-  constructor(message2, options) {
-    super(message2);
+  constructor(message3, options) {
+    super(message3);
     this.name = "GzFetchError";
     this.type = options.type;
     this.status = options.status;
@@ -65,6 +65,28 @@ function toGzFetchError(error) {
     originalError: error
   });
 }
+var feedbackHosts = /* @__PURE__ */ new Map();
+var activeHostId;
+var registerFeedbackHost = (hostId, host) => {
+  feedbackHosts.set(hostId, host);
+  activeHostId != null ? activeHostId : activeHostId = hostId;
+  return () => {
+    feedbackHosts.delete(hostId);
+    if (activeHostId !== hostId) {
+      return;
+    }
+    const nextHost = feedbackHosts.keys().next();
+    activeHostId = nextHost.done ? void 0 : nextHost.value;
+  };
+};
+var showFetchErrorMessage = (content) => {
+  const activeHost = activeHostId === void 0 ? void 0 : feedbackHosts.get(activeHostId);
+  if (activeHost) {
+    activeHost.showErrorMessage(content);
+    return;
+  }
+  message.error(content);
+};
 
 // src/fetch/middleware.ts
 async function runRequestMiddlewares(initialConfig, middlewares) {
@@ -257,7 +279,7 @@ function createGzFetch(options = {}) {
       await runErrorMiddlewares(error, { config: currentConfig }, middlewares);
       const shouldShowError = (_a2 = currentConfig.showErrorMessage) != null ? _a2 : showInstanceErrorMessage;
       if (shouldShowError && error.type !== "CANCELED_ERROR" && !shouldHandleUnauthorized) {
-        message.error(error.message);
+        showFetchErrorMessage(error.message);
       }
       throw error;
     }
@@ -297,37 +319,56 @@ var GzFetchUnauthorizedModal = () => {
   const hostIdRef = useRef(void 0);
   (_a = hostIdRef.current) != null ? _a : hostIdRef.current = /* @__PURE__ */ Symbol("gz-fetch-unauthorized-modal-host");
   const hostId = hostIdRef.current;
+  const [messageApi, messageContextHolder] = message.useMessage();
+  const showErrorMessage = useCallback(
+    (content) => {
+      void messageApi.error(content);
+    },
+    [messageApi]
+  );
   const snapshot2 = useSyncExternalStore(
     subscribeUnauthorized,
     getUnauthorizedSnapshot,
     getUnauthorizedServerSnapshot
   );
   useEffect(() => registerUnauthorizedModalHost(hostId), [hostId]);
-  if (snapshot2.activeHostId !== hostId) {
-    return null;
-  }
+  useEffect(
+    () => registerFeedbackHost(hostId, { showErrorMessage }),
+    [hostId, showErrorMessage]
+  );
   const handleConfirm = () => {
     const options = confirmUnauthorizedModal();
     if (options) {
       executeUnauthorizedAction(options);
     }
   };
-  return /* @__PURE__ */ jsx(
-    Modal,
-    {
-      afterClose: completeUnauthorizedModal,
-      cancelText: "取消",
-      closable: true,
-      okText: "重新登录",
-      open: snapshot2.phase === "open",
-      title: (_b = snapshot2.options) == null ? void 0 : _b.modalTitle,
-      onCancel: cancelUnauthorizedModal,
-      onOk: handleConfirm,
-      children: (_c = snapshot2.options) == null ? void 0 : _c.modalMessage
-    }
-  );
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    messageContextHolder,
+    snapshot2.activeHostId === hostId && /* @__PURE__ */ jsx(
+      Modal,
+      {
+        afterClose: completeUnauthorizedModal,
+        cancelText: "取消",
+        closable: true,
+        okText: "重新登录",
+        open: snapshot2.phase === "open",
+        title: (_b = snapshot2.options) == null ? void 0 : _b.modalTitle,
+        onCancel: cancelUnauthorizedModal,
+        onOk: handleConfirm,
+        children: (_c = snapshot2.options) == null ? void 0 : _c.modalMessage
+      }
+    )
+  ] });
 };
 GzFetchUnauthorizedModal.displayName = "GzFetchUnauthorizedModal";
 var GzFetchUnauthorizedModal_default = GzFetchUnauthorizedModal;
+var GzFetchFeedbackProvider = ({ children }) => {
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(GzFetchUnauthorizedModal_default, {}),
+    children
+  ] });
+};
+GzFetchFeedbackProvider.displayName = "GzFetchFeedbackProvider";
+var GzFetchFeedbackProvider_default = GzFetchFeedbackProvider;
 
-export { GzFetchError, GzFetchUnauthorizedModal_default as GzFetchUnauthorizedModal, configureGzFetch, createGzFetch, getResponseMessage, gzFetch, toGzFetchError };
+export { GzFetchError, GzFetchFeedbackProvider_default as GzFetchFeedbackProvider, GzFetchUnauthorizedModal_default as GzFetchUnauthorizedModal, configureGzFetch, createGzFetch, getResponseMessage, gzFetch, toGzFetchError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gz-fronted/gz-pc",
-  "version": "0.1.1-beta.2",
+  "version": "0.1.1-beta.3",
   "description": "Shared fetch, hooks and utility primitives for GZ frontend applications.",
   "license": "MIT",
   "type": "module",