添加注释，删除无用代码

tnc-generate/src/main/java/org/jeecg/codegen/generate/pojo/CgFormColumnExtendVo.java

@@ -30,9 +30,9 @@ public class CgFormColumnExtendVo {
     /** 是否主键 是："Y"；否：“N”  对应字段：db_is_key*/
     protected String isKey;
     /** 表单是否显示 是："Y"；否：“N”  对应字段：is_show_form */
-    protected String isShow = "N";
+    protected String isShow = "Y";
     /** 列表是否显示 是："Y"；否：“N” */
-    protected String isShowList = "N";
+    protected String isShowList = "Y";
     /** 查询条件是否显示 是："Y"；否：“N” */
     protected String isQuery = "Y";
     /** 查询模式 */

tnc-generate/src/main/java/org/jeecg/codegen/generate/pojo/ColumnVo.java

@@ -36,7 +36,16 @@ public class ColumnVo extends CgFormColumnExtendVo {
     private String scale;
     /** 是否为空 */
     private String nullable;
-    /** 表单控件类型 对应字段：field_show_type 用途不明（前端未找到使用） */
+    /**
+     * 表单控件类型 对应字段：field_show_type
+     * 富文本：umeditor
+     * 省市区组件：pca
+     * 开关：switch
+     * 分类字典树：cat_tree
+     * 图片：image
+     * 文件：file
+     * 单选框：radio
+     */
     private String classType = "";
     /** 表单控件类型 对应字段：field_show_type 用途不明（前端未找到使用） */
     private String classType_row = "";

tnc-generate/src/main/java/org/jeecg/codegen/generate/pojo/TableVo.java

@@ -24,7 +24,7 @@ public class TableVo {
     private String entityName;
     private String smallEntityName;
     /** 每行显示字段数 */
-    private Integer fieldRowNum;
+    private Integer fieldRowNum = 2;
     /** 页面显示字段数 */
     private Integer searchFieldNum;
     private Integer fieldRequiredNum;

tnc-generate/src/main/resources/jeecg/code-template-online/default/two/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -46,7 +46,7 @@
     <#assign query_field_dictCode="${po.dictField}">
   </#if>
   <#-- 结束-字段的字典值 -->
-	<#if po.queryMode=='single'>
+  <#if po.queryMode=='single'>
           <@indent/><a-col :xl="6" :lg="7" :md="8" :sm="24">
             <@indent/><a-form-item label="${po.filedComment}">
             <#if po.classType=='sel_search'>
@@ -61,48 +61,48 @@
               <@indent/><j-multi-select-tag placeholder="请选择${po.filedComment}" dictCode="${query_field_dictCode?default("")}" v-model="queryParam.${po.fieldName}"/>
             <#elseif po.classType=='cat_tree'>
               <@indent/><j-category-select placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" pcode="${po.dictField?default("")}"/>
-			      <#elseif po.classType=='date'>
+            <#elseif po.classType=='date'>
               <@indent/><j-date placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-date>
-			      <#elseif po.classType=='datetime'>
+            <#elseif po.classType=='datetime'>
               <@indent/><j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-date>
             <#elseif po.classType=='pca'>
               <@indent/><j-area-linkage type="cascader" v-model="queryParam.${po.fieldName}" placeholder="请选择省市区"/>
             <#elseif po.classType=='popup'>
               <@indent/><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')" :multi="${po.extendParams.popupMulti?c}"/>
-			      <#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
-			        <#--  开始-下拉或是单选 判断数据字典是表字典还是普通字典 -->
-			        <#if po.dictTable?default("")?trim?length gt 1>
+            <#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
+              <#--  开始-下拉或是单选 判断数据字典是表字典还是普通字典 -->
+              <#if po.dictTable?default("")?trim?length gt 1>
               <@indent/><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" dictCode="${po.dictTable},${po.dictText},${po.dictField}"/>
-			        <#elseif po.dictField?default("")?trim?length gt 1>
+              <#elseif po.dictField?default("")?trim?length gt 1>
               <@indent/><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" dictCode="${po.dictField}"/>
-			        <#else>
+              <#else>
               <@indent/><a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-			        </#if>
+              </#if>
               <#--  结束-下拉或是单选 判断数据字典是表字典还是普通字典 -->
-			      <#else>
+            <#else>
               <@indent/><a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-			      </#if>
+            </#if>
             <@indent/></a-form-item>
           <@indent/></a-col>
-	<#else>
+  <#else>
           <@indent/><a-col :xl="10" :lg="11" :md="12" :sm="24">
             <@indent/><a-form-item label="${po.filedComment}">
-			<#if po.classType=='date'>
+      <#if po.classType=='date'>
               <@indent/><j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.${po.fieldName}_begin"></j-date>
               <@indent/><span class="query-group-split-cust"></span>
               <@indent/><j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.${po.fieldName}_end"></j-date>
-			<#elseif po.classType=='datetime'>
+      <#elseif po.classType=='datetime'>
               <@indent/><j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.${po.fieldName}_begin"></j-date>
               <@indent/><span class="query-group-split-cust"></span>
               <@indent/><j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.${po.fieldName}_end"></j-date>
-			<#else>
+      <#else>
               <@indent/><a-input placeholder="请输入最小值" class="query-group-cust" v-model="queryParam.${po.fieldName}_begin"></a-input>
               <@indent/><span class="query-group-split-cust"></span>
               <@indent/><a-input placeholder="请输入最大值" class="query-group-cust" v-model="queryParam.${po.fieldName}_end"></a-input>
-			</#if>
+      </#if>
             <@indent/></a-form-item>
           <@indent/></a-col>
-	</#if>
+  </#if>
 <#assign query_field_no=query_field_no+1>
 </#if>
 <#-- 结束-字段一列 -->
@@ -283,13 +283,13 @@
               return parseInt(index)+1;
             }
           },
-    <#assign showColNum=0>
-	<#list columns as po>
-	<#if po.isShowList =='Y' && po.fieldName !='id'>
-	<#assign showColNum=showColNum+1>
+  <#-- 表字段定义 -->
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
           {
             title:'${po.filedComment}',
             align:"center",
+            <#-- 排序 -->
             <#if po.sort=='Y'>
             sorter: true,
             </#if>
@@ -300,6 +300,7 @@
             }
             <#elseif po.fieldDbType=='Blob'>
             dataIndex: '${po.fieldName}String'
+            <#-- 富文本 -->
             <#elseif po.classType=='umeditor'>
             dataIndex: '${po.fieldName}',
             scopedSlots: {customRender: 'htmlSlot'}
@@ -325,9 +326,9 @@
             dataIndex: '${po.fieldName}',
             customRender: (text, record) => (text ? record['${dashedToCamel(po.dictText)}'] : '')
             </#if>
-			<#else>
+      <#else>
             dataIndex: '${po.fieldName}'
-			</#if>
+      </#if>
           },
      </#if>
      </#list>
