@pubinfo/core 2.0.12 → 2.0.13

package/src/features/composables/partyLogin.ts

@@ -0,0 +1,423 @@
+import type { PartyLoginConfig, PartyLoginParamItem } from '../components/PartyLogin/type';
+import { ref } from 'vue';
+import {
+  useFavoritesStore,
+  useIframeStore,
+  useKeepAliveStore,
+  useMenuStore,
+  useRouteStore,
+  useSettingsStore,
+  useTabbarStore,
+  useUserStore,
+} from '@/features/stores';
+
+// Store 名称映射表
+const STORE_MAP: Record<string, () => any> = {
+  user: useUserStore,
+  settings: useSettingsStore,
+  menu: useMenuStore,
+  route: useRouteStore,
+  tabbar: useTabbarStore,
+  iframe: useIframeStore,
+  keepAlive: useKeepAliveStore,
+  favorites: useFavoritesStore,
+};
+
+/**
+ * 根据路径获取对象的嵌套值
+ * @param obj 目标对象
+ * @param path 路径字符串，用 . 分隔，如 'user.token'
+ */
+function getNestedValue(obj: any, path: string): any {
+  if (!obj || !path) {
+    return '';
+  }
+
+  const keys = path.split('.');
+  let result = obj;
+
+  for (const key of keys) {
+    if (result && typeof result === 'object' && key in result) {
+      result = result[key];
+    }
+    else {
+      return '';
+    }
+  }
+
+  return result ?? '';
+}
+
+/**
+ * 解析参数值
+ *
+ * @param item 参数项
+ * @param previousResponse 上一步请求的响应数据（仅用于 request 类型）
+ *
+ * @description
+ * 支持的参数类型：
+ *
+ * 1. **string/number**: 直接使用配置的值
+ *    - 示例: `{ key: "name", type: "string", value: "张三" }`
+ *
+ * 2. **boolean**: 值为 'true' 或 'false' 字符串
+ *    - 示例: `{ key: "enabled", type: "boolean", value: "true" }`
+ *
+ * 3. **system**: 从 Pinia Store 中获取值
+ *    - 格式: `"storeName:path.to.field"`
+ *    - 示例: `{ key: "authorization", type: "system", field: "user:user.token" }`
+ *      → 解析为: `userStore.user.token`
+ *    - 可用的 store 名称: user, settings, menu, route, tabbar, iframe, keepAlive, favorites
+ *
+ * 4. **request**: 从上一步请求响应中获取值
+ *    - 格式: `"path.to.field"`
+ *    - 示例: `{ key: "wd", type: "request", field: "data.name" }`
+ *      → 解析为: `previousResponse.data.name`
+ *
+ * @example
+ * // System 类型 - 从 userStore 获取 token
+ * const item1 = {
+ *   key: "authorization",
+ *   type: "system",
+ *   field: "user:user.token"
+ * };
+ * // 结果: userStore.user.token 的值
+ *
+ * @example
+ * // Request 类型 - 从响应数据获取
+ * const item2 = {
+ *   key: "name",
+ *   type: "request",
+ *   field: "data.result.userName"
+ * };
+ * // 结果: previousResponse.data.result.userName 的值
+ */
+function resolveParamValue(
+  item: PartyLoginParamItem,
+  previousResponse?: Record<string, any>,
+): string | number | boolean {
+  switch (item.type) {
+    case 'string':
+    case 'number':
+      return item.value ?? '';
+    case 'boolean':
+      return item.value === 'true';
+    case 'system': {
+      // 从 pinia store 中获取系统数据
+      // 格式: "storeName:path.to.field"
+      // 例如: "user:user.token" -> userStore.user.token
+      if (!item.field) {
+        return '';
+      }
+
+      const [storeName, fieldPath] = item.field.split(':');
+      if (!storeName || !fieldPath) {
+        return '';
+      }
+
+      try {
+        const useStore = STORE_MAP[storeName];
+        if (!useStore) {
+          console.warn(`Store "${storeName}" not found in STORE_MAP`);
+          return '';
+        }
+
+        const store = useStore();
+        return getNestedValue(store, fieldPath);
+      }
+      catch (error) {
+        console.error(`Error accessing store field ${item.field}:`, error);
+        return '';
+      }
+    }
+    case 'request':
+      // 从上一步请求响应中获取值
+      // 格式: "path.to.field"
+      // 例如: "data.name" -> previousResponse.data.name
+      if (!item.field || !previousResponse) {
+        return '';
+      }
+      return getNestedValue(previousResponse, item.field);
+    default:
+      return item.value ?? '';
+  }
+}
+
+/**
+ * 构建请求参数
+ * @param params 参数配置数组
+ * @param previousResponse 上一步请求的响应数据
+ */
+function buildParams(
+  params: PartyLoginParamItem[],
+  previousResponse?: Record<string, any>,
+): Record<string, any> {
+  const result: Record<string, any> = {};
+
+  params.forEach((item) => {
+    if (item.key) {
+      result[item.key] = resolveParamValue(item, previousResponse);
+    }
+  });
+
+  return result;
+}
+
+/**
+ * 拼接 OAuth URL
+ * @param baseUrl OAuth 基础 URL
+ * @param params OAuth 参数配置
+ * @param previousResponse 上一步请求的响应数据
+ */
+function buildOAuthUrl(
+  baseUrl: string,
+  params: PartyLoginParamItem[],
+  previousResponse?: Record<string, any>,
+): string {
+  const queryParams = buildParams(params, previousResponse);
+
+  const url = new URL(baseUrl);
+  Object.entries(queryParams).forEach(([key, value]) => {
+    url.searchParams.append(key, String(value));
+  });
+
+  // 解码 URL,将编码的中文转换为可读形式
+  return decodeURIComponent(url.toString());
+}
+
+/**
+ * 构建查询字符串
+ */
+function buildQueryString(queryObj: Record<string, any>): string {
+  const params = new URLSearchParams();
+  Object.entries(queryObj).forEach(([key, value]) => {
+    if (value != null) {
+      params.append(key, String(value));
+    }
+  });
+  return params.toString();
+}
+
+/**
+ * 序列化请求体
+ */
+function serializeBody(
+  bodyObj: Record<string, any>,
+  headers: Record<string, string>,
+): string | FormData | undefined {
+  const contentType = headers['Content-Type'] || headers['content-type'] || 'application/json';
+
+  if (!bodyObj || Object.keys(bodyObj).length === 0) {
+    return undefined;
+  }
+
+  const type = contentType.split(';')[0].trim().toLowerCase();
+
+  if (type === 'application/json') {
+    return JSON.stringify(bodyObj);
+  }
+
+  if (type === 'application/x-www-form-urlencoded') {
+    const params = new URLSearchParams();
+    Object.entries(bodyObj).forEach(([key, value]) => {
+      if (value != null) {
+        params.append(key, String(value));
+      }
+    });
+    return params.toString();
+  }
+
+  if (type === 'multipart/form-data') {
+    const formData = new FormData();
+    Object.entries(bodyObj).forEach(([key, value]) => {
+      if (value != null) {
+        formData.append(key, value as any);
+      }
+    });
+    // 移除 Content-Type，让浏览器自动设置
+    delete headers['Content-Type'];
+    delete headers['content-type'];
+    return formData;
+  }
+
+  return JSON.stringify(bodyObj);
+}
+
+/**
+ * 深度解析 JSON 字符串
+ */
+function deepParseJSON(obj: any): any {
+  if (obj === null || obj === undefined) {
+    return obj;
+  }
+
+  if (typeof obj === 'string') {
+    try {
+      const parsed = JSON.parse(obj);
+      return deepParseJSON(parsed);
+    }
+    catch {
+      return obj;
+    }
+  }
+
+  if (Array.isArray(obj)) {
+    return obj.map(item => deepParseJSON(item));
+  }
+
+  if (typeof obj === 'object') {
+    const result: Record<string, any> = {};
+    for (const key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        result[key] = deepParseJSON(obj[key]);
+      }
+    }
+    return result;
+  }
+
+  return obj;
+}
+
+/**
+ * Party Login Hook
+ * 处理第三方登录的多步骤流程
+ * @param config Party Login 配置
+ * @param targetUrl 目标跳转 URL (来自 meta.link 或 meta.iframe)
+ */
+export async function usePartyLogin(config: PartyLoginConfig, targetUrl: string) {
+  const url = ref<string>('');
+  const loading = ref(false);
+  const error = ref<Error | null>(null);
+
+  /**
+   * 执行第一步请求并生成第二步 URL
+   */
+  async function execute() {
+    if (!config || config.length < 2) {
+      throw new Error('PartyLogin config must have at least 2 steps');
+    }
+
+    if (!targetUrl) {
+      throw new Error('Target URL is required for OAuth redirect');
+    }
+
+    const step1 = config.find(step => step.step === 1);
+    const step2 = config.find(step => step.step === 2);
+
+    if (!step1 || !step2) {
+      throw new Error('Step 1 and Step 2 configurations are required');
+    }
+
+    // 第一步必须有 request 配置
+    if (!step1.request) {
+      throw new Error('Step 1 must have request configuration');
+    }
+
+    // 第二步必须有 oauth 配置
+    if (!step2.oauth) {
+      throw new Error('Step 2 must have OAuth configuration');
+    }
+
+    const { url: requestUrl, method, params } = step1.request;
+
+    // 构建第一步请求的各类参数（此时还没有 previousResponse，所以传 undefined）
+    const queryParams = params.query ? buildParams(params.query) : {};
+    const bodyParams = params.body ? buildParams(params.body) : {};
+    const headerParams = params.header ? buildParams(params.header) : {};
+    const cookieParams = params.cookie ? buildParams(params.cookie) : {};
+
+    // 构建请求头
+    const headers: Record<string, string> = {};
+    Object.entries(headerParams).forEach(([key, value]) => {
+      headers[key] = String(value);
+    });
+
+    // 处理 Cookie
+    const cookiePairs = Object.entries(cookieParams).map(([key, value]) => `${key}=${value}`);
+    if (cookiePairs.length > 0) {
+      headers.Cookie = cookiePairs.join('; ');
+    }
+
+    // 构建完整的 URL（带查询参数）
+    let finalUrl = requestUrl;
+    const queryString = buildQueryString(queryParams);
+    if (queryString) {
+      finalUrl = `${requestUrl}${requestUrl.includes('?') ? '&' : '?'}${queryString}`;
+    }
+
+    // 构建请求体
+    let requestBody: string | FormData | undefined;
+    if (!['GET', 'HEAD'].includes(method)) {
+      // 如果没有设置 Content-Type，默认使用 application/json
+      if (!headers['Content-Type'] && !headers['content-type']) {
+        headers['Content-Type'] = 'application/json';
+      }
+      requestBody = serializeBody(bodyParams, headers);
+    }
+
+    // 发送第一步请求
+    loading.value = true;
+    error.value = null;
+
+    try {
+      const response = await fetch(finalUrl, {
+        method,
+        headers,
+        body: requestBody,
+        credentials: cookiePairs.length > 0 ? 'include' : 'same-origin',
+        mode: 'cors',
+      });
+
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      }
+
+      // 解析响应数据
+      const contentType = response.headers.get('content-type') || '';
+      let responseData: Record<string, any> = {};
+
+      if (contentType.includes('application/json')) {
+        const jsonData = await response.json();
+        responseData = deepParseJSON(jsonData);
+      }
+      else {
+        const text = await response.text();
+        try {
+          const jsonData = JSON.parse(text);
+          responseData = deepParseJSON(jsonData);
+        }
+        catch {
+          // 如果不是 JSON，将文本作为 data 字段
+          responseData = { data: text };
+        }
+      }
+
+      // 拼接第二步的 OAuth URL
+      const oauthUrl = buildOAuthUrl(
+        targetUrl,
+        step2.oauth.params,
+        responseData,
+      );
+
+      url.value = oauthUrl;
+      return oauthUrl;
+    }
+    catch (err: any) {
+      error.value = new Error(`第一步请求失败: ${err?.message || String(err)}`);
+      throw error.value;
+    }
+    finally {
+      loading.value = false;
+    }
+  }
+
+  // 自动执行
+  await execute();
+
+  return {
+    url,
+    loading,
+    error,
+    execute,
+  };
+}

