DESKTOP-LMJ82IJ\Eno
2025-04-13 d6775a4b96a6a3ded3be9d3f2044ba3f91c070a1
#修改
编码规则修改
5个文件已修改
29 ■■■■■ 已修改文件
rsf-admin/src/i18n/zh.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/system/serialRule/SerialRuleList.jsx 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/i18n/zh.js
@@ -482,8 +482,8 @@
            },
            serialRuleItem: {
                ruleId: "规则标识",
                wkType: "规则类型",
                feildValue: "规则参数",
                wkType: "类型",
                feildValue: "类型参数",
                len: "截取长度",
                lenStr: "截取起始位置",
                sort: "排序",
rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx
@@ -43,6 +43,7 @@
const SerialRuleEdit = () => {
    const translate = useTranslate();
    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_task_reset_type')) || [];
    return (
        <>
@@ -84,12 +85,14 @@
                                />
                            </Stack>
                            <Stack direction='row' gap={2}>
                                <TextInput
                                <AutocompleteInput
                                    choices={dicts}
                                    optionText="label"
                                    label="table.field.serialRule.reset"
                                    source="reset"
                                    optionValue="value"
                                    parse={v => v}
                                    validate={required()}
                                />
                                    validate={[required()]} />
                                <TextInput
                                    label="table.field.serialRule.resetDep"
                                    source="resetDep"
rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
@@ -46,6 +46,7 @@
const SerialRuleItemEdit = (props) => {
    const { open, setOpen, record } = props;
    const translate = useTranslate();
    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_item_type')) || [];
    const handleClose = (event, reason) => {
        if (reason !== "backdropClick") {
            setOpen(false);
@@ -103,10 +104,12 @@
                                    />
                                </Stack>
                                <Stack direction='row' gap={2}>
                                    <TextInput
                                    <AutocompleteInput
                                        choices={dicts}
                                        optionText="label"
                                        label="table.field.serialRuleItem.wkType"
                                        source="wkType$"
                                        readOnly
                                        source="wkType"
                                        optionValue="value"
                                        parse={v => v}
                                    />
                                </Stack>
rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
@@ -95,6 +95,7 @@
  const [createDialog, setCreateDialog] = useState(false);
  const [drawerVal, setDrawerVal] = useState(false);
  const [detailDialog, setDetailDialog] = useState(false);
  const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_item_type')) || [];
  // const navigate = useNavigate();
  // const assign = (record) => {
@@ -148,7 +149,7 @@
          <TextField source="code" label="table.field.serialRule.code" />
          <TextField source="name" label="table.field.serialRule.name" />
          <TextField source="delimit" label="table.field.serialRule.delimit" />
          <TextField source="reset" label="table.field.serialRule.reset" />
          <TextField label="table.field.serialRule.reset"  source="reset$" />
          <TextField
            source="resetDep"
            label="table.field.serialRule.resetDep"
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
@@ -178,8 +178,10 @@
                return " 年";
            case  "month":
                return " 月";
            case  "day":
            case  "dd":
                return " 天";
            case  "non":
                return " 无";
            default:
                return String.valueOf(this.reset);
        }