#

luxiaotao1123

2024-09-10 0f2d419d4002c7d5297f418b6707d3348e80e75d

#

 zy-acs-flow/src/config/setting.js

@@ -29,4 +29,4 @@

export const OPERATE_MODE = 'undoable'; // pessimistic | optimistic(tip) | undoable

export const EDIT_MODE = 'undoable'; // pessimistic | undoable
export const EDIT_MODE = 'pessimistic'; // pessimistic | undoable

 zy-acs-flow/src/page/config/ConfigCreate.jsx

@@ -81,14 +81,14 @@
                        </DialogTitle>
                        <DialogContent>
                            <Grid container rowSpacing={2} columnSpacing={2}>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.config.uuid"
                                        source="uuid"
                                        parse={v => v}
                                        autoFocus
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.config.name"
@@ -116,7 +116,7 @@
                                        ]}
                                    />
                                </Grid>
                                <Grid item xs={12} display="flex" gap={1}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.config.val"
                                        source="val"

 zy-acs-flow/src/page/config/ConfigEdit.jsx

@@ -65,7 +65,7 @@
                                label="table.field.config.uuid"
                                source="uuid"
                                parse={v => v}
                                autoFocus
                                disabled
                            />
                            <TextInput
                                label="table.field.config.name"

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java

@@ -13,7 +13,7 @@
@Data
public class TaskPosDto {

    public static final Integer INF = 100000;
    public static final Integer INF = 999999999;

    private Long taskId;


 zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/ConfigController.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
@@ -24,6 +25,8 @@

    @Autowired
    private ConfigService configService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @PreAuthorize("hasAuthority('system:config:list')")
    @PostMapping("/config/page")
@@ -55,6 +58,7 @@
    @OperationLog("Create Config")
    @PostMapping("/config/save")
    public R save(@RequestBody Config config) {
        config.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        config.setCreateBy(getLoginUserId());
        config.setCreateTime(new Date());
        config.setUpdateBy(getLoginUserId());