github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

3.7.0 大版本发布（优化代码生成器模板）

pull/6320/head^2
JEECG 2024-06-17 17:50:59 +08:00
parent dcc27d71b4
commit 2747868ea7
25 changed files with 400 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
View File

@ -11,12 +11,12 @@
<a-col :span="${form_span}">
<a-form-item label="${po.filedComment}" v-bind="validateInfos.${autoStringSuffixForModel(po)}">
<#if po.classType =='date'>
<a-date-picker placeholder="请选择${po.filedComment}" v-model:value="formData.${po.fieldName}" value-format="YYYY-MM-DD" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
<a-date-picker placeholder="请选择${po.filedComment}" <#if po.extendParams?exists && po.extendParams.picker?exists>picker="${po.extendParams.picker}"</#if> v-model:value="formData.${po.fieldName}" value-format="YYYY-MM-DD" style="width: 100%" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType =='datetime'>
<a-date-picker placeholder="请选择${po.filedComment}" v-model:value="formData.${po.fieldName}" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
<a-date-picker placeholder="请选择${po.filedComment}" v-model:value="formData.${po.fieldName}" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType =='time'>
<#assign need_time = true>
<time-picker placeholder="请选择${po.filedComment}" value-format="HH:mm:ss" v-model:value="formData.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
<time-picker placeholder="请选择${po.filedComment}" value-format="HH:mm:ss" v-model:value="formData.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType =='popup'>
<#assign need_popup = true>
<#assign sourceFields = po.dictField?default("")?trim?split(",")/>
@ -32,47 +32,46 @@
]"
:multi="${po.extendParams.popupMulti?c}"
:setFieldsValue="setFieldsValue"
<#if po.readonly=='Y'>disabled</#if><#rt>
/>
<#if po.readonly=='Y'>disabled</#if><#rt> allow-clear />
<#elseif po.classType =='sel_depart'>
<#assign need_dept = true>
<j-select-dept v-model:value="formData.${po.fieldName}" :multiple="${po.extendParams.multi?default('true')}" checkStrictly <#if po.readonly=='Y'>disabled</#if> />
<j-select-dept v-model:value="formData.${po.fieldName}" :multiple="${po.extendParams.multi?default('true')}" checkStrictly <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType =='switch'>
<#assign need_switch = true>
<j-switch v-model:value="formData.${po.fieldName}" <#if po.dictField != 'is_open'>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
<#elseif po.classType =='pca'>
<#assign need_pca = true>
<j-area-linkage v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" saveCode="region" <#if po.readonly=='Y'>disabled</#if> />
<j-area-linkage v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" saveCode="region" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType =='markdown'>
<#assign need_markdown = true>
<j-markdown-editor v-model:value="formData.${autoStringSuffixForModel(po)}" id="${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></j-markdown-editor>
<#elseif po.classType =='password'>
<a-input-password v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
<a-input-password v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType =='sel_user'>
<#assign need_dept_user = true>
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<j-select-user v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>/>
<j-select-user v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType =='textarea'>
<a-textarea v-model:value="formData.${autoStringSuffixForModel(po)}" :rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.classType=='radio'>
<#assign need_select_tag = true>
<j-dict-select-tag type='radio' v-model:value="formData.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
<j-dict-select-tag type='radio' v-model:value="formData.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType=='list'>
<#assign need_select_tag = true>
<j-dict-select-tag v-model:value="formData.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
<j-dict-select-tag v-model:value="formData.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType=='list_multi'>
<#assign need_multi = true>
<j-select-multiple type="${po.classType}" v-model:value="formData.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> :triggerChange="false"/>
<#elseif po.classType=='checkbox'>
<#assign need_checkbox = true>
<j-checkbox type="${po.classType}" v-model:value="formData.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
<j-checkbox type="${po.classType}" v-model:value="formData.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType=='sel_search'>
<#assign need_search = true>
<j-search-select v-model:value="formData.${po.fieldName}" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
<j-search-select v-model:value="formData.${po.fieldName}" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> allow-clear />
<#elseif po.classType=='cat_tree'>
<#assign need_category = true>
<j-category-select v-model:value="formData.${po.fieldName}" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}"</#if> <#if po.readonly=='Y'>disabled</#if> @change="(value) => handleFormChange('${po.fieldName}', value)" />
<j-category-select v-model:value="formData.${po.fieldName}" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}"</#if> <#if po.readonly=='Y'>disabled</#if> @change="(value) => handleFormChange('${po.fieldName}', value)" allow-clear />
<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
<a-input-number v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.classType=='file'>
@ -80,12 +79,12 @@
<j-upload v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:maxCount=${po.uploadnum}</#if>></j-upload>
<#elseif po.classType=='image'>
<#assign need_image_upload = true>
<j-image-upload <#if po.uploadnum??>:fileMax=${po.uploadnum}</#if> v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
<j-image-upload <#if po.uploadnum??>:fileMax=${po.uploadnum}<#else>:fileMax="0"</#if> v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
<#elseif po.classType=='umeditor'>
<#assign need_editor = true>
<j-editor v-model:value="formData.${autoStringSuffixForModel(po)}" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.fieldDbType=='Blob'>
<a-input v-model:value="formData.${autoStringSuffixForModel(po)}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
<a-input v-model:value="formData.${autoStringSuffixForModel(po)}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> allow-clear ></a-input>
<#elseif po.classType == 'sel_tree'>
<#assign need_select_tree = true>
<j-tree-select
@ -101,10 +100,10 @@
pidValue="${po.dictField}"
<#if po.readonly=='Y'>disabled</#if>
v-model:value="formData.${po.fieldName}"
@change="(value) => handleFormChange('${po.fieldName}', value)">
@change="(value) => handleFormChange('${po.fieldName}', value)" allow-clear >
</j-tree-select>
<#else>
<a-input v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
<a-input v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> allow-clear ></a-input>
</#if>
</a-form-item>
</a-col>

