From fb9f367517e6671efd1f7e40dee67f05251154a6 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Mon, 18 Aug 2025 23:02:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=EF=BC=8Con?= =?UTF-8?q?line=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89=E9=92=AE=E6=97=A0?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../${entityPackage}/vue3/${entityName}List.vuei | 8 ++++---- .../vue3/components/${entityName}Modal.vuei | 2 +- .../${entityPackage}/vue3Native/${entityName}List.vuei | 8 ++++---- .../vue3Native/components/${entityName}Modal.vuei | 2 +- .../${entityPackage}/vue3/${entityName}List.vuei | 8 ++++---- .../vue3/components/${entityName}Modal.vuei | 2 +- .../${entityPackage}/vue3Native/${entityName}List.vuei | 8 ++++---- .../${entityPackage}/vue3/${entityName}List.vuei | 8 ++++---- .../vue3/components/${entityName}Modal.vuei | 2 +- .../${entityPackage}/vue3Native/${entityName}List.vuei | 8 ++++---- .../vue3Native/components/${entityName}Modal.vuei | 2 +- .../${entityPackage}/vue3/${entityName}List.vuei | 8 ++++---- .../vue3/components/${entityName}Modal.vuei | 2 +- .../${entityPackage}/vue3/${entityName}List.vuei | 8 ++++---- .../vue3/components/${entityName}Modal.vuei | 2 +- .../${entityPackage}/vue3Native/${entityName}List.vuei | 8 ++++---- .../vue3Native/components/${entityName}Modal.vuei | 4 ++-- .../${entityPackage}/vue3/${entityName}List.vuei | 8 ++++---- .../vue3/components/${entityName}Modal.vuei | 2 +- 19 files changed, 50 insertions(+), 50 deletions(-) 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 b79102452..924b25d6f 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 @@ -33,7 +33,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="ant-design:${btn.buttonIcon}" >${btn.buttonName} @@ -303,7 +303,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -339,7 +339,7 @@ auth: '${entityPackage}:${tableName}:delete' } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -378,7 +378,7 @@ <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei index 263176761..56538c6dd 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei @@ -107,7 +107,7 @@ }; <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); 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 838bae596..1ed5193be 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 @@ -110,7 +110,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="ant-design:${btn.buttonIcon}" >${btn.buttonName} @@ -368,7 +368,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -404,7 +404,7 @@ auth: '${entityPackage}:${tableName}:delete' } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -484,7 +484,7 @@ <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); 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}Modal.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}Modal.vuei index ce21b6e52..3a09ae289 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}Modal.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}Modal.vuei @@ -77,7 +77,7 @@ visible.value = false; } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); 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 6e434fa53..bbc4b2dfc 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 @@ -38,7 +38,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="${btn.buttonIcon}" >${btn.buttonName} @@ -447,7 +447,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -483,7 +483,7 @@ auth: '${entityPackage}:${tableName}:delete' } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -544,7 +544,7 @@ <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei index ad13ce7cb..799c43e7d 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei @@ -157,7 +157,7 @@ }; <#if buttonList?size gt 0> -<#list buttonList?sort_by('orderNum') as btn> +<#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); 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 972f2d04d..519eb27f9 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 @@ -120,7 +120,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="ant-design:${btn.buttonIcon}" >${btn.buttonName} @@ -518,7 +518,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -559,7 +559,7 @@ auth: '${entityPackage}:${tableName}:delete' } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -597,7 +597,7 @@ } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); 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 6c3b6d87e..99566158b 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 @@ -33,7 +33,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="ant-design:${btn.buttonIcon}" >${btn.buttonName} @@ -349,7 +349,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -384,7 +384,7 @@ auth: '${entityPackage}:${tableName}:delete' } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -443,7 +443,7 @@ <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei index 93cbf7cff..e1173a6d9 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei @@ -106,7 +106,7 @@ } }; <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); 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 4a9a7aa86..35afec027 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 @@ -114,7 +114,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="ant-design:${btn.buttonIcon}" >${btn.buttonName} @@ -389,7 +389,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', }, <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -426,7 +426,7 @@ auth: '${entityPackage}:${tableName}:delete' } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -464,7 +464,7 @@ } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei index 0a1d91c96..3597dd7c0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei @@ -79,7 +79,7 @@ } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index fc81d44f7..030031759 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -46,7 +46,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="${btn.buttonIcon}" >${btn.buttonName} @@ -356,7 +356,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -392,7 +392,7 @@ auth: '${entityPackage}:${tableName}:delete' } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -451,7 +451,7 @@ <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei index c7e89a75b..88f5f25ad 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei @@ -252,7 +252,7 @@ }; <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index 32feb1b01..8af1ca2dd 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -32,7 +32,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="${btn.buttonIcon}" >${btn.buttonName} @@ -330,7 +330,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -366,7 +366,7 @@ auth: '${entityPackage}:${tableName}:delete' } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -425,7 +425,7 @@ <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei index 60acb8269..ebce307e2 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei @@ -251,7 +251,7 @@ }; <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index 6199e829c..d8b161e49 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -113,7 +113,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="${btn.buttonIcon}" >${btn.buttonName} @@ -364,7 +364,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -401,7 +401,7 @@ } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -441,7 +441,7 @@ <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei index f1e8a0ac6..87eebac51 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei @@ -59,7 +59,7 @@ closeModal(); } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); @@ -75,7 +75,7 @@ handleSubmit, submitSuccess, <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> handle${btn.buttonCode?cap_first}, diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index 8aa9bcc47..79864c79f 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -32,7 +32,7 @@ 导出 导入 <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'button'> preIcon="${btn.buttonIcon}" >${btn.buttonName} @@ -329,7 +329,7 @@ ifShow: !!record.bpmStatus && record.bpmStatus !== '1', } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -365,7 +365,7 @@ auth: '${entityPackage}:${tableName}:delete' } <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle == 'link'> ,{ label: '${btn.buttonName}', @@ -424,7 +424,7 @@ <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='button'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei index 937a5f4bf..9b52722d0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei @@ -286,7 +286,7 @@ }; <#if buttonList?size gt 0> - <#list buttonList?sort_by('orderNum') as btn> + <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn> <#if btn.buttonStyle=='form'> function handle${btn.buttonCode?cap_first}(){ createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!');