@@ -419,4 +420,3 @@
 <style scoped>
   @import '~@assets/less/common.less';
 </style>
-

tnc-generate/src/main/resources/jeecg/code-template-online/default/two/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei

@@ -5,10 +5,13 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+<#-- Popup弹框 -->
 <#assign form_popup = false>
+<#-- 分类字典树 -->
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
-
+<#t>
+<#-- 一行一列 字段所占区域 -->
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
 <#assign form_span = 12>
@@ -17,25 +20,26 @@
 <#elseif tableVo.fieldRowNum==4>
 <#assign form_span = 6>
 </#if>
+<#-- 开始-遍历字段 -->
 <#list columns as po>
-
+<#t>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
-<#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
-		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
-	<#elseif po.dictField?default("")?trim?length gt 1>
-		<#assign form_field_dictCode="${po.dictField}">
-	</#if>
+  <#assign form_field_dictCode="">
+  <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
+    <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
+  <#elseif po.dictField?default("")?trim?length gt 1>
+    <#assign form_field_dictCode="${po.dictField}">
+  </#if>
           <a-col :span="${form_span}">
             <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
-	<#if po.classType =='date'>
+  <#if po.classType =='date'>
               <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}"  style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='datetime'>
+  <#elseif po.classType =='datetime'>
               <j-date placeholder="请选择${po.filedComment}"  v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='time'>