50
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
View File

@ -19,29 +19,29 @@
<#if query_field_no gt 1> </#if><a-form-item name="${autoStringSuffixForModel(po)}">
<#if query_field_no gt 1> </#if><template #label><span title="${po.filedComment}"><#if po.filedComment?default("")?trim?length gt 4>${po.filedComment?substring(0,4)}<#else>${po.filedComment}</#if></span></template>
<#if po.classType=='sel_search'>
<#if query_field_no gt 1> </#if><j-search-select placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dict="${po.dictTable},${po.dictText},${po.dictField}" />
<#if query_field_no gt 1> </#if><j-search-select placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dict="${po.dictTable},${po.dictText},${po.dictField}" allow-clear />
<#elseif po.classType=='sel_user'>
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#if query_field_no gt 1> </#if><j-select-user placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" @change="(value)=>handleFormJoinChange('${po.fieldName}',value)"/>
<#if query_field_no gt 1> </#if><j-select-user placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" @change="(value)=>handleFormJoinChange('${po.fieldName}',value)" allow-clear />
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
<#if query_field_no gt 1> </#if><j-switch placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" <#if po.dictField!= 'is_open'>:options="${po.dictField}"</#if> query />
<#elseif po.classType=='sel_depart'>
<#if query_field_no gt 1> </#if><j-select-dept placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" checkStrictly />
<#if query_field_no gt 1> </#if><j-select-dept placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" checkStrictly allow-clear />
<#elseif po.classType=='list_multi'>
<#if query_field_no gt 1> </#if><j-select-multiple placeholder="请选择${po.filedComment}" dictCode="${query_field_dictCode?default("")}" v-model:value="queryParam.${po.fieldName}" />
<#if query_field_no gt 1> </#if><j-select-multiple placeholder="请选择${po.filedComment}" dictCode="${query_field_dictCode?default("")}" v-model:value="queryParam.${po.fieldName}" allow-clear />
<#elseif po.classType=='cat_tree'>
<#if query_field_no gt 1> </#if><j-category-select placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" pcode="${po.dictField?default("")}" @change="(value) => handleFormChange('${po.fieldName}', value)" />
<#if query_field_no gt 1> </#if><j-category-select placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" pcode="${po.dictField?default("")}" @change="(value) => handleFormChange('${po.fieldName}', value)" allow-clear />
<#elseif po.classType=='date'>
<#if query_field_no gt 1> </#if><a-date-picker valueFormat="YYYY-MM-DD" placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" />
<#if query_field_no gt 1> </#if><a-date-picker valueFormat="YYYY-MM-DD" placeholder="请选择${po.filedComment}" <#if po.extendParams?exists && po.extendParams.picker?exists>picker="${po.extendParams.picker}"</#if> v-model:value="queryParam.${po.fieldName}" allow-clear />
<#elseif po.classType=='datetime'>
<#if query_field_no gt 1> </#if><a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" />
<#if query_field_no gt 1> </#if><a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" allow-clear />
<#elseif po.classType=='time'>
<#if query_field_no gt 1> </#if><time-picker valueFormat="HH:mm:ss" placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" />
<#if query_field_no gt 1> </#if><time-picker valueFormat="HH:mm:ss" placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" allow-clear />
<#elseif po.classType=='pca'>
<#if query_field_no gt 1> </#if><j-area-linkage v-model:value="queryParam.${po.fieldName}" placeholder="请选择${po.filedComment}" saveCode="region" @change="(value)=>handleFormJoinChange('${po.fieldName}',value)"/>
<#if query_field_no gt 1> </#if><j-area-linkage v-model:value="queryParam.${po.fieldName}" placeholder="请选择${po.filedComment}" saveCode="region" @change="(value)=>handleFormJoinChange('${po.fieldName}',value)" allow-clear />
<#elseif po.classType=='sel_tree'>
<#if query_field_no gt 1> </#if><j-tree-select v-model:value="queryParam.${po.fieldName}" placeholder="请选择${po.filedComment}" <#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 query_field_no gt 1> </#if><j-tree-select v-model:value="queryParam.${po.fieldName}" placeholder="请选择${po.filedComment}" <#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}" allow-clear />
<#elseif po.classType=='popup'>
<#assign sourceFields = po.dictField?default("")?trim?split(",")/>
<#assign targetFields = po.dictText?default("")?trim?split(",")/>
@ -55,18 +55,20 @@
</#list>
<#if query_field_no gt 1> </#if>]"
<#if query_field_no gt 1> </#if>:multi="${po.extendParams.popupMulti?c}"
<#if query_field_no gt 1> </#if>:setFieldsValue="setFieldsValue" />
<#if query_field_no gt 1> </#if>:setFieldsValue="setFieldsValue" allow-clear />
<#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
<#-- ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
<#if po.dictTable?default("")?trim?length gt 1>
<#if query_field_no gt 1> </#if><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dictCode="${po.dictTable},${po.dictText},${po.dictField}"/>
<#if query_field_no gt 1> </#if><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dictCode="${po.dictTable},${po.dictText},${po.dictField}" allow-clear />
<#elseif po.dictField?default("")?trim?length gt 1>
<#if query_field_no gt 1> </#if><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dictCode="${po.dictField}"/>
<#if query_field_no gt 1> </#if><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dictCode="${po.dictField}" allow-clear />
<#else>
<#if query_field_no gt 1> </#if><a-input placeholder="请输入${po.filedComment}" v-model:value="queryParam.${po.fieldName}"></a-input>
</#if>
<#if query_field_no gt 1> </#if><a-input placeholder="请输入${po.filedComment}" v-model:value="queryParam.${po.fieldName}" allow-clear ></a-input>
</#if>
<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
<#if query_field_no gt 1> </#if><a-input-number placeholder="请输入${po.filedComment}" v-model:value="queryParam.${po.fieldName}"></a-input-number>
<#else>
<#if query_field_no gt 1> </#if><a-input placeholder="请输入${po.filedComment}" v-model:value="queryParam.${autoStringSuffixForModel(po)}"></a-input>
<#if query_field_no gt 1> </#if><a-input placeholder="请输入${po.filedComment}" v-model:value="queryParam.${autoStringSuffixForModel(po)}" allow-clear ></a-input>
</#if>
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if></a-col>
@ -77,41 +79,41 @@
<#if po.classType=='date'>
<#if query_field_no gt 1> </#if><div style="display: flex">
<#if query_field_no gt 1> </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
<#if query_field_no gt 1> </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择开始日期" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust"/>
<#if query_field_no gt 1> </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择开始日期" <#if po.extendParams?exists && po.extendParams.picker?exists>picker="${po.extendParams.picker}"</#if> v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" allow-clear />
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if><span class="query-group-split-cust">~</span>
<#if query_field_no gt 1> </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
<#if query_field_no gt 1> </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择结束日期" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust"/>
<#if query_field_no gt 1> </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择结束日期" <#if po.extendParams?exists && po.extendParams.picker?exists>picker="${po.extendParams.picker}"</#if> v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" allow-clear />
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if></div>
<#elseif po.classType=='time'>
<#if query_field_no gt 1> </#if><div style="display: flex">
<#if query_field_no gt 1> </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
<#if query_field_no gt 1> </#if><time-picker value-format="HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust"/>
<#if query_field_no gt 1> </#if><time-picker value-format="HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" allow-clear />
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if><span class="query-group-split-cust">~</span>
<#if query_field_no gt 1> </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
<#if query_field_no gt 1> </#if><time-picker value-format="HH:mm:ss" placeholder="请选择结束日期" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust"/>
<#if query_field_no gt 1> </#if><time-picker value-format="HH:mm:ss" placeholder="请选择结束日期" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" allow-clear />
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if></div>
<#elseif po.classType=='datetime'>
<#if query_field_no gt 1> </#if><div style="display: flex">
<#if query_field_no gt 1> </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
<#if query_field_no gt 1> </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" />
<#if query_field_no gt 1> </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" allow-clear />
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if><span class="query-group-split-cust">~</span>
<#if query_field_no gt 1> </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
<#if query_field_no gt 1> </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" />
<#if query_field_no gt 1> </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" allow-clear />
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if></div>
<#else>
<#if query_field_no gt 1> </#if><div style="display: flex">
<#if query_field_no gt 1> </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
<#if query_field_no gt 1> </#if><a-input placeholder="请输入最小值" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust"></a-input>
<#if query_field_no gt 1> </#if><a-input placeholder="请输入最小值" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" allow-clear ></a-input>
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if><span class="query-group-left query-group-split-cust">~</span>
<#if query_field_no gt 1> </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
<#if query_field_no gt 1> </#if><a-input placeholder="请输入最大值" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust"></a-input>
<#if query_field_no gt 1> </#if><a-input placeholder="请输入最大值" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" allow-clear ></a-input>
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if></div>
</#if>

