getrebuild/rebuild
1
1
Fork 0
mirror of https://github.com/getrebuild/rebuild.git synced 2025-03-12 15:11:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
RB 2024-02-21 20:13:35 +08:00
commit 61a755d202
4 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/rebuild/core/service/approval/RobotApprovalManager.java
View file

@ -134,11 +134,13 @@ public class RobotApprovalManager implements ConfigManager {
// 发起人匹配
JSONArray users = root.getDataMap().getJSONArray("users");
if (users == null || users.isEmpty()) {
users = JSON.parseArray("['OWNS']");
// v3.5.5/3.5.6 默认所有人可发起
users = JSON.parseArray("['ALL']");
}
if (FlowNode.USER_ALL.equals(users.getString(0))
|| (FlowNode.USER_OWNS.equals(users.getString(0)) && owning.equals(user))
final String rootUser = users.getString(0);
if (FlowNode.USER_ALL.equals(rootUser)
|| (FlowNode.USER_OWNS.equals(rootUser) && owning.equals(user))
|| UserHelper.parseUsers(users, recordId).contains(user)) {
// 过滤条件

14
src/main/java/com/rebuild/core/service/general/GeneralEntityService.java
View file

@ -215,7 +215,12 @@ public class GeneralEntityService extends ObservableService implements EntitySer
}
/**
* 优先使用 `#createOrUpdate(Record) `
* 优先使用 `#createOrUpdate`。直接使用此方法请注意调用重复检查 `#getAndCheckRepeated`
*
* @param record
* @return
* @see #createOrUpdate(Record)
* @see #getAndCheckRepeated(Record, int)
*/
@Override
public Record create(Record record) {
@ -226,7 +231,12 @@ public class GeneralEntityService extends ObservableService implements EntitySer
}
/**
* 优先使用 `#createOrUpdate(Record) `
* 优先使用 `#createOrUpdate`。直接使用此方法请注意调用重复检查 `#getAndCheckRepeated`
*
* @param record
* @return
* @see #createOrUpdate(Record)
* @see #getAndCheckRepeated(Record, int)
*/
@Override
public Record update(Record record) {

12
src/main/java/com/rebuild/core/service/general/recyclebin/RestoreRecordCreator.java
View file

@ -59,6 +59,18 @@ public class RestoreRecordCreator extends JsonRecordCreator {
}
}
// fix: v3.5.6/v3.6
DisplayType dt = EasyMetaFactory.getDisplayType(entity.getField(fileName));
if (dt == DisplayType.N2NREFERENCE || dt == DisplayType.TAG) {
// 只需保留一个作为标志，因为 NreferenceItem/TagItem 中并未删除
try {
JSONArray valueArray = (JSONArray) value;
value = valueArray.get(0);
} catch (Exception ignored) {
continue;
}
}
setFieldValue(entity.getField(fileName), value.toString(), record);
}
return record;

2
src/main/resources/web/assets/js/metadata/field-edit.js
View file

@ -574,7 +574,7 @@ const _loadRefsLabel = function ($dv, $dvClear) {
$dv.attr('data-value-id', CURRENT_BIZZ)
$dvClear && $dvClear.removeClass('hide')
} else if (dvid) {
$.get(`/commons/search/read-labels?ids=${encodeURIComponent(dvid)}&ignoreMiss=true`, (res) => {
$.get(`/commons/search/read-labels?ids=${encodeURIComponent(dvid)}&ignoreMiss=false`, (res) => {
if (res.data) {
const ids = []
const labels = []