+  <#elseif po.classType =='time'>
               <j-time placeholder="请选择${po.filedComment}"  v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='popup'>
-	    <#assign form_popup=true>
+  <#elseif po.classType =='popup'>
+      <#assign form_popup=true>
               <j-popup
                 v-model="model.${po.fieldName}"
                 field="${po.fieldName}"
@@ -45,44 +49,44 @@
                 :multi="${po.extendParams.popupMulti?c}"
                 @input="popupCallback"
                 <#if po.readonly=='Y'>disabled</#if>/>
-    <#elseif po.classType =='sel_depart'>
+  <#elseif po.classType =='sel_depart'>
               <j-select-depart v-model="model.${po.fieldName}" multi <#if po.readonly=='Y'>disabled</#if> />
-<#elseif po.classType =='switch'>
+  <#elseif po.classType =='switch'>
               <j-switch v-model="model.${po.fieldName}" <#if po.dictField != 'is_open'>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
-	<#elseif po.classType =='pca'>
+  <#elseif po.classType =='pca'>
              <j-area-linkage type="cascader" v-model="model.${po.fieldName}" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if> />
-	<#elseif po.classType =='markdown'>
+  <#elseif po.classType =='markdown'>
               <j-markdown-editor v-model="model.${autoStringSuffixForModel(po)}" id="${po.fieldName}"></j-markdown-editor>
-    <#elseif po.classType =='password'>
+  <#elseif po.classType =='password'>
               <a-input-password v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='sel_user'>
+  <#elseif po.classType =='sel_user'>
               <j-select-user-by-dep v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='textarea'>
+  <#elseif po.classType =='textarea'>
               <a-textarea v-model="model.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType=='list' || po.classType=='radio'>
+  <#elseif po.classType=='list' || po.classType=='radio'>
               <j-dict-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+  <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
               <j-multi-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType=='sel_search'>
+  <#elseif po.classType=='sel_search'>
               <j-search-select-tag v-model="model.${po.fieldName}" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
-    <#elseif po.classType=='cat_tree'>
-    	<#assign form_cat_tree = true>
+  <#elseif po.classType=='cat_tree'>
+      <#assign form_cat_tree = true>
               <j-category-select v-model="model.${po.fieldName}" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
-    	<#if po.dictText?default("")?trim?length gt 1>
-    	<#assign form_cat_back = "${po.dictText}">
-    	</#if>
-	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
+      <#if po.dictText?default("")?trim?length gt 1>
+        <#assign form_cat_back = "${po.dictText}">
+      </#if>
+  <#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
               <a-input-number v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType=='file'>
+  <#elseif po.classType=='file'>
               <j-upload v-model="model.${po.fieldName}"  <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
-	<#elseif po.classType=='image'>
+  <#elseif po.classType=='image'>
               <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
-	<#elseif po.classType=='umeditor'>
+  <#elseif po.classType=='umeditor'>
               <j-editor v-model="model.${autoStringSuffixForModel(po)}" <#if po.readonly=='Y'>disabled</#if>/>
-    <#elseif po.fieldDbType=='Blob'>
+  <#elseif po.fieldDbType=='Blob'>
               <a-input v-model="model.${autoStringSuffixForModel(po)}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
-		<#elseif po.classType == 'sel_tree'>
-  	          <j-tree-select
+  <#elseif po.classType == 'sel_tree'>
+              <j-tree-select
                 ref="treeSelect"
                 placeholder="请选择${po.filedComment}"
                 v-model="model.${po.fieldName}"
@@ -98,13 +102,14 @@
                 pidValue="${po.dictField}"
                 <#if po.readonly=='Y'>disabled</#if>>
               </j-tree-select>
-	<#else>
+  <#else>
               <a-input v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> ></a-input>
-    </#if>
+  </#if>
             </a-form-model-item>
           </a-col>
 </#if>
 </#list>
+<#-- 结束-遍历字段 -->
         </a-row>
       </a-form-model>
     </j-form-container>