From 4d1360d7e91aa4d394eb4a35adea993a45c0d725 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期四, 09 一月 2025 10:53:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0 into dev
---
src/main/java/com/product/mobile/core/service/FaceMobileService.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/product/mobile/core/service/FaceMobileService.java b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
index 0fe11ac..4f774d3 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -331,20 +331,57 @@
if (!CollectionUtil.isEmpty(fieldSetEntity) && !StringUtils.isEmpty(parentUuid1)) {
if (i + 1 == result.size()) {
Map<String, Object> o = group.get(parentUuid1);
+ List<FieldSetEntity> configValueList = null;
if (o == null) {
List<FieldSetEntity> fieldSetEntity1 = productSysFaceControlProperty.getFieldSetEntity(parentUuid1);
List<FieldSetEntity> fieldSetEntity2 = productSysFaceControlProperty.getFieldSetEntity(fieldSetEntity1.get(0).getString("parent_uuid"));
List<FieldSetEntity> fieldSetEntities = groupMap.get(fieldSetEntity2.get(0).getString("group_uuid"));
//list杞琺ap
Map<String, Object> map = new HashMap<>();
+ String tabsChldren = null;
for (FieldSetEntity fieldSetEntity3 : fieldSetEntities) {
map.put(fieldSetEntity3.getString("property_name"), fieldSetEntity3.getString("property_value"));
+ if ("__config__".equals(fieldSetEntity3.getString("property_name"))) {
+ configValueList = parentMap.get(fieldSetEntity3.getString("uuid"));
+ }
+ if ("children".equals(fieldSetEntity3.getString("property_name"))) {
+ tabsChldren = fieldSetEntity3.getString("property_value");
+ }
+ }
+ if (map.get("tag") != null && "el-tabs".equals(map.get("tag"))) {
+ map.remove("label");
+ if(tabsChldren != null){
+
+ }
}
group.put(parentUuid1, map);
o = map;
+
}
result.get(i).putOtherParam("parentContainerName", BaseUtil.ifNull(o.get("title"), o.get("label")));
result.get(i).putOtherParam("parentContainer", parentUuid1);
+ Map<String, Object> configValueMap = null;
+ if (o.get("configValue") != null) {
+ configValueMap = (Map<String, Object>) o.get("configValue");
+ }
+ if ((configValueList != null || configValueMap != null) && StringUtils.isEmpty(BaseUtil.ifNull(o.get("title"), o.get("label")))) {
+ if (configValueMap == null) {
+ configValueMap = new HashMap<>();
+ for (FieldSetEntity fieldSetEntity4 : configValueList) {
+ configValueMap.put(fieldSetEntity4.getString("property_name"), fieldSetEntity4.getString("property_value"));
+ }
+ }
+ //tag
+ String tag = (String) configValueMap.get("tag");
+ if ("el-card".equals(tag)) {
+ result.get(i).putOtherParam("parentContainerName", configValueMap.get("label"));
+ } else if ("el-tabs".equals(tag)) {
+ System.out.println(1);
+ } else {
+ System.out.println(2);
+ }
+ o.put("configValue", configValueMap);
+ }
}
}
}
--
Gitblit v1.9.2