#

Junjie

2024-07-04 61ffad69120a6d8feb88e9827455bd42c3571210

#

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

@@ -902,18 +902,18 @@
            }

            // 关联表
            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");
@@ -921,7 +921,7 @@
                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");

 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/domain/Column.java

@@ -204,6 +204,13 @@
        return foreignKey;
    }

    public String getForeignKey$() {
        if (this.foreignKey != null) {
            return this.foreignKey.substring(0, 1).toLowerCase() + this.foreignKey.substring(1);
        }
        return foreignKey;
    }

    public void setForeignKey(final String foreignKey) {
        this.foreignKey = foreignKey;
    }