wms-master.git - Gitblit

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-03-25 eb8ded2565e746a360985f702c556b26f750d35a

 rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx

@@ -93,8 +93,8 @@
                            <TextInput
                                label="table.field.dictData.label"
                                source="label"
                                parse={v => v}
                                validate={required()}
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
@@ -103,13 +103,13 @@
                                source="sort"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                        {/* <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.dictData.color"
                                source="color"
                                parse={v => v}
                            />
                        </Stack>
                        </Stack> */}

                    </Grid>
                    <Grid item xs={12} md={4}>

			@@ -93,8 +93,8 @@
			<TextInput
			label="table.field.dictData.label"
			source="label"
			parse={v => v}
			validate={required()}
			parse={v => v}
			/>
			</Stack>
			<Stack direction='row' gap={2}>
			@@ -103,13 +103,13 @@
			source="sort"
			/>
			</Stack>
			<Stack direction='row' gap={2}>
			{/* <Stack direction='row' gap={2}>
			<TextInput
			label="table.field.dictData.color"
			source="color"
			parse={v => v}
			/>
			</Stack>
			</Stack> */}

			</Grid>
			<Grid item xs={12} md={4}>