getrebuild/rebuild
1
1
Fork 0
mirror of https://github.com/getrebuild/rebuild.git synced 2024-09-20 07:25:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

be

Browse source
This commit is contained in:
RB 2024-03-05 01:00:40 +08:00
parent 61be8c16de
commit 5e1dc802eb
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/rebuild/core/service/feeds/BaseFeedsService.java
View file

@ -44,7 +44,7 @@ public abstract class BaseFeedsService extends ObservableService {
@Override
public Record create(Record record) {
record = super.create(converContent(record));
record = super.create(converContent4Mentions(record));
awareMention(record, true);
return record;
@ -52,7 +52,7 @@ public abstract class BaseFeedsService extends ObservableService {
@Override
public Record update(Record record) {
record = super.update(converContent((record)));
record = super.update(converContent4Mentions((record)));
awareMention(record, false);
return record;
@ -174,7 +174,7 @@ public abstract class BaseFeedsService extends ObservableService {
* @param record
* @return
*/
private Record converContent(Record record) {
private Record converContent4Mentions(Record record) {
String content = record.getString("content");
if (StringUtils.isBlank(content)) return record;

10
src/main/java/com/rebuild/web/admin/audit/RevisionHistoryController.java
View file

@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.rebuild.core.Application;
import com.rebuild.core.metadata.EntityHelper;
import com.rebuild.core.metadata.MetadataHelper;
import com.rebuild.core.metadata.easymeta.EasyField;
import com.rebuild.core.metadata.easymeta.EasyMetaFactory;
@ -87,6 +88,7 @@ public class RevisionHistoryController extends EntityController {
// 补充字段名称
private void paddingFieldsName(JSONArray contents, Entity entity) {
final int entityCode = entity.getEntityCode();
for (Iterator<Object> iter = contents.iterator(); iter.hasNext(); ) {
JSONObject item = (JSONObject) iter.next();
String fieldName = item.getString("field");
@ -95,8 +97,12 @@ public class RevisionHistoryController extends EntityController {
EasyField easyField = EasyMetaFactory.valueOf(entity.getField(fieldName));
// 排除不可查询字段
if (!easyField.isQueryable()) {
iter.remove();
continue;
if (fieldName.equalsIgnoreCase("contentMore") && entityCode == EntityHelper.Feeds) {
// 保留
} else {
iter.remove();
continue;
}
}
fieldName = easyField.getLabel();

2
src/main/resources/metadata-conf.xml
View file

@ -427,7 +427,7 @@
<field name="feedsId" type="primary"/>
<field name="type" type="small-int" nullable="false" updatable="false" default-value="1" description="类型"/>
<field name="content" type="text" nullable="false" description="内容"/>
<field name="contentMore" type="text" description="扩展内容 (JSON Map)" queryable="false"/>
<field name="contentMore" type="text" description="附加内容" queryable="false"/>
<field name="images" type="string" max-length="700" description="图片" extra-attrs="{displayType:'IMAGE'}"/>
<field name="attachments" type="string" max-length="700" description="附件" extra-attrs="{displayType:'FILE'}"/>
<field name="relatedRecord" type="any-reference" description="相关记录" cascade="ignore"/>