From 61fc6b12f5231c50103849866fe2d094fc0b9936 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期六, 08 二月 2025 18:40:40 +0800
Subject: [PATCH] 列表表单支持配置是否搜索该字段
---
src/main/java/com/product/face/service/FaceCacheService.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceCacheService.java b/src/main/java/com/product/face/service/FaceCacheService.java
index 5b0b933..85f00ad 100644
--- a/src/main/java/com/product/face/service/FaceCacheService.java
+++ b/src/main/java/com/product/face/service/FaceCacheService.java
@@ -3,7 +3,6 @@
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
import com.product.common.lang.StringUtils;
import com.product.core.cache.util.RedisUtil;
import com.product.core.entity.DataTableEntity;
@@ -12,7 +11,6 @@
import com.product.face.config.FaceConst;
import com.product.face.entity.FaceEntity;
import com.product.face.entity.FaceListEntity;
-import com.product.face.entity.TableColumn;
import com.product.face.util.FaceUtil;
import com.product.util.BaseUtil;
import org.springframework.stereotype.Service;
@@ -54,7 +52,7 @@
if (!StringUtils.isEmpty(uuid)) {
objects = new Object[]{uuid};
}
- DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects, null, null, Integer.MAX_VALUE, 1, true);
+ DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects, null, null, 0, 0, true);
if (DataTableEntity.isEmpty(dt)) {
return;
}
@@ -148,13 +146,21 @@
}
String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
String tableUuid = fse.getString(FaceConst.FIELD_TABLE_UUID);
- List<TableColumn> result = Lists.newArrayList();
+ String treeShow = fse.getString("tree_show");
+ String treeDataType = fse.getString("tree_data_type");
+ String treeDataSource = fse.getString("tree_datasource");
+ String treeLabelKey = fse.getString("tree_label_key");
+ String treeValueKey = fse.getString("tree_value_key");
FaceListEntity faceListEntity = new FaceListEntity();
faceListEntity.setFaceName(faceNumber);
faceListEntity.setTableUuid(tableUuid);
faceListEntity.setUuid(fse.getUUID());
+ faceListEntity.setTreeShow(treeShow);
+ faceListEntity.setTreeDataType(treeDataType);
+ faceListEntity.setTreeDataSource(treeDataSource);
+ faceListEntity.setTreeLabelKey(treeLabelKey);
+ faceListEntity.setTreeValueKey(treeValueKey);
for (int i = 0; i < tableColumns.size(); i++) {
- TableColumn tableColumn = new TableColumn();
JSONObject columnJson = tableColumns.getJSONObject(i);
String fieldName = columnJson.getString(FaceConst.FIELD_PROPERTY_VMODEL);
if (StringUtils.isEmpty(fieldName)) {
@@ -165,21 +171,16 @@
JSONObject config = columnJson.getJSONObject(FaceConst.FIELD_PROPERTY_CONFIG);
Object setWidth = config.get("setWidth");
- if (!StringUtils.isEmpty(setWidth)) {
- tableColumn.setColumnWidth(setWidth + "%");
- }
FieldSetEntity fieldInfo = BaseUtil.getSingleInfoByCache("琛ㄥ瓧娈典俊鎭�", new String[]{tableUuid, fieldName});
String label = config.getString(FaceConst.FIELD_PROPERTY_LABEL);
+ boolean search = !"0".equals(config.getString("isSearch"));
String fieldUuid = null;
String fieldReference = null;
if (!FieldSetEntity.isEmpty(fieldInfo)) {
fieldUuid = fieldInfo.getString(FaceConst.UUID);
fieldReference = fieldInfo.getString(FaceConst.FIELD_FIELD_REFERENCE);
}
- faceListEntity.addField(fieldName, fieldUuid, label, tableColumn.getColumnWidth(), i, fieldReference);
- tableColumn.setField(fieldName);
- tableColumn.setTitle(config.getString(FaceConst.FIELD_PROPERTY_LABEL));
- result.add(tableColumn);
+ faceListEntity.addField(fieldName, fieldUuid, label, !StringUtils.isEmpty(setWidth)? setWidth+"%" : null, i, fieldReference,search);
}
//楠岃瘉琛ㄥ崟涓殑瀛楁鏄惁瀛樺湪
if (faceListEntity != null && !CollectionUtil.isEmpty(faceListEntity.getFaceFields())) {
--
Gitblit v1.9.2