diff --git a/src/main/java/cn/stylefeng/guns/core/beetl/consts/DictTagConstants.java b/src/main/java/cn/stylefeng/guns/core/beetl/consts/DictTagConstants.java index 75b0da28..56a5d9ab 100644 --- a/src/main/java/cn/stylefeng/guns/core/beetl/consts/DictTagConstants.java +++ b/src/main/java/cn/stylefeng/guns/core/beetl/consts/DictTagConstants.java @@ -74,5 +74,4 @@ public interface DictTagConstants { */ String ITEM_NAME = "itemName"; - } diff --git a/src/main/java/cn/stylefeng/guns/core/beetl/tag/SysDictBaseTag.java b/src/main/java/cn/stylefeng/guns/core/beetl/tag/SysDictBaseTag.java index 04dd7354..448869eb 100644 --- a/src/main/java/cn/stylefeng/guns/core/beetl/tag/SysDictBaseTag.java +++ b/src/main/java/cn/stylefeng/guns/core/beetl/tag/SysDictBaseTag.java @@ -23,56 +23,71 @@ import java.util.Map; */ @Data public class SysDictBaseTag extends GeneralVarTagBinding { + public DictService dictService = SpringUtil.getBean(DictService.class); + public DictTypeService dictTypeService = SpringUtil.getBean(DictTypeService.class); + /** * html组件 id */ public String id; + /** * html组件 name */ public String name; + /** * html组件 type */ public String type; + /** * 字典类型编码 */ public String dictTypeCode; + /** * layui元素的风格 */ public String laySkin; + /** * layui事件过滤器 */ public String layFilter; + /** * layui校验 */ public String layVerify; + /** * select控件提示name */ public String headName; + /** * select控件提示value */ public String headValue; + /** * select控件提示类型::1-全部,2-请选择 */ public String headType; + /** * 默认值 */ public String defaultValue; + /** * 工作流相关 */ public String workflowForm; + /** * 工作流相关 */ @@ -136,25 +151,25 @@ public class SysDictBaseTag extends GeneralVarTagBinding { /** * 获取字典类型 + * * @return 字典类型 * @author liuhanqing * @date 2021/1/16 23:46 */ - public SysDictType getDictType(){ + public SysDictType getDictType() { // 根据字典类型编码去查询字典类型 LambdaQueryWrapper dictTypeQueryWrapper = new LambdaQueryWrapper<>(); dictTypeQueryWrapper.eq(SysDictType::getDictTypeCode, this.getDictTypeCode()); dictTypeQueryWrapper.ne(SysDictType::getDelFlag, YesOrNotEnum.Y.getCode()); return dictTypeService.getOne(dictTypeQueryWrapper); } + /** - * - * * @return 根据字典类型返回字典集合 * @author liuhanqing * @date 2021/1/16 23:46 */ - public List getDictList(){ + public List getDictList() { // 查询字典列表 LambdaQueryWrapper dictQueryWrapper = new LambdaQueryWrapper<>(); dictQueryWrapper.eq(SysDict::getDictTypeCode, this.getDictTypeCode()); diff --git a/src/main/webapp/assets/common/js/common.js b/src/main/webapp/assets/common/js/common.js index b202bdf6..8450454e 100644 --- a/src/main/webapp/assets/common/js/common.js +++ b/src/main/webapp/assets/common/js/common.js @@ -5,7 +5,7 @@ /* 解析数据表格templet列 */ Feng.parseData = function (res) { return { - "code": res.code == "00000" ? "0" : res.code, //解析接口状态 + "code": res.code === "00000" ? "0" : res.code, //解析接口状态 "msg": res.message, //解析提示文本 "count": res.data.totalRows, //解析数据长度 "data": res.data.rows //解析数据列表 @@ -163,4 +163,4 @@ layui.config({ } }); -}); \ No newline at end of file +});