wms / wms4_shenzhenxinyi · Commits

Commit 918c85aecbfd4fd06c59eb3c28fc52d866c55474

Authored by zhangdaiscott
1 parent 695c207f
master ... develop

升级代码生成器模板 

1、支持自定义下拉树的生成
2、oracle下 三级联动配置了，导致生成报错
3、高级查询支持下拉搜索和下拉多选
4、树表单支持更多的控件生成
Inline Side-by-side
Showing 13 changed files with 212 additions and 16 deletions
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/common/utils.ftl
  View file @918c85a
@@ -76,12 +76,22 @@ @@ -76,12 +76,22 @@
76 76
77 <#-- ** 高级查询生成 * --> 77 <#-- ** 高级查询生成 * -->
78 <#function superQueryFieldList po> 78 <#function superQueryFieldList po>
  79 + <#assign superQuery_dictTable="">
  80 + <#assign superQuery_dictText="">
  81 + <#if po.dictTable?default("")?trim?length gt 1>
  82 + <#assign superQuery_dictTable="${po.dictTable}">
  83 + </#if>
  84 + <#if po.dictText?default("")?trim?length gt 1>
  85 + <#assign superQuery_dictText="${po.dictText}">
  86 + </#if>
79 <#if po.classType=="popup"> 87 <#if po.classType=="popup">
80 <#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}', popup:{code:'${po.dictTable}',field:'${po.dictField?split(',')[0]}',orgFields:'${po.dictField?split(',')[0]}',destFields:'${po.dictText?split(',')[0]}'}}"> 88 <#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}', popup:{code:'${po.dictTable}',field:'${po.dictField?split(',')[0]}',orgFields:'${po.dictField?split(',')[0]}',destFields:'${po.dictText?split(',')[0]}'}}">
81 <#elseif po.classType=="sel_user" || po.classType=="sel_depart" || po.classType=="datetime" || po.classType=="date" || po.classType=="pca" || po.classType=="switch"> 89 <#elseif po.classType=="sel_user" || po.classType=="sel_depart" || po.classType=="datetime" || po.classType=="date" || po.classType=="pca" || po.classType=="switch">
82 <#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}'}"> 90 <#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}'}">
83 <#else> 91 <#else>
84 - <#if po.dictTable?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down"> 92 + <#if po.classType=="sel_search" || po.classType=="list_multi">
  93 + <#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}',dictTable:'${superQuery_dictTable}', dictText:'${superQuery_dictText}', dictCode:'${po.dictField}'}">
  94 + <#elseif po.dictTable?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
85 <#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictTable},${po.dictText},${po.dictField}'}"> 95 <#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictTable},${po.dictText},${po.dictField}'}">
86 <#elseif po.dictField?? && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down"> 96 <#elseif po.dictField?? && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
87 <#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictField}'}"> 97 <#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictField}'}">
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
  View file @918c85a
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <#list columns as po> 31 <#list columns as po>
32 <#if po.isShow =='Y' && po.fieldName != 'id'> 32 <#if po.isShow =='Y' && po.fieldName != 'id'>
33 <#assign form_field_dictCode=""> 33 <#assign form_field_dictCode="">
34 - <#if po.dictTable?default("")?trim?length gt 1> 34 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
35 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 35 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
36 <#elseif po.dictField?default("")?trim?length gt 1> 36 <#elseif po.dictField?default("")?trim?length gt 1>
37 <#assign form_field_dictCode="${po.dictField}"> 37 <#assign form_field_dictCode="${po.dictField}">
@@ -101,6 +101,24 @@ @@ -101,6 +101,24 @@
101 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/> 101 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
102 <#elseif po.fieldDbType=='Blob'> 102 <#elseif po.fieldDbType=='Blob'>
103 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 103 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
  104 + <#elseif po.classType == 'sel_tree'>
  105 + <#assign form_tree_select = true>
  106 + <j-tree-select
  107 + ref="treeSelect"
  108 + placeholder="请选择${po.filedComment}"
  109 + v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
  110 + <#if po.dictText??>
  111 + <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
  112 + dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
  113 + <#elseif po.dictText?split(',')[1]??>
  114 + pidField="${po.dictText?split(',')[1]}"
  115 + <#elseif po.dictText?split(',')[3]??>
  116 + hasChildField="${po.dictText?split(',')[3]}"
  117 + </#if>
  118 + </#if>
  119 + pidValue="${po.dictField}"
  120 + <#if po.readonly=='Y'>disabled</#if>>
  121 + </j-tree-select>
