From 26e5c1cdad65881f7fdccb79fe15db713e0b3cc5 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 30 四月 2024 10:51:29 +0800
Subject: [PATCH] 字段枚举解析修改
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 22 +++++++++++-----------
Bin/web/vci-platform-web.jar | 0
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Bin/web/vci-platform-web.jar b/Bin/web/vci-platform-web.jar
index 3d447c3..927255a 100644
--- a/Bin/web/vci-platform-web.jar
+++ b/Bin/web/vci-platform-web.jar
Binary files differ
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index c7876ed..36da87e 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -372,18 +372,18 @@
if("radio".equalsIgnoreCase(itemVO.getType()) || "checkbox".equalsIgnoreCase(itemVO.getType())
|| "combox".equalsIgnoreCase(itemVO.getType())){
//鐪嬬湅鏈夋病鏈夊崟鐙缃�
- if(StringUtils.isNotBlank(itemXO.getComboxKey())){
- itemVO.setComboxKey(itemXO.getComboxKey());
- if(StringUtils.isNotBlank(itemXO.getComboxItems())){
- List<KeyValue> keyValues = new ArrayList<>();
- VciBaseUtil.str2List(itemXO.getComboxItems()).stream().forEach(temmpKeyValue->{
- KeyValue kv = new KeyValue();
- kv.setKey(temmpKeyValue.split("=")[0]);
- kv.setValue(temmpKeyValue.split("=")[1]);
- keyValues.add(kv);
- });
- itemVO.setData(keyValues);
+// if(StringUtils.isNotBlank(itemXO.getComboxKey())){
+// itemVO.setComboxKey(itemXO.getComboxKey());
+ if(StringUtils.isNotBlank(itemXO.getComboxItems())){
+ List<KeyValue> keyValues = new ArrayList<>();
+ for (String keyValue : itemXO.getComboxItems().split(";")) {
+ KeyValue kv = new KeyValue();
+ String[] split = keyValue.split("\\{");
+ kv.setKey(split[0]);
+ kv.setValue(split[1].substring(0,split[1].length()-1));
+ keyValues.add(kv);
}
+ itemVO.setData(keyValues);
}else{
String attr = itemVO.getField();
if(itemVO.getField().toLowerCase().startsWith("t_oid.")
--
Gitblit v1.9.3