#

Junjie

2024-07-29 13909c99e368788a94a48753dc9f76e40a992cd6

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

@@ -42,6 +42,7 @@
    public String password;
    public String table;
    public String tableName;
    public String rootPackagePath;
    public String packagePath;
    public boolean controller = true;
    public boolean service = true;
@@ -201,6 +202,7 @@
                    .replaceAll("@\\{SIMPLEENTITYNAME}", simpleEntityName)
                    .replaceAll("@\\{UENTITYNAME}", simpleEntityName)
                    .replaceAll("@\\{COMPANYNAME}",packagePath)
                    .replaceAll("@\\{ROOTPACKAGEPATH}",rootPackagePath)
                    .replaceAll("@\\{ITEMNAME}",itemName)
//                    .replaceAll("@\\{XMLCONTENT}", xmlContent)
                    .replaceAll("@\\{HTMLCONTENT}", htmlContent)
@@ -781,14 +783,18 @@
            sb.append("        {\n")
                    .append("            title: formatMessage('db.").append(table).append(".").append(column.getName()).append("', '").append(column.getComment()).append("'),").append("\n")
                    .append("            dataIndex: '");
            StringBuilder rowKey = new StringBuilder();
            if ("Date".equals(column.getType()) || !Cools.isEmpty(column.getEnums()) || !Cools.isEmpty(column.getForeignKeyMajor())){
                // 时间、枚举  格式化  主键修饰
                sb.append(column.getHumpName()).append("\\$");
                rowKey.append(column.getHumpName()).append("\\$");
            } else {
                sb.append(column.getHumpName());
                rowKey.append(column.getHumpName());
            }
            sb.append(rowKey);
            sb.append("',\n")
                    .append("            width: 140,\n");
                    .append("            width: 140,\n")
                    .append("            ellipsis: true,\n")
                    .append("            ...getColumnSearchProps('").append(rowKey).append("'),\n");
//            if (!Cools.isEmpty(column.getEnums())) {
//                sb.append("                customRender: (column) => {\n");
//                sb.append("                  let typeMap = {");
@@ -861,7 +867,7 @@
            }

            sb.append("                    <a-form-item \n");
            sb.append("                      label=\"").append(column.getComment()).append("\" \n");
            sb.append("                      :label=\"formatMessage('db.").append(table).append(".").append(column.getName()).append("', '").append(column.getComment()).append("') ").append("\" \n");
            sb.append("                      name=\"").append(column.getHumpName()).append("\" \n");
            sb.append("                      style=\"width: 250px;\" \n");

@@ -899,26 +905,26 @@
            }

            // 关联表
            if (!Cools.isEmpty(column.getForeignKey())) {
                if (!foreignKeyContains.contains(column.getForeignKey())) {
                    sb2.append("const ").append(column.getForeignKey()).append("QueryList = ref(null); \n");
                    sb2.append(column.getForeignKey()).append("Query();\n");
                    sb2.append("function ").append(column.getForeignKey()).append("Query() { \n");
                    sb2.append("    postForm('/api/").append(column.getForeignKey().toLowerCase()).append("/query', {}).then(resp => { \n");
            if (!Cools.isEmpty(column.getForeignKey$())) {
                if (!foreignKeyContains.contains(column.getForeignKey$())) {
                    sb2.append("const ").append(column.getForeignKey$()).append("QueryList = ref(null); \n");
                    sb2.append(column.getForeignKey$()).append("Query();\n");
                    sb2.append("function ").append(column.getForeignKey$()).append("Query() { \n");
                    sb2.append("    postForm('/api/").append(column.getForeignKey$()).append("/query', {}).then(resp => { \n");
                    sb2.append("        let result = resp.data;\n");
                    sb2.append("        ").append(column.getForeignKey()).append("QueryList.value = result.data;\n");
                    sb2.append("        ").append(column.getForeignKey$()).append("QueryList.value = result.data;\n");
                    sb2.append("    })\n");
                    sb2.append("}\n");

                    foreignKeyContains.add(column.getForeignKey());
                    foreignKeyContains.add(column.getForeignKey$());
                }

                sb.append("                    <a-select \n");
                sb.append("                        v-model:value=\"formData.").append(column.getHumpName()).append("\" \n");
                sb.append("                        placeholder=\"Select users\" \n");
                sb.append("                        :placeholder=\"formatMessage('common.select', '请选择')\" \n");
                sb.append("                        style=\"width: 100%\" \n");
                sb.append("                        show-search \n");
                sb.append("                        :options=\"").append(column.getForeignKey()).append("QueryList\" \n");
                sb.append("                        :options=\"").append(column.getForeignKey$()).append("QueryList\" \n");
                sb.append("                        optionFilterProp=\"label\" \n");
                sb.append("                        optionLabelProp=\"label\" \n");
                sb.append("                     > \n");