From f6f2ef63163f4b4d3b59f092cbd234f9184df8b4 Mon Sep 17 00:00:00 2001 From: WolfCat-ICE <45056430+WolfCat-ICE@users.noreply.github.com> Date: Fri, 19 Sep 2025 18:07:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Update=20renderUtils.ts=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AD=97=E5=85=B8=E6=B8=B2=E6=9F=93renderTag=E4=BD=BF?= =?UTF-8?q?=E7=94=A8tag=E6=B8=B2=E6=9F=93=E6=B2=A1=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=85=8D=E7=BD=AE=E9=A2=9C=E8=89=B2=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在renderDict方法中增加颜色属性传递，支持标签颜色渲染 render.renderDict(text, 'bpm_status',true) --- jeecgboot-vue3/src/utils/common/renderUtils.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jeecgboot-vue3/src/utils/common/renderUtils.ts b/jeecgboot-vue3/src/utils/common/renderUtils.ts index 87889a842..c0cb07d9e 100644 --- a/jeecgboot-vue3/src/utils/common/renderUtils.ts +++ b/jeecgboot-vue3/src/utils/common/renderUtils.ts @@ -45,15 +45,17 @@ const render = { */ renderDict: (v, code, renderTag = false) => { let text = ''; + let color = ''; let array = getDictItemsByCode(code) || []; let obj = array.filter((item) => { return item.value == v; }); if (obj.length > 0) { text = obj[0].text; + color = obj[0].color; } //【jeecgboot-vue3/issues/903】render.renderDict使用tag渲染报警告问题 #903 - return isEmpty(text) || !renderTag ? h('span', text) : h(Tag, () => text); + return isEmpty(text) || !renderTag ? h('span', text) : h(Tag,{ color }, () => text); }, /** * 渲染图片 From adc191f03e20cded2fec0c9c3ca0f09df78528af Mon Sep 17 00:00:00 2001 From: Jary Date: Mon, 20 Oct 2025 22:21:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix#9002=20=E8=A7=A3=E5=86=B3=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=B3=A8=E8=A7=A3=E6=9F=A5=E8=AF=A2=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=B9=8B=E5=90=8E=EF=BC=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E4=B8=8D=E8=83=BD=E6=81=A2=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysDictServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java index 8d76a2a19..441aafcc5 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java @@ -376,11 +376,19 @@ public class SysDictServiceImpl extends ServiceImpl impl if (isCustomDataSource) { DynamicDataSourceContextHolder.push(dataSource); } - List restData = sysDictMapper.queryTableDictByKeysAndFilterSql(table, text, code, filterSql, codeValues); - // 清理自定义的数据源 - if (isCustomDataSource) { - DynamicDataSourceContextHolder.clear(); + //update-begin---author:jarysun ---date:20251020 for：[issues/#9002]解决表字典查询出现异常之后，数据源不能恢复问题------------ + List restData = null; + + try { + restData = sysDictMapper.queryTableDictByKeysAndFilterSql(table, text, code, filterSql, codeValues); + } finally { + // 清理自定义的数据源 + if (isCustomDataSource) { + DynamicDataSourceContextHolder.clear(); + } } + //update-end---author:jarysun ---date:20251020 for：[issues/#9002]解决表字典查询出现异常之后，数据源不能恢复问题------------ + return restData; //update-end---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ //update-end-author:taoyan date:20220113 for: @dict注解支持 dicttable 设置where条件