From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/fields/FieldsList.jsx | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/page/fields/FieldsList.jsx b/rsf-admin/src/page/fields/FieldsList.jsx
index 5c1f785..c1bdc5e 100644
--- a/rsf-admin/src/page/fields/FieldsList.jsx
+++ b/rsf-admin/src/page/fields/FieldsList.jsx
@@ -60,21 +60,19 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="fields" label="table.field.fields.fields" />,
<TextInput source="fieldsAlise" label="table.field.fields.fieldsAlise" />,
<SelectInput source="unique" label="table.field.fields.unique"
choices={[
- { id: 0, name: ' 闈炲敮涓�' },
- { id: 1, name: ' 鍞竴' },
+ { id: 0, name: '涓绘暟鎹�' },
+ { id: 1, name: '涓氬姟鏁版嵁' },
]}
/>,
<SelectInput source="flagEnable" label="table.field.fields.flagEnable"
choices={[
{ id: 0, name: ' 涓嶅惎鐢�' },
- { id: 1, name: ' 鍚敤' },
+ { id: 1, name: ' 鍚敤' },
]}
/>,
@@ -105,7 +103,7 @@
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.fields"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -125,9 +123,7 @@
preferenceKey='fields'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <FieldsPanel />}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
>
<NumberField source="id" />
<TextField source="fields" label="table.field.fields.fields" />
--
Gitblit v1.9.1