@huyooo/ui 2.1.4 → 2.1.8

package/dist/types/api/billing.generated.d.ts

@@ -287,7 +287,7 @@ export type Api = {
             };
         };
         summary: {
-            /** 获取当前用户订阅、配额、积分和待支付账单摘要 */
+            /** 获取当前用户订阅快照（产品、价格、权益、配额、积分） */
             post: {
                 return: any;
             };
@@ -3581,7 +3581,7 @@ export interface ApiClient {
             }, config?: RequestConfig) => RequestBuilder<any>;
         };
         summary: {
-            /** 获取当前用户订阅、配额、积分和待支付账单摘要 */
+            /** 获取当前用户订阅快照（产品、价格、权益、配额、积分） */
             post: (config?: RequestConfig) => RequestBuilder<any>;
         };
         userDetail: {

package/dist/types/subscription.d.ts

@@ -0,0 +1,57 @@
+/** 与 billing / profile.subscription 对齐的用户订阅快照 */
+export interface UserSubscriptionSnapshotFeature {
+    key: string;
+    name?: string;
+    description?: string;
+    type: string;
+    value?: boolean | number | string | null;
+    highlight?: boolean;
+}
+export interface UserSubscriptionSnapshotQuota {
+    id: string;
+    featureKey: string;
+    name: string;
+    description?: string;
+    limit: number;
+    used: number;
+    remaining: number;
+    unlimited: boolean;
+    period: string;
+    resetsAt: string | null;
+    percentage: number;
+}
+export interface UserSubscriptionSnapshotEntitlement {
+    kind: 'plan' | 'beta';
+    status: string;
+    startAt: string | null;
+    endAt: string | null;
+    acquiredBy: 'subscribe' | 'free' | 'grant';
+    grantType?: 'backfill' | 'beta' | null;
+    sourceId: string;
+    cancelAtPeriodEnd?: boolean;
+    pendingChange?: Record<string, unknown> | null;
+}
+export interface UserSubscriptionSnapshot {
+    syncedAt: string;
+    product: {
+        id: string;
+        name: string;
+        description?: string | null;
+    } | null;
+    price: {
+        id: string;
+        nickname?: string | null;
+        type: string;
+        interval?: string | null;
+        intervalCount?: number | null;
+        unitAmount?: number | null;
+        currency?: string | null;
+    } | null;
+    entitlement: UserSubscriptionSnapshotEntitlement | null;
+    features: UserSubscriptionSnapshotFeature[];
+    quotas: UserSubscriptionSnapshotQuota[];
+    pointsBalance: {
+        totalPoints: number;
+        updateAt: string | null;
+    } | null;
+}

package/dist/types/user.d.ts

@@ -1,3 +1,4 @@
+import { UserSubscriptionSnapshot } from './subscription';
 export type UserStatusType = 'inactive' | 'normal';
 export interface BaseEntity {
     id: string;
@@ -105,6 +106,8 @@ export interface UserProfileType extends AuditableEntity, UserBaseInfo {
     personalInviteCode: string;
     role: RoleInfo | null;
     permissions: PermissionInfo[];
+    /** 订阅快照（产品 / 价格 / 权益 / 配额） */
+    subscription?: UserSubscriptionSnapshot | null;
     creatorInfo?: OperatorInfo;
     updatorInfo?: OperatorInfo;
 }

package/dist/useAuthkitUsersProfile-D4H_Gxgd.js

@@ -0,0 +1,67 @@
+import { ref as a, computed as i } from "vue";
+import { g as p } from "./apiClients-CWSwNzGk.js";
+import { u as l } from "./useAuthkitAuth-CWHJs8zY.js";
+const e = a(null), n = a(!1), u = a(!1), s = a(!1);
+function v() {
+  s.value = !0;
+}
+function d(t) {
+  return t === 401 || t === 40101;
+}
+const h = i(() => !!e.value), m = i(() => {
+  if (!s.value || !u.value)
+    return "pending";
+  if (e.value)
+    return "authenticated";
+  const {
+    getToken: t
+  } = l();
+  return t() ? "authenticated" : "unauthenticated";
+});
+async function g() {
+  const {
+    getToken: t,
+    clearAuth: f
+  } = l();
+  if (!t()) {
+    e.value = null, u.value = !0;
+    return;
+  }
+  n.value = !0, u.value = !1;
+  const {
+    data: r,
+    error: o
+  } = await p().auth.users.profile.post({
+    meta: {
+      silentError: !0
+    }
+  });
+  if (n.value = !1, r) {
+    if (e.value = r, r.subscription) {
+      const {
+        useBillingSubscriptionSummary: c
+      } = await import("./useBillingSubscriptionSummary-BC3G0N4t.js");
+      c().hydrateFromProfile(r.subscription);
+    }
+  } else d(o == null ? void 0 : o.code) && (e.value = null, console.warn("认证已过期，清除认证状态"), f());
+  u.value = !0;
+}
+function k() {
+  e.value = null, n.value = !1, u.value = !0;
+}
+function b() {
+  return {
+    userProfile: e,
+    loading: n,
+    usersProfileReady: u,
+    authSessionBootstrapped: s,
+    isLoggedIn: h,
+    authSessionState: m,
+    fetchUserProfile: g,
+    clearUserProfile: k,
+    markAuthSessionBootstrapped: v
+  };
+}
+export {
+  b as u
+};

package/dist/useBillingSubscriptionSummary-BC3G0N4t.js

@@ -0,0 +1,43 @@
+import { ref as u, computed as t } from "vue";
+import { g as d } from "./apiClients-CWSwNzGk.js";
+function r() {
+  return {
+    syncedAt: "",
+    product: null,
+    price: null,
+    entitlement: null,
+    features: [],
+    quotas: [],
+    pointsBalance: null
+  };
+}
+const e = u(r()), a = u(!1);
+function B() {
+  const o = t(() => e.value.product), l = t(() => e.value.price), s = t(() => e.value.entitlement), i = t(() => e.value.features), c = t(() => e.value.quotas), f = t(() => e.value.pointsBalance);
+  async function m() {
+    a.value = !0;
+    const {
+      data: n,
+      error: v
+    } = await d().billing.subscriptions.summary.post();
+    a.value = !1, !v && (e.value = n || r());
+  }
+  function p(n) {
+    n && (e.value = n);
+  }
+  return {
+    summary: e,
+    product: o,
+    price: l,
+    entitlement: s,
+    features: i,
+    quotas: c,
+    pointsBalance: f,
+    loading: a,
+    refresh: m,
+    hydrateFromProfile: p
+  };
+}
+export {
+  B as useBillingSubscriptionSummary
+};

package/dist/{useRoutePermission-ZOeRg6Wq.js → useRoutePermission-CGq_LIZM.js}

@@ -1,7 +1,7 @@
 import { computed as g, ref as L, watch as S } from "vue";
 import { useRouter as w, useRoute as C } from "vue-router";
 import { u as k } from "./useAuthkitAppsAuthPageInfo-2izIyMfu.js";
-import { u as M } from "./useAuthkitUsersProfile-DX2PYmdU.js";
+import { u as M } from "./useAuthkitUsersProfile-D4H_Gxgd.js";
 import { u as K } from "./useAuthkitAuth-CWHJs8zY.js";
 function O(e, s = "default") {
   const n = document;

package/dist/useSubscriptionCheckout-Dmg0kt4F.js

@@ -0,0 +1,399 @@
+import { ref as g, computed as S } from "vue";
+import { d as V } from "./useBillingStatusOptions-C6edto7H.js";
+import { g as $ } from "./apiClients-CWSwNzGk.js";
+/* empty css               */
+import { Message as h } from "@arco-design/web-vue";
+import { u as _ } from "./useEnsureAuthenticated-RZ1DflLz.js";
+function D(e) {
+  var u;
+  const r = (u = e == null ? void 0 : e.metadata) == null ? void 0 : u.originalPrice;
+  return typeof r == "number" ? r : void 0;
+}
+function F(e) {
+  const r = D(e);
+  return !e || r === void 0 || r <= e.unitAmount ? 0 : r - e.unitAmount;
+}
+function H(e) {
+  var d;
+  const r = [], u = (d = e == null ? void 0 : e.metadata) == null ? void 0 : d.includedPointsLabel;
+  if (typeof u == "string" && u.trim())
+    r.push(u.trim());
+  else {
+    const s = typeof (e == null ? void 0 : e.bonusPoints) == "number" ? e.bonusPoints : 0;
+    s > 0 && r.push(`含 ${s.toLocaleString("zh-CN")} 积分`);
+  }
+  const l = F(e);
+  return l > 0 && r.push(`优惠 ¥${P(l)}`), r.join(" · ");
+}
+function P(e) {
+  return e === void 0 ? 0 : Math.floor(e / 100);
+}
+function J(e, r = 1) {
+  const u = r > 1 ? `每 ${r} ` : "按";
+  switch (e) {
+    case "month":
+      return `${u}月订阅`;
+    case "year":
+      return `${u}年订阅`;
+    case "day":
+      return `${u}天订阅`;
+    case "week":
+      return `${u}周订阅`;
+    default:
+      return "";
+  }
+}
+function W(e) {
+  const r = e != null && e.intervalCount && e.intervalCount > 1 ? `${e.intervalCount} ` : "";
+  switch (e == null ? void 0 : e.interval) {
+    case "month":
+      return `/ ${r}月`;
+    case "year":
+      return `/ ${r}年`;
+    case "day":
+      return `/ ${r}天`;
+    case "week":
+      return `/ ${r}周`;
+    default:
+      return "";
+  }
+}
+function X(e) {
+  const r = (e == null ? void 0 : e.intervalCount) ?? 1;
+  switch (e == null ? void 0 : e.interval) {
+    case "month":
+      return `${r} 个月`;
+    case "year":
+      return `${r} 年`;
+    case "day":
+      return `${r} 天`;
+    case "week":
+      return `${r} 周`;
+    default:
+      return "";
+  }
+}
+function A(e) {
+  switch (e) {
+    case "day":
+      return "每天";
+    case "week":
+      return "每周";
+    case "month":
+      return "每月";
+    case "year":
+      return "每年";
+    case "lifetime":
+      return "不重置";
+    default:
+      return "";
+  }
+}
+function q(e) {
+  if (e.type === "quota" && e.value !== void 0) {
+    const r = A(e.quotaPeriod), u = r ? ` / ${r}` : "";
+    return `${e.name}: ${e.value === -1 ? "无限" : e.value}${u}`;
+  }
+  if (e.type === "unlimited") {
+    const r = A(e.quotaPeriod);
+    return r ? `${e.name}: 不限 / ${r}` : `${e.name}不限`;
+  }
+  return e.type === "boolean" && e.value === !1 ? `${e.name}（不支持）` : e.name;
+}
+function I(e) {
+  return e.type !== "recurring" || !e.interval ? null : {
+    key: `${e.interval}:${e.intervalCount ?? 1}`,
+    interval: e.interval,
+    intervalCount: e.intervalCount ?? 1
+  };
+}
+function Y(e, r) {
+  const u = {
+    day: 1,
+    week: 2,
+    month: 3,
+    year: 4
+  };
+  return u[e.interval] - u[r.interval] || e.intervalCount - r.intervalCount;
+}
+function Z(e, r) {
+  let u = 0;
+  for (const l of e)
+    for (const d of l.prices) {
+      const s = I(d);
+      (s == null ? void 0 : s.key) === r && (u = Math.max(u, F(d)));
+    }
+  return u > 0 ? `最高优惠 ¥${P(u)}` : void 0;
+}
+function ee(e) {
+  return e.includes(":") ? e : `${e}:1`;
+}
+function B() {
+  return !!localStorage.getItem("jwtToken");
+}
+function ae(e = "month") {
+  const r = g([]), u = g(null), l = g(null), d = g(!1), s = g(!1), f = g(ee(e)), m = S(() => {
+    const n = /* @__PURE__ */ new Map();
+    for (const t of r.value)
+      for (const i of t.prices) {
+        const c = I(i);
+        c && n.set(c.key, c);
+      }
+    return [...n.values()].sort(Y).map((t) => ({
+      value: t.key,
+      label: J(t.interval, t.intervalCount),
+      badge: Z(r.value, t.key)
+    }));
+  }), p = S(() => {
+    const n = [];
+    for (const t of r.value) {
+      const i = t.prices.find((o) => {
+        const b = I(o);
+        return (b == null ? void 0 : b.key) === f.value;
+      }), c = t.prices.find((o) => o.type === "free"), a = i ?? (c && t.prices.every((o) => o.type === "free") ? c : void 0);
+      a && n.push({
+        ...t,
+        features: a.features ?? [],
+        selectedPrice: a
+      });
+    }
+    return n;
+  });
+  function x(n) {
+    f.value = n;
+  }
+  function y(n) {
+    const t = u.value, i = l.value;
+    return t != null && t.priceId && n.selectedPrice ? t.priceId === n.selectedPrice.id : t ? t.productId === n.id : i != null && i.priceId && n.selectedPrice ? i.priceId === n.selectedPrice.id : i ? i.productId === n.id : !1;
+  }
+  function C(n) {
+    var t;
+    return ((t = u.value) == null ? void 0 : t.productId) === n.id;
+  }
+  function v(n) {
+    var t;
+    return ((t = n.selectedPrice) == null ? void 0 : t.type) === "free";
+  }
+  function U() {
+    return !!u.value;
+  }
+  function E(n) {
+    return !!(!n.selectedPrice || y(n) || v(n) && U());
+  }
+  function w(n) {
+    var t;
+    return ((t = n.metadata) == null ? void 0 : t.recommended) === !0;
+  }
+  function M(n) {
+    var t;
+    return P((t = n.selectedPrice) == null ? void 0 : t.unitAmount);
+  }
+  function j(n) {
+    const t = D(n.selectedPrice);
+    return t === void 0 ? void 0 : P(t);
+  }
+  function G(n) {
+    return v(n) ? "" : W(n.selectedPrice);
+  }
+  function O(n) {
+    if (v(n)) {
+      const t = X(n.selectedPrice);
+      return t ? `${t}免费体验` : "免费体验";
+    }
+    return H(n.selectedPrice);
+  }
+  function T(n) {
+    const t = [];
+    return y(n) ? t.push({
+      label: "当前方案",
+      type: "current"
+    }) : v(n) ? t.push({
+      label: "免费体验",
+      type: "trial"
+    }) : w(n) && t.push({
+      label: "最受欢迎",
+      type: "recommended"
+    }), t;
+  }
+  function N(n) {
+    const t = u.value;
+    return y(n) ? "当前方案" : v(n) ? t ? "已订阅付费方案" : B() ? "免费开通" : "免费注册" : t ? C(n) ? "切换周期" : typeof t.unitAmount == "number" && n.selectedPrice.unitAmount > t.unitAmount ? "升级方案" : "切换方案" : "立即订阅";
+  }
+  function R(n, t) {
+    const i = typeof n.description == "string" ? n.description.trim() : "";
+    if (i)
+      return i;
+    const c = n.features.find((a) => a.type === "quota" && a.value !== void 0);
+    if (c) {
+      const a = A(c.quotaPeriod), o = c.value === -1 ? "不限量" : c.value;
+      return `${c.name} ${a ? `${o} / ${a}` : o}，覆盖核心使用场景。`;
+    }
+    return v(n) ? "注册后自动开通免费权益，适合先体验核心能力。" : t === 1 ? "为正式团队准备的高配能力组合。" : "包含入门所需的核心能力。";
+  }
+  function z(n) {
+    return n.filter((t) => t.highlight !== !1).map((t) => ({
+      title: q(t),
+      description: t.description || ""
+    }));
+  }
+  function K(n) {
+    const t = n.filter((o) => o.highlight !== !1), i = t.filter((o) => o.type === "quota" || o.type === "unlimited").map((o) => ({
+      title: q(o),
+      description: o.description || ""
+    })), c = t.filter((o) => o.type === "boolean" && o.value !== !1).map((o) => ({
+      title: o.name,
+      description: o.description || ""
+    })), a = [];
+    return c.length && a.push({
+      title: "功能特性",
+      items: c
+    }), i.length && a.push({
+      title: "用量配额",
+      items: i
+    }), a;
+  }
+  async function k() {
+    d.value = !0;
+    const {
+      data: n,
+      error: t
+    } = await V.productOptions();
+    if (d.value = !1, t)
+      return;
+    r.value = Array.isArray(n) ? n : [], !m.value.some((c) => c.value === f.value) && m.value[0] && (f.value = m.value[0].value);
+  }
+  async function L() {
+    var c;
+    if (!B()) {
+      u.value = null, l.value = null;
+      return;
+    }
+    s.value = !0;
+    const {
+      data: n,
+      error: t
+    } = await $().billing.subscriptions.summary.post();
+    if (s.value = !1, t)
+      return;
+    const i = n;
+    if (!(i != null && i.entitlement) || !i.product) {
+      u.value = null, l.value = null;
+      return;
+    }
+    if (i.entitlement.acquiredBy === "subscribe" && i.price) {
+      u.value = {
+        id: i.entitlement.sourceId,
+        productId: i.product.id,
+        productName: i.product.name,
+        priceId: i.price.id,
+        interval: i.price.interval || void 0,
+        intervalCount: i.price.intervalCount || void 0,
+        unitAmount: i.price.unitAmount || void 0,
+        currency: i.price.currency || void 0,
+        status: i.entitlement.status,
+        currentPeriodStart: i.entitlement.startAt || void 0,
+        currentPeriodEnd: i.entitlement.endAt,
+        cancelAtPeriodEnd: !!i.entitlement.cancelAtPeriodEnd,
+        pendingChange: i.entitlement.pendingChange || null,
+        trialEnd: null
+      }, l.value = null;
+      return;
+    }
+    u.value = null, l.value = {
+      id: i.entitlement.sourceId,
+      productId: i.product.id,
+      productName: i.product.name,
+      priceId: (c = i.price) == null ? void 0 : c.id,
+      status: i.entitlement.status,
+      startAt: i.entitlement.startAt,
+      endAt: i.entitlement.endAt
+    };
+  }
+  async function Q() {
+    await Promise.all([k(), L()]);
+  }
+  return {
+    products: r,
+    plans: p,
+    currentSubscription: u,
+    currentTrial: l,
+    listLoading: d,
+    currentLoading: s,
+    billingInterval: f,
+    billingIntervalTabs: m,
+    setBillingInterval: x,
+    isCurrentPlan: y,
+    isSameProduct: C,
+    isRecommendedPlan: w,
+    isFreePlan: v,
+    isPlanActionDisabled: E,
+    getDisplayPrice: M,
+    getDisplayOriginalPrice: j,
+    getDisplayCycle: G,
+    getPromotionLabel: O,
+    getBadgeLabels: T,
+    getButtonLabel: N,
+    getPlanSummary: R,
+    getFeatureItems: z,
+    getFeatureGroups: K,
+    loadProducts: k,
+    loadCurrentSubscription: L,
+    refresh: Q
+  };
+}
+function te(e) {
+  window.open(e, "_blank", "noopener,noreferrer");
+}
+function ne(e) {
+  return e && typeof e == "object" && "message" in e && typeof e.message == "string" ? e.message : "";
+}
+function re(e) {
+  return e && typeof e == "object" && "alipayUrl" in e && typeof e.alipayUrl == "string" ? e.alipayUrl : "";
+}
+function de(e) {
+  const r = g(null), {
+    ensureAuthenticated: u
+  } = _();
+  async function l(s) {
+    if (!s.selectedPrice) {
+      h.warning("当前方案暂无可购买价格");
+      return;
+    }
+    if (!u(() => l(s))) return;
+    const f = e.currentSubscription.value;
+    if ((f == null ? void 0 : f.priceId) === s.selectedPrice.id) {
+      h.info("当前已经是该方案");
+      return;
+    }
+    if (s.selectedPrice.type === "free")
+      return;
+    r.value = s.id;
+    const m = f ? await $().billing.subscriptions.change.post({
+      subscriptionId: f.id,
+      newPriceId: s.selectedPrice.id,
+      proration: !0
+    }) : await $().billing.subscriptions.create.post({
+      priceId: s.selectedPrice.id
+    });
+    if (r.value = null, m.error)
+      return;
+    const p = re(m.data);
+    if (p) {
+      te(p);
+      return;
+    }
+    h.success(ne(m.data) || "订阅已更新"), await e.refreshCurrentSubscription();
+  }
+  function d(s) {
+    return r.value === s.id;
+  }
+  return {
+    checkoutPlanId: r,
+    checkout: l,
+    isCheckingOut: d
+  };
+}
+export {
+  de as a,
+  ae as u
+};

package/dist/user.js

@@ -1,4 +1,4 @@
-import { U as a, a as n, b as r, c as t, d as U, _ as u, e as i, f as M, g as o, h as m, i as I, j as c, k as d, l as b, m as f } from "./UserMenuInvitationsItem.vue_vue_type_script_setup_true_lang-COM36ViG.js";
+import { U as a, a as n, b as r, c as t, d as U, _ as u, e as i, f as M, g as o, h as m, i as I, j as c, k as d, l as b, m as f } from "./UserMenuInvitationsItem.vue_vue_type_script_setup_true_lang-DbkGYZ2f.js";
 export {
   a as UserAccountMenu,
   n as UserAvatar,

package/dist/utils/subscriptionDisplay.d.ts

@@ -1,7 +1,7 @@
-import { BillingSubscriptionSummaryEntitlement } from '../composables/Billing/useBillingSubscriptionSummary';
+import { UserSubscriptionSnapshotEntitlement } from '../types/subscription';
 /** 菜单/弹窗统一的订阅主操作文案 */
-export declare function getSubscriptionActionLabel(entitlement: BillingSubscriptionSummaryEntitlement | null | undefined, paidProductCount: number): "" | "升级" | "修改订阅" | "订阅" | "查看价格方案";
-export declare function shouldShowSubscriptionAction(entitlement: BillingSubscriptionSummaryEntitlement | null | undefined, paidProductCount: number, canUpgrade?: boolean): boolean;
-export declare function getEntitlementDisplayName(entitlement: BillingSubscriptionSummaryEntitlement | null | undefined): string;
-/** 权益/订阅到期时间标签（trial 统一为权益有效期，不再区分试用文案） */
-export declare function getEntitlementEndAtLabel(entitlement: Pick<BillingSubscriptionSummaryEntitlement, "type"> | null | undefined): "当前周期结束" | "权益有效期至";
+export declare function getSubscriptionActionLabel(entitlement: UserSubscriptionSnapshotEntitlement | null | undefined, paidProductCount: number): "" | "订阅" | "查看价格方案" | "修改订阅" | "升级";
+export declare function shouldShowSubscriptionAction(entitlement: UserSubscriptionSnapshotEntitlement | null | undefined, paidProductCount: number, canUpgrade?: boolean): boolean;
+export declare function getEntitlementDisplayName(entitlement: UserSubscriptionSnapshotEntitlement | null | undefined, productName?: string | null): string;
+/** 权益/订阅到期时间标签 */
+export declare function getEntitlementEndAtLabel(entitlement: UserSubscriptionSnapshotEntitlement | null | undefined): "当前周期结束" | "权益有效期至";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huyooo/ui",
-  "version": "2.1.4",
+  "version": "2.1.8",
   "private": false,
   "type": "module",
   "files": [