#

luxiaotao1123

2024-02-17 07dcbafd02e169ecd69e4e9209e4ca85b3571d8a

#

 zy-asrs-flow/src/components/TableSearch/index.jsx

@@ -216,7 +216,7 @@
    const [options, setOptions] = React.useState([]);

    const fetchData = async (value) => {
        return await Http.doPostForm(`api/${props.name}/query`, { condition: value });
        return await Http.doPostForm(`api/${props.major}/query`, { condition: value });
    }

    async function initOptions(value) {

 zy-asrs-flow/src/pages/system/role/components/edit.jsx

@@ -99,7 +99,7 @@
                        showSearch
                        debounceTime={300}
                        request={async ({ keyWords }) => {
                            const resp = await Http.doPostForm('api/hostId/query', { condition: keyWords });
                            const resp = await Http.doPostForm('api/host/query', { condition: keyWords });
                            return resp.data;
                        }}
                    />

 zy-asrs-flow/src/pages/system/role/index.jsx

@@ -135,6 +135,7 @@
            valueType: 'text',
            filterDropdown: (props) => <LinkFilter
                name='hostId'
                major='host'
                {...props}
                actionRef={actionRef}
                setSearchParam={setSearchParam}

 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java

@@ -792,8 +792,13 @@
                sb.append("            copyable: true,\n");
            }
            sb.append("            filterDropdown: (props) => <").append(getAntProFilterType(column)).append("\n")
                    .append("                name='").append(column.getHumpName()).append("'\n")
                    .append("                {...props}\n")
                    .append("                name='").append(column.getHumpName()).append("'\n");

            if (!Cools.isEmpty(column.getForeignKey())) {
                sb.append("                major='").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("'\n");
            }

            sb.append("                {...props}\n")
                    .append("                actionRef={actionRef}\n")
                    .append("                setSearchParam={setSearchParam}\n");
            if (!Cools.isEmpty(column.getEnums())) {
@@ -861,16 +866,101 @@
            ) {
                continue;
            }

            if (times%2 == 0) {

                sb.append("                    <ProForm.Group>\n");
            }

            String itemType = "ProFormText";
            String precision = "";
            switch (column.getType()) {
                case "Boolean":
                    itemType = "ProFormText";
                    break;
                case "Short":
                    itemType = "ProFormDigit";
                    precision = "0";
                    break;
                case "Integer":
                    itemType = "ProFormDigit";
                    precision = "0";
                    break;
                case "Long":
                    itemType = "ProFormDigit";
                    precision = "0";
                    break;
                case "Double":
                    itemType = "ProFormDigit";
                    precision = "2";
                    break;
                case "String":
                    itemType = "ProFormText";
                    break;
                case "Date":
                    itemType = "ProFormDateTimePicker";
                    break;
                default:
                    break;
            }
            if (!Cools.isEmpty(column.getEnums())) {
                itemType = "ProFormSelect";
            }
            if (!Cools.isEmpty(column.getForeignKey())) {
                itemType = "ProFormSelect";
            }

            sb.append("                        <").append(itemType).append("\n")
                    .append("                            name=\"").append(column.getHumpName()).append("\"\n")
                    .append("                            label=\"").append(column.getComment()).append("\"\n")
                    .append("                            colProps={{ md: 12, xl: 12 }}\n");
            // 数字小数点
            if (!Cools.isEmpty(precision) && Cools.isEmpty(column.getEnums())) {
                sb.append("                            fieldProps={{ precision: ").append(precision).append(" }}\n");
            }
            if ("Date".equals(column.getType()) || !Cools.isEmpty(column.getEnums()) || !Cools.isEmpty(column.getForeignKeyMajor())){
                // 时间、枚举  格式化  主键修饰
                sb.append("                            placeholder=\"请选择\"\n");
            } else {
                sb.append("                            placeholder=\"请输入\"\n");
            }

            // 非空
            if (column.isNotNull()) {
                sb.append("                            rules={[{ required: true, message: \"").append(column.getComment()).append("不能为空！\" }]}\n");
            }

            // 枚举
            if (!Cools.isEmpty(column.getEnums())) {
                sb.append("                            options={[\n");
                for (Map<String, Object> map : column.getEnums()) {
                    for (Map.Entry<String, Object> entry : map.entrySet()){
                        sb.append("                                { label: '").append(entry.getValue()).append("', value: ").append(entry.getKey()).append(" },\n");
                    }
                }
                sb.append("                            ]}\n");
            }

            // 时间
            if ("Date".equals(column.getType())) {
                sb.append("                            transform={(value) => moment(value).toISOString()}\n");
            }

            // 关联表
            if (!Cools.isEmpty(column.getForeignKey())) {
                sb.append("                        showSearch\n")
                        .append("                        debounceTime={300}\n")
                        .append("                        request={async ({ keyWords }) => {\n")
                        .append("                            const resp = await Http.doPostForm('api/").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("/query', { condition: keyWords });\n")
                        .append("                        }}\n");
            }

            sb.append("                    />\n");

            if (times%2 == 0) {
                sb.append("                    </ProForm.Group>\n");
            }
            times++;
        }
        return sb.toString();
    }



}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java

@@ -28,7 +28,7 @@
    private HostService hostService;

    @PreAuthorize("hasAuthority('sys:host:list')")
    @PostMapping("/hostId/query")
    @PostMapping("/host/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<Host> wrapper = new LambdaQueryWrapper<>();