移除主子表代码生成模块

ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -16,11 +16,6 @@ public class GenConstants {
      */
     public static final String TPL_TREE = "tree";
 
-    /**
-     * 主子表（增删改查）
-     */
-    public static final String TPL_SUB = "sub";
-
     /**
      * 树编码字段
      */

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -61,7 +61,7 @@ public class GenTable extends BaseEntity {
     private String className;
 
     /**
-     * 使用的模板（crud单表操作 tree树表操作 sub主子表操作）
+     * 使用的模板（crud单表操作 tree树表操作）
      */
     private String tplCategory;
 
@@ -110,10 +110,6 @@ public class GenTable extends BaseEntity {
      */
     private GenTableColumn pkColumn;
 
-    /**
-     * 子表信息
-     */
-    private GenTable subTable;
 
     /**
      * 表列信息
@@ -156,9 +152,6 @@ public class GenTable extends BaseEntity {
      */
     private String remark;
 
-    public static boolean isSub (String tplCategory) {
-        return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
-    }
 
     public static boolean isTree (String tplCategory) {
         return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
@@ -176,10 +169,6 @@ public class GenTable extends BaseEntity {
         return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
     }
 
-    public boolean isSub () {
-        return isSub(this.tplCategory);
-    }
-
     public boolean isTree () {
         return isTree(this.tplCategory);
     }

ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java

@@ -204,8 +204,6 @@ public class GenTableServiceImpl implements GenTableService {
         Map<String, String> dataMap = new LinkedHashMap<>();
         // 查询表信息
         GenTable table = genTableMapper.selectGenTableById(tableId);
-        // 设置主子表信息
-        setSubTable(table);
         // 设置主键列信息
         setPkColumn(table);
         VelocityInitializer.initVelocity();
@@ -249,8 +247,6 @@ public class GenTableServiceImpl implements GenTableService {
     public void generatorCode (String tableName) {
         // 查询表信息
         GenTable table = genTableMapper.selectGenTableByName(tableName);
-        // 设置主子表信息
-        setSubTable(table);
         // 设置主键列信息
         setPkColumn(table);
 
@@ -347,8 +343,6 @@ public class GenTableServiceImpl implements GenTableService {
     private void generatorCode (String tableName, ZipOutputStream zip) {
         // 查询表信息
         GenTable table = genTableMapper.selectGenTableByName(tableName);
-        // 设置主子表信息
-        setSubTable(table);
         // 设置主键列信息
         setPkColumn(table);
 
@@ -392,12 +386,6 @@ public class GenTableServiceImpl implements GenTableService {
                 throw new ServiceException("树父编码字段不能为空");
             } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) {
                 throw new ServiceException("树名称字段不能为空");
-            } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
-                if (StringUtils.isEmpty(genTable.getSubTableName())) {
-                    throw new ServiceException("关联子表的表名不能为空");
-                } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) {
-                    throw new ServiceException("子表关联的外键名不能为空");
-                }
             }
         }
     }
@@ -417,29 +405,6 @@ public class GenTableServiceImpl implements GenTableService {
         if (StringUtils.isNull(table.getPkColumn())) {
             table.setPkColumn(table.getColumns().get(0));
         }
-        if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
-            for (GenTableColumn column : table.getSubTable().getColumns()) {
-                if (column.isPk()) {
-                    table.getSubTable().setPkColumn(column);
-                    break;
-                }
-            }
-            if (StringUtils.isNull(table.getSubTable().getPkColumn())) {
-                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
-            }
-        }
-    }
-
-    /**
-     * 设置主子表信息
-     *
-     * @param table 业务表信息
-     */
-    public void setSubTable (GenTable table) {
-        String subTableName = table.getSubTableName();
-        if (StringUtils.isNotEmpty(subTableName)) {
-            table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
-        }
     }
 
     /**

ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -70,9 +70,6 @@ public class VelocityUtils {
         if (GenConstants.TPL_TREE.equals(tplCategory)) {
             setTreeVelocityContext(velocityContext, genTable);
         }
-        if (GenConstants.TPL_SUB.equals(tplCategory)) {
-            setSubVelocityContext(velocityContext, genTable);
-        }
         return velocityContext;
     }
 
@@ -102,22 +99,6 @@ public class VelocityUtils {
         }
     }
 
-    public static void setSubVelocityContext (VelocityContext context, GenTable genTable) {
-        GenTable subTable = genTable.getSubTable();
-        String subTableName = genTable.getSubTableName();
-        String subTableFkName = genTable.getSubTableFkName();
-        String subClassName = genTable.getSubTable().getClassName();
-        String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
-
-        context.put("subTable", subTable);
-        context.put("subTableName", subTableName);
-        context.put("subTableFkName", subTableFkName);
-        context.put("subTableFkClassName", subTableFkClassName);
-        context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
-        context.put("subClassName", subClassName);
-        context.put("subclassName", StringUtils.uncapitalize(subClassName));
-        context.put("subImportList", getImportList(genTable.getSubTable()));
-    }
 
     /**
      * 获取模板信息
@@ -141,9 +122,6 @@ public class VelocityUtils {
             templates.add("vm/vue/index.vue.vm");
         } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
             templates.add("vm/vue/index-tree.vue.vm");
-        } else if (GenConstants.TPL_SUB.equals(tplCategory)) {
-            templates.add("vm/vue/index.vue.vm");
-            templates.add("vm/java/sub-domain.java.vm");
         }
         return templates;
     }
@@ -179,9 +157,7 @@ public class VelocityUtils {
         if (template.contains("edit.java.vm")) {
             fileName = StringUtils.format("{}/domain/req/{}EditReq.java", javaPath, className);
         }
-        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) {
+        if (template.contains("mapper.java.vm")) {
-            fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
-        } else if (template.contains("mapper.java.vm")) {
             fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
         } else if (template.contains("service.java.vm")) {
             fileName = StringUtils.format("{}/service/{}Service.java", javaPath, className);
@@ -224,11 +200,7 @@ public class VelocityUtils {
      */
     public static HashSet<String> getImportList (GenTable genTable) {
         List<GenTableColumn> columns = genTable.getColumns();
-        GenTable subGenTable = genTable.getSubTable();
         HashSet<String> importList = new HashSet<String>();
-        if (StringUtils.isNotNull(subGenTable)) {
-            importList.add("java.util.List");
-        }
         for (GenTableColumn column : columns) {
             if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) {
                 importList.add("java.util.Date");
@@ -251,10 +223,6 @@ public class VelocityUtils {
         List<GenTableColumn> columns = genTable.getColumns();
         Set<String> dicts = new HashSet<String>();
         addDicts(dicts, columns);
-        if (StringUtils.isNotNull(genTable.getSubTable())) {
-            List<GenTableColumn> subColumns = genTable.getSubTable().getColumns();
-            addDicts(dicts, subColumns);
-        }
         return StringUtils.join(dicts, ", ");
     }
 

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -24,7 +24,7 @@ import ${packageName}.domain.req.${ClassName}SaveReq;
 import ${packageName}.domain.req.${ClassName}EditReq;
 import ${packageName}.service.${ClassName}Service;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-#if($table.crud || $table.sub)
+#if($table.crud)
 import com.ruoyi.common.core.page.TableDataInfo;
 #elseif($table.tree)
 #end
@@ -48,7 +48,7 @@ public class ${ClassName}Controller extends BaseController {
     @ApiOperation("获取${functionName}列表")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
     @GetMapping("/list")
-#if($table.crud || $table.sub)
+#if($table.crud)
     public Result<TableDataInfo> list(${ClassName}QueryReq ${className}QueryReq) {
         startPage();
         List<${ClassName}> list = ${className}Service.list(${ClassName}.queryBuild(${className}QueryReq));

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -16,7 +16,7 @@ import com.ruoyi.common.annotation.Excel;
 import ${packageName}.domain.req.${ClassName}QueryReq;
 import ${packageName}.domain.req.${ClassName}SaveReq;
 import ${packageName}.domain.req.${ClassName}EditReq;
-#if($table.crud || $table.sub)
+#if($table.crud)
 import com.ruoyi.common.core.domain.BaseEntity;
 #elseif($table.tree)
 import com.ruoyi.common.core.domain.TreeEntity;
@@ -28,7 +28,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
  * @author ${author}
  * @date ${datetime}
  */
-#if($table.crud || $table.sub)
+#if($table.crud)
 #set($Entity="BaseEntity")
 #elseif($table.tree)
 #set($Entity="TreeEntity")
@@ -120,7 +120,7 @@ public class ${ClassName} extends ${Entity} {
     */
     public static ${ClassName} editBuild(${pkColumn.javaType} ${pkColumn.javaField}, ${ClassName}EditReq ${className}EditReq){
         return ${ClassName}.builder()
-        .${pkColumn.javaField}(${pkColumn.javaField})
+            .${pkColumn.javaField}(${pkColumn.javaField})
 #foreach ($column in $columns)
     #if($column.isEdit == '1')
     #if(!$table.isSuperColumn($column.javaField))

ruoyi-generator/src/main/resources/vm/java/edit.java.vm

@@ -12,7 +12,7 @@ import lombok.AllArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import io.swagger.annotations.*;
 import com.ruoyi.common.annotation.Excel;
-#if($table.crud || $table.sub)
+#if($table.crud)
 import com.ruoyi.common.core.domain.BaseEntity;
 #elseif($table.tree)
 import com.ruoyi.common.core.domain.TreeEntity;
@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
  * @author ${author}
  * @date ${datetime}
  */
-#if($table.crud || $table.sub)
+#if($table.crud)
     #set($Entity="BaseEntity")
 #elseif($table.tree)
     #set($Entity="TreeEntity")

ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

@@ -3,9 +3,6 @@ package ${packageName}.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import ${packageName}.domain.${ClassName};
-#if($table.sub)
-import ${packageName}.domain.${subClassName};
-#end
 
 /**
  * ${functionName}Mapper接口

ruoyi-generator/src/main/resources/vm/java/query.java.vm

@@ -12,7 +12,7 @@ import lombok.AllArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import io.swagger.annotations.*;
 import com.ruoyi.common.annotation.Excel;
-#if($table.crud || $table.sub)
+#if($table.crud)
 import com.ruoyi.common.core.domain.BaseEntity;
 #elseif($table.tree)
 import com.ruoyi.common.core.domain.TreeEntity;
@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
  * @author ${author}
  * @date ${datetime}
  */
-#if($table.crud || $table.sub)
+#if($table.crud)
 #set($Entity="BaseEntity")
 #elseif($table.tree)
 #set($Entity="TreeEntity")

ruoyi-generator/src/main/resources/vm/java/save.java.vm

@@ -12,7 +12,7 @@ import lombok.AllArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import io.swagger.annotations.*;
 import com.ruoyi.common.annotation.Excel;
-#if($table.crud || $table.sub)
+#if($table.crud)
 import com.ruoyi.common.core.domain.BaseEntity;
 #elseif($table.tree)
 import com.ruoyi.common.core.domain.TreeEntity;
@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
  * @author ${author}
  * @date ${datetime}
  */
-#if($table.crud || $table.sub)
+#if($table.crud)
     #set($Entity="BaseEntity")
 #elseif($table.tree)
     #set($Entity="TreeEntity")

ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm

@@ -1,65 +0,0 @@
-package ${packageName}.domain;
-
-#foreach ($import in $subImportList)
-import ${import};
-#end
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * ${subTable.functionName}对象 ${subTableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Data
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ${subClassName} extends BaseEntity{
-    private static final long serialVersionUID = 1L;
-
-#foreach ($column in $subTable.columns)
-#if(!$table.isSuperColumn($column.javaField))
-    /** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($parentheseIndex != -1)
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
-#else
-    @Excel(name = "${comment}")
-#end
-#end
-    private $column.javaType $column.javaField;
-
-#end
-#end
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $subTable.columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-            .toString();
-    }
-}

ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -283,65 +283,6 @@
 #end
 #end
 #end
-#end
-#if($table.sub)
-        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
-          <el-table-column label="$comment" prop="${javaField}" width="240">
-            <template slot-scope="scope">
-              <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd" placeholder="请选择$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option
-                  v-for="dict in dict.type.$column.dictType"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </template>
-          </el-table-column>
-#end
-#end
-        </el-table>
 #end
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -366,10 +307,6 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-#if($table.sub)
-      // 子表选中数据
-      checked${subClassName}: [],
-#end
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -380,10 +317,6 @@ export default {
       total: 0,
       // ${functionName}表格数据
       ${businessName}List: [],
-#if($table.sub)
-      // ${subTable.functionName}表格数据
-      ${subclassName}List: [],
-#end
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -469,9 +402,6 @@ export default {
 #end
 #end
       };
-#if($table.sub)
-      this.${subclassName}List = [];
-#end
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -512,9 +442,6 @@ export default {
 #if($column.htmlType == "checkbox")
         this.form.$column.javaField = this.form.${column.javaField}.split(",");
 #end
-#end
-#if($table.sub)
-        this.${subclassName}List = response.data.${subclassName}List;
 #end
         this.open = true;
         this.title = "修改${functionName}";
@@ -528,9 +455,6 @@ export default {
 #if($column.htmlType == "checkbox")
           this.form.$column.javaField = this.form.${column.javaField}.join(",");
 #end
-#end
-#if($table.sub)
-          this.form.${subclassName}List = this.${subclassName}List;
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
@@ -558,39 +482,6 @@ export default {
         this.#[[$modal]]#.msgSuccess("删除成功");
       }).catch(() => {});
     },
-#if($table.sub)
-	/** ${subTable.functionName}序号 */
-    row${subClassName}Index({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
-    /** ${subTable.functionName}添加按钮操作 */
-    handleAdd${subClassName}() {
-      let obj = {};
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
-      obj.$column.javaField = "";
-#end
-#end
-      this.${subclassName}List.push(obj);
-    },
-    /** ${subTable.functionName}删除按钮操作 */
-    handleDelete${subClassName}() {
-      if (this.checked${subClassName}.length == 0) {
-        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
-      } else {
-        const ${subclassName}List = this.${subclassName}List;
-        const checked${subClassName} = this.checked${subClassName};
-        this.${subclassName}List = ${subclassName}List.filter(function(item) {
-          return checked${subClassName}.indexOf(item.index) == -1
-        });
-      }
-    },
-    /** 复选框选中数据 */
-    handle${subClassName}SelectionChange(selection) {
-      this.checked${subClassName} = selection.map(item => item.index)
-    },
-#end
     /** 导出按钮操作 */
     handleExport() {
       this.download('${moduleName}/${businessName}/export', {

ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm

@@ -153,7 +153,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -266,70 +266,6 @@
 #end
 #end
 #end
-#end
-#if($table.sub)
-        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">添加</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template #default="scope">
-              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
-          <el-table-column label="$comment" prop="${javaField}" width="240">
-            <template #default="scope">
-              <el-date-picker clearable
-                v-model="scope.row.$javaField"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择$comment">
-              </el-date-picker>
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template #default="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option
-                  v-for="dict in $column.dictType"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template #default="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </template>
-          </el-table-column>
-#end
-#end
-        </el-table>
 #end
       </el-form>
       <template #footer>
@@ -352,16 +288,10 @@ const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
 #end
 
 const ${businessName}List = ref([]);
-#if($table.sub)
-const ${subclassName}List = ref([]);
-#end
 const open = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref([]);
-#if($table.sub)
-const checked${subClassName} = ref([]);
-#end
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
@@ -445,9 +375,6 @@ function reset() {
 #end
 #end
   };
-#if($table.sub)
-  ${subclassName}List.value = [];
-#end
   proxy.resetForm("${businessName}Ref");
 }
 
@@ -493,9 +420,6 @@ function handleUpdate(row) {
 #if($column.htmlType == "checkbox")
     form.value.$column.javaField = form.value.${column.javaField}.split(",");
 #end
-#end
-#if($table.sub)
-    ${subclassName}List.value = response.data.${subclassName}List;
 #end
     open.value = true;
     title.value = "修改${functionName}";
@@ -510,9 +434,6 @@ function submitForm() {
 #if($column.htmlType == "checkbox")
       form.value.$column.javaField = form.value.${column.javaField}.join(",");
 #end
-#end
-#if($table.sub)
-      form.value.${subclassName}List = ${subclassName}List.value;
 #end
       if (form.value.${pkColumn.javaField} != null) {
         update${BusinessName}(form.value).then(response => {
@@ -542,43 +463,6 @@ function handleDelete(row) {
   }).catch(() => {});
 }
 
-#if($table.sub)
-/** ${subTable.functionName}序号 */
-function row${subClassName}Index({ row, rowIndex }) {
-  row.index = rowIndex + 1;
-}
-
-/** ${subTable.functionName}添加按钮操作 */
-function handleAdd${subClassName}() {
-  let obj = {};
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
-  obj.$column.javaField = "";
-#end
-#end
-  ${subclassName}List.value.push(obj);
-}
-
-/** ${subTable.functionName}删除按钮操作 */
-function handleDelete${subClassName}() {
-  if (checked${subClassName}.value.length == 0) {
-    proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
-  } else {
-    const ${subclassName}s = ${subclassName}List.value;
-    const checked${subClassName}s = checked${subClassName}.value;
-    ${subclassName}List.value = ${subclassName}s.filter(function(item) {
-      return checked${subClassName}s.indexOf(item.index) == -1
-    });
-  }
-}
-
-/** 复选框选中数据 */
-function handle${subClassName}SelectionChange(selection) {
-  checked${subClassName}.value = selection.map(item => item.index)
-}
-
-#end
 /** 导出按钮操作 */
 function handleExport() {
   proxy.download('${moduleName}/${businessName}/export', {