104 <#else> 122 <#else>
105 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> ></a-input> 123 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> ></a-input>
106 </#if> 124 </#if>
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
  View file @918c85a
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <#list columns as po> 31 <#list columns as po>
32 <#if po.isShow =='Y' && po.fieldName != 'id'> 32 <#if po.isShow =='Y' && po.fieldName != 'id'>
33 <#assign form_field_dictCode=""> 33 <#assign form_field_dictCode="">
34 - <#if po.dictTable?default("")?trim?length gt 1> 34 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
35 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 35 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
36 <#elseif po.dictField?default("")?trim?length gt 1> 36 <#elseif po.dictField?default("")?trim?length gt 1>
37 <#assign form_field_dictCode="${po.dictField}"> 37 <#assign form_field_dictCode="${po.dictField}">
@@ -106,6 +106,24 @@ @@ -106,6 +106,24 @@
106 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/> 106 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
107 <#elseif po.fieldDbType=='Blob'> 107 <#elseif po.fieldDbType=='Blob'>
108 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 108 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
  109 + <#elseif po.classType == 'sel_tree'>
  110 + <#assign form_tree_select = true>
  111 + <j-tree-select
  112 + ref="treeSelect"
  113 + placeholder="请选择${po.filedComment}"
  114 + v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
  115 + <#if po.dictText??>
  116 + <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
  117 + dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
  118 + <#elseif po.dictText?split(',')[1]??>
  119 + pidField="${po.dictText?split(',')[1]}"
  120 + <#elseif po.dictText?split(',')[3]??>
  121 + hasChildField="${po.dictText?split(',')[3]}"
  122 + </#if>
  123 + </#if>
  124 + pidValue="${po.dictField}"
  125 + <#if po.readonly=='Y'>disabled</#if>>
  126 + </j-tree-select>
109 <#else> 127 <#else>
110 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 128 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
111 </#if> 129 </#if>
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
  View file @918c85a
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <#list sub.colums as po> 32 <#list sub.colums as po>
33 <#if po.isShow =='Y' && po.fieldName != 'id'> 33 <#if po.isShow =='Y' && po.fieldName != 'id'>
34 <#assign form_field_dictCode=""> 34 <#assign form_field_dictCode="">
35 - <#if po.dictTable?default("")?trim?length gt 1> 35 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
36 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 36 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
37 <#elseif po.dictField?default("")?trim?length gt 1> 37 <#elseif po.dictField?default("")?trim?length gt 1>
38 <#assign form_field_dictCode="${po.dictField}"> 38 <#assign form_field_dictCode="${po.dictField}">
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
  View file @918c85a
@@ -182,6 +182,8 @@ @@ -182,6 +182,8 @@
182 ref="table" 182 ref="table"
183 size="middle" 183 size="middle"
184 rowKey="id" 184 rowKey="id"
  185 + class="j-table-force-nowrap"
  186 + :scroll="{x:true}"
185 :columns="columns" 187 :columns="columns"
186 :dataSource="dataSource" 188 :dataSource="dataSource"
187 :pagination="ipagination" 189 :pagination="ipagination"
@@ -219,7 +221,7 @@ @@ -219,7 +221,7 @@
219 <a @click="handleAddChild(record)">添加下级</a> 221 <a @click="handleAddChild(record)">添加下级</a>
220 </a-menu-item> 222 </a-menu-item>
221 <a-menu-item> 223 <a-menu-item>
222 - <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)"> 224 + <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
223 <a>删除</a> 225 <a>删除</a>
224 </a-popconfirm> 226 </a-popconfirm>
225 </a-menu-item> 227 </a-menu-item>
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  View file @918c85a
@@ -23,11 +23,17 @@ @@ -23,11 +23,17 @@
23 <#assign form_tree_select = false> 23 <#assign form_tree_select = false>
24 <#assign form_switch=false> 24 <#assign form_switch=false>
25 <#assign pidFieldName = ""> 25 <#assign pidFieldName = "">
26 - 26 +<#assign form_select_search = false>
  27 +<#assign form_cat_tree = false>
  28 +<#assign form_cat_back = "">
  29 +<#assign form_pca = false>
  30 +<#assign form_editor = false>
  31 +<#assign form_md = false>
  32 +<#assign form_sel_tree = false>
