YuNan
/
CET-cmd-2.0
forked from Big-Data-Lab/CET-cmd-2.0
1
0
Fork 0
Code Pull Requests Activity

[issues/5755]vue代码不加入逻辑删除字段 

[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件
[issues/1022]我这个控件是哪里设置没对吗，为什么打开已有的记录，会触发提示“请输入”验证？ #1022
fix 带条件字典存在单引号导致js编译错误
This commit is contained in:
zhangdaiscott 2024-02-19 16:40:33 +08:00
parent e333b126b6
commit a47d0984dc
21 changed files with 273 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,9 @@
JSelectDept,
</#if>
<#if need_dept_user>
JSelectUserByDept,
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
JSelectUser,
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
</#if>
<#if need_select_tree>
JTreeSelect,

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

@ -1,5 +1,7 @@
<#include "/common/utils.ftl">
<#if po.isShow =='Y' && po.fieldName != 'id' && isNotPidField(tableVo, po.fieldDbName)>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName != 'id' && po.fieldName !='delFlag' && isNotPidField(tableVo, po.fieldDbName)>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -48,7 +50,9 @@
<a-input-password v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
<#elseif po.classType =='sel_user'>
<#assign need_dept_user = true>
<j-select-user-by-dept v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<j-select-user v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
<#-- 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<#else>:disabled="disabled"</#if>/>
<#elseif po.classType=='radio'>

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

@ -20,7 +20,9 @@
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
</#if>
<#if need_dept_user>
import JSelectUserByDept from '/@/components/Form/src/jeecg/components/JSelectUserByDept.vue';
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
</#if>
<#if need_select_tree>
import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';

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

@ -1,5 +1,7 @@
<#include "/common/utils.ftl">
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#if query_field_no==2>
<template v-if="toggleSearchStatus">
@ -19,7 +21,9 @@
<#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}" />
<#elseif po.classType=='sel_user'>
<#if query_field_no gt 1> </#if><j-select-user-by-dept placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" @change="(value)=>handleFormJoinChange('${po.fieldName}',value)"/>
<#-- 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)"/>
<#-- 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'>

4
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl
View File

@ -144,7 +144,9 @@
<#assign extAttrs="">
<#assign dictCode="">
<#if po.dictTable?default('')?trim?length gt 1 && po.dictText?default('')?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign dictCode="dictTable: '${po.dictTable}', dictCode: '${po.dictField}', dictText: '${po.dictText}'">
<#-- update-begin---author:chenrui ---date:20231228 for:fix 带条件字典存在单引号导致js编译错误---------- -->
<#assign dictCode="dictTable: \"${po.dictTable}\", dictCode: '${po.dictField}', dictText: '${po.dictText}'">
<#-- update-begin---author:chenrui ---date:20231228 for:fix 带条件字典存在单引号导致js编译错误---------- -->
<#elseif po.dictField?default("")?trim?length gt 1>
<#assign dictCode="dictCode: '${po.dictField}'">
</#if>

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

@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -70,7 +72,9 @@ export const searchFormSchema: FormSchema[] = [
<#if po.fieldDbName=='bpm_status'>
<#assign bpm_flag=true>
</#if>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -88,7 +92,9 @@ export const searchFormSchema: FormSchema[] = [
dict:"${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps:{
@ -186,7 +192,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -236,7 +244,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -387,7 +397,9 @@ export const formSchema: FormSchema[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>

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

@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align: "center",
@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
<#if po.fieldDbName=='bpm_status'>
<#assign bpm_flag=true>
</#if>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
dict: "${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps:{
@ -181,7 +187,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -222,7 +230,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey: 'realname',
},
@ -373,7 +383,9 @@ export const formSchema: FormSchema[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>

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

@ -80,7 +80,7 @@
const validatorRules = {
<#include "/common/validatorRulesTemplate/native/vue3MainNative.ftl">
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
// 表单禁用
const disabled = computed(()=>{

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

@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
<#if po.fieldDbName == tableVo.extendParams.textField>
@ -74,7 +76,9 @@ export const searchFormSchema: FormSchema[] = [
<#if po.fieldDbName=='bpm_status'>
<#assign bpm_flag=true>
</#if>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -92,7 +96,9 @@ export const searchFormSchema: FormSchema[] = [
dict:"${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps:{
@ -204,7 +210,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -262,7 +270,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -416,7 +426,9 @@ export const formSchema: FormSchema[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>

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

@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
<#if po.fieldDbName == tableVo.extendParams.textField>
@ -75,7 +77,9 @@ export const searchFormSchema: FormSchema[] = [
<#if po.fieldDbName=='bpm_status'>
<#assign bpm_flag=true>
</#if>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -93,7 +97,9 @@ export const searchFormSchema: FormSchema[] = [
dict:"${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps: {
@ -203,7 +209,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -252,7 +260,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey: 'realname',
},
@ -406,7 +416,9 @@ export const formSchema: FormSchema[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>

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

@ -98,7 +98,7 @@
const validatorRules = {
<#include "/common/validatorRulesTemplate/native/vue3MainNative.ftl">
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: ()=>{} },

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

@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -67,7 +69,9 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [
<#-- 开始循环 -->
<#list columns as po>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -85,7 +89,9 @@ export const searchFormSchema: FormSchema[] = [
dict:"${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps:{
@ -179,7 +185,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -229,7 +237,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -381,7 +391,9 @@ export const formSchema: FormSchema[] = [
//子表列表数据
export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
<#list sub.originalColumns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -453,7 +465,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
show: false
},
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -503,7 +517,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -647,7 +663,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>

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

@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -67,7 +69,9 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [
<#-- 开始循环 -->
<#list columns as po>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -85,7 +89,9 @@ export const searchFormSchema: FormSchema[] = [
dict:"${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps:{
@ -179,7 +185,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -229,7 +237,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -381,7 +391,9 @@ export const formSchema: FormSchema[] = [
//子表列表数据
export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
<#list sub.originalColumns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -453,7 +465,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
show: false
},
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -503,7 +517,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -647,7 +663,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>

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

@ -79,7 +79,7 @@
const validatorRules = {
<#include "/common/validatorRulesTemplate/native/vue3MainNative.ftl">
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
const formRef = ref();
// 表单禁用
const disabled = computed(()=>{

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

@ -78,7 +78,7 @@
</#if>
</#list>
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
const props = defineProps({
disabled: { type: Boolean, default: false },
});

40
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

@ -7,7 +7,9 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
<#if po.fieldDbName=='bpm_status'>
<#assign bpm_flag=true>
</#if>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
dict:"${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps:{
@ -182,7 +188,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -232,7 +240,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -384,7 +394,9 @@ export const formSchema: FormSchema[] = [
//子表列表数据
export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
<#list sub.originalColumns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -504,7 +516,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -660,7 +674,9 @@ export const ${sub.entityName?uncap_first}JVxeColumns: JVxeColumn[] = [
<#-- 循环子表的列 开始 -->
<#list sub.colums as col><#rt/>
<#if col.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if col.isShow =='Y' && col.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if col.filedComment !='外键' >
{
title: '${col.filedComment}',
@ -812,7 +828,9 @@ export const ${sub.entityName?uncap_first}JVxeColumns: JVxeColumn[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
@ -823,7 +841,9 @@ export const superQuerySchema = {
view: 'table',
fields: {
<#list sub.colums as subCol>
<#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if subCol.isShowList =='Y' && subCol.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(subCol,subCol_index)},
</#if>
</#list>

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

@ -7,7 +7,9 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
<#if po.fieldDbName=='bpm_status'>
<#assign bpm_flag=true>
</#if>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
dict:"${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps:{
@ -182,7 +188,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -232,7 +240,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
componentProps:{
labelKey:'realname',
},
@ -394,7 +404,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#if po.fieldDbName=='id'>
<#assign sub_id_exists=true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -444,7 +456,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
componentProps:{
labelKey:'realname',
},
@ -600,7 +614,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
<#-- 循环子表的列 开始 -->
<#list sub.colums as col><#rt/>
<#if col.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if col.isShow =='Y' && col.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if col.filedComment !='外键' >
{
title: '${col.filedComment}',
@ -753,7 +769,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
@ -764,7 +782,9 @@ export const superQuerySchema = {
view: 'table',
fields: {
<#list sub.colums as subCol>
<#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if subCol.isShowList =='Y' && subCol.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(subCol,subCol_index)},
</#if>
</#list>

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

@ -7,7 +7,9 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
<#if po.fieldDbName=='bpm_status'>
<#assign bpm_flag=true>
</#if>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
dict:"${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps:{
@ -177,7 +183,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -218,7 +226,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
componentProps:{
labelKey:'realname',
},
@ -380,7 +390,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#if po.fieldDbName=='id'>
<#assign sub_id_exists=true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -421,7 +433,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -577,7 +591,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
<#-- 循环子表的列 开始 -->
<#list sub.colums as col><#rt/>
<#if col.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if col.isShow =='Y' && col.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if col.filedComment !='外键' >
{
title: '${col.filedComment}',
@ -729,7 +745,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
@ -740,7 +758,9 @@ export const superQuerySchema = {
view: 'table',
fields: {
<#list sub.colums as subCol>
<#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if subCol.isShowList =='Y' && subCol.fieldName !='id' && subCol.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(subCol,subCol_index)},
</#if>
</#list>

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

@ -158,7 +158,7 @@
</#if>
</#list>
});
const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: true});
const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
const dbData = {};
const formItemLayout = {
labelCol: {xs: {span: 24}, sm: {span: 5}},

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

@ -85,7 +85,7 @@
</#if>
</#list>
})
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, {immediate: true});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, {immediate: false});
const formItemLayout = {
labelCol: { xs: { span: 24 }, sm: { span: 5 } },
wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },

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

@ -7,7 +7,9 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
//列表数据
export const columns: BasicColumn[] = [
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
{
title: '${po.filedComment}',
align:"center",
@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
<#if po.fieldDbName=='bpm_status'>
<#assign bpm_flag=true>
</#if>
<#if po.isQuery=='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign query_flag=true>
<#assign query_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1>
@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
dict:"${po.dictTable},${po.dictText},${po.dictField}"
},
<#elseif po.classType=='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
<#elseif po.classType=='switch'>
component: 'JSwitch',
componentProps:{
@ -182,7 +188,9 @@ export const formSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -229,7 +237,9 @@ export const formSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -391,7 +401,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#if po.fieldDbName == 'id'>
<#assign sub_id_exists = true>
</#if>
<#if po.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShow =='Y' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@ -438,7 +450,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
<#elseif po.classType =='password'>
component: 'InputPassword',
<#elseif po.classType =='sel_user'>
component: 'JSelectUserByDept',
<#-- update-begin---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
component: 'JSelectUser',
<#-- update-end---author:chenrui ---date:20240102 for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
componentProps:{
labelKey:'realname',
},
@ -594,7 +608,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
<#-- 循环子表的列 开始 -->
<#list sub.colums as col><#rt/>
<#if col.isShow =='Y'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if col.isShow =='Y' && col.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if col.filedComment !='外键' >
{
title: '${col.filedComment}',
@ -746,7 +762,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
@ -757,7 +775,9 @@ export const superQuerySchema = {
view: 'table',
fields: {
<#list sub.colums as subCol>
<#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
<#-- update-begin---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
<#if subCol.isShowList =='Y' && subCol.fieldName !='id' && po.fieldName !='delFlag'>
<#-- update-end---author:chenrui ---date:20240108 for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
${superQueryFieldListForVue3(subCol,subCol_index)},
</#if>
</#list>