From 58f5568a606d7bef0670aaf0f663826742c118d0 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 26 Jan 2021 22:26:52 +0800 Subject: [PATCH] =?UTF-8?q?beetl=E6=A8=A1=E6=9D=BF=E6=9B=B4=E6=96=B0strUti?= =?UTF-8?q?l=E7=9A=84=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guns/core/beetl/CustomBeetlGroupUtilConfiguration.java | 6 +++++- src/main/webapp/pages/layout/_container.html | 6 +++--- src/main/webapp/pages/layout/_form.html | 6 +++--- src/main/webapp/pages/layout/_tree_container.html | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/cn/stylefeng/guns/core/beetl/CustomBeetlGroupUtilConfiguration.java b/src/main/java/cn/stylefeng/guns/core/beetl/CustomBeetlGroupUtilConfiguration.java index 36223009..1ea5c3aa 100644 --- a/src/main/java/cn/stylefeng/guns/core/beetl/CustomBeetlGroupUtilConfiguration.java +++ b/src/main/java/cn/stylefeng/guns/core/beetl/CustomBeetlGroupUtilConfiguration.java @@ -1,6 +1,7 @@ package cn.stylefeng.guns.core.beetl; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.stylefeng.guns.core.beetl.tag.SysDictCheckBoxTag; import cn.stylefeng.guns.core.beetl.tag.SysDictRadioTag; import cn.stylefeng.guns.core.beetl.tag.SysDictSelectTag; @@ -28,9 +29,12 @@ public class CustomBeetlGroupUtilConfiguration extends BeetlGroupUtilConfigurati // 获取当前用户的接口 groupTemplate.registerFunctionPackage("loginUser", loginUserApi); - // 字符串处理工具类 + // 对象工具类 groupTemplate.registerFunctionPackage("objectUtil", ObjectUtil.class); + // 字符串处理工具类 + groupTemplate.registerTag("strUtil", StrUtil.class); + // 获取基本信息的工具 groupTemplate.registerFunctionPackage("constants", SystemConfigExpander.class); diff --git a/src/main/webapp/pages/layout/_container.html b/src/main/webapp/pages/layout/_container.html index 7a8ce2b8..ccc82f56 100644 --- a/src/main/webapp/pages/layout/_container.html +++ b/src/main/webapp/pages/layout/_container.html @@ -36,7 +36,7 @@ @if(isNotEmpty(css)){ @for(item in css){ - @if(strutil.startWith(item,"/")){ + @if(strUtil.startWith(item,"/")){ @item = ctxPath + item; @} @@ -83,11 +83,11 @@ ${layoutContent} @if(isNotEmpty(js)){ @for(item in js){ - @if(strutil.startWith(item,"/")){ + @if(strUtil.startWith(item,"/")){ @item = ctxPath + item; @} @} @} - \ No newline at end of file + diff --git a/src/main/webapp/pages/layout/_form.html b/src/main/webapp/pages/layout/_form.html index 0030f480..2ca56212 100644 --- a/src/main/webapp/pages/layout/_form.html +++ b/src/main/webapp/pages/layout/_form.html @@ -38,7 +38,7 @@ @if(isNotEmpty(css)){ @for(item in css){ - @if(strutil.startWith(item,"/")){ + @if(strUtil.startWith(item,"/")){ @item = ctxPath + item; @} @@ -85,7 +85,7 @@ ${layoutContent} @if(isNotEmpty(js)){ @for(item in js){ - @if(strutil.startWith(item,"/")){ + @if(strUtil.startWith(item,"/")){ @item = ctxPath + item; @} @@ -109,4 +109,4 @@ ${layoutContent} - \ No newline at end of file + diff --git a/src/main/webapp/pages/layout/_tree_container.html b/src/main/webapp/pages/layout/_tree_container.html index 61b4dab2..8f315b65 100644 --- a/src/main/webapp/pages/layout/_tree_container.html +++ b/src/main/webapp/pages/layout/_tree_container.html @@ -32,7 +32,7 @@ @/* 其他业务用的css */ @if(isNotEmpty(css)){ @for(item in css){ - @if(strutil.startWith(item,"/")){ + @if(strUtil.startWith(item,"/")){ @item = ctxPath + item; @} @@ -70,7 +70,7 @@ ${layoutContent} @if(isNotEmpty(js)){ @for(item in js){ - @if(strutil.startWith(item,"/")){ + @if(strUtil.startWith(item,"/")){ @item = ctxPath + item; @}