27 <#list columns as po> 33 <#list columns as po>
28 <#if po.isShow =='Y'> 34 <#if po.isShow =='Y'>
29 <#assign form_field_dictCode=""> 35 <#assign form_field_dictCode="">
30 - <#if po.dictTable?default("")?trim?length gt 1> 36 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
31 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 37 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
32 <#elseif po.dictField?default("")?trim?length gt 1> 38 <#elseif po.dictField?default("")?trim?length gt 1>
33 <#assign form_field_dictCode="${po.dictField}"> 39 <#assign form_field_dictCode="${po.dictField}">
@@ -87,10 +93,51 @@ @@ -87,10 +93,51 @@
87 <#elseif po.classType=='image'> 93 <#elseif po.classType=='image'>
88 <#assign form_image = true> 94 <#assign form_image = true>
89 <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload> 95 <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
  96 + <#elseif po.classType=='sel_search'>
  97 + <#assign form_select_search = true>
  98 + <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
  99 + <#elseif po.classType=='cat_tree'>
  100 + <#assign form_cat_tree = true>
  101 + <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
  102 + <#if po.dictText?default("")?trim?length gt 1>
  103 + <#assign form_cat_back = "${po.dictText}">
  104 + </#if>
  105 + <#elseif po.classType =='pca'>
  106 + <#assign form_pca=true>
  107 + <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if> />
  108 + <#elseif po.classType=='umeditor'>
  109 + <#assign form_editor = true>
  110 + <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
  111 + <#elseif po.classType =='markdown'>
  112 + <#assign form_md=true>
  113 + <j-markdown-editor v-decorator="['${po.fieldName}']" id="${po.fieldName}"></j-markdown-editor>
  114 + <#elseif po.classType == 'sel_tree'>
  115 + <#assign form_tree_select = true>
  116 + <j-tree-select
  117 + ref="treeSelect"
  118 + placeholder="请选择${po.filedComment}"
  119 + v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
  120 + <#if po.dictText??>
  121 + <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
  122 + dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
  123 + <#elseif po.dictText?split(',')[1]??>
  124 + pidField="${po.dictText?split(',')[1]}"
  125 + <#elseif po.dictText?split(',')[3]??>
  126 + hasChildField="${po.dictText?split(',')[3]}"
  127 + </#if>
  128 + </#if>
  129 + pidValue="${po.dictField}"
  130 + <#if po.readonly=='Y'>disabled</#if>>
  131 + </j-tree-select>
90 <#else> 132 <#else>
91 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 133 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
92 </#if> 134 </#if>
93 </a-form-item> 135 </a-form-item>
  136 + <#if form_cat_tree && form_cat_back?length gt 1>
  137 + <a-form-item v-show="false">
  138 + <a-input v-decorator="['${form_cat_back}']"></a-input>
  139 + </a-form-item>
  140 + </#if>
94 </#if> 141 </#if>
95 </#list> 142 </#list>
96 143
@@ -131,7 +178,21 @@ @@ -131,7 +178,21 @@
131 <#if form_switch==true > 178 <#if form_switch==true >
132 import JSwitch from '@/components/jeecg/JSwitch' 179 import JSwitch from '@/components/jeecg/JSwitch'
133 </#if> 180 </#if>
134 - 181 + <#if form_select_search>
  182 + import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
  183 + </#if>
  184 + <#if form_cat_tree>
  185 + import JCategorySelect from '@/components/jeecg/JCategorySelect'
  186 + </#if>
  187 + <#if form_pca>
  188 + import JAreaLinkage from '@comp/jeecg/JAreaLinkage'
  189 + </#if>
  190 + <#if form_editor>
  191 + import JEditor from '@/components/jeecg/JEditor'
  192 + </#if>
  193 + <#if form_md>
  194 + import JMarkdownEditor from '@/components/jeecg/JMarkdownEditor/index'
  195 + </#if>
