{label}
{required ? (
@@ -128,14 +137,6 @@ function Field({
);
}
-/** 只读时不展示没有解析到的可选格；编辑页仍留空格供补录，但不预填编造值 */
-function showOptional(readonly: boolean, value: unknown): boolean {
- if (!readonly) return true;
- if (value === undefined || value === null) return false;
- if (typeof value === "string") return value.trim() !== "";
- return true;
-}
-
function ChevronSteps({
step,
onChange,
@@ -165,14 +166,336 @@ function ChevronSteps({
);
}
+function ShipEditCellSync({
+ value,
+ disabled,
+ onCommit,
+ mono,
+ placeholder,
+}: {
+ value: string;
+ disabled?: boolean;
+ onCommit: (next: string) => void;
+ mono?: boolean;
+ placeholder?: string;
+}) {
+ const [draft, setDraft] = useState(value);
+ const [focused, setFocused] = useState(false);
+ useEffect(() => {
+ if (!focused) setDraft(value);
+ }, [value, focused]);
+ return (
+
setFocused(true)}
+ onChange={(e) => setDraft(e.target.value)}
+ onBlur={() => {
+ setFocused(false);
+ if (draft !== value) onCommit(draft);
+ }}
+ onPressEnter={(e) => (e.target as HTMLInputElement).blur()}
+ />
+ );
+}
+
+function buildEditableCcShipmentColumns(
+ onPatch: (rowIndex: number, patch: Partial
) => void,
+ onOpenEdit: (rowIndex: number) => void,
+): ShipmentColumn[] {
+ const text = (
+ key: keyof ShipmentRow,
+ title: string,
+ width: number,
+ opts?: { mono?: boolean; channel?: boolean; placeholder?: string },
+ ): ShipmentColumn => ({
+ key: String(key),
+ title,
+ width,
+ render: (row) => {
+ const raw =
+ opts?.channel
+ ? row.channel_raw || row.F_Transporter || ""
+ : key === "F_FBACode"
+ ? normalizeFbaCodeForCc(row.F_FBACode, row.F_Transporter || "") ||
+ row.F_FBACode ||
+ ""
+ : row[key] == null
+ ? ""
+ : String(row[key]);
+ return (
+ {
+ if (opts?.channel) {
+ onPatch(row.row_index, {
+ channel_raw: next,
+ F_Transporter: next,
+ });
+ return;
+ }
+ if (
+ key === "F_CTNS" ||
+ key === "F_CBM" ||
+ key === "F_Weight" ||
+ key === "F_Pcs"
+ ) {
+ const n = next.trim() === "" ? null : Number(next.replace(/,/g, ""));
+ onPatch(row.row_index, {
+ [key]:
+ n != null && Number.isFinite(n)
+ ? key === "F_CTNS"
+ ? Math.trunc(n)
+ : n
+ : key === "F_CTNS"
+ ? 0
+ : null,
+ } as Partial);
+ return;
+ }
+ onPatch(row.row_index, { [key]: next } as Partial);
+ }}
+ />
+ );
+ },
+ });
+
+ return [
+ { key: "idx", title: "#", width: 44, render: (row) => row.row_index + 1 },
+ { key: "ck", title: "选", width: 44, render: () => null },
+ text("F_Transporter", "Move Type", 110, {
+ channel: true,
+ placeholder: "派送方式*",
+ }),
+ text("F_FBACode", "FBACode", 88, { placeholder: "仓库代码" }),
+ text("F_ShipmentID", "Custmer Ref No.", 120, {
+ mono: true,
+ placeholder: "客户参考号",
+ }),
+ text("F_FBAID", "FBAId(Amazon)", 130, { mono: true, placeholder: "FBA ID" }),
+ text("F_PO", "PO(Amazon)", 100, { mono: true, placeholder: "PO" }),
+ text("F_Address", "Address", 200, { placeholder: "地址" }),
+ text("F_CTNS", "Qty.(CTNS)", 88, { placeholder: "件数*" }),
+ text("F_CBM", "Vol(CBM)", 88, { placeholder: "体积*" }),
+ text("F_Weight", "G.W.(KGS)", 88, { placeholder: "毛重*" }),
+ text("F_Pcs", "PCS", 64, { placeholder: "PCS" }),
+ text("F_City", "City", 90, { placeholder: "城市" }),
+ text("F_State", "State", 70, { placeholder: "州" }),
+ text("F_ZipCode", "ZipCode", 80, { placeholder: "邮编" }),
+ text("F_Contact", "Contact", 90, { placeholder: "联系人" }),
+ text("F_Mobile", "Mobile", 100, { placeholder: "电话" }),
+ text("F_Email", "Email", 140, { placeholder: "邮箱" }),
+ text("F_EnglishName", "英文名称", 120, { placeholder: "公司/英文名" }),
+ text("F_Remark", "行备注", 160, { placeholder: "备注" }),
+ text("F_ReferenceId", "ReferenceId", 110, {
+ mono: true,
+ placeholder: "Reference",
+ }),
+ {
+ key: "st",
+ title: "状态",
+ width: 64,
+ render: (row) => (row.row_status === "VALID" ? "有效" : "无效"),
+ },
+ {
+ key: "act",
+ title: "操作",
+ width: 72,
+ render: (row) => (
+
+ ),
+ },
+ ];
+}
+
+type ShipmentEditFormValues = {
+ F_Transporter: string;
+ F_FBACode: string;
+ F_ShipmentID: string;
+ F_FBAID: string;
+ F_PO: string;
+ F_Address: string;
+ F_CTNS: number | null;
+ F_CBM: number | null;
+ F_Weight: number | null;
+ F_Pcs: number | null;
+ F_City: string;
+ F_State: string;
+ F_ZipCode: string;
+ F_Contact: string;
+ F_Mobile: string;
+ F_Email: string;
+ F_EnglishName: string;
+ F_Remark: string;
+};
+
+function shipmentRowToEditForm(row: ShipmentRow): ShipmentEditFormValues {
+ return {
+ F_Transporter: row.channel_raw || row.F_Transporter || "",
+ F_FBACode: row.F_FBACode || "",
+ F_ShipmentID: row.F_ShipmentID || "",
+ F_FBAID: row.F_FBAID || "",
+ F_PO: row.F_PO || "",
+ F_Address: row.F_Address || "",
+ F_CTNS: row.F_CTNS ?? null,
+ F_CBM: row.F_CBM ?? null,
+ F_Weight: row.F_Weight ?? null,
+ F_Pcs: row.F_Pcs ?? null,
+ F_City: row.F_City || "",
+ F_State: row.F_State || "",
+ F_ZipCode: row.F_ZipCode || "",
+ F_Contact: row.F_Contact || "",
+ F_Mobile: row.F_Mobile || "",
+ F_Email: row.F_Email || "",
+ F_EnglishName: row.F_EnglishName || "",
+ F_Remark: row.F_Remark || "",
+ };
+}
+
+function ShipmentEditModal({
+ rowIndex,
+ row,
+ onCancel,
+ onSave,
+}: {
+ rowIndex: number;
+ row: ShipmentRow;
+ onCancel: () => void;
+ onSave: (values: ShipmentEditFormValues) => void;
+}) {
+ const [form] = Form.useForm();
+
+ const onOk = async () => {
+ const values = await form.validateFields().catch(() => null);
+ if (!values) return;
+ onSave(values);
+ };
+
+ return (
+ void onOk()}
+ okText="保存"
+ cancelText="取消"
+ width={640}
+ >
+
+
+ );
+}
+
export function CcForecastFormOrder({
mode,
value,
shipments,
shippingLines = [],
+ onFetchShippingLine,
+ fetchShippingLineLoading,
selected,
onSelectedChange,
onChange,
+ onShipmentsChange,
+ packingImportLoading,
+ onImportPackingFile,
errors = {},
step: controlledStep,
onStepChange,
@@ -186,11 +509,13 @@ export function CcForecastFormOrder({
finishLabel = "确认导入",
portal = "admin",
}: CcForecastFormOrderProps) {
+ const { message } = App.useApp();
const readonly = mode === "readonly";
const isAdmin = portal === "admin";
const [innerStep, setInnerStep] = useState(0);
const [queryDraft, setQueryDraft] = useState("");
const [query, setQuery] = useState("");
+ const [editRowIndex, setEditRowIndex] = useState(null);
const step = controlledStep ?? innerStep;
const setStep = (s: number) => {
onStepChange?.(s);
@@ -230,6 +555,96 @@ export function CcForecastFormOrder({
});
}, [shipments, query]);
+ const canEditShipments = !readonly && Boolean(onShipmentsChange);
+ const shipmentsRef = useRef(shipments);
+ shipmentsRef.current = shipments;
+
+ const patchShipment = useCallback(
+ (rowIndex: number, patch: Partial) => {
+ if (!onShipmentsChange) return;
+ onShipmentsChange(
+ shipmentsRef.current.map((row) =>
+ row.row_index === rowIndex
+ ? revalidateShipmentRow({ ...row, ...patch, row_index: rowIndex })
+ : row,
+ ),
+ );
+ },
+ [onShipmentsChange],
+ );
+
+ const openEditRow = useCallback((rowIndex: number) => {
+ setEditRowIndex(rowIndex);
+ }, []);
+
+ const shipmentColumns = useMemo(
+ () =>
+ canEditShipments
+ ? buildEditableCcShipmentColumns(patchShipment, openEditRow)
+ : CC_SHIPMENT_COLUMNS,
+ [canEditShipments, patchShipment, openEditRow],
+ );
+
+ const onAddShipment = () => {
+ if (!onShipmentsChange) return;
+ const cur = shipmentsRef.current;
+ const nextIndex = cur.reduce((m, r) => Math.max(m, r.row_index), -1) + 1;
+ const row = revalidateShipmentRow({ row_index: nextIndex });
+ const next = [...cur, row];
+ shipmentsRef.current = next;
+ onShipmentsChange(next);
+ onSelectedChange?.(new Set(selectedSet).add(nextIndex));
+ message.success("已新增一行，请填写派送方式、件数、体积、毛重（可点「编辑」弹窗填写）");
+ openEditRow(nextIndex);
+ };
+
+ const onSaveEditRow = (values: ShipmentEditFormValues) => {
+ if (editRowIndex == null) return;
+ const transporter = (values.F_Transporter || "").trim();
+ patchShipment(editRowIndex, {
+ channel_raw: transporter,
+ F_Transporter: transporter,
+ F_FBACode: (values.F_FBACode || "").trim() || undefined,
+ F_ShipmentID: (values.F_ShipmentID || "").trim() || null,
+ F_FBAID: (values.F_FBAID || "").trim() || null,
+ F_PO: (values.F_PO || "").trim() || null,
+ F_Address: (values.F_Address || "").trim() || null,
+ F_CTNS: values.F_CTNS ?? 0,
+ F_CBM: values.F_CBM,
+ F_Weight: values.F_Weight,
+ F_Pcs: values.F_Pcs,
+ F_City: (values.F_City || "").trim() || null,
+ F_State: (values.F_State || "").trim() || null,
+ F_ZipCode: (values.F_ZipCode || "").trim() || null,
+ F_Contact: (values.F_Contact || "").trim() || null,
+ F_Mobile: (values.F_Mobile || "").trim() || null,
+ F_Email: (values.F_Email || "").trim() || null,
+ F_EnglishName: (values.F_EnglishName || "").trim() || null,
+ F_Remark: (values.F_Remark || "").trim() || null,
+ });
+ setEditRowIndex(null);
+ message.success("货件已更新");
+ };
+
+ const editRow =
+ editRowIndex == null
+ ? null
+ : shipments.find((r) => r.row_index === editRowIndex) ?? null;
+
+ const onDeleteSelected = () => {
+ if (!onShipmentsChange) return;
+ const keep = shipmentsRef.current.filter(
+ (r) => !selectedSet.has(r.row_index),
+ );
+ const next = reindexShipments(keep);
+ onShipmentsChange(next);
+ onSelectedChange?.(
+ new Set(
+ next.filter((r) => r.row_status === "VALID").map((r) => r.row_index),
+ ),
+ );
+ };
+
const selectedRows = useMemo(
() => shipments.filter((s) => selectedSet.has(s.row_index)),
[shipments, selectedSet],
@@ -254,7 +669,6 @@ export function CcForecastFormOrder({
}, [selectedRows, shipments]);
const ph = "==请选择==";
- const opt = (v: unknown) => showOptional(readonly, v);
const transModeValue =
value.F_TransMode === 0 || value.F_TransMode === 1 || value.F_TransMode === 3
? value.F_TransMode
@@ -291,9 +705,9 @@ export function CcForecastFormOrder({
{isAdmin ? (
修改 · 基础信息
) : (
- 基础信息（客户端字段序）
+ 基础信息
)}
- {/* 客户端顺序：运输方式、业务类型、柜号…；管理端带客户行 */}
+ {/* 对齐 CC「修改·基础信息」：运输方式/业务类型/柜号/柜型* + 柜号Id/提单/ETD/ETA/港/船司/客服/自带车架/Instruction/备注 */}
{isAdmin ? (
@@ -306,294 +720,188 @@ export function CcForecastFormOrder({
}
/>
-
-
-
- ) : (
-
-
-
-
-
+
- )}
+ ) : null}
- {isAdmin ? (
-
-
-
-
-
- patch({ F_ContainerNo: e.target.value.toUpperCase() })
- }
- />
-
- {opt(value.F_CabinetType) ? (
-
-
- ) : null}
-
- ) : (
-
- {isAdmin ? (
- <>
- {opt(value.F_ETD) || opt(value.F_ETA) || opt(value.F_LoadPort) ? (
-
- {opt(value.F_ETD) ? (
-
- patch({ F_ETD: e.target.value })}
- />
-
- ) : null}
- {opt(value.F_ETA) ? (
-
- patch({ F_ETA: e.target.value })}
- />
-
- ) : null}
- {opt(value.F_LoadPort) ? (
-
- patch({ F_LoadPort: e.target.value })}
- />
-
- ) : null}
-
- ) : null}
-
- {opt(value.F_Dock) ||
- opt(value.F_BLCopyCode) ||
- opt(value.F_ContainerId) ? (
-
- {opt(value.F_Dock) ? (
-
- patch({ F_Dock: e.target.value })}
- />
-
- ) : null}
- {opt(value.F_BLCopyCode) ? (
-
-
- patch({ F_BLCopyCode: e.target.value.toUpperCase() })
- }
- />
-
- ) : null}
- {opt(value.F_ContainerId) ? (
-
-
-
- ) : null}
-
- ) : null}
-
- {opt(value.F_ShippingLineId) ||
- opt(value.F_CustomerService) ||
- opt(value.F_Classis) ? (
-
- {opt(value.F_ShippingLineId) ? (
-
-
- ) : null}
- {opt(value.F_CustomerService) ? (
-
-
- patch({ F_CustomerService: e.target.value })
- }
- />
-
- ) : null}
- {opt(value.F_Classis) ? (
-
-
- patch({ F_Classis: e.target.checked ? 1 : 0 })
- }
- >
- 自带车架
-
-
- ) : null}
-
-
-
- patch({ F_CustomerService: e.target.value })
- }
- />
-
-
- )}
+
+
+ patch({ F_Classis: e.target.checked ? 1 : 0 })
+ }
+ >
+ 自带车架
+
+
- {isAdmin ? (
- opt(value.F_Instruction) || opt(value.F_MemoRemark) ? (
-
- {opt(value.F_Instruction) ? (
-
-
- patch({ F_Instruction: e.target.value })
- }
- />
-
- ) : null}
- {opt(value.F_MemoRemark) ? (
-
-
- patch({ F_MemoRemark: e.target.value })
- }
- />
-
- ) : null}
-
- ) : null
- ) : (
-
-
- patch({ F_Instruction: e.target.value })}
- />
-
-
- patch({ F_MemoRemark: e.target.value })}
- />
-
-
- )}
+
+
+ patch({ F_Instruction: e.target.value })}
+ />
+
+
+ patch({ F_MemoRemark: e.target.value })}
+ />
+
+
) : null}
@@ -602,6 +910,16 @@ export function CcForecastFormOrder({
{isAdmin ? (
货件列表
) : null}
+ {canEditShipments ? (
+
+ 表格单元格可直接填写；也可点行末「编辑」弹窗修改。有效行需至少填写：派送方式、件数、体积、毛重。
+
+ ) : null}
+ {errors.rows ? (
+
+ {errors.rows}
+
+ ) : null}
查询
+ {canEditShipments ? (
+ <>
+
+
+ {onImportPackingFile ? (
+ {
+ void onImportPackingFile(file);
+ return false;
+ }}
+ >
+
+
+ ) : null}
+
+ ) : null}
-
+
{
if (readonly || !onSelectedChange) return;
const next = new Set(selectedSet);
@@ -635,8 +986,9 @@ export function CcForecastFormOrder({
/>
{shipments.length === 0 ? (
- 货件列表来自卡派清单等表格附件；当前无解析出行。请检查是否附带
- xlsx/xls，或重新解析。
+ {canEditShipments
+ ? "暂无货件行。可点击「新增货件」手工录入，或「导入装箱表」上传卡派清单（xlsx）。"
+ : "货件列表来自卡派清单等表格附件；当前无解析出行。请检查是否附带 xlsx/xls，或重新解析。"}
) : null}
@@ -732,6 +1084,16 @@ export function CcForecastFormOrder({
) : null}
+
+ {editRowIndex != null && editRow ? (
+
setEditRowIndex(null)}
+ onSave={onSaveEditRow}
+ />
+ ) : null}
);
}
@@ -765,6 +1127,7 @@ export function buildCcForecastFormValue(input: {
vessel_voyage?: string;
service?: string;
classis?: 0 | 1;
+ ops_hints?: string[];
} | null;
}): CcForecastFormValue {
const h = input.header || {};
@@ -779,14 +1142,22 @@ export function buildCcForecastFormValue(input: {
const memoRaw = h.F_MemoRemark || "";
// 备注若残留「回复：柜号：…」等脏客户前缀，剥掉已占用柜号包装
const memo = sanitizeMemoRemark(memoRaw, { containerNo, blNo, customer });
- const transMode = h.F_TransMode;
- const operationType = h.F_OperationType;
+ const fromHints = applyServiceFromModules({
+ ops_hints: m.ops_hints,
+ service: m.service,
+ });
+ const transMode =
+ h.F_TransMode ??
+ (m.container_no || m.bl_no || m.cabinet_type || m.vessel_voyage
+ ? (0 as const)
+ : undefined);
+ const operationType = h.F_OperationType ?? fromHints.F_OperationType;
const classis =
h.F_Classis === 0 || h.F_Classis === 1
? h.F_Classis
: m.classis === 0 || m.classis === 1
? m.classis
- : undefined;
+ : fromHints.F_Classis;
return {
customerName: customer,
F_TransMode:
@@ -798,7 +1169,9 @@ export function buildCcForecastFormValue(input: {
? operationType
: undefined,
F_ContainerNo: containerNo,
- F_CabinetType: h.F_CabinetType || m.cabinet_type || "",
+ F_CabinetType: normalizeCabinetType(
+ h.F_CabinetType || m.cabinet_type || "",
+ ),
F_ETD: h.F_ETD || m.etd || "",
F_ETA: h.F_ETA || m.eta || "",
F_LoadPort: h.F_LoadPort || "",
@@ -811,7 +1184,7 @@ export function buildCcForecastFormValue(input: {
F_OverWeight: false,
F_Classis: classis,
F_Instruction: stripMobileMailChrome(
- h.F_Instruction || vesselInst || "",
+ h.F_Instruction || vesselInst || fromHints.F_Instruction || "",
),
F_MemoRemark: memo,
};
diff --git a/src/components/CcMessageTypeDictCard.tsx b/src/components/CcMessageTypeDictCard.tsx
new file mode 100644
index 0000000..4141a23
--- /dev/null
+++ b/src/components/CcMessageTypeDictCard.tsx
@@ -0,0 +1,242 @@
+"use client";
+
+import { useCallback, useEffect, useMemo, useState } from "react";
+import {
+ App,
+ Button,
+ Card,
+ Form,
+ Input,
+ InputNumber,
+ Popconfirm,
+ Space,
+ Spin,
+ Switch,
+ Table,
+ Typography,
+} from "antd";
+import { DownOutlined, UpOutlined } from "@ant-design/icons";
+import {
+ createCcMessageTypeApi,
+ deleteCcMessageTypeApi,
+ listCcMessageTypesApi,
+ updateCcMessageTypeApi,
+} from "@/lib/client-api";
+import type { CcMessageTypeDictItem } from "@/types";
+
+export function CcMessageTypeDictCard() {
+ const { message } = App.useApp();
+ const [loading, setLoading] = useState(true);
+ const [expanded, setExpanded] = useState(false);
+ const [items, setItems] = useState
([]);
+ const [adding, setAdding] = useState(false);
+ const [form] = Form.useForm<{ name: string; sort_order?: number }>();
+
+ const enabledCount = useMemo(
+ () => items.filter((i) => i.enabled).length,
+ [items],
+ );
+
+ const reload = useCallback(async () => {
+ setLoading(true);
+ const res = await listCcMessageTypesApi();
+ setLoading(false);
+ if (!res.ok) {
+ message.error(res.error.message);
+ return;
+ }
+ setItems(res.data.items);
+ }, [message]);
+
+ useEffect(() => {
+ void reload();
+ }, [reload]);
+
+ const onAdd = async () => {
+ const values = await form.validateFields().catch(() => null);
+ if (!values) return;
+ setAdding(true);
+ const res = await createCcMessageTypeApi({
+ name: values.name,
+ sort_order: values.sort_order,
+ enabled: true,
+ });
+ setAdding(false);
+ if (!res.ok) {
+ message.error(res.error.message);
+ return;
+ }
+ message.success("已添加留言类型");
+ form.resetFields();
+ await reload();
+ };
+
+ const onToggle = async (row: CcMessageTypeDictItem, enabled: boolean) => {
+ const res = await updateCcMessageTypeApi(row.id, { enabled });
+ if (!res.ok) {
+ message.error(res.error.message);
+ return;
+ }
+ setItems((prev) =>
+ prev.map((x) => (x.id === row.id ? { ...x, enabled } : x)),
+ );
+ };
+
+ const onRename = async (row: CcMessageTypeDictItem, name: string) => {
+ const next = name.trim();
+ if (!next || next === row.name) return;
+ const res = await updateCcMessageTypeApi(row.id, { name: next });
+ if (!res.ok) {
+ message.error(res.error.message);
+ return;
+ }
+ message.success("已更新名称");
+ await reload();
+ };
+
+ const onSort = async (row: CcMessageTypeDictItem, sort_order: number | null) => {
+ if (sort_order == null || sort_order === row.sort_order) return;
+ const res = await updateCcMessageTypeApi(row.id, { sort_order });
+ if (!res.ok) {
+ message.error(res.error.message);
+ return;
+ }
+ await reload();
+ };
+
+ const onDelete = async (row: CcMessageTypeDictItem) => {
+ const res = await deleteCcMessageTypeApi(row.id);
+ if (!res.ok) {
+ message.error(res.error.message);
+ return;
+ }
+ message.success("已删除");
+ await reload();
+ };
+
+ return (
+
+
+ {loading
+ ? "加载中…"
+ : `共 ${items.length} 项 · 启用 ${enabledCount}`}
+
+ : }
+ onClick={() => setExpanded((v) => !v)}
+ >
+ {expanded ? "收起" : "展开"}
+
+
+ }
+ >
+ {!expanded ? (
+
+ 折叠中。展开后可维护工单 / 客户留言表单的留言类型下拉选项。
+
+ ) : (
+ <>
+
+ 在此维护写入 CarrierCentral 的「留言类型」名称。启用项会出现在确认页工单表单中；首次空库会自动写入默认种子。
+
+
+
+ 8 ? { y: 320 } : undefined}
+ columns={[
+ {
+ title: "名称",
+ dataIndex: "name",
+ render: (name: string, row) => (
+ void onRename(row, e.target.value)}
+ onPressEnter={(e) => {
+ (e.target as HTMLInputElement).blur();
+ }}
+ />
+ ),
+ },
+ {
+ title: "排序",
+ dataIndex: "sort_order",
+ width: 100,
+ render: (v: number, row) => (
+ void onSort(row, n)}
+ />
+ ),
+ },
+ {
+ title: "启用",
+ dataIndex: "enabled",
+ width: 80,
+ render: (enabled: boolean, row) => (
+ void onToggle(row, checked)}
+ />
+ ),
+ },
+ {
+ title: "操作",
+ width: 80,
+ render: (_, row) => (
+ void onDelete(row)}
+ >
+
+
+ ),
+ },
+ ]}
+ />
+
+
+
+
+ )}
+
+ );
+}
diff --git a/src/components/CcSettingsCard.tsx b/src/components/CcSettingsCard.tsx
index 6db6816..091c8fc 100644
--- a/src/components/CcSettingsCard.tsx
+++ b/src/components/CcSettingsCard.tsx
@@ -9,20 +9,15 @@ import {
Input,
Space,
Spin,
- Tag,
} from "antd";
import {
getCcSettingsApi,
testCcSettingsApi,
updateCcSettingsApi,
} from "@/lib/client-api";
-import type { CcSettings } from "@/types";
type FormValues = {
- mock: boolean;
api_base: string;
- saas_header: string;
- login_mark: string;
username: string;
password?: string;
};
@@ -32,11 +27,9 @@ export function CcSettingsCard() {
const [loading, setLoading] = useState(true);
const [saving, setSaving] = useState(false);
const [testing, setTesting] = useState(false);
- const [meta, setMeta] = useState | null>(null);
- const [mockMode, setMockMode] = useState(false);
+ const [hasPassword, setHasPassword] = useState(false);
+ const [saasHeader, setSaasHeader] = useState("TEST");
+ const [loginMark, setLoginMark] = useState("");
const [form] = Form.useForm();
const reload = useCallback(async () => {
@@ -47,17 +40,11 @@ export function CcSettingsCard() {
message.error(res.error.message);
return;
}
- setMeta({
- source: res.data.source,
- has_password: res.data.has_password,
- updated_at: res.data.updated_at,
- });
- setMockMode(res.data.mock);
+ setHasPassword(res.data.has_password);
+ setSaasHeader(res.data.saas_header || "TEST");
+ setLoginMark(res.data.login_mark || crypto.randomUUID());
form.setFieldsValue({
- mock: res.data.mock,
api_base: res.data.api_base,
- saas_header: res.data.saas_header,
- login_mark: res.data.login_mark,
username: res.data.username,
password: undefined,
});
@@ -69,13 +56,13 @@ export function CcSettingsCard() {
const onSave = async () => {
const values = await form.validateFields();
- // mock 开关已从设置页移除；保存时沿用当前运行时配置，不在此页改 mock
- const mock = mockMode;
- if (!mock && !values.username.trim()) {
+ // 工单等业务需真写 CC；保存时强制关闭全局 mock
+ const mock = false;
+ if (!values.username.trim()) {
message.error("请填写用户名");
return;
}
- if (!mock && !meta?.has_password && !values.password?.trim()) {
+ if (!hasPassword && !values.password?.trim()) {
message.error("请填写密码（首次或尚未配置）");
return;
}
@@ -84,8 +71,8 @@ export function CcSettingsCard() {
const res = await updateCcSettingsApi({
mock,
api_base: values.api_base,
- saas_header: values.saas_header,
- login_mark: values.login_mark,
+ saas_header: saasHeader || "TEST",
+ login_mark: loginMark || crypto.randomUUID(),
username: values.username,
...(values.password?.trim()
? { password: values.password.trim() }
@@ -120,21 +107,7 @@ export function CcSettingsCard() {
};
return (
-
- {meta ? (
-
- 来源 {meta.source === "db" ? "数据库" : ".env"}
-
- ) : null}
-
- {mockMode ? "mock" : "live"}
-
-
- }
- >
+