合并冲突
puz
commit
d5738ca35d
|
|
@ -6,7 +6,6 @@ import { createDictItem, createDictType, deleteDictItem, deleteDictType, fetchDi
|
|||
import { useDict } from "@/hooks/useDict";
|
||||
import { usePermission } from "@/hooks/usePermission";
|
||||
import PageHeader from "@/components/shared/PageHeader";
|
||||
import PageContainer from "@/components/shared/PageContainer";
|
||||
import { getStandardPagination } from "@/utils/pagination";
|
||||
import type { SysDictItem, SysDictType } from "@/types";
|
||||
import "./index.less";
|
||||
|
|
@ -79,10 +78,17 @@ export default function Dictionaries() {
|
|||
|
||||
const handleEditType = (record: SysDictType) => {
|
||||
setEditingType(record);
|
||||
typeForm.resetFields();
|
||||
typeForm.setFieldsValue(record);
|
||||
setTypeDrawerVisible(true);
|
||||
};
|
||||
|
||||
const closeTypeDrawer = () => {
|
||||
setTypeDrawerVisible(false);
|
||||
setEditingType(null);
|
||||
typeForm.resetFields();
|
||||
};
|
||||
|
||||
const handleDeleteType = async (id: number) => {
|
||||
await deleteDictType(id);
|
||||
message.success(t("common.success"));
|
||||
|
|
@ -97,7 +103,7 @@ export default function Dictionaries() {
|
|||
await createDictType(values);
|
||||
}
|
||||
message.success(t("common.success"));
|
||||
setTypeDrawerVisible(false);
|
||||
closeTypeDrawer();
|
||||
loadTypes();
|
||||
};
|
||||
|
||||
|
|
@ -127,10 +133,17 @@ export default function Dictionaries() {
|
|||
|
||||
const handleEditItem = (record: SysDictItem) => {
|
||||
setEditingItem(record);
|
||||
itemForm.resetFields();
|
||||
itemForm.setFieldsValue(record);
|
||||
setItemDrawerVisible(true);
|
||||
};
|
||||
|
||||
const closeItemDrawer = () => {
|
||||
setItemDrawerVisible(false);
|
||||
setEditingItem(null);
|
||||
itemForm.resetFields();
|
||||
};
|
||||
|
||||
const handleDeleteItem = async (id: number) => {
|
||||
await deleteDictItem(id);
|
||||
message.success(t("common.success"));
|
||||
|
|
@ -145,18 +158,28 @@ export default function Dictionaries() {
|
|||
await createDictItem(values);
|
||||
}
|
||||
message.success(t("common.success"));
|
||||
setItemDrawerVisible(false);
|
||||
closeItemDrawer();
|
||||
if (selectedType) loadItems(selectedType.typeCode);
|
||||
};
|
||||
|
||||
return (
|
||||
<PageContainer
|
||||
title={t("dicts.title")}
|
||||
subtitle={t("dicts.subtitle")}
|
||||
>
|
||||
<Row gutter={24} style={{ flex: 1, minHeight: 0, overflow: "hidden" }}>
|
||||
<div className="app-page dictionaries-page">
|
||||
<PageHeader title={t("dicts.title")} subtitle={t("dicts.subtitle")}/>
|
||||
|
||||
<Row gutter={24} className="flex-1 min-h-0 overflow-hidden">
|
||||
<Col span={8} className="h-full flex flex-col overflow-hidden">
|
||||
<Card title={<Space><BookOutlined aria-hidden="true" /><span>{t("dicts.dictType")}</span></Space>} className="app-page__panel-card flex-1 flex flex-col overflow-hidden" styles={{ body: { padding: "12px", flex: 1, display: "flex", flexDirection: "column", overflow: "hidden",maxHeight:"calc(100vh - 360px)" } }} extra={can("sys_dict:type:create") && <Button type="primary" size="small" icon={<PlusOutlined aria-hidden="true" />} onClick={handleAddType}>{t("common.create")}</Button>}>
|
||||
<Card title={<Space><BookOutlined aria-hidden="true"/><span>{t("dicts.dictType")}</span></Space>}
|
||||
className="app-page__panel-card flex-1 flex flex-col overflow-hidden" styles={{
|
||||
body: {
|
||||
padding: "12px",
|
||||
flex: 1,
|
||||
display: "flex",
|
||||
flexDirection: "column",
|
||||
overflow: "hidden"
|
||||
}
|
||||
}} extra={can("sys_dict:type:create") &&
|
||||
<Button type="primary" size="small" icon={<PlusOutlined aria-hidden="true"/>}
|
||||
onClick={handleAddType}>{t("common.create")}</Button>}>
|
||||
<div style={{ marginBottom: 12 }} className="flex-shrink-0">
|
||||
<Space.Compact style={{ width: "100%" }}>
|
||||
<Input
|
||||
|
|
@ -251,7 +274,13 @@ export default function Dictionaries() {
|
|||
</Col>
|
||||
</Row>
|
||||
|
||||
<Drawer title={<Space><BookOutlined aria-hidden="true" /><span>{editingType ? t("dicts.drawerTitleTypeEdit") : t("dicts.drawerTitleTypeCreate")}</span></Space>} open={typeDrawerVisible} onClose={() => setTypeDrawerVisible(false)} width={400} destroyOnClose footer={<div className="app-page__drawer-footer"><Button onClick={() => setTypeDrawerVisible(false)}>{t("common.cancel")}</Button><Button type="primary" onClick={handleTypeSubmit}>{t("common.save")}</Button></div>}>
|
||||
<Drawer title={<Space><BookOutlined
|
||||
aria-hidden="true"/><span>{editingType ? t("dicts.drawerTitleTypeEdit") : t("dicts.drawerTitleTypeCreate")}</span></Space>}
|
||||
open={typeDrawerVisible} onClose={closeTypeDrawer} width={400} destroyOnClose
|
||||
footer={<div className="app-page__drawer-footer"><Button
|
||||
onClick={closeTypeDrawer}>{t("common.cancel")}</Button><Button type="primary"
|
||||
onClick={handleTypeSubmit}>{t("common.save")}</Button>
|
||||
</div>}>
|
||||
<Form form={typeForm} layout="vertical">
|
||||
<Form.Item label={t("dicts.typeCode")} name="typeCode" rules={[{ required: true, message: t("dicts.typeCode") }]}>
|
||||
<Input disabled={!!editingType} placeholder={t("dictsExt.typeCodePlaceholder")} />
|
||||
|
|
@ -265,7 +294,13 @@ export default function Dictionaries() {
|
|||
</Form>
|
||||
</Drawer>
|
||||
|
||||
<Drawer title={<Space><ProfileOutlined aria-hidden="true" /><span>{editingItem ? t("dicts.drawerTitleItemEdit") : t("dicts.drawerTitleItemCreate")}</span></Space>} open={itemDrawerVisible} onClose={() => setItemDrawerVisible(false)} width={400} destroyOnClose footer={<div className="app-page__drawer-footer"><Button onClick={() => setItemDrawerVisible(false)}>{t("common.cancel")}</Button><Button type="primary" onClick={handleItemSubmit}>{t("common.save")}</Button></div>}>
|
||||
<Drawer title={<Space><ProfileOutlined
|
||||
aria-hidden="true"/><span>{editingItem ? t("dicts.drawerTitleItemEdit") : t("dicts.drawerTitleItemCreate")}</span></Space>}
|
||||
open={itemDrawerVisible} onClose={closeItemDrawer} width={400} destroyOnClose
|
||||
footer={<div className="app-page__drawer-footer"><Button
|
||||
onClick={closeItemDrawer}>{t("common.cancel")}</Button><Button type="primary"
|
||||
onClick={handleItemSubmit}>{t("common.save")}</Button>
|
||||
</div>}>
|
||||
<Form form={itemForm} layout="vertical">
|
||||
<Form.Item label={t("dicts.typeCode")} name="typeCode"><Input disabled className="tabular-nums" /></Form.Item>
|
||||
<Form.Item label={t("dicts.itemLabel")} name="itemLabel" rules={[{ required: true, message: t("dicts.itemLabel") }]}><Input placeholder={t("dictsExt.itemLabelPlaceholder")} /></Form.Item>
|
||||
|
|
@ -275,6 +310,6 @@ export default function Dictionaries() {
|
|||
<Form.Item label={t("common.remark")} name="remark"><Input.TextArea placeholder={t("dictsExt.itemRemarkPlaceholder")} rows={3} /></Form.Item>
|
||||
</Form>
|
||||
</Drawer>
|
||||
</PageContainer>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,11 +31,10 @@ export default function SysParams() {
|
|||
const [drawerOpen, setDrawerOpen] = useState(false);
|
||||
const [editing, setEditing] = useState<SysParamVO | null>(null);
|
||||
const [jsonError, setJsonError] = useState<string | null>(null);
|
||||
const [form] = Form.useForm();
|
||||
const paramType = Form.useWatch("paramType", form) as string | undefined;
|
||||
const [searchForm] = Form.useForm<SysParamQuery>();
|
||||
const [drawerForm] = Form.useForm<SysParamVO>();
|
||||
const paramType = Form.useWatch("paramType", drawerForm) as string | undefined;
|
||||
|
||||
// Per-type validation rules. The submitted paramValue is always a string
|
||||
// (backend stores TEXT), so validators operate on string values.
|
||||
const valueRules = (() => {
|
||||
const required = [{ required: true, message: t("sysParams.paramValue") }];
|
||||
if (isType(paramType, "Number")) {
|
||||
|
|
@ -69,11 +68,11 @@ export default function SysParams() {
|
|||
})();
|
||||
|
||||
const formatJson = () => {
|
||||
const raw = form.getFieldValue("paramValue");
|
||||
const raw = drawerForm.getFieldValue("paramValue");
|
||||
if (!raw) return;
|
||||
try {
|
||||
const parsed = JSON.parse(raw);
|
||||
form.setFieldValue("paramValue", JSON.stringify(parsed, null, 2));
|
||||
drawerForm.setFieldValue("paramValue", JSON.stringify(parsed, null, 2));
|
||||
setJsonError(null);
|
||||
} catch {
|
||||
setJsonError(t("sysParamsExt.jsonInvalid"));
|
||||
|
|
@ -96,10 +95,12 @@ export default function SysParams() {
|
|||
}, [loadData]);
|
||||
|
||||
const handleSearch = (values: any) => {
|
||||
|
||||
setQueryParams({ ...queryParams, ...values, pageNum: 1 });
|
||||
};
|
||||
|
||||
const handleReset = () => {
|
||||
searchForm.resetFields();
|
||||
setQueryParams({ pageNum: 1, pageSize: 10 });
|
||||
};
|
||||
|
||||
|
|
@ -110,18 +111,23 @@ export default function SysParams() {
|
|||
const openCreate = () => {
|
||||
setEditing(null);
|
||||
setJsonError(null);
|
||||
form.resetFields();
|
||||
form.setFieldsValue({ isSystem: 0, status: 1 });
|
||||
drawerForm.resetFields();
|
||||
drawerForm.setFieldsValue({ isSystem: 0, status: 1 });
|
||||
setDrawerOpen(true);
|
||||
};
|
||||
|
||||
const openEdit = (record: SysParamVO) => {
|
||||
setEditing(record);
|
||||
setJsonError(null);
|
||||
form.setFieldsValue(record);
|
||||
drawerForm.resetFields();
|
||||
drawerForm.setFieldsValue(record);
|
||||
setDrawerOpen(true);
|
||||
};
|
||||
|
||||
const closeDrawer = () => {
|
||||
setDrawerOpen(false);
|
||||
setEditing(null);
|
||||
drawerForm.resetFields();
|
||||
};
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
await deleteParam(id);
|
||||
|
|
@ -133,7 +139,7 @@ export default function SysParams() {
|
|||
|
||||
const submit = async () => {
|
||||
try {
|
||||
const values = await form.validateFields();
|
||||
const values = await drawerForm.validateFields();
|
||||
setSaving(true);
|
||||
if (editing) {
|
||||
await updateParam(editing.paramId, values);
|
||||
|
|
@ -141,7 +147,7 @@ export default function SysParams() {
|
|||
await createParam(values);
|
||||
}
|
||||
message.success(t("common.success"));
|
||||
setDrawerOpen(false);
|
||||
closeDrawer();
|
||||
loadData();
|
||||
} finally {
|
||||
setSaving(false);
|
||||
|
|
@ -255,7 +261,7 @@ export default function SysParams() {
|
|||
</Button>
|
||||
}
|
||||
toolbar={
|
||||
<Form layout="inline" onFinish={handleSearch}>
|
||||
<Form form={searchForm} layout="inline" onFinish={handleSearch}>
|
||||
<Form.Item name="paramKey">
|
||||
<Input placeholder={t("sysParams.paramKey")} prefix={<SearchOutlined />} allowClear style={{ width: 200 }} />
|
||||
</Form.Item>
|
||||
|
|
@ -296,12 +302,14 @@ export default function SysParams() {
|
|||
<Drawer
|
||||
title={<Space size={8}><SettingOutlined />{editing ? t("sysParams.drawerTitleEdit") : t("sysParams.drawerTitleCreate")}</Space>}
|
||||
open={drawerOpen}
|
||||
onClose={() => setDrawerOpen(false)}
|
||||
onClose={closeDrawer}
|
||||
width={500}
|
||||
destroyOnClose
|
||||
footer={<div className="app-page__drawer-footer"><Button onClick={() => setDrawerOpen(false)}>{t("common.cancel")}</Button><Button type="primary" loading={saving} onClick={submit}>{t("common.save")}</Button></div>}
|
||||
footer={<div className="app-page__drawer-footer"><Button
|
||||
onClick={closeDrawer}>{t("common.cancel")}</Button><Button type="primary" loading={saving}
|
||||
onClick={submit}>{t("common.save")}</Button></div>}
|
||||
>
|
||||
<Form form={form} layout="vertical">
|
||||
<Form form={drawerForm} layout="vertical">
|
||||
<Form.Item label={t("sysParams.paramKey")} name="paramKey" rules={[{ required: true, message: t("sysParams.paramKey") }]}>
|
||||
<Input placeholder={t("sysParamsExt.paramKeyPlaceholder")} disabled={!!editing} />
|
||||
</Form.Item>
|
||||
|
|
@ -309,7 +317,7 @@ export default function SysParams() {
|
|||
<Col span={12}>
|
||||
<Form.Item label={t("sysParams.paramType")} name="paramType" rules={[{ required: true, message: t("sysParams.paramType") }]}>
|
||||
<Select placeholder={t("sysParams.paramType")} options={paramTypeDict.map((item) => ({ label: item.itemLabel, value: item.itemValue }))} onChange={(value) => {
|
||||
form.setFieldValue("paramValue", isType(value, "Boolean") ? "true" : "");
|
||||
drawerForm.setFieldValue("paramValue", isType(value, "Boolean") ? "true" : "");
|
||||
setJsonError(null);
|
||||
}} />
|
||||
</Form.Item>
|
||||
|
|
@ -358,8 +366,8 @@ export default function SysParams() {
|
|||
style={{ fontFamily: "'SFMono-Regular', Consolas, Menlo, monospace" }}
|
||||
placeholder={t("sysParamsExt.jsonPlaceholder")}
|
||||
onFocus={() => {
|
||||
const v = form.getFieldValue("paramValue");
|
||||
if (!v) form.setFieldValue("paramValue", JSON.stringify({ key: "value" }));
|
||||
const v = drawerForm.getFieldValue("paramValue");
|
||||
if (!v) drawerForm.setFieldValue("paramValue", JSON.stringify({ key: "value" }));
|
||||
}}
|
||||
onChange={(e) => {
|
||||
const v = e.target.value;
|
||||
|
|
|
|||
Loading…
Reference in New Issue