From 37e8e06c8d13146e62ef08d018d86443b9f42f00 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 24 二月 2025 14:46:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/page/dictType/DictTypePanel.jsx | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/customer/CustomerPanel.jsx b/rsf-admin/src/page/dictType/DictTypePanel.jsx
similarity index 88%
rename from rsf-admin/src/page/customer/CustomerPanel.jsx
rename to rsf-admin/src/page/dictType/DictTypePanel.jsx
index d03f129..846681f 100644
--- a/rsf-admin/src/page/customer/CustomerPanel.jsx
+++ b/rsf-admin/src/page/dictType/DictTypePanel.jsx
@@ -7,7 +7,7 @@
import PanelTypography from "../components/PanelTypography";
import * as Common from '@/utils/common'
-const CustomerPanel = () => {
+const DictTypePanel = () => {
const record = useRecordContext();
if (!record) return null;
const translate = useTranslate();
@@ -23,7 +23,7 @@
overflow: 'hidden',
textOverflow: 'ellipsis',
}}>
- {Common.camelToPascalWithSpaces(translate('table.field.customer.name'))}: {record.name}
+ {Common.camelToPascalWithSpaces(translate('table.field.dictType.name'))}: {record.name}
</Typography>
{/* inherit, primary, secondary, textPrimary, textSecondary, error */}
<Typography variant="h6" gutterBottom align="right" >
@@ -42,14 +42,14 @@
<Grid container spacing={2}>
<Grid item xs={6}>
<PanelTypography
- title="table.field.customer.uuid"
- property={record.uuid}
+ title="table.field.dictType.name"
+ property={record.name}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.customer.name"
- property={record.name}
+ title="table.field.dictType.description"
+ property={record.description}
/>
</Grid>
@@ -60,4 +60,4 @@
);
};
-export default CustomerPanel;
+export default DictTypePanel;
--
Gitblit v1.9.1