3
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vueNativeSearchStyle.ftl
View File

@ -18,5 +18,8 @@
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
}

5
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/vue3SearchStyle.ftl Normal file
View File

@ -0,0 +1,5 @@
<#-- 非原生查询区域样式 -->
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}

2
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
View File

@ -319,5 +319,5 @@
</script>
<style scoped>
<#include "/common/form/vue3SearchStyle.ftl">
</style>

43
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -3,6 +3,7 @@ import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -18,7 +19,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'
@ -123,6 +133,9 @@ export const searchFormSchema: FormSchema[] = [
<#elseif po.classType=='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType=='datetime'>
@ -153,6 +166,22 @@ export const searchFormSchema: FormSchema[] = [
dictCode:"${po.dictField}"
</#if>
},
<#elseif po.classType == 'sel_tree'>
component: 'JTreeSelect',
componentProps:{
<#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}",
},
<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
component: 'InputNumber',
<#else>
component: 'Input',
</#if>
@ -165,7 +194,10 @@ export const searchFormSchema: FormSchema[] = [
<#if po.classType=='date'>
component: 'RangePicker',
componentProps: {
valueType: 'Date',
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueType: 'Date',
},
<#elseif po.classType=='datetime'>
component: 'RangePicker',
@ -226,6 +258,9 @@ export const formSchema: FormSchema[] = [
<#if po.classType =='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -319,7 +354,9 @@ export const formSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
</#if>
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
component: 'JEditor',

12
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
View File

@ -3,6 +3,7 @@ import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -18,7 +19,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text);
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'

2
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
View File

@ -443,5 +443,5 @@
</script>
<style scoped>
<#include "/common/form/vue3SearchStyle.ftl">
</style>

29
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -3,6 +3,7 @@ import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -22,7 +23,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'
@ -126,6 +136,9 @@ export const searchFormSchema: FormSchema[] = [
<#elseif po.classType=='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType=='datetime'>
@ -172,6 +185,8 @@ export const searchFormSchema: FormSchema[] = [
dictCode:"${po.dictField}"
</#if>
},
<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
component: 'InputNumber',
<#else>
component: 'Input',
</#if>
@ -184,7 +199,10 @@ export const searchFormSchema: FormSchema[] = [
<#if po.classType=='date'>
component: 'RangePicker',
componentProps: {
valueType: 'Date',
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueType: 'Date',
},
<#elseif po.classType=='datetime'>
component: 'RangePicker',
@ -258,6 +276,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -351,7 +372,9 @@ export const formSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
</#if>
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
component: 'JEditor',

12
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
View File

@ -3,6 +3,7 @@ import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -22,7 +23,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text);
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'

5
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
View File

@ -119,7 +119,8 @@
title: '${tableVo.ftlDescription}',
api: list,
columns,
canResize:false,
canResize: false,
clickToRowSelect: true,
rowSelection: {type: 'radio'},
formConfig: {
schemas: searchFormSchema,
@ -349,4 +350,6 @@
}
}
}
<#include "/common/form/vue3SearchStyle.ftl">
</style>

61
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -3,6 +3,7 @@ import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -18,7 +19,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'
@ -120,6 +130,9 @@ export const searchFormSchema: FormSchema[] = [
<#elseif po.classType=='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType=='datetime'>
@ -145,6 +158,22 @@ export const searchFormSchema: FormSchema[] = [
dictCode:"${po.dictField}"
</#if>
},
<#elseif po.classType == 'sel_tree'>
component: 'JTreeSelect',
componentProps:{
<#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}",
},
<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
component: 'InputNumber',
<#else>
component: 'Input',
</#if>
@ -157,7 +186,10 @@ export const searchFormSchema: FormSchema[] = [
<#if po.classType=='date'>
component: 'RangePicker',
componentProps: {
valueType: 'Date',
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueType: 'Date',
},
<#elseif po.classType=='datetime'>
component: 'RangePicker',
@ -219,6 +251,9 @@ export const formSchema: FormSchema[] = [
<#if po.classType =='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -312,6 +347,8 @@ export const formSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
@ -425,7 +462,16 @@ export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'
@ -511,6 +557,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#if po.classType =='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -598,8 +647,10 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
</#if>
},
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
component: 'JEditor',
<#elseif po.classType == 'sel_tree'>

6
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei
View File

@ -6,9 +6,9 @@
<BasicTable @register="registerTable" :rowSelection="rowSelection" :searchInfo="searchInfo">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleCreate" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-button type="primary" @click="handleCreate" preIcon="ant-design:plus-outlined" v-if="mainId!=''"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" v-if="mainId!=''"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls" v-if="mainId!=''">导入</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>

1
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
View File

@ -193,6 +193,7 @@
columns,
canResize:false,
useSearchForm: false,
clickToRowSelect: true,
rowSelection: {type: 'radio'},
actionColumn: {
width: 120,

12
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
View File

@ -3,6 +3,7 @@ import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -18,7 +19,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'

6
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei
View File

@ -8,9 +8,9 @@
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined" v-if="mainId!=''"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" v-if="mainId!=''"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls" v-if="mainId!=''">导入</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>

2
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
View File

@ -348,5 +348,5 @@
</script>
<style scoped>
<#include "/common/form/vue3SearchStyle.ftl">
</style>

55
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -4,6 +4,7 @@ import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -19,7 +20,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'
@ -124,6 +134,9 @@ export const searchFormSchema: FormSchema[] = [
<#elseif po.classType=='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType=='datetime'>
@ -149,6 +162,22 @@ export const searchFormSchema: FormSchema[] = [
dictCode:"${po.dictField}"
</#if>
},
<#elseif po.classType == 'sel_tree'>
component: 'JTreeSelect',
componentProps:{
<#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}",
},
<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
component: 'InputNumber',
<#else>
component: 'Input',
</#if>
@ -161,7 +190,10 @@ export const searchFormSchema: FormSchema[] = [
<#if po.classType=='date'>
component: 'RangePicker',
componentProps: {
valueType: 'Date',
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueType: 'Date',
},
<#elseif po.classType=='datetime'>
component: 'RangePicker',
@ -222,6 +254,9 @@ export const formSchema: FormSchema[] = [
<#if po.classType =='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -315,7 +350,9 @@ export const formSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
</#if>
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
component: 'JEditor',
@ -510,6 +547,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#if po.classType =='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -603,8 +643,10 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
</#if>
},
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
component: 'JEditor',
<#elseif po.classType == 'sel_tree'>
@ -717,6 +759,9 @@ export const ${sub.entityName?uncap_first}JVxeColumns: JVxeColumn[] = [
key: '${autoStringSuffixForModel(col)}',
<#if col.classType =='date'>
type: JVxeTypes.date,
<#if col.extendParams?exists && col.extendParams.picker?exists>
picker: '${col.extendParams.picker}',
</#if>
<#if col.readonly=='Y'>
disabled:true,
</#if>

2
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
View File

@ -321,5 +321,5 @@
</script>
<style scoped>
<#include "/common/form/vue3SearchStyle.ftl">
</style>

55
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -4,6 +4,7 @@ import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -19,7 +20,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'
@ -124,6 +134,9 @@ export const searchFormSchema: FormSchema[] = [
<#elseif po.classType=='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType=='datetime'>
@ -149,6 +162,22 @@ export const searchFormSchema: FormSchema[] = [
dictCode:"${po.dictField}"
</#if>
},
<#elseif po.classType == 'sel_tree'>
component: 'JTreeSelect',
componentProps:{
<#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}",
},
<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
component: 'InputNumber',
<#else>
component: 'Input',
</#if>
@ -161,7 +190,10 @@ export const searchFormSchema: FormSchema[] = [
<#if po.classType=='date'>
component: 'RangePicker',
componentProps: {
valueType: 'Date',
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueType: 'Date',
},
<#elseif po.classType=='datetime'>
component: 'RangePicker',
@ -222,6 +254,9 @@ export const formSchema: FormSchema[] = [
<#if po.classType =='date'>
component: 'DatePicker',
componentProps:{
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -315,7 +350,9 @@ export const formSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
</#if>
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
component: 'JEditor',
@ -450,6 +487,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#if po.classType =='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -543,8 +583,10 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
</#if>
},
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
component: 'JEditor',
<#elseif po.classType == 'sel_tree'>
@ -657,6 +699,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
key: '${autoStringSuffixForModel(col)}',
<#if col.classType =='date'>
type: JVxeTypes.date,
<#if col.extendParams?exists && col.extendParams.picker?exists>
picker: '${col.extendParams.picker}',
</#if>
<#if col.readonly=='Y'>
disabled:true,
</#if>

4
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
View File

@ -1,8 +1,8 @@
<#include "/common/utils.ftl">
<template>
<BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="${getModalWidth(tableVo.fieldRowNum?default(1))}" @ok="handleSubmit">
<BasicForm @register="registerForm" ref="formRef"/>
<!-- 子表单区域 -->
<BasicForm @register="registerForm" ref="formRef"/>
<!-- 子表单区域 -->
<a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
<#list subTables as sub><#rt/>
<#assign refKey = sub.entityName?uncap_first/>

15
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
View File

@ -4,6 +4,7 @@ import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -19,7 +20,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'
@ -84,6 +94,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
key: '${autoStringSuffixForModel(col)}',
<#if col.classType =='date'>
type: JVxeTypes.date,
<#if col.extendParams?exists && col.extendParams.picker?exists>
picker: '${col.extendParams.picker}',
</#if>
<#if col.readonly=='Y'>
disabled:true,
</#if>

2
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
View File

@ -320,5 +320,5 @@
</script>
<style scoped>
<#include "/common/form/vue3SearchStyle.ftl">
</style>

53
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -4,6 +4,7 @@ import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
@ -19,7 +20,16 @@ export const columns: BasicColumn[] = [
<#if po.classType=='date'>
dataIndex: '${po.fieldName}',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
<#if po.extendParams?exists && po.extendParams.picker?exists>
if(text) {
return getWeekMonthQuarterYear(text)['${po.extendParams.picker}'];
} else {
return text;
}
<#else>
return text;
</#if>
},
<#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String'
@ -124,6 +134,9 @@ export const searchFormSchema: FormSchema[] = [
<#elseif po.classType=='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType=='datetime'>
@ -149,6 +162,22 @@ export const searchFormSchema: FormSchema[] = [
dictCode:"${po.dictField}"
</#if>
},
<#elseif po.classType == 'sel_tree'>
component: 'JTreeSelect',
componentProps:{
<#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}",
},
<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
component: 'InputNumber',
<#else>
component: 'Input',
</#if>
@ -161,7 +190,10 @@ export const searchFormSchema: FormSchema[] = [
<#if po.classType=='date'>
component: 'RangePicker',
componentProps: {
valueType: 'Date',
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueType: 'Date',
},
<#elseif po.classType=='datetime'>
component: 'RangePicker',
@ -222,6 +254,9 @@ export const formSchema: FormSchema[] = [
<#if po.classType =='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -315,7 +350,9 @@ export const formSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
</#if>
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
component: 'JEditor',
@ -450,6 +487,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#if po.classType =='date'>
component: 'DatePicker',
componentProps: {
<#if po.extendParams?exists && po.extendParams.picker?exists>
picker: '${po.extendParams.picker}',
</#if>
valueFormat: 'YYYY-MM-DD'
},
<#elseif po.classType =='datetime'>
@ -543,7 +583,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
<#if po.uploadnum??>
fileMax:${po.uploadnum}
</#if>
<#else>
fileMax: 0
</#if>
},
<#elseif po.classType=='umeditor'>
component: 'JEditor',
@ -657,6 +699,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
key: '${autoStringSuffixForModel(col)}',
<#if col.classType =='date'>
type: JVxeTypes.date,
<#if col.extendParams?exists && col.extendParams.picker?exists>
picker: '${col.extendParams.picker}',
</#if>
<#if col.readonly=='Y'>
disabled:true,
</#if>

13
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
View File

@ -238,8 +238,21 @@
overflow-y: hidden;
flex: 1;
white-space: nowrap;
.ant-radio-group {
font-weight: normal;
}
}
}
html[data-theme='light'] {
.right {
.ant-radio-group {
:deep(.ant-radio-button-wrapper:not(.ant-radio-button-wrapper-checked)) {
color: #555;
}
}
}
}
</style>
<style lang="less">