From dd9ec47cdbe60728158d914534022d3feb4688e7 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Thu, 6 Feb 2025 19:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/7549=E3=80=91Online=20=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=BC=80=E5=8F=91=20=E9=A1=B5=E9=9D=A2=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20=E6=9F=A5=E8=AF=A2=E9=80=89=E6=8B=A9=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=20=E7=BB=93=E6=9E=9C=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=E4=BB=A3=E7=A0=81=E6=98=AF=20JRangeNumber=20?= =?UTF-8?q?=E8=80=8C=E4=B8=94=E9=A1=B5=E9=9D=A2=E4=B8=AD=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=9A=E7=88=B6=E5=AD=90=E8=A1=A8--]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/form/native/vue3NativeImport.ftl | 3 +++ .../common/form/native/vue3NativeSearch.ftl | 7 +++++++ .../resources/jeecg/code-template-online/common/utils.ftl | 2 +- .../${entityPackage}/vue3/${entityName}List.vuei | 4 ++-- .../${entityPackage}/vue3/${entityName}__data.tsi | 6 ++++++ .../${entityPackage}/vue3Native/${entityName}List.vuei | 7 +++++-- .../vue3Native/components/${entityName}Form.vuei | 1 + .../${entityPackage}/vue3/${entityName}List.vuei | 4 ++-- .../${entityPackage}/vue3/${entityName}__data.tsi | 6 ++++++ .../${entityPackage}/vue3Native/${entityName}List.vuei | 8 ++++++-- .../vue3Native/components/${entityName}Form.vuei | 1 + .../${entityPackage}/vue3/${entityName}List.vuei | 4 ++-- .../${entityPackage}/vue3/${entityName}__data.tsi | 6 ++++++ .../${entityPackage}/vue3Native/${entityName}List.vuei | 8 ++++++-- .../${entityPackage}/vue3Native/[1-n]List.vuei | 1 + .../vue3Native/components/${entityName}Form.vuei | 1 + .../${entityPackage}/vue3Native/components/[1-n]Form.vuei | 1 + .../${entityPackage}/vue3/${entityName}List.vuei | 4 ++-- .../${entityPackage}/vue3/${entityName}__data.tsi | 6 ++++++ .../${entityPackage}/vue3/${entityName}List.vuei | 4 ++-- .../${entityPackage}/vue3/${entityName}__data.tsi | 6 ++++++ .../${entityPackage}/vue3Native/${entityName}List.vuei | 8 ++++++-- .../vue3Native/components/${entityName}Form.vuei | 1 + .../${entityPackage}/vue3Native/components/[1-n]Form.vuei | 1 + .../${entityPackage}/vue3/${entityName}List.vuei | 4 ++-- .../${entityPackage}/vue3/${entityName}__data.tsi | 6 ++++++ 26 files changed, 89 insertions(+), 21 deletions(-) diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl index 5e0e88ef..b770ae9f 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl @@ -53,4 +53,7 @@ <#if need_range_number> import JRangeNumber from "/@/components/Form/src/jeecg/components/JRangeNumber.vue"; + +<#if is_like> + import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl index dbd09534..efd724a1 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl @@ -81,6 +81,13 @@ <#if query_field_no gt 1> <#if query_field_no gt 1> + <#elseif po.queryMode=='like'> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> <#else> <#if query_field_no gt 1> <#if query_field_no gt 1> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl index b26a3bc7..49bdba0a 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl @@ -238,7 +238,7 @@ <#assign rangeField = ""> <#list columns as po> <#if po.isQuery=='Y'> - <#if po.queryMode!='single'> + <#if po.queryMode=='group'> <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal' || po.classType=='time' || po.classType=='date' || po.classType=='datetime'> <#assign rangeField = rangeField + "${po.fieldName},"> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index 41c283a9..60c3ca1f 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -115,7 +115,7 @@ fieldMapToNumber: [ <#list columns as po> <#if po.isQuery=='Y'> - <#if po.queryMode!='single'> + <#if po.queryMode=='group'> <#-- update-begin---author:chenrui ---date:20240527 for:[TV360X-388]时间范围查询控件---------- --> <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal' || po.classType=='time'> <#-- update-end---author:chenrui ---date:20240527 for:[TV360X-388]时间范围查询控件---------- --> @@ -128,7 +128,7 @@ fieldMapToTime: [ <#list columns as po> <#if po.isQuery=='Y'> - <#if po.queryMode!='single'> + <#if po.queryMode=='group'> <#if po.classType=='date'> ['${po.fieldName}', ['${po.fieldName}_begin', '${po.fieldName}_end'], 'YYYY-MM-DD'], <#elseif po.classType=='datetime'> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index 259e3194..1902f22c 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -210,6 +210,12 @@ export const searchFormSchema: FormSchema[] = [ //colProps: {span: 6}, }, +<#elseif po.queryMode=='like'> + { + label: "${po.filedComment}", + field: "${po.fieldName}", + component: 'JInput', + }, <#else> { label: "${po.filedComment}", diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index effc2107..02336b81 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -65,11 +65,14 @@ <#if po.classType=='time'> <#assign need_time = true> -<#if po.queryMode!='single' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')> +<#if po.queryMode=='group' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')> <#assign need_range_number = true> -<#if po.queryMode!='single'> +<#if po.queryMode=='group'> <#assign is_range = true> + +<#if po.queryMode=='like'> +<#assign is_like = true> <#include "/common/form/native/vue3NativeSearch.ftl"> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei index b9b33915..a3413bb7 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei @@ -25,6 +25,7 @@ <#assign need_checkbox = false> <#assign hasOnlyValidate = false> <#assign need_range_number = false> +<#assign is_like = false> <#assign form_span = 24> <#if tableVo.fieldRowNum==2> <#assign form_span = 12> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index 596d65ad..c340d804 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -118,7 +118,7 @@ fieldMapToNumber: [ <#list columns as po> <#if po.isQuery=='Y'> - <#if po.queryMode!='single'> + <#if po.queryMode=='group'> <#-- update-begin---author:chenrui ---date:20240527 for:[TV360X-388]时间范围查询控件---------- --> <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal' || po.classType=='time'> <#-- update-end---author:chenrui ---date:20240527 for:[TV360X-388]时间范围查询控件---------- --> @@ -131,7 +131,7 @@ fieldMapToTime: [ <#list columns as po> <#if po.isQuery=='Y'> - <#if po.queryMode!='single'> + <#if po.queryMode=='group'> <#if po.classType=='date'> ['${po.fieldName}', ['${po.fieldName}_begin', '${po.fieldName}_end'], 'YYYY-MM-DD'], <#elseif po.classType=='datetime'> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index 52592923..63428656 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -215,6 +215,12 @@ export const searchFormSchema: FormSchema[] = [ //colProps: {span: 6}, }, +<#elseif po.queryMode=='like'> + { + label: "${po.filedComment}", + field: "${po.fieldName}", + component: 'JInput', + }, <#else> { label: "${po.filedComment}", diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index f770b62b..cb2f78c9 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -32,6 +32,7 @@ <#assign need_checkbox = false> <#assign need_range_number = false> <#assign is_range = false> +<#assign is_like = false> <#assign query_flag = false>
@@ -75,11 +76,14 @@ <#if po.classType=='time'> <#assign need_time = true> -<#if po.queryMode!='single' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')> +<#if po.queryMode=='group' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')> <#assign need_range_number = true> -<#if po.queryMode!='single'> +<#if po.queryMode=='group'> <#assign is_range = true> + +<#if po.queryMode=='like'> +<#assign is_like = true> <#include "/common/form/native/vue3NativeSearch.ftl"> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei index 572864d4..2a5a09ef 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei @@ -24,6 +24,7 @@ <#assign need_editor = false> <#assign need_checkbox = false> <#assign need_range_number = false> +<#assign is_like = false> <#assign pidFieldName = ""> <#assign hasOnlyValidate = false> <#assign form_span = 24> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index 7e620da6..23a37ad9 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -127,7 +127,7 @@ fieldMapToNumber: [ <#list columns as po> <#if po.isQuery=='Y'> - <#if po.queryMode!='single'> + <#if po.queryMode=='group'> <#-- update-begin---author:chenrui ---date:20240527 for:[TV360X-388]时间范围查询控件---------- --> <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal' || po.classType=='time'> <#-- update-end---author:chenrui ---date:20240527 for:[TV360X-388]时间范围查询控件---------- --> @@ -140,7 +140,7 @@ fieldMapToTime: [ <#list columns as po> <#if po.isQuery=='Y'> - <#if po.queryMode!='single'> + <#if po.queryMode=='group'> <#if po.classType=='date'> ['${po.fieldName}', ['${po.fieldName}_begin', '${po.fieldName}_end'], 'YYYY-MM-DD'], <#elseif po.classType=='datetime'> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index 90613a25..49fa57cd 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -202,6 +202,12 @@ export const searchFormSchema: FormSchema[] = [ //colProps: {span: 6}, }, +<#elseif po.queryMode=='like'> + { + label: "${po.filedComment}", + field: "${po.fieldName}", + component: 'JInput', + }, <#else> { label: "${po.filedComment}", diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index 04d68cc4..923d8493 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -23,6 +23,7 @@ <#assign query_flag = false> <#assign need_range_number = false> <#assign is_range = false> + <#assign is_like = false>
@@ -68,12 +69,15 @@ <#if po.classType=='time'> <#assign need_time = true> - <#if po.queryMode!='single' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')> + <#if po.queryMode='group' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')> <#assign need_range_number = true> - <#if po.queryMode!='single'> + <#if po.queryMode='group'> <#assign is_range = true> + <#if po.queryMode='like'> + <#assign is_like = true> + <#include "/common/form/native/vue3NativeSearch.ftl"> <#if query_field_no gt 2> diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei index 36e43bd9..e34f1783 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei @@ -1,6 +1,7 @@ <#list subTables as sub> #segment#${sub.entityName}List.vue <#assign need_pca = false> +<#assign is_like = false>