From 35c390431b4ffa1e3f50371a46b4e9ac63d9aa70 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 17 四月 2026 09:45:08 +0800
Subject: [PATCH] Merge branch 'saas' of http://nonxin.cn:8090/r/product/product-server-tool-face/V2.0.0 into saas
---
src/main/java/com/product/face/service/FaceDesignService.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceDesignService.java b/src/main/java/com/product/face/service/FaceDesignService.java
index 9daf37d..464d7d4 100644
--- a/src/main/java/com/product/face/service/FaceDesignService.java
+++ b/src/main/java/com/product/face/service/FaceDesignService.java
@@ -6,7 +6,6 @@
import com.alibaba.fastjson.JSONObject;
import com.product.admin.service.PublicService;
import com.product.common.lang.StringUtils;
-import com.product.core.cache.DataPoolCacheImpl;
import com.product.core.config.CoreConst;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -18,8 +17,6 @@
import com.product.face.service.ide.IFaceDesignService;
import com.product.face.util.FaceUtil;
import com.product.util.BaseUtil;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -37,6 +34,14 @@
@Resource
public PublicService publicService;
+ public DataTableEntity listAllTable(){
+ return getBaseDao().listTable("product_sys_datamodel_table", null, "table_type ASC");
+ }
+
+ public DataTableEntity listAllDesignFace(){
+ return getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG);
+ }
+
/**
* 鑾峰彇琛ㄥ崟閰嶇疆璇︽儏
*
@@ -65,6 +70,10 @@
other.put("product_sys_face_custom_field", new String[]{});
}
fse.getSubData().clear();
+ //澶у啓瀛楁鍊兼樉绀鸿浆鎹�
+// fse.setValue("formRules", fse.getString("form_rules"));
+// fse.setValue("formModel", fse.getString("form_model"));
+// fse.setValue("labelWidth", fse.getString("label_width"));
return BaseUtil.success(fse, other);
}
@@ -108,6 +117,10 @@
fieldSetEntityList.addAll(controlTraverse(new JSONObject((Map) fields.getFieldSetEntity(i).getValues()), null, i, pointer));
}
fse.removeSubData(FaceConst.FACE_FIELD);
+ //澶у啓瀛楁鍊间繚瀛樿浆鎹�
+// fse.setValue("form_rules", fse.getString("formRules"));
+// fse.setValue("form_model", fse.getString("formModel"));
+// fse.setValue("label_width", fse.getString("labelWidth"));
BaseUtil.createCreatorAndCreationTime(fse);
fields.setData(fieldSetEntityList);
fse.addSubDataTable(fields);
@@ -147,6 +160,10 @@
FieldSetEntity fs = getTemplateFieldSet(entry.getKey(), entry.getValue(), groupUuid);
if (fs != null) {
int propertyType = fs.getInteger(FaceConst.FIELD_PROPERTY_TYPE).intValue();
+ // 2025骞�6鏈�16鏃� 14:28:39 绉诲姩绔� 浜哄憳閫夋嫨瀛楁鏈�夛紝榛樿涓�0 bug瑙ｅ喅锛堟湰韬槸false锛屼絾鏄暟鎹簱淇濆瓨涓�0锛�
+ if (5 == propertyType && "defaultValue".equals(fs.getString("property_name")) && !fs.getBoolean("property_value")) {
+ continue;
+ }
if ((4 == propertyType || 3 == propertyType) && (entry.getValue() instanceof JSONArray || entry.getValue() instanceof JSONObject)) {
try {
fieldSetList.addAll(controlTraverse(entry.getValue(), fs.getUUID(), null, pointer));
--
Gitblit v1.9.2