fix: 修正小程序配置表单实例归属

This commit is contained in:
que01 committed 2026-10-21 10:47:30 +08:00
1 parent 8c5860699f
commit a293591dba
3 files changed
+17 -31

No files matched your search

@@ -1,5 +1,5 @@
import { useEffect } from "react";
import { Alert, Button, Form, Input, Space } from "antd"; import { Alert, Button, Form, Input, Space } from "antd";
import type { FormInstance } from "antd";
import type { MiniAppReleaseSettings } from "@personal-brand/api-client"; import type { MiniAppReleaseSettings } from "@personal-brand/api-client";
import { AdminSection } from "../../components/AdminSection.js"; import { AdminSection } from "../../components/AdminSection.js";
import { MutationError } from "../../components/QueryState.js"; import { MutationError } from "../../components/QueryState.js";
@@ -12,20 +12,24 @@ export type MiniAppSettingsValues = {
}; };
interface MiniAppSettingsTabProps { interface MiniAppSettingsTabProps {
form: FormInstance<MiniAppSettingsValues>;
settings: MiniAppReleaseSettings | undefined; settings: MiniAppReleaseSettings | undefined;
saving: boolean; saving: boolean;
error?: unknown; error?: unknown;
onSave: (values: MiniAppSettingsValues) => void; onSave: (values: MiniAppSettingsValues) => void;
} }
export function MiniAppSettingsTab({ export function MiniAppSettingsTab({ settings, saving, error, onSave }: MiniAppSettingsTabProps) {
form, const [form] = Form.useForm<MiniAppSettingsValues>();
settings,
saving, useEffect(() => {
error, if (!settings) return;
onSave, form.setFieldsValue({
}: MiniAppSettingsTabProps) { appId: settings.appId,
apiBaseUrl: settings.apiBaseUrl,
privateKey: "",
});
}, [form, settings]);
return ( return (
<div className="admin-stack admin-stack-lg"> <div className="admin-stack admin-stack-lg">
<AdminSection <AdminSection
@@ -1,14 +1,14 @@
import { useState } from "react"; import { useState } from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useQueryClient } from "@tanstack/react-query"; import { useQueryClient } from "@tanstack/react-query";
import { Alert, Button, Divider, Form, Input, Modal, Space, Tabs, Typography } from "antd"; import { Alert, Button, Divider, Input, Modal, Space, Tabs, Typography } from "antd";
import { AdminPageHeader } from "../../components/AdminPageHeader.js"; import { AdminPageHeader } from "../../components/AdminPageHeader.js";
import { AdminSection } from "../../components/AdminSection.js"; import { AdminSection } from "../../components/AdminSection.js";
import { EmptyState } from "../../components/EmptyState.js"; import { EmptyState } from "../../components/EmptyState.js";
import { MutationError, QueryState } from "../../components/QueryState.js"; import { MutationError, QueryState } from "../../components/QueryState.js";
import { StatusTag, statusLabel } from "../../components/StatusTag.js"; import { StatusTag, statusLabel } from "../../components/StatusTag.js";
import { MiniAppReleaseCard } from "./MiniAppReleaseCard.js"; import { MiniAppReleaseCard } from "./MiniAppReleaseCard.js";
import { MiniAppSettingsTab, type MiniAppSettingsValues } from "./MiniAppSettingsTab.js"; import { MiniAppSettingsTab } from "./MiniAppSettingsTab.js";
import { usePublicationQueries } from "./use-publication-queries.js"; import { usePublicationQueries } from "./use-publication-queries.js";
import { usePublicationMutations } from "./use-publication-mutations.js"; import { usePublicationMutations } from "./use-publication-mutations.js";
@@ -29,8 +29,7 @@ export function PublicationPage() {
const [rollbackVersion, setRollbackVersion] = useState<number | null>(null); const [rollbackVersion, setRollbackVersion] = useState<number | null>(null);
const [note, setNote] = useState(""); const [note, setNote] = useState("");
const [activeTab, setActiveTab] = useState("content"); const [activeTab, setActiveTab] = useState("content");
const [miniAppSettingsForm] = Form.useForm<MiniAppSettingsValues>(); const queries = usePublicationQueries();
const queries = usePublicationQueries(miniAppSettingsForm);
const { const {
workspace, workspace,
readiness, readiness,
@@ -255,7 +254,6 @@ export function PublicationPage() {
label: "小程序配置", label: "小程序配置",
children: ( children: (
<MiniAppSettingsTab <MiniAppSettingsTab
form={miniAppSettingsForm}
settings={miniAppSettings.data} settings={miniAppSettings.data}
saving={saveMiniAppSettings.isPending} saving={saveMiniAppSettings.isPending}
error={saveMiniAppSettings.error} error={saveMiniAppSettings.error}
@@ -1,17 +1,10 @@
import { useEffect } from "react"; import { useEffect } from "react";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import type { FormInstance } from "antd";
import { createApiClient } from "../../lib/api.js"; import { createApiClient } from "../../lib/api.js";
const client = createApiClient(); const client = createApiClient();
export function usePublicationQueries( export function usePublicationQueries() {
miniAppSettingsForm: FormInstance<{
appId: string;
apiBaseUrl: string;
privateKey?: string;
}>,
) {
const brand = useQuery<Awaited<ReturnType<typeof client.getAdminBrand>>>({ const brand = useQuery<Awaited<ReturnType<typeof client.getAdminBrand>>>({
queryKey: ["publication-brand"], queryKey: ["publication-brand"],
queryFn: () => client.getAdminBrand(), queryFn: () => client.getAdminBrand(),
@@ -37,15 +30,6 @@ export function usePublicationQueries(
queryFn: () => client.getAdminMiniAppSettings(), queryFn: () => client.getAdminMiniAppSettings(),
}); });
useEffect(() => {
if (!miniAppSettings.data) return;
miniAppSettingsForm.setFieldsValue({
appId: miniAppSettings.data.appId,
apiBaseUrl: miniAppSettings.data.apiBaseUrl,
privateKey: "",
});
}, [miniAppSettings.data, miniAppSettingsForm]);
useEffect(() => { useEffect(() => {
const building = miniAppReleases.data?.find( const building = miniAppReleases.data?.find(
(task) => (task) =>