From 918c85aecbfd4fd06c59eb3c28fc52d866c55474 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 11 Dec 2020 19:59:56 +0800
Subject: [PATCH] 升级代码生成器模板
---
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/common/utils.ftl | 12 +++++++++++-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei | 20 +++++++++++++++++++-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei | 20 +++++++++++++++++++-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei | 2 +-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei | 4 +++-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei | 20 +++++++++++++++++++-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei | 2 +-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei | 20 +++++++++++++++++++-
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 | 2 +-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei | 20 +++++++++++++++++++-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei | 2 +-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei | 20 +++++++++++++++++++-
13 files changed, 212 insertions(+), 16 deletions(-)
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/common/utils.ftl b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/common/utils.ftl
index 0dab8eb..19684c1 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/common/utils.ftl
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/common/utils.ftl
@@ -76,12 +76,22 @@
<#-- ** 高级查询生成 * -->
<#function superQueryFieldList po>
+ <#assign superQuery_dictTable="">
+ <#assign superQuery_dictText="">
+ <#if po.dictTable?default("")?trim?length gt 1>
+ <#assign superQuery_dictTable="${po.dictTable}">
+ </#if>
+ <#if po.dictText?default("")?trim?length gt 1>
+ <#assign superQuery_dictText="${po.dictText}">
+ </#if>
<#if po.classType=="popup">
<#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]}'}}">
<#elseif po.classType=="sel_user" || po.classType=="sel_depart" || po.classType=="datetime" || po.classType=="date" || po.classType=="pca" || po.classType=="switch">
<#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}'}">
<#else>
- <#if po.dictTable?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
+ <#if po.classType=="sel_search" || po.classType=="list_multi">
+ <#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}',dictTable:'${superQuery_dictTable}', dictText:'${superQuery_dictText}', dictCode:'${po.dictField}'}">
+ <#elseif po.dictTable?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
<#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictTable},${po.dictText},${po.dictField}'}">
<#elseif po.dictField?? && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
<#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictField}'}">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index ad88de2..701d55a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -31,7 +31,7 @@
<#list columns as po>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
@@ -101,6 +101,24 @@
<j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.fieldDbType=='Blob'>
<a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+ <#elseif po.classType == 'sel_tree'>
+ <#assign form_tree_select = true>
+ <j-tree-select
+ ref="treeSelect"
+ placeholder="请选择${po.filedComment}"
+ v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+ <#if po.dictText??>
+ <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+ dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+ <#elseif po.dictText?split(',')[1]??>
+ pidField="${po.dictText?split(',')[1]}"
+ <#elseif po.dictText?split(',')[3]??>
+ hasChildField="${po.dictText?split(',')[3]}"
+ </#if>
+ </#if>
+ pidValue="${po.dictField}"
+ <#if po.readonly=='Y'>disabled</#if>>
+ </j-tree-select>
<#else>
<a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> ></a-input>
</#if>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index 7672973..2b0cafd 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -31,7 +31,7 @@
<#list columns as po>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
@@ -106,6 +106,24 @@
<j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.fieldDbType=='Blob'>
<a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+ <#elseif po.classType == 'sel_tree'>
+ <#assign form_tree_select = true>
+ <j-tree-select
+ ref="treeSelect"
+ placeholder="请选择${po.filedComment}"
+ v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+ <#if po.dictText??>
+ <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+ dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+ <#elseif po.dictText?split(',')[1]??>
+ pidField="${po.dictText?split(',')[1]}"
+ <#elseif po.dictText?split(',')[3]??>
+ hasChildField="${po.dictText?split(',')[3]}"
+ </#if>
+ </#if>
+ pidValue="${po.dictField}"
+ <#if po.readonly=='Y'>disabled</#if>>
+ </j-tree-select>
<#else>
<a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
</#if>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
index aab5452..538a209 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
@@ -32,7 +32,7 @@
<#list sub.colums as po>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index 45bd1b7..23469b1 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -182,6 +182,8 @@
ref="table"
size="middle"
rowKey="id"
+ class="j-table-force-nowrap"
+ :scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -219,7 +221,7 @@
<a @click="handleAddChild(record)">添加下级</a>
</a-menu-item>
<a-menu-item>
- <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)">
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index fdd708a..d328438 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -23,11 +23,17 @@
<#assign form_tree_select = false>
<#assign form_switch=false>
<#assign pidFieldName = "">
-
+<#assign form_select_search = false>
+<#assign form_cat_tree = false>
+<#assign form_cat_back = "">
+<#assign form_pca = false>
+<#assign form_editor = false>
+<#assign form_md = false>
+<#assign form_sel_tree = false>
<#list columns as po>
<#if po.isShow =='Y'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
@@ -87,10 +93,51 @@
<#elseif po.classType=='image'>
<#assign form_image = true>
<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>
+ <#elseif po.classType=='sel_search'>
+ <#assign form_select_search = true>
+ <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
+ <#elseif po.classType=='cat_tree'>
+ <#assign form_cat_tree = true>
+ <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>/>
+ <#if po.dictText?default("")?trim?length gt 1>
+ <#assign form_cat_back = "${po.dictText}">
+ </#if>
+ <#elseif po.classType =='pca'>
+ <#assign form_pca=true>
+ <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if> />
+ <#elseif po.classType=='umeditor'>
+ <#assign form_editor = true>
+ <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
+ <#elseif po.classType =='markdown'>
+ <#assign form_md=true>
+ <j-markdown-editor v-decorator="['${po.fieldName}']" id="${po.fieldName}"></j-markdown-editor>
+ <#elseif po.classType == 'sel_tree'>
+ <#assign form_tree_select = true>
+ <j-tree-select
+ ref="treeSelect"
+ placeholder="请选择${po.filedComment}"
+ v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+ <#if po.dictText??>
+ <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+ dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+ <#elseif po.dictText?split(',')[1]??>
+ pidField="${po.dictText?split(',')[1]}"
+ <#elseif po.dictText?split(',')[3]??>
+ hasChildField="${po.dictText?split(',')[3]}"
+ </#if>
+ </#if>
+ pidValue="${po.dictField}"
+ <#if po.readonly=='Y'>disabled</#if>>
+ </j-tree-select>
<#else>
<a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
</#if>
</a-form-item>
+ <#if form_cat_tree && form_cat_back?length gt 1>
+ <a-form-item v-show="false">
+ <a-input v-decorator="['${form_cat_back}']"></a-input>
+ </a-form-item>
+ </#if>
</#if>
</#list>
@@ -131,7 +178,21 @@
<#if form_switch==true >
import JSwitch from '@/components/jeecg/JSwitch'
</#if>
-
+ <#if form_select_search>
+ import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
+ </#if>
+ <#if form_cat_tree>
+ import JCategorySelect from '@/components/jeecg/JCategorySelect'
+ </#if>
+ <#if form_pca>
+ import JAreaLinkage from '@comp/jeecg/JAreaLinkage'
+ </#if>
+ <#if form_editor>
+ import JEditor from '@/components/jeecg/JEditor'
+ </#if>
+ <#if form_md>
+ import JMarkdownEditor from '@/components/jeecg/JMarkdownEditor/index'
+ </#if>
export default {
name: "${entityName}Modal",
components: {
@@ -160,8 +221,23 @@
JSwitch,
</#if>
<#if form_tree_select>
- JTreeSelect
+ JTreeSelect,
</#if>
+ <#if form_select_search>
+ JSearchSelectTag,
+ </#if>
+ <#if form_cat_tree>
+ JCategorySelect,
+ </#if>
+ <#if form_pca>
+ JAreaLinkage,
+ </#if>
+ <#if form_editor>
+ JEditor,
+ </#if>
+ <#if form_md>
+ JMarkdownEditor,
+ </#if>
},
data () {
return {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index cbcec01..560c749 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -31,7 +31,7 @@
<#list columns as po>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
@@ -101,6 +101,24 @@
<j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.fieldDbType=='Blob'>
<a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+ <#elseif po.classType == 'sel_tree'>
+ <#assign form_tree_select = true>
+ <j-tree-select
+ ref="treeSelect"
+ placeholder="请选择${po.filedComment}"
+ v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+ <#if po.dictText??>
+ <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+ dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+ <#elseif po.dictText?split(',')[1]??>
+ pidField="${po.dictText?split(',')[1]}"
+ <#elseif po.dictText?split(',')[3]??>
+ hasChildField="${po.dictText?split(',')[3]}"
+ </#if>
+ </#if>
+ pidValue="${po.dictField}"
+ <#if po.readonly=='Y'>disabled</#if>>
+ </j-tree-select>
<#else>
<a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
</#if>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
index aed2c67..ca5df25 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
@@ -33,7 +33,7 @@
<#list sub.originalColumns as po>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index 72fe228..1880d79 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -32,7 +32,7 @@
<#list columns as po>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
@@ -107,6 +107,24 @@
<j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.fieldDbType=='Blob'>
<a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+ <#elseif po.classType == 'sel_tree'>
+ <#assign form_tree_select = true>
+ <j-tree-select
+ ref="treeSelect"
+ placeholder="请选择${po.filedComment}"
+ v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+ <#if po.dictText??>
+ <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+ dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+ <#elseif po.dictText?split(',')[1]??>
+ pidField="${po.dictText?split(',')[1]}"
+ <#elseif po.dictText?split(',')[3]??>
+ hasChildField="${po.dictText?split(',')[3]}"
+ </#if>
+ </#if>
+ pidValue="${po.dictField}"
+ <#if po.readonly=='Y'>disabled</#if>>
+ </j-tree-select>
<#else>
<a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
</#if>
diff --git a/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 b/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
index 012cad5..7b839fb 100644
--- a/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
+++ b/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
@@ -19,7 +19,7 @@
<#list sub.colums as po>
<#if po.isShow =='Y'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index 59796ad..911d23e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -31,7 +31,7 @@
<#list columns as po>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
@@ -106,6 +106,24 @@
<j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.fieldDbType=='Blob'>
<a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+ <#elseif po.classType == 'sel_tree'>
+ <#assign form_tree_select = true>
+ <j-tree-select
+ ref="treeSelect"
+ placeholder="请选择${po.filedComment}"
+ v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+ <#if po.dictText??>
+ <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+ dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+ <#elseif po.dictText?split(',')[1]??>
+ pidField="${po.dictText?split(',')[1]}"
+ <#elseif po.dictText?split(',')[3]??>
+ hasChildField="${po.dictText?split(',')[3]}"
+ </#if>
+ </#if>
+ pidValue="${po.dictField}"
+ <#if po.readonly=='Y'>disabled</#if>>
+ </j-tree-select>
<#else>
<a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
</#if>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
index aab5452..538a209 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
@@ -32,7 +32,7 @@
<#list sub.colums as po>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index f2fa600..2199202 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -34,7 +34,7 @@
<#list columns as po>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
- <#if po.dictTable?default("")?trim?length gt 1>
+ <#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}">
@@ -109,6 +109,24 @@
<j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.fieldDbType=='Blob'>
<a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+ <#elseif po.classType == 'sel_tree'>
+ <#assign form_tree_select = true>
+ <j-tree-select
+ ref="treeSelect"
+ placeholder="请选择${po.filedComment}"
+ v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+ <#if po.dictText??>
+ <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+ dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+ <#elseif po.dictText?split(',')[1]??>
+ pidField="${po.dictText?split(',')[1]}"
+ <#elseif po.dictText?split(',')[3]??>
+ hasChildField="${po.dictText?split(',')[3]}"
+ </#if>
+ </#if>
+ pidValue="${po.dictField}"
+ <#if po.readonly=='Y'>disabled</#if>>
+ </j-tree-select>
<#else>
<a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
</#if>
--
libgit2 0.22.2