package/src/features/settings/index.ts

@@ -13,7 +13,6 @@ let globalSettings: RequiredDeep<Settings.all> = {
     enableDynamicTitle: true,
     storagePrefix: 'wsy_rbac',
     // enableWatermark: false,
-    enableErrorLog: false,
     enableUserPreferences: true,
     enableSettingPreferences: true,
     enableAppSetting: true,

package/src/features/stores/modules/menu.ts

@@ -4,13 +4,15 @@ import { computedAsync } from '@vueuse/core';
 import { get, isNumber } from 'lodash-es';
 import { match } from 'path-to-regexp';
 import { defineStore } from 'pinia';
-import { hooks } from '@/core/ctx';
+import { callHookAsync } from '@/core/ctx';
 import { useWarn } from '@/features/composables';
 import { resolveRoutePath } from '@/utils';
 import { STORE_NAME } from '../enum';
 import useRouteStore from './route';
 import useSettingsStore from './settings';
 
+export type MenuData = Menu.recordMainRaw;
+
 /**
  * 用于管理与菜单相关数据的自定义存储。
  *
@@ -21,7 +23,7 @@ const useMenuStore = defineStore(
   () => {
     const settingsStore = useSettingsStore();
     const routeStore = useRouteStore();
-    const menus = ref<Menu.recordMainRaw[]>([{
+    const menus = ref<MenuData[]>([{
       meta: {},
       children: [],
     }]);
@@ -61,9 +63,9 @@ const useMenuStore = defineStore(
      * 获取所有菜单项
      * @returns 所有菜单项的数组
      */
-    const allMenus = computedAsync<Menu.recordMainRaw[]>(
+    const allMenus = computedAsync<MenuData[]>(
       async () => {
-        let returnMenus: Menu.recordMainRaw[] = [{
+        let returnMenus: MenuData[] = [{
           meta: {},
           children: [],
         }];
@@ -80,33 +82,21 @@ const useMenuStore = defineStore(
           });
         }
         else {
-          returnMenus = routeStore.routes as Menu.recordMainRaw[];
+          returnMenus = routeStore.routes as MenuData[];
         }
 
         returnMenus.forEach(item => convertToFullPath(item.children));
 
-        const transformedMenus = await hooks.callHookWith(
-          async (hookFns, args) => {
-            let res = args[0];
-            for (const fn of hookFns) {
-              res = await fn(res);
-            }
-            return res as Menu.recordMainRaw[];
-          },
-          'menu:transform',
-          returnMenus,
-        );
-
-        return transformedMenus;
+        return await callHookAsync<MenuData[]>('menu:transform', returnMenus);
       },
       [],
     );
 
     /**
      * 侧边栏菜单的计算属性。
-     * @returns {Menu.recordMainRaw['children']} 当前活动菜单的子菜单，如果没有菜单则返回空数组。
+     * @returns {MenuData['children']} 当前活动菜单的子菜单，如果没有菜单则返回空数组。
      */
-    const sidebarMenus = computed<Menu.recordMainRaw['children']>(() => {
+    const sidebarMenus = computed<MenuData['children']>(() => {
       const tempAllMenus = allMenus.value.filter(item => !get(item, 'meta.isDev', false));
       if (tempAllMenus.length > 0) {
         if (tempAllMenus.length > 1) {