135 export default { 196 export default {
136 name: "${entityName}Modal", 197 name: "${entityName}Modal",
137 components: { 198 components: {
@@ -160,8 +221,23 @@ @@ -160,8 +221,23 @@
160 JSwitch, 221 JSwitch,
161 </#if> 222 </#if>
162 <#if form_tree_select> 223 <#if form_tree_select>
163 - JTreeSelect 224 + JTreeSelect,
164 </#if> 225 </#if>
  226 + <#if form_select_search>
  227 + JSearchSelectTag,
  228 + </#if>
  229 + <#if form_cat_tree>
  230 + JCategorySelect,
  231 + </#if>
  232 + <#if form_pca>
  233 + JAreaLinkage,
  234 + </#if>
  235 + <#if form_editor>
  236 + JEditor,
  237 + </#if>
  238 + <#if form_md>
  239 + JMarkdownEditor,
  240 + </#if>
165 }, 241 },
166 data () { 242 data () {
167 return { 243 return {
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  View file @918c85a
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <#list columns as po> 31 <#list columns as po>
32 <#if po.isShow =='Y' && po.fieldName != 'id'> 32 <#if po.isShow =='Y' && po.fieldName != 'id'>
33 <#assign form_field_dictCode=""> 33 <#assign form_field_dictCode="">
34 - <#if po.dictTable?default("")?trim?length gt 1> 34 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
35 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 35 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
36 <#elseif po.dictField?default("")?trim?length gt 1> 36 <#elseif po.dictField?default("")?trim?length gt 1>
37 <#assign form_field_dictCode="${po.dictField}"> 37 <#assign form_field_dictCode="${po.dictField}">
@@ -101,6 +101,24 @@ @@ -101,6 +101,24 @@
101 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/> 101 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
102 <#elseif po.fieldDbType=='Blob'> 102 <#elseif po.fieldDbType=='Blob'>
103 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 103 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
  104 + <#elseif po.classType == 'sel_tree'>
  105 + <#assign form_tree_select = true>
  106 + <j-tree-select
  107 + ref="treeSelect"
  108 + placeholder="请选择${po.filedComment}"
  109 + v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
  110 + <#if po.dictText??>
  111 + <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
  112 + dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
  113 + <#elseif po.dictText?split(',')[1]??>
  114 + pidField="${po.dictText?split(',')[1]}"
  115 + <#elseif po.dictText?split(',')[3]??>
  116 + hasChildField="${po.dictText?split(',')[3]}"
  117 + </#if>
  118 + </#if>
  119 + pidValue="${po.dictField}"
  120 + <#if po.readonly=='Y'>disabled</#if>>
  121 + </j-tree-select>
104 <#else> 122 <#else>
105 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 123 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
106 </#if> 124 </#if>
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
  View file @918c85a
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <#list sub.originalColumns as po> 33 <#list sub.originalColumns as po>
34 <#if po.isShow =='Y' && po.fieldName != 'id'> 34 <#if po.isShow =='Y' && po.fieldName != 'id'>
35 <#assign form_field_dictCode=""> 35 <#assign form_field_dictCode="">
36 - <#if po.dictTable?default("")?trim?length gt 1> 36 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
37 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 37 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
38 <#elseif po.dictField?default("")?trim?length gt 1> 38 <#elseif po.dictField?default("")?trim?length gt 1>
39 <#assign form_field_dictCode="${po.dictField}"> 39 <#assign form_field_dictCode="${po.dictField}">
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  View file @918c85a
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <#list columns as po> 32 <#list columns as po>
33 <#if po.isShow =='Y' && po.fieldName != 'id'> 33 <#if po.isShow =='Y' && po.fieldName != 'id'>
34 <#assign form_field_dictCode=""> 34 <#assign form_field_dictCode="">
35 - <#if po.dictTable?default("")?trim?length gt 1> 35 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
36 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 36 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
37 <#elseif po.dictField?default("")?trim?length gt 1> 37 <#elseif po.dictField?default("")?trim?length gt 1>
38 <#assign form_field_dictCode="${po.dictField}"> 38 <#assign form_field_dictCode="${po.dictField}">
@@ -107,6 +107,24 @@ @@ -107,6 +107,24 @@
107 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/> 107 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
108 <#elseif po.fieldDbType=='Blob'> 108 <#elseif po.fieldDbType=='Blob'>
109 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 109 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
  110 + <#elseif po.classType == 'sel_tree'>
  111 + <#assign form_tree_select = true>
  112 + <j-tree-select
  113 + ref="treeSelect"
  114 + placeholder="请选择${po.filedComment}"
  115 + v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
  116 + <#if po.dictText??>
  117 + <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
  118 + dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
  119 + <#elseif po.dictText?split(',')[1]??>
  120 + pidField="${po.dictText?split(',')[1]}"
  121 + <#elseif po.dictText?split(',')[3]??>
  122 + hasChildField="${po.dictText?split(',')[3]}"
  123 + </#if>
  124 + </#if>
  125 + pidValue="${po.dictField}"
  126 + <#if po.readonly=='Y'>disabled</#if>>
  127 + </j-tree-select>
110 <#else> 128 <#else>
111 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 129 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
112 </#if> 130 </#if>
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
  View file @918c85a
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <#list sub.colums as po> 19 <#list sub.colums as po>
20 <#if po.isShow =='Y'> 20 <#if po.isShow =='Y'>
21 <#assign form_field_dictCode=""> 21 <#assign form_field_dictCode="">
22 - <#if po.dictTable?default("")?trim?length gt 1> 22 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
23 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 23 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
24 <#elseif po.dictField?default("")?trim?length gt 1> 24 <#elseif po.dictField?default("")?trim?length gt 1>
25 <#assign form_field_dictCode="${po.dictField}"> 25 <#assign form_field_dictCode="${po.dictField}">
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
  View file @918c85a
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <#list columns as po> 31 <#list columns as po>
32 <#if po.isShow =='Y' && po.fieldName != 'id'> 32 <#if po.isShow =='Y' && po.fieldName != 'id'>
33 <#assign form_field_dictCode=""> 33 <#assign form_field_dictCode="">
34 - <#if po.dictTable?default("")?trim?length gt 1> 34 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
35 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 35 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
36 <#elseif po.dictField?default("")?trim?length gt 1> 36 <#elseif po.dictField?default("")?trim?length gt 1>
37 <#assign form_field_dictCode="${po.dictField}"> 37 <#assign form_field_dictCode="${po.dictField}">
@@ -106,6 +106,24 @@ @@ -106,6 +106,24 @@
106 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/> 106 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
107 <#elseif po.fieldDbType=='Blob'> 107 <#elseif po.fieldDbType=='Blob'>
108 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 108 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
  109 + <#elseif po.classType == 'sel_tree'>
  110 + <#assign form_tree_select = true>
  111 + <j-tree-select
  112 + ref="treeSelect"
  113 + placeholder="请选择${po.filedComment}"
  114 + v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
  115 + <#if po.dictText??>
  116 + <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
  117 + dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
  118 + <#elseif po.dictText?split(',')[1]??>
  119 + pidField="${po.dictText?split(',')[1]}"
  120 + <#elseif po.dictText?split(',')[3]??>
  121 + hasChildField="${po.dictText?split(',')[3]}"
  122 + </#if>
  123 + </#if>
  124 + pidValue="${po.dictField}"
  125 + <#if po.readonly=='Y'>disabled</#if>>
  126 + </j-tree-select>
109 <#else> 127 <#else>
110 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 128 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
111 </#if> 129 </#if>
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
  View file @918c85a
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <#list sub.colums as po> 32 <#list sub.colums as po>
33 <#if po.isShow =='Y' && po.fieldName != 'id'> 33 <#if po.isShow =='Y' && po.fieldName != 'id'>
34 <#assign form_field_dictCode=""> 34 <#assign form_field_dictCode="">
35 - <#if po.dictTable?default("")?trim?length gt 1> 35 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
36 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 36 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
37 <#elseif po.dictField?default("")?trim?length gt 1> 37 <#elseif po.dictField?default("")?trim?length gt 1>
38 <#assign form_field_dictCode="${po.dictField}"> 38 <#assign form_field_dictCode="${po.dictField}">
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  View file @918c85a
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <#list columns as po> 34 <#list columns as po>
35 <#if po.isShow =='Y' && po.fieldName != 'id'> 35 <#if po.isShow =='Y' && po.fieldName != 'id'>
36 <#assign form_field_dictCode=""> 36 <#assign form_field_dictCode="">
37 - <#if po.dictTable?default("")?trim?length gt 1> 37 + <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
38 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}"> 38 <#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
39 <#elseif po.dictField?default("")?trim?length gt 1> 39 <#elseif po.dictField?default("")?trim?length gt 1>
40 <#assign form_field_dictCode="${po.dictField}"> 40 <#assign form_field_dictCode="${po.dictField}">
@@ -109,6 +109,24 @@ @@ -109,6 +109,24 @@
109 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/> 109 <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
110 <#elseif po.fieldDbType=='Blob'> 110 <#elseif po.fieldDbType=='Blob'>
111 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 111 <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
  112 + <#elseif po.classType == 'sel_tree'>
  113 + <#assign form_tree_select = true>
  114 + <j-tree-select
  115 + ref="treeSelect"
  116 + placeholder="请选择${po.filedComment}"
  117 + v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
  118 + <#if po.dictText??>
  119 + <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
  120 + dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
  121 + <#elseif po.dictText?split(',')[1]??>
  122 + pidField="${po.dictText?split(',')[1]}"
  123 + <#elseif po.dictText?split(',')[3]??>
  124 + hasChildField="${po.dictText?split(',')[3]}"
  125 + </#if>
  126 + </#if>
  127 + pidValue="${po.dictField}"
  128 + <#if po.readonly=='Y'>disabled</#if>>
  129 + </j-tree-select>
112 <#else> 130 <#else>
113 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input> 131 <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
114 </#if> 132 </#if>